From cf2454cdfcbeeb9374968010d2a9fa0288326781 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 30 Dec 2022 16:19:12 +0800
Subject: [PATCH 1/8] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=87=8D=E7=BD=AE=E5=90=8E=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/assetManage.vue            |  1 +
 src/views/inventory/deviceMAOrderCompleted.vue | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/views/inventory/assetManage.vue b/src/views/inventory/assetManage.vue
index 8e26b58..314f90e 100644
--- a/src/views/inventory/assetManage.vue
+++ b/src/views/inventory/assetManage.vue
@@ -119,6 +119,7 @@ export default {
             this.filterQuery = {
                 code: null,
                 nameCode: null,
+                status: 2,
                 page: 1,
                 limit: 20,
             };
diff --git a/src/views/inventory/deviceMAOrderCompleted.vue b/src/views/inventory/deviceMAOrderCompleted.vue
index 98161a3..95f566e 100644
--- a/src/views/inventory/deviceMAOrderCompleted.vue
+++ b/src/views/inventory/deviceMAOrderCompleted.vue
@@ -40,6 +40,17 @@
                 <el-table-column label="领用记录号" prop="collOrderId" width="180"></el-table-column>
                 <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
                 <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="操作" width="180" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="print(scope.row)"
+                        >养护
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
             </el-table>
 
             <el-pagination
@@ -201,6 +212,9 @@ export default {
                 this.detailTotal = 0;
             })
         },
+        print(row) {
+
+        },
     },
     created() {
         this.getList();

From 8219e2cafa2d987dd81e83df8ec4331777ad3e2c Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 30 Dec 2022 17:42:47 +0800
Subject: [PATCH 2/8] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=A2=86=E7=94=A8=EF=BC=8C=E5=85=BB=E6=8A=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/addDeviceCollectOrder.vue | 3 +++
 src/views/inventory/assetManage.vue           | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/views/inventory/addDeviceCollectOrder.vue b/src/views/inventory/addDeviceCollectOrder.vue
index c75f9fe..6f0837d 100644
--- a/src/views/inventory/addDeviceCollectOrder.vue
+++ b/src/views/inventory/addDeviceCollectOrder.vue
@@ -572,7 +572,10 @@ export default {
                 page: 1,
                 limit: 10
             };
+            this.$refs.multipleTable.clearSelection();
             this.multiProduct = [];
+            this.productList = [];
+            this.productTotal = 0;
             this.queryInvProducts();
         },
         handleCurrentChange(val) {
diff --git a/src/views/inventory/assetManage.vue b/src/views/inventory/assetManage.vue
index 314f90e..19f70a9 100644
--- a/src/views/inventory/assetManage.vue
+++ b/src/views/inventory/assetManage.vue
@@ -33,6 +33,7 @@
                 <el-table-column label="设备编号" prop="code" width="180" show-overflow-tooltip></el-table-column>
                 <el-table-column label="产品DI" prop="nameCode" width="180"></el-table-column>
                 <el-table-column label="生产日期" prop="produceDate" width="180"></el-table-column>
+                <el-table-column label="失效日期" prop="exipreDate" width="180"></el-table-column>
                 <el-table-column label="批次号" prop="batchNo" width="180"></el-table-column>
                 <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
                 <el-table-column label="医疗器械注册/备案人名称" prop="ylqxzcrbarmc" width="180"></el-table-column>

From 3d5e29a5e12832efc0cbb8bc341afef457f1879b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sun, 1 Jan 2023 19:29:15 +0800
Subject: [PATCH 3/8] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inventory/deviceMAOrder.js            | 17 +++++++
 src/views/inventory/InvProducts.vue           | 11 +++--
 src/views/inventory/InvStatistics.vue         | 11 ++++-
 src/views/inventory/addInvMAOrder.vue         | 44 ++++++++++++++-----
 .../inventory/deviceMAOrderCompleted.vue      | 33 ++++++++++++--
 5 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/src/api/inventory/deviceMAOrder.js b/src/api/inventory/deviceMAOrder.js
index 99214fd..f6e2cfd 100644
--- a/src/api/inventory/deviceMAOrder.js
+++ b/src/api/inventory/deviceMAOrder.js
@@ -79,3 +79,20 @@ export function addDeviceMAOrder(data) {
         data: data
     });
 }
+
+
+export function verifyTemplateFile(data) {
+    return axios({
+        url: "/device/MA/order/verifyTemplateFile",
+        method: "post",
+        data: data
+    });
+}
+
+export function printOrder(data) {
+    return axios({
+        url: "/device/MA/order/pintOrder",
+        method: "post",
+        data: data
+    });
+}
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 8d42940..8f35b57 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -63,8 +63,7 @@
 <!--            </el-select>-->
 <!--          </el-form-item>-->
           <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
-                       :disabled="invWarehouseDisabled"
+            <el-select v-model="filterQuery.invWarehouseCode" @change="invWarehouseChange" placeholder="请选择当前仓库" clearable="true"
                        size="mini">
               <el-option
                   v-for="item in subInvList"
@@ -239,7 +238,6 @@ export default {
         page: 1,
         limit: 20,
       };
-      this.invChange();
       this.getList();
     },
     onSubmit() {
@@ -398,6 +396,13 @@ export default {
         }
       }
     },
+      invWarehouseChange(invWarehouseCode) {
+          this.subInvList.forEach(item => {
+              if (item.code === invWarehouseCode) {
+                  this.filterQuery.invStorageCode = item.parentId;
+              }
+          });
+      },
   },
   filters: {
     statusFilterType(status) {
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 64dc911..f1197cd 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -62,7 +62,7 @@
 <!--                        </el-select>-->
 <!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" @change="invWarehouseChange" placeholder="请选择当前仓库" clearable="true"
                                    size="mini">
                             <el-option
                                 v-for="item in subInvList"
@@ -212,7 +212,7 @@ export default {
         onSubmit() {
             //判断统计条件是否全部为空
             var param = this.filterQuery;
-            if (this.$isBlank(this.filterQuery.invStorageCode)) {
+            if (this.$isBlank(this.filterQuery.invWarehouseCode)) {
                 this.$message({
                     message: '请先选择当前仓库',
                     type: 'warning'
@@ -337,6 +337,13 @@ export default {
                 .catch(() => {
                 });
         },
+        invWarehouseChange(invWarehouseCode) {
+            this.subInvList.forEach(item => {
+                if (item.code === invWarehouseCode) {
+                    this.filterQuery.invStorageCode = item.parentId;
+                }
+            });
+        },
     },
     filters: {
         statusFilterType(status) {
diff --git a/src/views/inventory/addInvMAOrder.vue b/src/views/inventory/addInvMAOrder.vue
index 39ff688..7d3790f 100644
--- a/src/views/inventory/addInvMAOrder.vue
+++ b/src/views/inventory/addInvMAOrder.vue
@@ -372,6 +372,21 @@ export default {
             if (!isBlank(this.formData.orderId)) {
                 //更新单据
                 updateOrder(this.formData).then((res) => {
+                    if (!isBlank(this.formData.code)) {
+                        //扫码添加库存养护记录详情
+                        let params = {
+                            orderIdFk: this.formData.orderId,
+                            code: this.formData.code
+                        }
+                        addOrderDetail(params).then((res) => {
+                            if (res.code === 20000) {
+                                this.$message.success("添加成功！");
+                                this.getList();
+                            } else {
+                                this.$message.error(res.message);
+                            }
+                        });
+                    }
                 }).catch((error) => {
                     this.$message.error("更新单据信息失败！");
                 })
@@ -422,19 +437,24 @@ export default {
                 this.saveOrder(this.formData.code);
                 return;
             }
-            //扫码添加库存养护记录详情
-            let params = {
-                orderIdFk: this.formData.orderId,
-                code: this.formData.code
+
+            if (this.detailList.length === 0) {
+                this.saveOrder();
+            } else {
+                //扫码添加库存养护记录详情
+                let params = {
+                    orderIdFk: this.formData.orderId,
+                    code: this.formData.code
+                };
+                addOrderDetail(params).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message.success("添加成功！");
+                        this.getList();
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                });
             }
-            addOrderDetail(params).then((res) => {
-                if (res.code === 20000) {
-                    this.$message.success("添加成功！");
-                    this.getList();
-                } else {
-                    this.$message.error(res.message);
-                }
-            });
         },
         deleteOrderDetail(index, row) {
             if (row.count === 1) {
diff --git a/src/views/inventory/deviceMAOrderCompleted.vue b/src/views/inventory/deviceMAOrderCompleted.vue
index 95f566e..9a52583 100644
--- a/src/views/inventory/deviceMAOrderCompleted.vue
+++ b/src/views/inventory/deviceMAOrderCompleted.vue
@@ -40,13 +40,14 @@
                 <el-table-column label="领用记录号" prop="collOrderId" width="180"></el-table-column>
                 <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
                 <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
+                <el-table-column label="养护备注" prop="remark" width="120"></el-table-column>
                 <el-table-column label="操作" width="180" fixed="right">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
                             size="small"
                             @click.native.stop="print(scope.row)"
-                        >养护
+                        >打印
                         </el-button
                         >
                     </template>
@@ -114,7 +115,7 @@
 </template>
 
 <script>
-import {getDeviceMAOrderList, getDeviceMAOrderDetailList} from "@/api/inventory/deviceMAOrder";
+import {getDeviceMAOrderList, getDeviceMAOrderDetailList, verifyTemplateFile, printOrder} from "@/api/inventory/deviceMAOrder";
 
 export default {
     data() {
@@ -213,7 +214,33 @@ export default {
             })
         },
         print(row) {
-
+            let query = {moduleId: 7};
+            this.loading = true;
+            verifyTemplateFile(query).then((res) => {
+                if (res.code === 20000) {
+                    let printParams = {
+                        templateId: res.data,
+                        orderId: row.orderId
+                    };
+                    printOrder(printParams).then((response) => {
+                        //将pdf文件转换为url。
+                        const binaryData = [];
+                        binaryData.push(response);
+                        //获取blob链接。
+                        let url = window.URL.createObjectURL(
+                            new Blob(binaryData, {type: "application/pdf"})
+                        );
+                        this.loading = false;
+                        window.open(url);//打开新标签页，预览pdf。
+                    })
+                } else {
+                    this.loading = false;
+                    this.$message.error(res.message);
+                }
+            }).catch((error) => {
+                this.loading = false;
+                this.$message.error(error.message);
+            })
         },
     },
     created() {

From e74da945e96b43bb98c25dedffd2face04c13039 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 3 Jan 2023 10:04:43 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                |  4 ++--
 src/views/purchase/supCertSet.vue | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/config.json b/public/config.json
index 7c7e6b4..e7474d4 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,7 +1,7 @@
 {
     "UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/",
-    "BASE_URL":"http://127.0.0.1:9992",
-    "SERVER_IP": "http://127.0.0.1:9992/",
+    "BASE_URL":"http://127.0.0.1:9991",
+    "SERVER_IP": "http://127.0.0.1:9991/",
     "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/",
     "hosp_name": "平和县医院"
 }
diff --git a/src/views/purchase/supCertSet.vue b/src/views/purchase/supCertSet.vue
index 9cff612..6b64168 100644
--- a/src/views/purchase/supCertSet.vue
+++ b/src/views/purchase/supCertSet.vue
@@ -173,6 +173,7 @@
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
                 v-if="addManufacturerDialogVisible"
+                :isShow="false"
             >
 
                 <el-form :model="currentManufacturer" :rules="formManufactureRules" ref="dataManufacturerForm">
@@ -206,12 +207,12 @@
 
                     </el-row>
                     <el-row>
-                        <el-col :span="3">
+                        <el-col :span="3" v-if="isShow">
                             <div class="ao-text">
                                 <span>是否禁用：</span>
                             </div>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="8" v-if="isShow">
                             <el-form-item prop="need">
                                 <el-select v-model="currentManufacturer.need" style="width: 100%">
                                     <el-option label="是" :value=true></el-option>
@@ -319,6 +320,7 @@
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
                 v-if="addProductDialogVisible"
+                :isShow="false"
             >
 
                 <el-form :model="currentProduct" :rules="formRules" ref="dataForm">
@@ -335,12 +337,12 @@
                         </el-col>
 
 
-                        <el-col :span="3">
+                        <el-col :span="3"  v-if="isShow">
                             <div class="ao-text">
                                 <span>是否禁用：</span>
                             </div>
                         </el-col>
-                        <el-col :span="8">
+                        <el-col :span="8"  v-if="isShow" >
                             <el-form-item prop="need">
                                 <el-select v-model="currentProduct.need" style="width: 100%">
                                     <el-option label="禁用" :value=true></el-option>

From 7237cb3d3f3ea3a372a83b54e847af495d37f760 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 3 Jan 2023 11:59:29 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/supCompanyEditDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/purchase/supCompanyEditDialog.vue b/src/views/purchase/supCompanyEditDialog.vue
index a957836..2a9db9b 100644
--- a/src/views/purchase/supCompanyEditDialog.vue
+++ b/src/views/purchase/supCompanyEditDialog.vue
@@ -605,7 +605,7 @@ export default {
 
         getCompanyCertList() {
             this.certLoading = true;
-            this.certQuery.customerId = this.inputQuery.customerId;
+            this.certQuery.customerId = this.customerId;
             filterCompanyCert(this.certQuery)
                 .then((response) => {
                     this.certLoading = false;

From c0203b47a7c6ef886df07270e3ac3d6ba3427cb3 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 3 Jan 2023 14:13:29 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/supCompanyEditDialog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/purchase/supCompanyEditDialog.vue b/src/views/purchase/supCompanyEditDialog.vue
index 2a9db9b..2576fa8 100644
--- a/src/views/purchase/supCompanyEditDialog.vue
+++ b/src/views/purchase/supCompanyEditDialog.vue
@@ -513,6 +513,7 @@ export default {
                                     this.closeDialog();
                                 } else {
                                     this.$message.error(response.message);
+                                    this.inputQuery.auditStatus=0
                                 }
                             });
                         }).catch(() => {

From f7be2225cd36e18956c8856e96dd09410930df46 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 3 Jan 2023 16:38:11 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/stockOrderNewDistribution.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index 3f8d3d5..9f4d52b 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -185,10 +185,11 @@
                                 :remote-method="findDeptMethod"
                                 :loading="loading"
                                 @focus="findDeptMethod('')"
+                                @change="ksChange"
                             >
                                 <el-option
                                     v-for="item in fromDeptOptions"
-                                    :key="item.id"
+                                    :key="item.code"
                                     :label="item.name"
                                     :value="item.code"
                                 >
@@ -1216,6 +1217,9 @@ export default {
             this.invChange();
             this.findStorageMethod();
         },
+        ksChange(code){
+            this.formData.deptCode=code;
+        },
 
         subStorageChange() {
             this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
@@ -1273,10 +1277,10 @@ export default {
             this.query.limit = 100;
             this.query.orderIdFk = this.idQuery.id;
             this.formData = this.idQuery.formData;
+            this.formData.deptCode=this.idQuery.formData.dept
             this.orderEditor = true;
             this.sValue = this.formData.corpName;
             this.getStockOrderDetailList();
-
         } else {
             this.formData = {
                 billNo: null,

From 2adb4d7e0c97e3acbd97ae0475ab38dd9575861a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 3 Jan 2023 16:51:41 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BusTypeChange.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue
index f3f37c6..8c75fbb 100644
--- a/src/views/basic/BusTypeChange.vue
+++ b/src/views/basic/BusTypeChange.vue
@@ -141,6 +141,7 @@ export default {
         },
         cancelDialog() {
             this.addDialogVisible = false;
+            this.getList();
         },
         search() {
             this.filterQuery.page = 1;