乐菲 1 päivä sitten
vanhempi
commit
e6439450d8

+ 2 - 2
.env.dev

@@ -5,9 +5,9 @@ NODE_ENV = 'development'
 VUE_APP_TITLE = WMS开发环境
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.94:48080'
+VUE_APP_BASE_API = 'http://192.168.1.94:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.26:48080'
-VUE_APP_BASE_API = 'http://113.105.183.190:48028'
+# VUE_APP_BASE_API = 'http://113.105.183.190:48028'
 # VUE_APP_BASE_API = 'http://61.155.26.34:36936'
 # VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 # VUE_APP_BASE_API = 'http://2227el9013.iok.la'

+ 4 - 4
.env.rtk.prod

@@ -5,13 +5,13 @@ NODE_ENV = 'development'
 VUE_APP_TITLE = 瑞泰克WMS开发环境
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://113.105.183.190:48028'
-# VUE_APP_BASE_API = 'http://113.105.183.190:15980'
+# VUE_APP_BASE_API = 'http://113.105.183.190:48028'
+VUE_APP_BASE_API = 'http://113.105.183.190:15980'
 
 
 # 积木报表API
-VUE_APP_REPORT_API = 'http://113.105.183.190:48028'
-# VUE_APP_REPORT_API = 'http://113.105.183.190:15980'
+# VUE_APP_REPORT_API = 'http://113.105.183.190:48028'
+VUE_APP_REPORT_API = 'http://113.105.183.190:15980'
 
 
 # 路由懒加载

+ 3 - 1
src/views/mes/queryManage/queryNew.vue

@@ -461,7 +461,9 @@ export default {
       if (this.multipleSelection.length === 0) {
         return this.$message.warning("请先选择数据!");
       }
-
+      if (this.multipleSelection.length > 1) {
+        return this.$message.warning("只能选择单条数据打印!");
+      }
       // 确认数据值和类型
 
       // 验证interfaceUrl

+ 10 - 1
src/views/wms/quality/iqcInspection/components/InspectDetail.vue

@@ -12,7 +12,8 @@
             apiStatus === 1 ||
             apiStatus === 2 ||
             choiceStatus ||
-            disableApproval
+            disableApproval ||
+            (apiStatus === 0 && !tailSelected)
           "
           @click="handleTesting"
           >{{ apiStatus === -1 ? "送审" : "批核" }}</el-button
@@ -736,6 +737,7 @@ export default {
       processDetailId: "",
       // 选中的
       currentRows: [],
+      tailSelected: false,
       // 查询参数
       queryParams: {
         id: null,
@@ -909,6 +911,12 @@ export default {
         this.formParams.produceDate = parseTime(produceDate);
         this.adjustForm.noPassType =
           noPassType === null ? this.adjustForm.noPassType : noPassType;
+        if (
+          this.adjustForm.noPassType !== "" &&
+          this.adjustForm.noPassType != null
+        ) {
+          this.tailSelected = true;
+        }
         this.adjustForm.inspector = inspector;
         this.adjustForm.manage = manage;
         if (this.adjustForm.noPassType === "2") {
@@ -943,6 +951,7 @@ export default {
     },
     // 选择批核结果
     async noPassChange(v) {
+      this.tailSelected = true;
       //  v === '2' --》挑选入库
       if (v === "2") {
         const { materialLots } = this.queryParams;