lucw 7 miesięcy temu
rodzic
commit
d01188ee0f

+ 14 - 4
src/views/checklistManagement/components/checkDetails.vue

@@ -9,7 +9,7 @@
     width="80%"
   >
     <div
-      v-if="type == 'detail' || type == 'edit'"
+      v-if="(type == 'detail' || type == 'edit') && form.processInstanceId"
       class="switch"
       :maxable="true"
       style="margin-bottom: 20px"
@@ -406,7 +406,14 @@
           },
           {
             prop: 'formingNum',
-            label: '数量',
+            label: '要求生产数量',
+            align: 'center',
+            minWidth: 110,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'formedNum',
+            label: '实际生产数量',
             align: 'center',
             minWidth: 110,
             showOverflowTooltip: true
@@ -513,9 +520,12 @@
       },
       // 关闭时清理表单
       handleClose() {
-        this.visible = false;
         this.form = JSON.parse(JSON.stringify(this.formBaseData));
-        this.$refs.formRef && this.$refs.formRef.resetFields();
+        this.activeComp = 'main';
+        this.$nextTick(() => {
+          this.$refs.formRef.clearValidate();
+          this.visible = false;
+        });
       },
       // 提交
       submit(type) {

+ 1 - 0
src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -277,6 +277,7 @@
       :columns="detailsColumns"
       :datasource="rulesDetails"
       cacheKey="mes-releaseRulesDialong-2510281408"
+      :needPage="false"
     >
       <template v-slot:paramValue="{ row }">
         <div v-if="addForm.recordRulesClassify == 4">

+ 2 - 2
vue.config.js

@@ -37,8 +37,8 @@ module.exports = {
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.125:18086',
-        target: 'http://192.168.1.116:18086', // 赵沙金
-        // target: 'http://192.168.1.251:18086', // 开发环境
+        // target: 'http://192.168.1.116:18086', // 赵沙金
+        target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',