Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

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

@@ -2,7 +2,7 @@
   <div class="process-mange-wrap">
     <!-- <el-card shadow="always" :body-style="{ padding: '20px' }"> -->
     <el-row>
-      <el-col :xs="24" :md="8" :xl="8" class="col">
+      <el-col :xs="24" :md="8" :xl="8" class="col" v-show="false">
         <div class="statistic-wrap">
           <div class="discription">
             <span class="title">我的处理</span>
@@ -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">
@@ -273,7 +273,7 @@ export default {
     Print,
     RecordQuality,
     ProductionProcesses,
-    PersonalDistribution
+    PersonalDistribution,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {
@@ -396,7 +396,7 @@ export default {
       // }
       console.log(this.$refs.myFormRef);
       let temp = await this.$refs.myFormRef?.getFormData();
-      console.log('temp',temp);
+      console.log("temp", temp);
       if (!temp?.flag) {
         this.$message.error(temp.msg);
         return false;

zkqy-ui/src/views/system/role/index.vue

@@ -526,16 +526,17 @@ export default {
           response.rows = response.rows.filter(
             (item) => !tempSelection.find((val) => val.roleId == item.roleId)
           );
-          this.roleList = [...tempSelection, ...response.rows];
+          // this.roleList = [...tempSelection, ...response.rows];
+          this.roleList = 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);
+          //     });
+          //   });
+          // }
         }
       );
     },

zkqy-ui/src/views/system/user/index.vue

@@ -729,16 +729,17 @@ export default {
           response.rows = response.rows.filter(
             (item) => !tempSelection.find((val) => val.userId == item.userId)
           );
-          this.userList = [...tempSelection, ...response.rows];
+          // this.userList = [...tempSelection, ...response.rows];
+          this.userList = 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);
+          //     });
+          //   });
+          // }
         }
       );
     },

zkqy-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -54,6 +54,7 @@
       :form-vals="templateInfo.where"
       :statisticList="statisticList"
       :showCount="showCount"
+      :showSearch="showSearch"
       @getList="getList"
       ref="mychild"
     />

zkqy-ui/src/views/tablelist/commonTable/queryfrom.vue

@@ -30,6 +30,7 @@
       :inline="true"
       label-width="68px"
       @submit.native.prevent
+      v-show="showSearch"
     >
       <el-form-item label="超级查询">
         <el-input
@@ -77,17 +78,20 @@
             </el-form-item>
           </span>
           <!--      button按钮循环-->
-            <span
-              v-if="item.conditionType == 'button'"
-              style="width: 500px; height: 500px"
+          <span
+            v-if="item.conditionType == 'button'"
+            style="width: 500px; height: 500px"
+          >
+            <el-form-item
+              :label="item.conditionName"
+              :prop="item.conditionField"
             >
-            <el-form-item :label="item.conditionName"
-                          :prop="item.conditionField">
-              {{ queryParams.queryMap[item.conditionField] = item.conditionDefaultValue }}
-              <el-button
-                @keyup.enter.native="handleQuery"
-                @click="handleQuery">
-                {{ item.conditionNotes == null ? '按钮' : item.conditionNotes }}
+              {{
+                (queryParams.queryMap[item.conditionField] =
+                  item.conditionDefaultValue)
+              }}
+              <el-button @keyup.enter.native="handleQuery" @click="handleQuery">
+                {{ item.conditionNotes == null ? "按钮" : item.conditionNotes }}
               </el-button>
             </el-form-item>
           </span>
@@ -166,13 +170,12 @@
           </span>
         </span>
       </div>
-
     </el-form>
   </div>
 </template>
 
 <script>
-import cardcountpanel from "../components/cardCountPanel.vue"
+import cardcountpanel from "../components/cardCountPanel.vue";
 export default {
   name: "queryfrom",
   props: {
@@ -180,14 +183,17 @@ export default {
       type: Array,
       default: () => [],
     },
-    showCount : {
+    showCount: {
+      type: Boolean,
+    },
+    showSearch: {
       type: Boolean,
     },
-    statisticList:{
+    statisticList: {
       type: Array,
-    }
+    },
   },
-  components:{cardcountpanel},
+  components: { cardcountpanel },
   data() {
     return {
       // 时间范围临时存储
@@ -220,7 +226,6 @@ export default {
       // 单选/按钮
       radios: [],
       // card
-
     };
   },
   watch: {