lph 1 год назад
Родитель
Сommit
8ef5c40a8a

+ 9 - 1
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: "不需表单",

+ 9 - 8
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);
+        //     });
+        //   });
+        // }
       });
     },
     // 取消按钮

+ 23 - 23
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>