From fe57fef6165700b57bb5a18742250e1e6fa1fda2 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 8 Nov 2024 09:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/views/basic/product/drug/drugMaintain.vue | 12 ++++++------
 src/views/collect/IoCreateOrder.vue           | 17 +++++++++--------
 src/views/inout/DialogCreateOrder.vue         |  3 +--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.env.development b/.env.development
index 45e70ba5..d23661e2 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 # VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://127.0.0.1:9991'
+VUE_APP_BASE_API = 'http://192.168.0.166:9991'
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index 69d3ac34..e42e35df 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -86,7 +86,7 @@
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           <!--<el-button type="primary" icon="el-icon-plus" @click="chooseDrug">选入药品信息</el-button>-->
           <el-button type="primary" icon="el-icon-plus" @click="chooseHouseDrug">添加院内药品</el-button>
-<!--          <el-button type="primary" icon="el-icon-plus" @click="addDrug">新增药品信息</el-button>-->
+          <!--          <el-button type="primary" icon="el-icon-plus" @click="addDrug">新增药品信息</el-button>-->
         </el-button-group>
       </div>
 
@@ -218,7 +218,7 @@ import chooseDrug from '@/views/basic/product/drug/chooseDrug'
 import chooseHouseDrug from '@/views/basic/product/drug/chooseHouseDrug'
 
 export default {
-  components: {drugAdd, chooseDrug,chooseHouseDrug},
+  components: {drugAdd, chooseDrug, chooseHouseDrug},
   name: 'drugMaintain',
   data() {
     return {
@@ -226,7 +226,7 @@ export default {
       filterBadInv: true,
       query: {},
       list: [],
-      mainIds:[],
+      mainIds: [],
       filterQuery: {
         productsType: 2,
         page: 1,
@@ -305,7 +305,7 @@ export default {
       this.chooseDrugVisible = true
 
     },
-    chooseHouseDrug(val){
+    chooseHouseDrug(val) {
       this.defaultSys = null;
       this.uuid = val.uuid;
       this.relId = val.id;
@@ -338,7 +338,7 @@ export default {
         };
         deletetUdiInfos(tquery).then(res => {
           if (res.code != 20000) {
-            this.$message.error("删除错误")
+            this.$message.error(res.message)
             this.getList()
           } else {
             this.$message.success("删除成功！")
@@ -369,7 +369,7 @@ export default {
       this.rowData = row
       this.addDrugVisible = true;
     },
-    closeUdi(){
+    closeUdi() {
 
     },
     closeDialog() {
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 5fe1fdfb..3436b645 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -25,7 +25,8 @@
             >结束剔除
             </el-button>
             <el-button size="mini" type="primary" @click.native="selectPrescribe()" :loading="submitLoading"
-                       v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
+                       v-if="splitType=='out' &&  !redMesg" style="margin-right: 8px;border-radius: 5%;"
+                       v-show="isLinkDisabled"
             >选入已完成单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
@@ -1087,7 +1088,7 @@ export default {
         {
           let item = this.allWorkPlaces.find(item => item.workplaceId == this.orderFormData.workPlaceCode)
           this.queueStatus = item.queueStatus
-          if (this.queueStatus == 1){
+          if (this.queueStatus == 1) {
             this.redMesg = true
             this.redMesgOld = true
           }
@@ -1800,17 +1801,17 @@ export default {
         return
       }
 
-      if (this.splitType =='out'){
+      if (this.splitType == 'out') {
         if (!this.scanCode.includes("DMQ")) {
           if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) {
             this.$message.warning('当前工位无需按货位上架')
             return;
-          }else if (this.queueStatus == "1" && isBlank(this.orderFormData.workPlaceQueueCode)) {
+          } else if (this.queueStatus == "1" && isBlank(this.orderFormData.workPlaceQueueCode)) {
             this.scanCode = ''
             this.$message.warning('当前工位需按货位上架')
             return;
           }
-        }else {
+        } else {
           if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) {
             this.$message.warning('当前工位无需按货位上架')
             return;
@@ -1992,11 +1993,11 @@ export default {
           console.log('字符串不是有效的 JSON 格式')
         }
       } else if (str.includes("DMQ")) {
-        if (!isBlank(this.curQueueName)){
+        if (!isBlank(this.curQueueName)) {
           this.scanCode = ''
           return this.$message.warning("上货未完成")
         }
-        if (this.queueStatus == "0"){
+        if (this.queueStatus == "0") {
           this.scanCode = ''
           return this.$message.warning('当前工位无需按货位上架')
         }
@@ -2019,7 +2020,7 @@ export default {
             this.redMesg = false
             this.orderFormData.workPlaceQueueCode = this.curQueue.code
             this.scanCode = '';
-          }else {
+          } else {
             this.scanCode = ''
             this.$message.error(response.message)
           }
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index e8045498..64cbee9c 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -31,8 +31,7 @@
                 style="margin-left: 15px"
               >添加
               </el-button>
-
-              <el-button icon="el-icon-view" @click="hideSearch">显示/隐藏快捷设置</el-button>
+              <!--              <el-button icon="el-icon-view" @click="hideSearch">显示/隐藏快捷设置</el-button>-->
               <el-button
                 type="primary"
                 size="mini"