Merge remote-tracking branch 'origin/orderChange' into orderChange

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",
+    "BASE_URL":"http://127.0.0.1:9991",
-    "SERVER_IP": "http://127.0.0.1:9992/",
+    "SERVER_IP": "http://127.0.0.1:9991/",
     "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/",
     "hosp_name": "平和县医院"
 }

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
+    });
+}

src/views/basic/BusTypeChange.vue

@@ -141,6 +141,7 @@ export default {
         },
         cancelDialog() {
             this.addDialogVisible = false;
+            this.getList();
         },
         search() {
             this.filterQuery.page = 1;

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,

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"
+            <el-select v-model="filterQuery.invWarehouseCode" @change="invWarehouseChange" placeholder="请选择当前仓库" clearable="true"
-                       :disabled="invWarehouseDisabled"
                        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) {

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) {

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) {

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,11 +437,15 @@ export default {
                 this.saveOrder(this.formData.code);
                 return;
             }
+
+            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("添加成功！");
@@ -435,6 +454,7 @@ export default {
                         this.$message.error(res.message);
                     }
                 });
+            }
         },
         deleteOrderDetail(index, row) {
             if (row.count === 1) {

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>
@@ -119,6 +120,7 @@ export default {
             this.filterQuery = {
                 code: null,
                 nameCode: null,
+                status: 2,
                 page: 1,
                 limit: 20,
             };

src/views/inventory/deviceMAOrderCompleted.vue

@@ -40,6 +40,18 @@
                 <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>
+                </el-table-column>
             </el-table>
 
             <el-pagination
@@ -103,7 +115,7 @@
 </template>
 
 <script>
-import {getDeviceMAOrderList, getDeviceMAOrderDetailList} from "@/api/inventory/deviceMAOrder";
+import {getDeviceMAOrderList, getDeviceMAOrderDetailList, verifyTemplateFile, printOrder} from "@/api/inventory/deviceMAOrder";
 
 export default {
     data() {
@@ -201,6 +213,35 @@ export default {
                 this.detailTotal = 0;
             })
         },
+        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() {
         this.getList();

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>

src/views/purchase/supCompanyEditDialog.vue

@@ -513,6 +513,7 @@ export default {
                                     this.closeDialog();
                                 } else {
                                     this.$message.error(response.message);
+                                    this.inputQuery.auditStatus=0
                                 }
                             });
                         }).catch(() => {
@@ -605,7 +606,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;