From 2725684196757255f56fadfd27d759d9f8a36944 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 14 Mar 2023 14:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   2 +-
 .../purchase/purDelivery/purDelivery.vue      |   3 +
 .../purDelivery/purDeliveryEditDialog.vue     | 176 +++++++++---------
 .../purOrder/DialogSelectOrderList.vue        |  28 +--
 4 files changed, 94 insertions(+), 115 deletions(-)

diff --git a/.env.production b/.env.production
index 53b4793..d54efe1 100644
--- a/.env.production
+++ b/.env.production
@@ -4,7 +4,7 @@ VUE_APP_TITLE = UDI自助平台
 # 生产环境配置
 ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_WMS_MC/'
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
diff --git a/src/views/purchase/purDelivery/purDelivery.vue b/src/views/purchase/purDelivery/purDelivery.vue
index 1a8b850..da48f2e 100644
--- a/src/views/purchase/purDelivery/purDelivery.vue
+++ b/src/views/purchase/purDelivery/purDelivery.vue
@@ -82,6 +82,9 @@
         <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="送货数量" prop="count"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo"></el-table-column>
+        <el-table-column label="生产日期" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
index 31df9ba..4af7795 100644
--- a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
@@ -18,12 +18,12 @@
           <el-col :span="11">
             <el-form-item label="单据时间:" prop="billdate">
               <el-date-picker
-                v-model="formData.billDate"
-                type="datetime"
-                placeholder="选择日期"
-                style="width: 100%"
-                :clearable="false"
-                value-format="yyyy-MM-dd HH:mm:ss"
+                  v-model="formData.billDate"
+                  type="datetime"
+                  placeholder="选择日期"
+                  style="width: 100%"
+                  :clearable="false"
+                  value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </el-form-item>
@@ -36,10 +36,10 @@
               <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="送货仓库信息" style="width: 100%"
                          clearable>
                 <el-option
-                  v-for="item in invCodeList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
+                    v-for="item in invCodeList"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.code">
                   <span style="float: left">{{ item.name }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
                 </el-option>
@@ -119,7 +119,7 @@
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
-          <el-table-column label="操作" width="120"  fixed="right">
+          <el-table-column label="操作" width="120" fixed="right">
             <template slot-scope="scope">
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
                          @click.native="rowChange(scope.row)">编辑
@@ -134,35 +134,35 @@
     </el-form>
 
     <el-dialog
-      title="产品录入"
-      :visible.sync="selectProductVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="80%"
-      v-if="selectProductVisible"
-      :append-to-body='true'
+        title="产品录入"
+        :visible.sync="selectProductVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        v-if="selectProductVisible"
+        :append-to-body='true'
     >
       <purOrderProducts
-        :closeDialog="closeDialogC2"
-        :purType="1"
-        :pId="pId"
-        :data="thisData"
+          :closeDialog="closeDialogC2"
+          :purType="1"
+          :pId="pId"
+          :data="thisData"
       ></purOrderProducts>
     </el-dialog>
 
     <el-dialog
-      title="采购订单选入"
-      :visible.sync="selectApplyVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="80%"
-      append-to-body
-      v-if="selectApplyVisible"
+        title="采购订单选入"
+        :visible.sync="selectApplyVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        append-to-body
+        v-if="selectApplyVisible"
     >
       <select-plan-list-dialog
-        :data="thisData"
-        :pId="pId"
-        :closeDialog="closeDialogC2"
+          :data="thisData"
+          :pId="pId"
+          :closeDialog="closeDialogC2"
       ></select-plan-list-dialog>
     </el-dialog>
   </div>
@@ -179,7 +179,7 @@ import {
   updateDetail
 } from "@/api/purchase/purDelivery";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
-import SelectPlanListDialog from "@/views/purchase/purPlan/selectPlanListDialog";
+import SelectPlanListDialog from "@/views/purchase/purOrder/DialogSelectOrderList";
 
 
 export default {
@@ -312,18 +312,18 @@ export default {
         type: 1,
       }
       inserThrOrderWeb(tQuery)
-        .then(response => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.$message.success(tMessage + "成功");
-            this.closeDialog(true);
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-        })
+          .then(response => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.$message.success(tMessage + "成功");
+              this.closeDialog(true);
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          })
     },
     selectProductFunction() {
       this.selectProductVisible = true;
@@ -349,17 +349,17 @@ export default {
         orderIdFk: this.pId
       }
       selectOrderDetail(this.query) //查找该单号下的所有条码
-        .then((response) => {
-          console.log(response)
-          this.codeArray = response.data.list || [];
-          this.total = response.data.total || 0;
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
+          .then((response) => {
+            console.log(response)
+            this.codeArray = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
     },
     rowChange(val) {
       this.tableCountChange(this.currentRow);
@@ -400,19 +400,19 @@ export default {
             let delIds = [];
             delIds.push(row.id)
             delOrderDetail(delIds)
-              .then(response => {
-                this.detailLoading = false;
-                if (response.code === 20000) {
-                  this.$message.success(response.data);
-                  // this.getStockOrderDetailList();
-                  this.codeArray.splice(index, 1);
-                } else {
-                  this.$message.error(response.message);
-                }
-              })
-              .catch(() => {
-                this.detailLoading = false;
-              })
+                .then(response => {
+                  this.detailLoading = false;
+                  if (response.code === 20000) {
+                    this.$message.success(response.data);
+                    // this.getStockOrderDetailList();
+                    this.codeArray.splice(index, 1);
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                })
+                .catch(() => {
+                  this.detailLoading = false;
+                })
           } else {
             this.$message.success('删除成功');
             this.codeArray.splice(index, 1);
@@ -428,17 +428,17 @@ export default {
     getStockOrderDetailList() {
       this.loading = true;
       listOrderDetail(this.query) //查找该单号下的所有条码
-        .then((response) => {
-          console.log(response)
-          this.codeArray = response.data.list || [];
-          this.total = response.data.total || 0;
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-          this.total = 0;
-        });
+          .then((response) => {
+            console.log(response)
+            this.codeArray = response.data.list || [];
+            this.total = response.data.total || 0;
+            this.loading = false;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
     },
     findSubInvs() {
       this.invCodeList = [];
@@ -446,14 +446,14 @@ export default {
         filter: 3
       };
       filterSubByInv(query)
-        .then((response) => {
-          this.invCodeList = response.data || [];
-          if (this.invCodeList != null && this.invCodeList.length == 1) {
-            this.formData.invCode = this.invCodeList[0].code;
-          }
-        })
-        .catch(() => {
-        });
+          .then((response) => {
+            this.invCodeList = response.data || [];
+            if (this.invCodeList != null && this.invCodeList.length == 1) {
+              this.formData.invCode = this.invCodeList[0].code;
+            }
+          })
+          .catch(() => {
+          });
     },
     selectApply() {
       this.selectApplyVisible = true;
diff --git a/src/views/purchase/purOrder/DialogSelectOrderList.vue b/src/views/purchase/purOrder/DialogSelectOrderList.vue
index fe4852f..adce119 100644
--- a/src/views/purchase/purOrder/DialogSelectOrderList.vue
+++ b/src/views/purchase/purOrder/DialogSelectOrderList.vue
@@ -67,7 +67,7 @@
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="采购数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
@@ -79,6 +79,7 @@
 
 <script>
 import {listOrder, listOrderDetail} from "@/api/purchase/purOrder"
+import {addPlanDetailAndOrder} from "@/api/purchase/purDelivery";
 
 export default {
   name: "selectPlanListDialog",
@@ -233,31 +234,6 @@ export default {
           this.total = 0;
         });
     },
-    deleteDialog(row) {
-      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          delOrder(row.id)
-            .then((response) => {
-              this.loading = false;
-              if (response.code == 20000) {
-                this.$message.success("删除成功");
-                this.getList();
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
-
-        })
-        .catch(() => {
-        });
-    },
     handleCurrentChange(val) {
       this.filterQuery.page = val.page;
       this.getList();