Răsfoiți Sursa

功能调整

lucw 9 luni în urmă
părinte
comite
cad31ac205

+ 6 - 1
src/views/batchRecord/components/detialsModal.vue

@@ -500,7 +500,12 @@
 
     <!-- 底部审批 -->
     <el-row
-      v-if="details && visible && details.processInstanceId"
+      v-if="
+        details &&
+        visible &&
+        details.processInstanceId &&
+        details.approvalStatus == 0
+      "
       :gutter="20"
       style="margin-top: 40px"
     >

+ 1 - 1
src/views/batchRecord/index.vue

@@ -210,7 +210,7 @@
         productBody: {
           param: '',
           pageNum: 1,
-          size: 20,
+          size: 10,
           // 创建开始时间和结束时间
           createTimeStart: '',
           createTimeEnd: ''

+ 6 - 3
src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -22,7 +22,7 @@
           <el-form-item label="记录规则名称" required>
             <el-input
               v-model="addForm.ruleName"
-              size="small"
+
               placeholder="自动带出"
               disabled
             ></el-input>
@@ -46,7 +46,7 @@
           >
             <el-input
               v-model="addForm.deviceName"
-              size="small"
+
               placeholder="自动带出"
               disabled
             ></el-input>
@@ -54,7 +54,7 @@
           <el-form-item v-else label="车间区域" prop="workshopArea">
             <el-input
               v-model="addForm.workshopArea"
-              size="small"
+
               placeholder="请输入"
             ></el-input>
           </el-form-item>
@@ -405,6 +405,9 @@
           console.log('dat 缓存', data);
           this.$util.assignObject(this.addForm, data);
           this.addForm.recordRulesClassify += '';
+          if (this.addForm.details?.length == 0) {
+            this.getRuleList();
+          }
           this.loading = false;
         } catch (error) {
           this.loading = false;

+ 2 - 2
vue.config.js

@@ -33,9 +33,9 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.116:18086',
-        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',