代码同步

zkqy-ui/src/views/bussiness/dialogCompments/Mec/AssignEmployees.vue

@@ -16,6 +16,7 @@
             :key="item.value"
             :label="item.name"
             :value="item.id"
+            :rules="rules"
           >
           </el-option>
         </el-select>
@@ -138,7 +139,6 @@ export default {
       }
     },
   },
-
 };
 </script>
 

zkqy-ui/src/views/bussiness/processMange.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="process-mange-wrap">
     <!-- <el-card shadow="always" :body-style="{ padding: '20px' }"> -->
-    <el-row>
+    <el-row v-show="false">
       <el-col :xs="24" :md="8" :xl="8" class="col">
         <div class="statistic-wrap">
           <div class="discription">
             <span class="title">我的处理</span>
-            <span class="sub-title">需要我处理的管道</span>
+            <span class="sub-title">需要我处理的流程</span>
           </div>
           <span class="data">{{ tableData.length }}</span>
         </div>
@@ -14,8 +14,8 @@
       <el-col :xs="24" :md="8" :xl="8" class="col">
         <div class="statistic-wrap">
           <div class="discription">
-            <span class="title">其它处理</span>
-            <span class="sub-title">需要其他人处理的管道</span>
+            <span class="title">已完成</span>
+            <span class="sub-title">已完成的</span>
           </div>
           <span class="data">0</span>
         </div>
@@ -36,7 +36,7 @@
         <h3 class="header">管道列表</h3>
         <div class="search-list">
           <div class="search-tab">
-            <el-radio-group v-model="taskType">
+            <el-radio-group v-model="taskType" v-show="false">
               <el-radio-button :label="1">我的处理</el-radio-button>
               <el-radio-button :label="2">其他处理</el-radio-button>
             </el-radio-group>
@@ -47,7 +47,7 @@
             >
               <el-radio-button label="3">已完成</el-radio-button>
               <el-radio-button label="0">进行中</el-radio-button>
-              <el-radio-button label="">所有</el-radio-button>
+              <!-- <el-radio-button label="">所有</el-radio-button> -->
             </el-radio-group>
           </div>
           <div class="search-input">
@@ -359,15 +359,17 @@ export default {
   methods: {
     // 获取列表数据
     getList() {
-      processList(this.queryParams).then((res) => {
-        if (res.code == 200) {
-          this.tableData = res.rows.map((item) => item.resultMap);
-          this.total = res.total;
-          console.log(this.tableData);
-        } else {
-          this.$message.error("网络异常,请稍后再试");
+      processList({ ...this.queryParams, taskName: this.queryString }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.tableData = res.rows.map((item) => item.resultMap);
+            this.total = res.total;
+            console.log(this.tableData);
+          } else {
+            this.$message.error("网络异常,请稍后再试");
+          }
         }
-      });
+      );
     },
     // 获取表单数据
     async getFormData() {
@@ -420,7 +422,6 @@ export default {
       this.nodeTitle = row.benTaskNodeName;
       // let preFix = row.benTaskNodeName.split("-")[0];
       let preFix = row.benTaskNodeFormKey;
-      console.log(preFix);
       let {
         benTaskNodeFormKey,
         benTaskNodeFormType,

zkqy-ui/src/views/system/tenant/dict/index.vue

@@ -348,16 +348,17 @@ export default {
           response.rows = response.rows.filter(
             (item) => !tempSelection.find((val) => val.dictId == item.dictId)
           );
-          this.typeList = [...tempSelection, ...response.rows];
+          // this.typeList = [...tempSelection, ...response.rows];
+          this.typeList = response.rows;
           this.total = response.total;
           this.loading = false;
-          if (tempSelection.length) {
-            this.$nextTick(() => {
-              tempSelection.forEach((item) => {
-                this.$refs.tableRef.toggleRowSelection(item);
-              });
-            });
-          }
+          // if (tempSelection.length) {
+          //   this.$nextTick(() => {
+          //     tempSelection.forEach((item) => {
+          //       this.$refs.tableRef.toggleRowSelection(item);
+          //     });
+          //   });
+          // }
         }
       );
     },