From 4c43cd5095cf6a29d9892416d6ec04529a9c9d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Sun, 5 Dec 2021 14:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=B8=9A=E6=89=A7=E6=B3=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lawEnforcement/index.js               |  9 +++
 src/views/lawEnforcement/case/caseDetail.vue  | 30 ++++----
 .../programme/programmeApproval.vue           |  6 +-
 .../lawEnforcement/scheme/schemeDetail.vue    |  8 +-
 src/views/lawEnforcement/user/index.vue       |  1 +
 .../lawEnforcement/user/waitingProcessing.vue | 74 ++++++++++++++++++-
 6 files changed, 107 insertions(+), 21 deletions(-)

diff --git a/src/api/lawEnforcement/index.js b/src/api/lawEnforcement/index.js
index 3b9e7b2f..81b5b282 100644
--- a/src/api/lawEnforcement/index.js
+++ b/src/api/lawEnforcement/index.js
@@ -269,3 +269,12 @@ export function processTaskList(query) {
     params: query
   })
 }
+
+// 新增配置
+export function listModelCustom(data) {
+  return request({
+    url: '/activiti/modelCustom/list',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/views/lawEnforcement/case/caseDetail.vue b/src/views/lawEnforcement/case/caseDetail.vue
index 8a3a74e8..f84a51a0 100644
--- a/src/views/lawEnforcement/case/caseDetail.vue
+++ b/src/views/lawEnforcement/case/caseDetail.vue
@@ -221,10 +221,10 @@
                     <span
                       class="bq"
                       :style="{
-                        background:item.comment == '提交申请' ? 'rgba(29,111,233,0.2)' : item.comment == '同意' ? 'rgba(29,204,128,0.2)' :  item.comment == '自动结束' ? 'rgba(255,166,62,0.2)' : '',
-                        color:item.comment == '提交申请' ? '#1D6FE9' : item.comment == '同意' ? '#1DCC80' :  item.comment == '自动结束' ? '#FFA63E' : ''
+                        background:item.comment.substr(item.comment.length-2,2) == '申请' ? 'rgba(29,111,233,0.2)' : item.comment.substr(item.comment.length-2,2) == '同意' ? 'rgba(29,204,128,0.2)' :  item.comment.substr(item.comment.length-2,2) == '结束' ? 'rgba(255,166,62,0.2)' : item.comment.substr(item.comment.length-2,2) == '驳回' ? 'rgba(254,19,19,0.2)' : '',
+                        color:item.comment.substr(item.comment.length-2,2) == '申请' ? '#1D6FE9' : item.comment.substr(item.comment.length-2,2) == '同意' ? '#1DCC80' :  item.comment.substr(item.comment.length-2,2) == '结束' ? '#FFA63E' : item.comment.substr(item.comment.length-2,2) == '驳回' ? '#FE1313' : ''
                       }"
-                    >{{ item.comment }}</span>
+                    >{{ item.comment.substr(item.comment.length-2,2) }}</span>
                   </p>
                   <p style="color: #999999;">{{ item.durationInMillis }}</p>
                 </template>
@@ -237,7 +237,7 @@
           <van-row type="flex" justify="space-between" align="center">
             <van-col span="5">审批<br/>意见</van-col>
             <van-col span="19">
-              <van-radio-group v-model="pass" direction="horizontal">
+              <van-radio-group v-model="pass" direction="horizontal" @change="radioChange">
                 <van-radio name="true">同意</van-radio>
                 <van-radio name="false">驳回</van-radio>
               </van-radio-group>
@@ -540,10 +540,10 @@
                     <span
                       class="bq"
                       :style="{
-                        background:item.comment == '提交申请' ? 'rgba(29,111,233,0.2)' : item.comment == '同意' ? 'rgba(29,204,128,0.2)' :  item.comment == '自动结束' ? 'rgba(255,166,62,0.2)' : '',
-                        color:item.comment == '提交申请' ? '#1D6FE9' : item.comment == '同意' ? '#1DCC80' :  item.comment == '自动结束' ? '#FFA63E' : ''
+                        background:item.comment.substr(item.comment.length-2,2) == '申请' ? 'rgba(29,111,233,0.2)' : item.comment.substr(item.comment.length-2,2) == '同意' ? 'rgba(29,204,128,0.2)' :  item.comment.substr(item.comment.length-2,2) == '结束' ? 'rgba(255,166,62,0.2)' : item.comment.substr(item.comment.length-2,2) == '驳回' ? 'rgba(254,19,19,0.2)' : '',
+                        color:item.comment.substr(item.comment.length-2,2) == '申请' ? '#1D6FE9' : item.comment.substr(item.comment.length-2,2) == '同意' ? '#1DCC80' :  item.comment.substr(item.comment.length-2,2) == '结束' ? '#FFA63E' : item.comment.substr(item.comment.length-2,2) == '驳回' ? '#FE1313' : ''
                       }"
-                    >{{ item.comment }}</span>
+                    >{{ item.comment.substr(item.comment.length-2,2) }}</span>
                   </p>
                   <p style="color: #999999;">{{ item.durationInMillis }}</p>
                 </template>
@@ -556,7 +556,7 @@
           <van-row type="flex" justify="space-between" align="center">
             <van-col span="5">审批<br/>意见</van-col>
             <van-col span="19">
-              <van-radio-group v-model="pass" direction="horizontal">
+              <van-radio-group v-model="pass" direction="horizontal" @change="radioChange">
                 <van-radio name="true">同意</van-radio>
                 <van-radio name="false">驳回</van-radio>
               </van-radio-group>
@@ -699,10 +699,10 @@
                     <span
                       class="bq"
                       :style="{
-                        background:item.comment == '提交申请' ? 'rgba(29,111,233,0.2)' : item.comment == '同意' ? 'rgba(29,204,128,0.2)' :  item.comment == '自动结束' ? 'rgba(255,166,62,0.2)' : '',
-                        color:item.comment == '提交申请' ? '#1D6FE9' : item.comment == '同意' ? '#1DCC80' :  item.comment == '自动结束' ? '#FFA63E' : ''
+                        background:item.comment.substr(item.comment.length-2,2) == '申请' ? 'rgba(29,111,233,0.2)' : item.comment.substr(item.comment.length-2,2) == '同意' ? 'rgba(29,204,128,0.2)' :  item.comment.substr(item.comment.length-2,2) == '结束' ? 'rgba(255,166,62,0.2)' : item.comment.substr(item.comment.length-2,2) == '驳回' ? 'rgba(254,19,19,0.2)' : '',
+                        color:item.comment.substr(item.comment.length-2,2) == '申请' ? '#1D6FE9' : item.comment.substr(item.comment.length-2,2) == '同意' ? '#1DCC80' :  item.comment.substr(item.comment.length-2,2) == '结束' ? '#FFA63E' : item.comment.substr(item.comment.length-2,2) == '驳回' ? '#FE1313' : ''
                       }"
-                    >{{ item.comment }}</span>
+                    >{{ item.comment.substr(item.comment.length-2,2) }}</span>
                   </p>
                   <p style="color: #999999;">{{ item.durationInMillis }}</p>
                 </template>
@@ -715,7 +715,7 @@
           <van-row type="flex" justify="space-between" align="center">
             <van-col span="5">审批<br/>意见</van-col>
             <van-col span="19">
-              <van-radio-group v-model="pass" direction="horizontal">
+              <van-radio-group v-model="pass" direction="horizontal" @change="radioChange">
                 <van-radio name="true">同意</van-radio>
                 <van-radio name="false">驳回</van-radio>
               </van-radio-group>
@@ -1803,7 +1803,11 @@ export default {
       var leave3 = leave2 % 60;                           // 计算分钟数后剩余的毫秒数
       var seconds = Math.round(leave3);
       return days + "天" + hours + "时" + minutes + "分" + seconds + '秒';
-    }
+    },
+
+    radioChange(value){
+      this.comment = value == 'true' ? '同意' : '驳回' ;
+    },
 
   },
 };
diff --git a/src/views/lawEnforcement/programme/programmeApproval.vue b/src/views/lawEnforcement/programme/programmeApproval.vue
index 55323d81..e432c4e1 100644
--- a/src/views/lawEnforcement/programme/programmeApproval.vue
+++ b/src/views/lawEnforcement/programme/programmeApproval.vue
@@ -27,9 +27,9 @@
                 <span
                   class="bq"
                   :style="{
-                        background:item.comment.substr(item.comment.length-2,2) == '申请' ? 'rgba(29,111,233,0.2)' : item.comment.substr(item.comment.length-2,2) == '同意' ? 'rgba(29,204,128,0.2)' :  item.comment.substr(item.comment.length-2,2) == '结束' ? 'rgba(255,166,62,0.2)' : item.comment.substr(item.comment.length-2,2) == '驳回' ? 'rgba(254,19,19,0.2)' : '',
-                        color:item.comment.substr(item.comment.length-2,2) == '申请' ? '#1D6FE9' : item.comment.substr(item.comment.length-2,2) == '同意' ? '#1DCC80' :  item.comment.substr(item.comment.length-2,2) == '结束' ? '#FFA63E' : item.comment.substr(item.comment.length-2,2) == '驳回' ? '#FE1313' : ''
-                      }"
+                    background:item.comment.substr(item.comment.length-2,2) == '申请' ? 'rgba(29,111,233,0.2)' : item.comment.substr(item.comment.length-2,2) == '同意' ? 'rgba(29,204,128,0.2)' :  item.comment.substr(item.comment.length-2,2) == '结束' ? 'rgba(255,166,62,0.2)' : item.comment.substr(item.comment.length-2,2) == '驳回' ? 'rgba(254,19,19,0.2)' : '',
+                    color:item.comment.substr(item.comment.length-2,2) == '申请' ? '#1D6FE9' : item.comment.substr(item.comment.length-2,2) == '同意' ? '#1DCC80' :  item.comment.substr(item.comment.length-2,2) == '结束' ? '#FFA63E' : item.comment.substr(item.comment.length-2,2) == '驳回' ? '#FE1313' : ''
+                  }"
                 >{{ item.comment.substr(item.comment.length-2,2) }}</span>
               </p>
               <p style="color: #999999;">{{ item.durationInMillis }}</p>
diff --git a/src/views/lawEnforcement/scheme/schemeDetail.vue b/src/views/lawEnforcement/scheme/schemeDetail.vue
index 25ef2c3d..863b91d5 100644
--- a/src/views/lawEnforcement/scheme/schemeDetail.vue
+++ b/src/views/lawEnforcement/scheme/schemeDetail.vue
@@ -92,7 +92,7 @@
       <van-row type="flex" justify="space-between" align="center">
         <van-col span="5">审批<br/>意见</van-col>
         <van-col span="19">
-          <van-radio-group v-model="pass" direction="horizontal">
+          <van-radio-group v-model="pass" direction="horizontal" @change="radioChange">
             <van-radio name="true">同意</van-radio>
             <van-radio name="false">驳回</van-radio>
           </van-radio-group>
@@ -106,11 +106,11 @@
           <van-button type="info" native-type="submit" @click="submitComplete" class="submitButtonActive">提交</van-button>
         </van-col>
       </van-row>
-      <div class="clear"></div>
     </div>
   </div>
 </template>
 <script>
+import request from "@/utils/request";
 import { getTopDeptId , schemeDetail } from "@/api/lawEnforcement/index";
 import law from "@/components/common/law_footer";
 export default {
@@ -147,6 +147,9 @@ export default {
         this.schemeOption = response.data;
       });
     },
+    radioChange(value){
+      this.comment = value == 'true' ? '同意' : '驳回' ;
+    },
     submitComplete() {
       const data = {
         taskId: this.schemeOption.taskId,
@@ -180,6 +183,7 @@ export default {
 }
 .app-container {
   padding: 0;
+  padding-bottom: 1%;
 }
 .examine_box{
   background-color: #1D6FE9!important;
diff --git a/src/views/lawEnforcement/user/index.vue b/src/views/lawEnforcement/user/index.vue
index 5f989020..f6b62935 100644
--- a/src/views/lawEnforcement/user/index.vue
+++ b/src/views/lawEnforcement/user/index.vue
@@ -21,6 +21,7 @@
 
       <van-cell
         v-for="(item,index) in taskList"
+        :key="index"
         :value="item.formData.createTime == null ? '' : item.formData.createTime.substr(0,10)"
         :to="{
           name:item.formData.activityBusinessType == '21' ? 'schemeDetail':'caseDetail',
diff --git a/src/views/lawEnforcement/user/waitingProcessing.vue b/src/views/lawEnforcement/user/waitingProcessing.vue
index bbd209a4..e4c16036 100644
--- a/src/views/lawEnforcement/user/waitingProcessing.vue
+++ b/src/views/lawEnforcement/user/waitingProcessing.vue
@@ -7,6 +7,10 @@
       left-arrow
       @click-left="onClickLeft"
     />
+    <van-dropdown-menu>
+      <van-dropdown-item v-model="queryParamsTask.activityBusinessType" :options="typeOptions" @change="getTaskList" />
+      <van-dropdown-item v-model="queryParamsTask.isAsc" :options="option" @change="getTaskList" />
+    </van-dropdown-menu>
     <van-list
       v-model="loading"
       :finished="finished"
@@ -15,7 +19,19 @@
     >
       <van-cell-group class="listBox db">
 
-        <van-cell v-for="(item,index) in taskList" :value="item.formData.createTime == null ? '' : item.formData.createTime.substr(0,10)">
+        <van-cell
+          v-for="(item,index) in taskList"
+          :key="index"
+          :value="item.formData.createTime == null ? '' : item.formData.createTime.substr(0,10)"
+          :to="{
+            name:item.formData.activityBusinessType == '21' ? 'schemeDetail':'caseDetail',
+            query:{
+              id:item.formData.activityBusinessType == '21' ? item.formData.id:item.formData.caseId,
+              caseProgress:item.formData.activityBusinessType == '21' ? '': item.formData.activityBusinessType == '22' ? 2:item.formData.activityBusinessType == '24' ? 4:item.formData.activityBusinessType == '25' ? 5:'',
+              type:'waiting'
+            }
+          }"
+        >
           <template #title>
             <span class="tap">{{selectDictLabel(activityBusinessTypeOptions,item.formData.activityBusinessType)}}</span>
             <span>{{item.projectName}}</span>
@@ -27,6 +43,7 @@
   </div>
 </template>
 <script>
+import { listModelCustom } from "@/api/lawEnforcement/index";
 import request from "@/utils/request";
 import law from "@/components/common/law_footer";
 export default {
@@ -36,6 +53,16 @@ export default {
   },
   data() {
     return {
+      value1: '',
+      value2: 'a',
+      typeOptions: [
+        { text: '全部待办', value: '' },
+      ],
+      option: [
+        { text: '默认排序', value: '' },
+        { text: '时间倒序', value: 'desc' },
+        { text: '时间正序', value: 'asc' },
+      ],
       //是否显示加载
       loading: false,
       //是否滚动到底部
@@ -47,6 +74,8 @@ export default {
         taskId: null,
         taskName: null,
         systemType: 26,
+        activityBusinessType:'',
+        isAsc:''
       },
       //新闻集合
       workList:[],
@@ -58,13 +87,31 @@ export default {
     };
   },
   created() {
+    var that = this ;
     this.getDicts("activity_business_type").then((response) => {
-      this.activityBusinessTypeOptions = response.data;
+      listModelCustom({"systemType": 26}).then(response1 => {
+        let res = [];
+        let activityBusinessTypeArray = response1.rows.map(function (current) {
+          return current.activityBusinessType
+        });
+        response.data.forEach(function (value) {
+          if (activityBusinessTypeArray.indexOf(value.dictValue) !== -1) {
+            res.push(value);
+            that.typeOptions.push({
+              text:value.dictLabel,
+              value:value.dictValue
+            })
+          }
+        });
+        this.activityBusinessTypeOptions = res;
+        console.log(that.typeOptions)
+      });
     });
     this.getTaskList();
   },
   methods: {
     getTaskList() {
+      this.taskList = []
       this.loading = true;
       return request({
         url: "/activiti/process/taskList",
@@ -93,6 +140,27 @@ export default {
   font-family: SourceHanSansCNBold;
   src: url("../../../assets/fonts/SourceHanSansCN-Bold.otf");
 }
+.van-list{
+  width: 96%;
+  margin: 0 auto;
+  margin-top: 10PX;
+}
+/deep/ .van-search__content{
+  background-color: #ffffff;
+}
+/deep/ .van-search__action{
+  background-color: #1D6FE9;
+  text-align: center;
+  color: #ffffff;
+  padding: 0 0.5rem;
+}
+/deep/ .van-search{
+  background-color: transparent;
+  border-radius: 20PX;
+  border: 1px solid #cccccc;
+  padding: 0;
+  overflow: hidden;
+}
 .van-cell__title{
   color: #666666;
   flex: 0.7;
@@ -106,7 +174,7 @@ export default {
   flex: 0.3;
 }
 .app-container {
-  padding: 10PX ;
+
 }
 /deep/ .van-nav-bar--fixed{
   background: url("../../../../static/images/lawEnforcement/head_bg.png") 100%;