From 1e01f5a578ea8312a4b04d9c5dcb11b4d886b0f9 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 22 Aug 2022 11:32:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                       |  4 ++--
 src/views/basic/basicCompanyProducts.vue | 24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/public/config.json b/public/config.json
index d57a14d..0ae8930 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
 
-    "BASE_URL": "http://192.168.0.66:8500/SPMS_SERVER",
-    "SERVER_IP": "http://192.168.0.66:8500/SPMS_SERVER",
+    "BASE_URL": "http://127.0.0.1:9906",
+    "SERVER_IP": "http://127.0.0.1:9906",
     "hosp_name": "诏安县总医院（测试）"
 }
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index a0eebc6..af139da 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -731,22 +731,23 @@
                         <el-row :gutter="20" class="el-row" type="flex">
                             <el-col :span="24" class="el-col">
                                 <div style="margin-top: 18px;margin-bottom: 18px">
-                                    <el-checkbox v-model="checked" :disabled="!isUseDyCheck"
+                                    <el-checkbox v-model="checked" :disabled="!isUseDyCheck" disabled
                                     >以使用单元数量入库
                                     </el-checkbox>
-                                    <el-checkbox v-model="editQuery.isDisable"
+                                    <el-checkbox v-model="editQuery.isDisable" disabled
                                     >是否禁用
                                     </el-checkbox>
-                                    <el-checkbox v-model="editQuery.isAdavence"
+                                    <el-checkbox v-model="editQuery.isAdavence" disabled
                                     >是否寄售
                                     </el-checkbox>
                                     <el-checkbox v-model="editQuery.allowNoBatch" class=""
+                                                 disabled
                                     >允许无批次号
                                     </el-checkbox>
-                                    <el-checkbox v-model="editQuery.allowNoExpire" class=""
+                                    <el-checkbox v-model="editQuery.allowNoExpire" class="" disabled
                                     >允许无失效日期
                                     </el-checkbox>
-                                    <el-checkbox v-model="editQuery.allowNoProduct" class=""
+                                    <el-checkbox v-model="editQuery.allowNoProduct" class="" disabled
                                     >允许无生产日期
                                     </el-checkbox>
                                 </div>
@@ -1340,7 +1341,9 @@
                 ></selectErp>
             </el-dialog>
             <el-dialog
-                title="选入DI器械信息"
+
+                :title="selectformMap[selectValue]"
+
                 :visible.sync="selectLocalVisible"
                 width="85%"
                 :close-on-click-modal="false"
@@ -1508,6 +1511,12 @@ export default {
             lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
             isUseDyCheck: false,
             loading: false,
+            selectValue: 0,
+            selectformMap: {
+                0: "选入DI器械信息",
+                1: "拆分产品",
+            },
+
         };
     },
 
@@ -1738,6 +1747,7 @@ export default {
             this.thisData = val;
             this.idSpliUdi = false;
             this.thirdId = val.thirdId;
+            this.selectValue = 0;
             this.selectLocalVisible = true;
         },
 
@@ -1746,11 +1756,13 @@ export default {
             this.isImportUdi = true;
             this.thisData = val;
             this.idSpliUdi = true;
+            this.selectValue = 1;
             this.selectLocalVisible = true;
         },
 
         intentImportUdi() {
             this.relId = null;
+            this.selectValue = 0;
             this.selectLocalVisible = true;
         },
         deleteCompanyProductRelevance(row) {

From 490d9036d005e136e79b40eedebdfc57d60cb37e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 22 Aug 2022 15:05:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E4=B8=80=E4=BA=8C=E6=AC=A1=E5=A4=8D=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BussinessType.vue       |  4 ++++
 src/views/basic/BussinessTypeModify.vue | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index 93b1650..ebd5048 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -193,6 +193,7 @@ export default {
                 checkPc: null,
                 checkWebNew: null,
                 checkChange: null,
+                checkCopy: null,
                 secCheckUdims: null,
                 secCheckPdaEd: null,
                 secCheckPdaUn: null,
@@ -201,6 +202,7 @@ export default {
                 secCheckChange: null,
                 checkBalacne: null,
                 secCheckBalacne: null,
+                secCheckCopy: null,
                 corpType: null,
                 storageCode: null,
                 supplementOrderType: null,
@@ -371,6 +373,8 @@ export default {
                 defaultSubInv: row.defaultSubInv,
                 defaultInv: row.defaultInv,
                 orderVisibleType: row.orderVisibleType,
+                checkCopy: row.checkCopy,
+                secCheckCopy: row.secCheckCopy,
             };
             this.modifyDialogVisible = true;
         },
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index df1ac03..2e7f7ab 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -293,6 +293,12 @@
                     </el-checkbox>
                 </div>
             </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkCopy" :disabled="!inputQuery.checkEnable">手动补单
+                    </el-checkbox>
+                </div>
+            </el-col>
         </el-row>
 
         <el-divider></el-divider>
@@ -352,6 +358,12 @@
                     </el-checkbox>
                 </div>
             </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckCopy" :disabled="!inputQuery.secCheckEnable">手动补单
+                    </el-checkbox>
+                </div>
+            </el-col>
         </el-row>
         <el-divider></el-divider>
 
@@ -374,7 +386,7 @@ import {findConfig} from "@/api/thrsys/spsSyncStatus";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
-    name: "inputQuery",
+    name: "BussinessTypeModify",
     props: {
         inputQuery: {
             type: Object,