From 401a9a493b34c328bae9c18dbc5ed1499d21012c Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 21 Apr 2022 20:55:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B1=8F=E8=94=BD=E5=AF=84=E5=94=AE=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95=202.=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AD=97=E5=85=B8=E9=A1=B5=E9=9D=A2=203.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5=E5=8F=96=E5=80=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                            | 4 ++--
 src/views/basic/invWarehouse.vue               | 8 ++++----
 src/views/sys/bindPlatform.vue                 | 5 ++++-
 src/views/userManage/param/systemPDFModule.vue | 8 --------
 src/views/userManage/phoneRegisterManage.vue   | 4 ++--
 src/views/warehouse/stockOrderDelSearch.vue    | 9 +++++----
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 206fc72..fdf0db0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -416,7 +416,7 @@ export const asyncRouterMap = [
                     authRule: ["stock/additionalOrder"]
                 }
             },
-            {
+            /*{
                 path: "invPreProducts",
                 component: invPreProducts,
                 name: "寄售库查询",
@@ -424,7 +424,7 @@ export const asyncRouterMap = [
                 meta: {
                     authRule: ["inv/invPreProducts"]
                 }
-            },
+            },*/
             {
                 path: "invProducts",
                 component: invProducts,
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 1c3d2a4..8c84ed8 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -12,8 +12,8 @@
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-select v-model="query.advanceType" placeholder="仓库类型" clearable>
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="寄售" value="true"></el-option>
+<!--                        <el-option label="全部" value=""></el-option>
+                        <el-option label="寄售" value="true"></el-option>-->
                         <el-option label="仓库" value="false"></el-option>
                     </el-select>
                 </el-form-item>
@@ -297,7 +297,7 @@
                 <el-form-item class="query-form-item" label="仓库类型:">
                     <el-select v-model="formData.advanceType" placeholder="仓库类型" clearable disabled>
                         <el-option label="寄售" :value=true></el-option>
-                        <el-option label="仓库" :value=false></el-option>
+<!--                        <el-option label="仓库" :value=false></el-option>-->
                     </el-select>
                 </el-form-item>
                 <el-form-item label="状态:" prop="status" class="query-form-item">
@@ -381,7 +381,7 @@
                     <el-col :span="12" class="el-col">
                         <el-form-item class="query-form-item" label="仓库类型:">
                             <el-select v-model="formData.advanceType" placeholder="仓库类型" :disabled="formName =='edit'">
-                                <el-option label="寄售" :value="true"></el-option>
+<!--                                <el-option label="寄售" :value="true"></el-option>-->
                                 <el-option label="仓库" :value="false"></el-option>
                             </el-select>
                         </el-form-item>
diff --git a/src/views/sys/bindPlatform.vue b/src/views/sys/bindPlatform.vue
index 6d4ce01..9cb9d6d 100644
--- a/src/views/sys/bindPlatform.vue
+++ b/src/views/sys/bindPlatform.vue
@@ -91,6 +91,7 @@
                                 <el-select
                                     v-model="editLogin.corpName"
                                     style="width: 65%"
+                                    :disabled="editDialogVisible"
                                     @change="intentPlatform"
                                     placeholder="请选择医院客户"
                                 >
@@ -261,6 +262,7 @@ export default {
             },
             loading: false,
             editLoginVisible: false,
+
             checked: false,
             editDialogVisible: false,
             list: [],
@@ -352,7 +354,7 @@ export default {
                     this.editType = 2;
                     this.editLoginVisible = true;
                     this.editLogin = row;
-
+                    this.editDialogVisible = true;
                     this.getUnitMaintain();
                     this.getPlatformList();
                     this.getLocalBussinessType();
@@ -368,6 +370,7 @@ export default {
         handleAddClick() {
             this.editType = 0;
             this.editLoginVisible = true;
+            this.editDialogVisible = false;
 
             //清空表单数据
             this.editLogin = {
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index c15a737..2ffcde9 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -633,16 +633,8 @@ export default {
         previewTemplate(row) {
         },
         showFieldExpain(row) {
-
             this.currentRow = row.fieldExplain.replace("\\\n", "<br>");
             this.centerDialogVisible = true;
-            // const {href} = this.$router.resolve({//打开新窗口页面
-            //     path: '/showText',
-            //     query: {
-            //         content: row.fieldExplain
-            //     }
-            // })
-            // window.open(href, '_blank')
         },
         // 显示表单
         handleForm(index, row) {
diff --git a/src/views/userManage/phoneRegisterManage.vue b/src/views/userManage/phoneRegisterManage.vue
index 28c96d0..1497382 100644
--- a/src/views/userManage/phoneRegisterManage.vue
+++ b/src/views/userManage/phoneRegisterManage.vue
@@ -31,7 +31,7 @@
 
         <el-table v-loading="loading" :data="list" style="width: 100%">
             <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="企业名称" prop="customerName" width="230"></el-table-column>
+            <el-table-column label="企业名称" prop="companyName" width="230"></el-table-column>
             <el-table-column label="IMEI唯一识别码" prop="imei" width="230"></el-table-column>
             <el-table-column
                 label="登记说明"
@@ -40,7 +40,7 @@
 
             <el-table-column
                 label="申请人"
-                prop="companyName"
+                prop="applicant"
             ></el-table-column>
 
             <el-table-column label="审核状态" prop="isCheck" width="120">
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index f0de1d2..3a9d3e5 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -102,6 +102,7 @@
                         </el-button
                         >
                         <el-button
+                            v-if="scope.row.uploadFlag"
                             type="text"
                             size="small"
                             :disabled="scope.row.uploadStatus == 1"
@@ -560,12 +561,12 @@ export default {
             }
         },
         printOrder(row) {
-            let tQuery = { queryId: row.id };
+            let tQuery = { queryId: row.orderId };
             this.loading = true;
             inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
                 if (response.code === 20000) {
                     tQuery = {
-                        id: row.id
+                        orderId: row.orderId
                     };
                     stockOrderPDFFromTemplateFile(tQuery).then((response) => {
                         //将pdf文件转换为url。
@@ -768,6 +769,7 @@ export default {
                     type: "success",
                     message: "补单成功!"
                 });
+                row.enableSupplementOrder = false;
                 //补单
                 let orderQuery = {
                     orderId: row.orderId
@@ -784,6 +786,7 @@ export default {
             let orderIds = [];
             orderIds.push(row.orderId);
             let query = {orderIds: orderIds};
+            row.uploadStatus = 1;
             updateSpms(query)
                 .then((response) => {
                     if (response.code == 20000) {
@@ -792,11 +795,9 @@ export default {
                     } else {
                         this.$message.error(response.message);
                     }
-
                 })
                 .catch(() => {
                 });
-
         }
     },
     components: {