Merge remote-tracking branch 'origin/master'

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/bpmnPro/components/Panel/components/ElementGenerations.vue

@@ -164,7 +164,11 @@ export default {
         },
         {
           formKey: "ProductionProcesses",
-          formName: "工艺流程",
+          formName: "工序:领料",
+        },
+        {
+          formKey: "PersonalDistribution",
+          formName: "工序:检验",
         },
         {
           formKey: "RecordQuality",
@@ -174,6 +178,10 @@ export default {
           formKey: "GY06",
           formName: "节点回退",
         },
+        {
+          formKey: "Print",
+          formName: "打印交接单",
+        },
         {
           formKey: "KB01",
           formName: "不需表单",

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

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

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

@@ -46,7 +46,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="租户名称" prop="tenantName">
+          <!-- <el-form-item label="租户名称" prop="tenantName">
             <el-input
               v-model="queryParams.tenantName"
               placeholder="请输租户户名称"
@@ -54,7 +54,7 @@
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="手机号码" prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
@@ -191,14 +191,14 @@
             v-if="columns[1].visible"
             :show-overflow-tooltip="true"
           />
-          <el-table-column
+          <!-- <el-table-column
             label="租户名称"
             align="center"
             key="tenantName"
             prop="tenantName"
             v-if="columns[7].visible && $store.state.user.name == 'admin'"
             :show-overflow-tooltip="true"
-          />
+          /> -->
           <el-table-column
             label="用户昵称"
             align="center"
@@ -632,7 +632,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         userName: undefined,
-        tenantName: undefined,
+        //tenantName: undefined,
         phonenumber: undefined,
         status: undefined,
         deptId: undefined,
@@ -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: {

zkqy-ui/src/views/tablelist/components/cardCountPanel.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="cardBox" v-show="showCount" >
+    <div class="cardBox" v-show="showCount">
       <el-card
         shadow="hover"
         :body-style="{ padding: '20px' }"
@@ -11,11 +11,19 @@
         <el-tooltip
           class="item"
           effect="dark"
-          :content="item.statisticTitle ? item.statisticTitle : item.statisticDescription"
+          :content="
+            item.statisticTitle
+              ? item.statisticTitle
+              : item.statisticDescription
+          "
           placement="top-start"
         >
           <div class="title">
-            <span class="left">{{ item.statisticTitle ? item.statisticTitle : item.statisticDescription }}</span>
+            <span class="left">{{
+              item.statisticTitle
+                ? item.statisticTitle
+                : item.statisticDescription
+            }}</span>
             <span class="right">{{ item.result }}</span>
           </div>
         </el-tooltip>
@@ -26,31 +34,24 @@
       </el-card>
     </div>
   </div>
-
-  
 </template>
 
 <script>
-
 export default {
   name: "cardcountpanel",
   props: {
-    showCount : {
+    showCount: {
       type: Boolean,
     },
-    statisticList:{
+    statisticList: {
       type: Array,
-    }
+    },
   },
-  data () {
-   return {
-    
-   }
- },
-  methods: {
-   
-  }
-}
+  data() {
+    return {};
+  },
+  methods: {},
+};
 </script>
 
 <style lang="scss" scoped>
@@ -62,11 +63,11 @@ export default {
   display: flex;
 }
 .card {
-  width:100%;
+  width: 100%;
   /* flex-basis: 15%; */
   margin-bottom: 10px;
   margin-right: 15px;
-  /* min-width: 130px; */
+  max-width: 200px;
   .title {
     /* width:20%; */
     /* display: flex; */
@@ -77,11 +78,11 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
 
-    .left{
+    .left {
       float: left;
     }
 
-    .right{
+    .right {
       float: right;
       font-size: 20px;
       font-weight: 800;
@@ -107,5 +108,4 @@ export default {
     font-size: 30px;
   }
 }
-  
 </style>