From 2d36d62111fa408b5754b63de65aeebaf88580b7 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 27 Dec 2023 16:32:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .env.production                               |  7 ++-
 src/views/basic/busType/bussinessType.vue     |  4 +-
 .../basic/busType/bussinessTypeModify.vue     | 59 ++++++++++++-------
 src/views/dev/deviceInfo.vue                  |  2 +-
 src/views/inout/DialogCreateOrder.vue         |  6 +-
 src/views/inventory/supInoutSearchOrder.vue   | 10 ++--
 7 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/.env.development b/.env.development
index eed92e7d..c36d00d3 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-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"
 
diff --git a/.env.production b/.env.production
index 39028584..b4a32b32 100644
--- a/.env.production
+++ b/.env.production
@@ -12,12 +12,13 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 
 
-刘恩典
+# 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.127:9160/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/'
 
+# 诏安总医院
 # VUE_APP_BASE_API = 'http://192.168.8.58:9150/UDI_WMS_MC/'
 
 
@@ -45,7 +46,7 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/'
 
-
+VUE_APP_BASE_API = 'http://192.168.0.191:9150/UDI_WMS_MC/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 3489b4da..72737db6 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -269,7 +269,8 @@ export default {
         thrCheckReview: null,
         inPreInBack: 1,
         deptNoInvType: 0,
-        vailPrescribe:false,
+        vailPrescribe: false,
+        inputSick: false,
       },
       enableMap: {
         true: '是',
@@ -559,6 +560,7 @@ export default {
         inPreInBack: 1,
         deptNoInvType: 0,
         vailPrescribe: false,
+        inputSick: false,
       }
       this.addDialogVisible = true
     },
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index b11e446f..38ba3422 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -501,6 +501,43 @@
               <span class="sptext">预验收剩余库存自动退库</span>
             </el-col>
           </el-row>
+          <el-divider></el-divider>
+          <el-row>
+            <el-col span="5">
+              <span class="sptext">出库是否校验处方</span>
+            </el-col>
+            <el-col span="5">
+              <el-select v-model="inputQuery.vailPrescribe" style="width: 65%"
+                         :disabled="inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
+                         placeholder="是否启用">
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+              </el-select>
+            </el-col>
+            <el-col span="13">
+              <span class="sptext">出库是否校验处方</span>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-row>
+            <el-col span="5">
+              <span class="sptext">出库是否手输患者信息</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select v-model="inputQuery.inputSick" style="width: 65%"
+                         :disabled="inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
+                         placeholder="是否启用">
+                <el-option label="是" :value="true"></el-option>
+                <el-option label="否" :value="false"></el-option>
+              </el-select>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">出库是否手输患者信息</span>
+            </el-col>
+          </el-row>
+
           <el-divider></el-divider>
           <el-row v-if="inputQuery.preInBack==true">
             <el-col span="5">
@@ -523,7 +560,7 @@
             <el-col span="5">
               <span class="sptext">预验收退库单据类型</span>
             </el-col>
-            <el-divider direction="vertical"></el-divider>
+
             <el-col span="5">
               <el-select v-model="inputQuery.preInBackAction" style="width: 65%">
                 <el-option
@@ -536,30 +573,12 @@
                 </el-option>
               </el-select>
             </el-col>
-            <el-divider direction="vertical"></el-divider>
             <el-col span="13">
               <span class="sptext">预验收退库单据类型</span>
             </el-col>
           </el-row>
           <el-divider></el-divider>
-          <el-row>
-            <el-col span="5">
-              <span class="sptext">出库是否校验处方</span>
-            </el-col>
-            <el-divider direction="vertical"></el-divider>
-            <el-col span="5">
-              <el-select v-model="inputQuery.vailPrescribe" style="width: 65%"
-                         :disabled="inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
-                         placeholder="是否启用">
-                <el-option label="是" :value="true"></el-option>
-                <el-option label="否" :value="false"></el-option>
-              </el-select>
-            </el-col>
-            <el-divider direction="vertical"></el-divider>
-            <el-col span="13">
-              <span class="sptext">出库是否校验处方</span>
-            </el-col>
-          </el-row>
+
         </el-collapse-item>
 
         <el-collapse-item title="是否校验业务单设置">
diff --git a/src/views/dev/deviceInfo.vue b/src/views/dev/deviceInfo.vue
index 1ef01333..9fab712c 100644
--- a/src/views/dev/deviceInfo.vue
+++ b/src/views/dev/deviceInfo.vue
@@ -142,7 +142,7 @@
         <el-table-column label="供应商" width="100" prop="supName"/>
         <el-table-column label="udi码" width="150" prop="udi"/>
         <el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
-        <el-table-column label="操作" :width="150" fixed="right">
+        <el-table-column label="操作" :width="180" fixed="right">
           <template scope="scope">
             <el-button type="text" class="mr5" @click="getDeviceLogs(scope.row)"
             >变更日志
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index c9412faf..50874fa8 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -196,7 +196,7 @@
               v-if="curAction.corpType == 1 && curAction.genUnit "
             >
               <el-input
-                v-if="!enableSick"
+                v-if="curAction.inputSick"
                 v-model="orderFormData.fromCorp"
                 auto-complete="off"
                 clearable
@@ -206,14 +206,14 @@
               ></el-input>
 
               <el-select
-                v-if="enableSick"
+                v-if="!curAction.inputSick"
                 v-model="orderFormData.sickerAdNum"
                 filterable
                 remote
                 clearable
                 reserve-keyword
                 style="width: 90%"
-                placeholder="请输入往来信息"
+                placeholder="请选择患者信息"
                 :remote-method="findSickMethod"
                 :loading="loading"
                 @change="sickChange"
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index cc3afd92..00fd11da 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -320,11 +320,11 @@ export default {
     getList() {
       this.loading = true;
       this.filterQuery.actionType = this.actionType;
-      if (this.filterQuery.actionType == 'preInDetail') {
-        this.filterQuery.invCode = '1000001'
-      } else if (this.filterQuery.actionType == 'preDetail') {
-        this.filterQuery.invCode = '1000002'
-      }
+      // if (this.filterQuery.actionType == 'preInDetail') {
+      //   this.filterQuery.invCode = '1000001'
+      // } else if (this.filterQuery.actionType == 'preDetail') {
+      //   this.filterQuery.invCode = '1000002'
+      // }
       getResultOrderList(this.filterQuery)
         .then((response) => {
           if (response.code === 20000) {