Merge remote-tracking branch 'origin/develop' into develop

src/views/plat/task/components/TaskAdd.vue

@@ -36,8 +36,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="督办事项来源" prop="source">
-            <el-select v-model="form.source" placeholder="请选择督办事项来源" style="width: 100%">
+          <el-form-item label="事项来源" prop="source">
+            <el-select v-model="form.source" placeholder="请选择事项来源" style="width: 100%">
               <el-option v-for="item in sourceOptions" :key="item.key" :label="item.value" :value="item.key" />
             </el-select>
           </el-form-item>

src/views/plat/task/detail.vue

@@ -26,8 +26,10 @@
               <span v-if="theTask.taskStatus === '10'">发起</span>
               <span v-else-if="theTask.taskStatus === '20'">进行中</span>
               <span v-else-if="theTask.taskStatus === '30'">流程完成</span>
+              <span v-else-if="theTask.taskStatus === '40'">审批拒绝</span>
+              <span v-else-if="theTask.taskStatus === '50'">撤销</span>
             </el-descriptions-item>
-            <el-descriptions-item content-class-name="my-content" label="超期" label-class-name="my-label">
+            <el-descriptions-item content-class-name="my-content" label="是否超期" label-class-name="my-label">
               {{ isNotOverdue(parseTime(theTask.taskEndDate, '{y}-{m}-{d} 23:59:59')) ? '否' : '是' }}
             </el-descriptions-item>
             <el-descriptions-item content-class-name="my-content" label="发布时间" label-class-name="my-label">
@@ -59,7 +61,7 @@
               <span v-show="theTask.targetType == '30'">合同</span>
               <span v-show="theTask.targetType == '40'">回款</span>
             </el-descriptions-item> -->
-            <el-descriptions-item content-class-name="my-content" label="督办事项来源" label-class-name="my-label">
+            <el-descriptions-item content-class-name="my-content" label="事项来源" label-class-name="my-label">
               {{ selectDictLabel(sourceOptions, theTask.source) }}
             </el-descriptions-item>
           </el-descriptions>

src/views/plat/task/index.vue

@@ -33,22 +33,28 @@
           <i class="el-icon-folder-checked" style="margin-right: 10px"></i>
           我处理的
         </div>
-        <div class="type" style="margin-top: 50px">督办类型</div>
+        <div class="type" style="margin-top: 50px">事项来源</div>
         <div
-          :style="{ color: queryForm.taskType != '' ? '#999999' : '#1D66DC', 'margin-top': '20px', cursor: 'pointer' }"
-          @click="searchType('')">
+          class="el-icon-s-management"
+          :style="{
+            color: queryForm.source != '' ? '#999999' : '#1D66DC',
+            'margin-top': '20px',
+            cursor: 'pointer',
+          }"
+          @click="searchSource('')">
           全部
         </div>
         <div
-          v-for="item in types"
+          v-for="item in sourceOptions"
           :key="item.dictCode"
+          class="el-icon-s-ticket"
           :style="{
-            color: queryForm.taskType != item.dictValue ? '#999999' : '#1D66DC',
+            color: queryForm.source != item.key ? '#999999' : '#1D66DC',
             'margin-top': '20px',
             cursor: 'pointer',
           }"
-          @click="searchType(item.dictValue)">
-          {{ item.dictLabel }}
+          @click="searchSource(item.key)">
+          {{ item.value }}
         </div>
       </div>
       <div class="tree-table">
@@ -89,7 +95,7 @@
               <el-button v-if="item.prop === 'taskTitle'" class="link-button" type="text" @click="showDetail(row)">
                 {{ row.taskTitle }}
               </el-button>
-              <span v-if="item.prop === 'taskType'">
+              <span v-else-if="item.prop === 'taskType'">
                 {{ typeMap[row.taskType] }}
               </span>
               <span v-else-if="item.prop === 'source'">
@@ -99,11 +105,16 @@
                 <span v-if="row.taskStatus === '10'">发起</span>
                 <span v-if="row.taskStatus === '20'">进行中</span>
                 <span v-if="row.taskStatus === '30'">流程完成</span>
+                <span v-if="row.taskStatus === '40'">审批拒绝</span>
+                <span v-if="row.taskStatus === '50'">撤销</span>
               </span>
               <span v-else-if="item.prop === 'isOverdue'">
                 {{ isNotOverdue(parseTime(row['taskEndDate'], '{y}-{m}-{d} 23:59:59')) ? '否' : '是' }}
               </span>
-              <span v-else-if="item.prop === 'mainUserId' || item.prop === 'supervisorUserId'">
+              <span
+                v-else-if="
+                  item.prop === 'mainUserId' || item.prop === 'supervisorUserId' || item.prop === 'watchUserId'
+                ">
                 {{ userMap[row[item.prop]] }}
               </span>
               <span v-else-if="item.prop === 'ownerUserId'">
@@ -177,7 +188,7 @@
           pageNum: 1,
           pageSize: 10,
           taskTitle: undefined,
-          taskType: '',
+          source: '',
           operateType: '1',
         },
         // 用户信息
@@ -197,6 +208,12 @@
             sortable: false,
             disableCheck: true,
           },
+          {
+            label: '督办内容',
+            width: '320px',
+            prop: 'taskDesc',
+            sortable: false,
+          },
           {
             label: '督办类型',
             width: '120px',
@@ -210,23 +227,11 @@
             sortable: false,
           },
           {
-            label: '督办事项来源',
+            label: '事项来源',
             width: '120px',
             prop: 'source',
             sortable: false,
           },
-          {
-            label: '超期',
-            width: '120px',
-            prop: 'isOverdue',
-            sortable: false,
-          },
-          {
-            label: '督办内容',
-            width: '120px',
-            prop: 'taskDesc',
-            sortable: false,
-          },
           // {
           //   label: '关联对象',
           //   width: '120px',
@@ -251,6 +256,12 @@
             prop: 'supervisorUserId',
             sortable: false,
           },
+          {
+            label: '监办人',
+            width: '120px',
+            prop: 'watchUserId',
+            sortable: false,
+          },
           {
             label: '发布时间',
             width: '160px',
@@ -269,6 +280,12 @@
           //   prop: 'createdTime',
           //   sortable: false,
           // },
+          {
+            label: '是否超期',
+            width: '120px',
+            prop: 'isOverdue',
+            sortable: false,
+          },
         ],
       }
     },
@@ -327,7 +344,7 @@
         this.queryForm.pageSize = 10
         this.queryForm.taskTitle = undefined
         this.queryForm.operateType = '1'
-        this.queryForm.taskType = ''
+        this.queryForm.source = ''
         this.queryData()
       },
       // 左侧操作栏搜索
@@ -335,9 +352,9 @@
         this.queryForm.operateType = type
         this.queryData()
       },
-      // 督办类型搜索
-      searchType(type) {
-        this.queryForm.taskType = type
+      // 事项来源搜索
+      searchSource(source) {
+        this.queryForm.source = source
         this.queryData()
       },
       // 初始化数据