Merge remote-tracking branch 'origin/master'

.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/'

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>

src/views/purchase/purDelivery/purDeliveryEditDialog.vue

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

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();