diff --git a/pages/work2/work2.wxml b/pages/work2/work2.wxml
index d71449e..ee9100d 100644
--- a/pages/work2/work2.wxml
+++ b/pages/work2/work2.wxml
@@ -81,7 +81,7 @@
安检巡查
-
+
热线接办
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
index 9d8f331..ac778b3 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.js
@@ -577,10 +577,6 @@ formatTimestamp(timestamp) {
return
}
if (this.data.tabVal === '1') {
- if (!this.data.fmData.content) {
- this.showToast('需求描述不能为空')
- return
- }
if (!this.data.fmData.content) {
this.showToast('需求描述不能为空')
return
@@ -611,8 +607,14 @@ formatTimestamp(timestamp) {
}
} else {
if (!this.data.fmData.content) {
- this.showToast('事件描述不能为空')
- return
+ if(this.data.fmData.voiceList.length<=0){
+ this.showToast('事件描述不能为空')
+ return
+ }else{
+ this.setData({
+ 'fmData.content': "语音事件",
+ })
+ }
}
if (!this.data.fmData.happenTime) {
this.showToast('发生时间不能为空')
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml
index 600cc6f..69750bd 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml
@@ -192,61 +192,61 @@
-
- 处理进展
+
+ 处理进展
-
+
【指派】
【完成并回复】
【{{ item.processName }}】
+ {{item.formattedTime}}
- {{item.formattedTime}}
- 指派人：
-
+ 指派人：
+
{{ item.departmentName }}
- 指派部门：
-
+ 指派部门：
+
{{ item.agencyName }}
- 转办意见：
-
+ 转办意见：
+
{{ item.publicReply }}
- 办结时限：
-
+ 办结时限：
+
{{ item.timeLimit }}
- 回复人：
-
+ 回复人：
+
{{ item.departmentName }}
- 回复内容：
-
+ 回复内容：
+
{{ item.publicReply }}
- 办结时限：
-
+ 办结时限：
+
{{ item.timeLimit }}
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
index 3b38350..ab4edbe 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
@@ -585,11 +585,11 @@ background: rgb(175, 1, 1);
display: flex;
align-items: center;
color: #999;
- font-size: 28rpx;
+ font-size: 25rpx;
font-weight: 300;
}
.radio-group radio + radio {
- margin-left: 20rpx;
+ margin-left: 5rpx;
}
.radio-group-small {
@@ -1054,7 +1054,7 @@ background: rgb(175, 1, 1);
padding: 30rpx;
margin-top: 20rpx;
}
-.card .title {
+.card .title1 {
font-size: 34rpx;
font-weight: bold;
color: #333333;
@@ -1064,7 +1064,7 @@ background: rgb(175, 1, 1);
margin-bottom: 39rpx;
position: relative;
}
-.card .title:before {
+.card .title1:before {
content: '';
display: block;
width: 10rpx;
@@ -1077,27 +1077,37 @@ background: rgb(175, 1, 1);
.step-title {
font-size: 32rpx;
font-weight: 500;
- color: #333333;
+ color: #fcfcfc;
margin-left: -.5em;
+ background-color: #3A80E7;
}
.step-time {
font-size: 26rpx;
font-weight: 400;
color: #999999;
- margin: 20rpx 0 30rpx;
+ margin-left: 30rpx;
+
}
.card_content {
display: flex;
font-weight: 400;
color: #999999;
+ margin-top: 20rpx;
}
-.label {
+.label1 {
white-space: nowrap;
font-size: 30rpx;
- margin-bottom: 22rpx;
+ /* margin-bottom: 22rpx; */
}
-.value {
+.value1 {
color: #333;
+}
+
+.step-container {
+ display: flex;
+ flex-direction: row;
+ align-items: center; /* 垂直居中对齐 */
+ margin-top: 35rpx;
}
\ No newline at end of file
diff --git a/subpages/myTroubleshootDemand/pages/event/event.js b/subpages/myTroubleshootDemand/pages/event/event.js
index 87c56fd..19a8877 100644
--- a/subpages/myTroubleshootDemand/pages/event/event.js
+++ b/subpages/myTroubleshootDemand/pages/event/event.js
@@ -23,8 +23,8 @@ Page({
categoryIds:'',
currentDate: new Date().getTime(),
- minDate: new Date(2024, 0, 1).getTime(),
- maxDate: new Date().getTime(),
+ minDate: new Date(2020, 0, 1).getTime(),
+ maxDate: new Date(2030, 12, 31).getTime(),
form: {
operationType: "0", //处理方式[0:已回复 5、指派 6、完成并回复]
@@ -34,7 +34,9 @@ Page({
deptId: "", //指派部门
deptName: "",
categoryList: [],
- files: [] //附件
+ files: [], //附件
+ sendMsg: 1, // 这个存储选中值（整数1或0）
+ sendMsgArray: ['1'] // 默认选中，值为数组['1']
},
categoryTreeData:[]
@@ -184,7 +186,7 @@ Page({
}
agencyGridDepttree(params).then(res => {
this.setData({
- orgOptions: this.deleteChildren(res.data.subAgencyList, 'subAgencyList')
+ orgOptions: this.deleteChildren([res.data], 'subAgencyList')
})
})
},
@@ -243,7 +245,18 @@ Page({
},
onClose2() {
this.setData({visible2: false})
- console.log('onClose2')
+
+ },
+ onChange2(e) {
+ let data = e.detail
+
+ let params = data.selectedOptions[data.selectedOptions.length - 1]
+ this.setData({
+ "form.deptId": params.agencyId,
+ "form.deptName": params.agencyName,
+ "form.orgType": params.level
+ })
+ this.setData({orgName: data.selectedOptions.map(item => item.agencyName).join('/')})
},
onConfirm2(e) {
let data = e.detail
@@ -358,12 +371,13 @@ Page({
return
}
+
let params = {
...this.data.form,
files: this.data.fileList,
icEventId: this.data.id,
- status: "processing",
+ status: this.data.tabVal==="6"?"closed_case":"processing",
// timeLimit: this.data.value1 && this.data.value1.length ? this.data.value1[0] : ""
}
icEventOldReply(params).then(res => {
@@ -389,4 +403,12 @@ Page({
})
},
+ sendMsgChange(e) {
+ const selected = e.detail.length > 0; // 判断复选框是否选中
+ this.setData({
+ 'form.sendMsg': selected ? 1 : 0, // 如果选中则值为1，否则为0
+ 'form.sendMsgArray': selected ? ['1'] : [] // 更新sendMsgArray
+ });
+ },
+
})
\ No newline at end of file
diff --git a/subpages/myTroubleshootDemand/pages/event/event.json b/subpages/myTroubleshootDemand/pages/event/event.json
index 3cf54e0..110023c 100644
--- a/subpages/myTroubleshootDemand/pages/event/event.json
+++ b/subpages/myTroubleshootDemand/pages/event/event.json
@@ -5,6 +5,8 @@
"van-calendar": "@vant/weapp/calendar/index",
"van-uploader": "@vant/weapp/uploader/index",
"van-picker": "@vant/weapp/picker/index",
+ "van-checkbox": "@vant/weapp/checkbox/index",
+ "van-checkbox-group": "@vant/weapp/checkbox-group/index",
"wux-date-picker": "../../../../components/dist/date-picker/index"
},
diff --git a/subpages/myTroubleshootDemand/pages/event/event.wxml b/subpages/myTroubleshootDemand/pages/event/event.wxml
index c949792..2309473 100644
--- a/subpages/myTroubleshootDemand/pages/event/event.wxml
+++ b/subpages/myTroubleshootDemand/pages/event/event.wxml
@@ -57,7 +57,7 @@
附件
-
+
@@ -72,6 +72,16 @@
+
+
+
+
+ 短信通知部门负责人
+
+
+
+
+
@@ -102,31 +112,16 @@
options="{{ orgOptions }}"
bind:close="onClose2"
bind:finish="onConfirm2"
+ bind:change="onChange2"
field-names="{{orgField}}"
/>
-
-
{{item.type == 'event'?'事件':item.type == 'chengguan'?'城管':'需求'}}
{{item.name}} {{item.mobile}}
+ {{item.status == 'processing'?'处理中':'已完成'}}
{{item.content}}
@@ -31,6 +32,7 @@
{{item.type == 'event'?'事件':item.type == 'chengguan'?'城管':'需求'}}
{{item.name}} {{item.mobile}}
+ {{item.status == 'processing'?'处理中':'已完成'}}
{{item.content}}
diff --git a/subpages/myTroubleshootDemand/pages/index/index.wxss b/subpages/myTroubleshootDemand/pages/index/index.wxss
index d66b35d..6f1fbcb 100644
--- a/subpages/myTroubleshootDemand/pages/index/index.wxss
+++ b/subpages/myTroubleshootDemand/pages/index/index.wxss
@@ -45,6 +45,12 @@ page {
background-color: #eef4fd;
color: #5cc789;
}
+
+.gray_small{
+ background-color: #a4a8ad;
+ color: #fdfdfd;
+ font-size: 25rpx;
+}
.content{
width: 100%;
padding:0 20rpx ;
@@ -67,7 +73,11 @@ page {
overflow: hidden;
box-sizing: border-box;
color: #333;
+ position: relative; /* 为了使用伪元素 */
+ margin-bottom: 20rpx;
}
+
+
.content .card .title{
display: flex;
justify-content: space-between;