From bdbc66d808f80a4bec95e801bfe499debaf0710f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 21 Feb 2023 16:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9B=B8=E5=85=B3bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectInvProduct.vue    | 56 ++++++++++----
 src/views/inout/DialogSelectProduct.vue       | 34 ++++++++-
 src/views/inout/IoCreateBusOrder.vue          |  4 +-
 src/views/inout/IoCreateOrder.vue             |  8 +-
 src/views/inout/PanelCreateOrderBizDetail.vue | 74 ++++++++++++++-----
 .../inout/PanelCreateOrderCodeDetail.vue      |  2 +-
 6 files changed, 138 insertions(+), 40 deletions(-)

diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index 312c6f6b..b342c027 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -64,6 +64,7 @@ import {
   getInvProduct,
 } from "@/api/inventory/invPorduct";
 import {addDetail} from "@/api/inout/receiveOrder";
+import {addBizProduct} from "@/api/inout/orderDetailCode";
 
 
 export default {
@@ -77,7 +78,8 @@ export default {
       type: Object,
       required: true,
     },
-    type: {
+    orderQuery: {},
+    type: {     //1.领用选入，2：业务单据选入
       type: Object,
       required: true,
     }
@@ -183,25 +185,49 @@ export default {
           batchNo: obj.batchNo,
           productDate: obj.productionDate,
           expireDate: obj.expireDate,
+          supId: obj.supId,
         }
         ids.push(data);
       });
 
-      this.loading = true;
-      let tQuery = {
-        datas: ids,
-        purReceiveEntity: this.invQueryData,
-      };
-      addDetail(tQuery).then((response) => {
-        this.loading = false;
-        if (response.code === 20000) {
-          this.closeDialog(response.data);
-        } else {
-          this.$message.error(response.message);
+      if (this.type == 2) {  //新增业务单据选入
+        let data = {
+          datas: ids,
+          orderEntity: this.orderQuery,
         }
-      }).catch(() => {
-        this.loading = false;
-      });
+        this.loading = true;
+        addBizProduct(data)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.closeDialog(response.data);
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+
+      } else {
+        this.loading = true;
+        let tQuery = {
+          datas: ids,
+          purReceiveEntity: this.invQueryData,
+        };
+        addDetail(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeDialog(response.data);
+          } else {
+            this.$message.error(response.message);
+          }
+        }).catch(() => {
+          this.loading = false;
+        });
+      }
+
+
     },
   },
   filters: {
diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue
index ea8d5b3c..6ea9ab5c 100644
--- a/src/views/inout/DialogSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@@ -149,14 +149,27 @@
         <el-button @click="dialogFormVisible = false">取 消</el-button>
       </div>
     </el-dialog>
+
+
+    <el-dialog
+      title="耗材字典详情"
+      :visible.sync="udiRlDetailVisible"
+      width="85%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="udiRlDetailVisible"
+    >
+      <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 
-import {getUdiInfos} from "@/api/basic/product/udiRelevance";
 import {addBizProduct} from "@/api/inout/orderDetailCode";
 import {filterCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
+import udiRlDetailDialog from "../purchase/purApply/purUdiRlDetailDialog";
 
 export default {
   name: "stockOrderNewSelectProduct",//选入耗材字典产品对话框
@@ -185,6 +198,7 @@ export default {
         ggxh: null,
         ylqxzcrbarmc: null,
         thrPiId: null,
+        unitFk: null,
         page: 1,
         limit: 10,
       },
@@ -198,6 +212,7 @@ export default {
       dialogFormVisible: false,
       currentCert: null,
       certList: [],
+      udiRlDetailVisible: false,
     };
   },
   methods: {
@@ -228,6 +243,9 @@ export default {
 
     getList() {
       this.loading = true;
+      if (this.data.fromCorp != null) {
+        this.listQuery.unitFk = this.data.fromCorp;
+      }
       filterCompanyProductRelevance(this.listQuery)
         .then((response) => {
           this.loading = false;
@@ -306,12 +324,24 @@ export default {
         });
     },
 
+
+    handleDetailClick(row) {
+      this.currentRow = row;
+      this.udiRlDetailVisible = true;
+
+    },
+
+
   },
-  components: {}
+  components: {udiRlDetailDialog}
   ,
 
   created() {
+
+
     this.getList();
+
+    console.log(this.data);
   }
   ,
 }
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index d5a4e9da..575555d9 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -219,7 +219,7 @@
 import {
   deleteByOrderId,
   submitOrderWeb,
-  getOrderList
+  getOrderList, submitBiz
 } from "../../api/inout/order";
 import addOrder from "./IoCreateOrder";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@@ -464,7 +464,7 @@ export default {
         billNo: "",
       };
       idQuery.billNo = data;
-      submitOrderWeb(idQuery)
+      submitBiz(idQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 270632e8..43cd8fdc 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -190,6 +190,7 @@
       <el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible">
         <biz-detail-panel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
                           :viewType="viewType"
+                          :curBustype="curAction"
                           v-if="isBizDetailAlive"></biz-detail-panel>
       </el-tab-pane>
       <el-tab-pane label="扫码详情" v-if="viewCodeVisible">
@@ -379,7 +380,7 @@ export default {
         .then((response) => {
           this.busTypeOptions = response.data || [];
           this.curAction = this.getActionItem(this.orderFormData.action);
-          if (this.curAction.checkEnable && this.curAction.checkWebNew) {
+          if ((this.curAction.checkEnable && this.curAction.checkWebNew) || this.viewType == 1) {
             this.bizShow = true;
           } else
             this.bizShow = false;
@@ -422,6 +423,7 @@ export default {
     actionChange(item) {
       this.curAction = this.getActionItem(item);
       if ((this.curAction.checkEnable && this.curAction.checkWebNew) || this.viewType == 1) {
+        //单据类型需要一次校验 或 单据类型为1，显示业务单据页面
         this.bizShow = true;
       } else
         this.bizShow = false;
@@ -487,6 +489,7 @@ export default {
       this.loading = true;
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
       tQuery.code = this.codeFormData.code;
+      tQuery.orderType = this.viewType;
       this.addCodeSubmit(tQuery);
       this.$refs.inputRef.select();
     },
@@ -592,6 +595,7 @@ export default {
 
 
     submit() {
+      debugger
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
       tQuery.orderId = this.orderFormData.billNo;
       if (this.viewType == 2) {
@@ -628,7 +632,7 @@ export default {
     saveOrder() {
       let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
       tQuery.billNo = this.orderFormData.billNo;
-      if(this.orderFormData.billNo==null){
+      if (this.orderFormData.billNo == null) {
         this.$message.error("请先添加扫码详情！");
         return;
       }
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index f15919cd..cb4b679d 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -154,27 +154,31 @@
       ></stockOrderNewSelectProduct>
     </el-dialog>
 
-    <!--    <el-dialog-->
-    <!--      title="库存产品录入"-->
-    <!--      :visible.sync="selectInvProductVisible"-->
-    <!--      :close-on-click-modal="false"-->
-    <!--      :close-on-press-escape="false"-->
-    <!--      width="85%"-->
-    <!--      v-if="selectInvProductVisible"-->
-    <!--      :append-to-body='true'-->
-    <!--    >-->
-    <!--      <dialogInvProduct-->
-    <!--        :closeDialog="closeDialogC2"-->
-    <!--        :data="thisData"-->
-    <!--        :invQueryData="invQueryData"-->
-    <!--      ></dialogInvProduct>-->
-    <!--    </el-dialog>-->
+
+    <el-dialog
+      title="库存产品录入"
+      :visible.sync="selectInvProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectInvProductVisible"
+      :append-to-body='true'
+    >
+      <dialogInvProduct
+        :closeDialog="closeDialogC2"
+        :invQueryData="invQueryData"
+        :orderQuery="thisData"
+        :type="2"
+      ></dialogInvProduct>
+    </el-dialog>
+
+
   </div>
 </template>
 
 <script>
 import stockOrderNewSelectProduct from "./DialogSelectProduct";
-// import dialogInvProduct from "../inventory/DialogInvProduct"
+import dialogInvProduct from "./DialogSelectInvProduct";
 import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
 
 export default {
@@ -196,6 +200,10 @@ export default {
       type: Object,
       required: true,
     },
+    curBustype: {
+      type: Object,
+      required: true,
+    },
 
   },
   data() {
@@ -212,13 +220,17 @@ export default {
       total: 0,
       iCount: 0,
       selectProductVisible: false,
+      selectInvProductVisible: false,
       thisData: {},
       selectedIndex: null,
+      invQueryData: {
+        invCode: null,
+      },
     };
   },
   components: {
     stockOrderNewSelectProduct,
-    // dialogInvProduct,
+    dialogInvProduct,
   },
   methods: {
     getOrderDetails() {
@@ -250,6 +262,12 @@ export default {
       this.getOrderDetails();
     },
 
+    closeDialogC2(rData) {
+      this.idQuery = rData;
+      this.selectInvProductVisible = false;
+      this.getOrderDetails();
+    },
+
     rowStyle({row, rowIndex}) {
       if (this.viewType == 1)
         return null;
@@ -265,8 +283,28 @@ export default {
     },
 
     selectProductFunction() {
-      this.selectProductVisible = true;
       this.thisData = this.idQuery;
+      if (this.$isBlank(this.idQuery.action)) {
+        this.$message.error("单据类型不能为空！")
+        return;
+      }
+      if (this.$isBlank(this.idQuery.invCode)) {
+        this.$message.error("当前仓库不能为空！");
+        return;
+      }
+
+      if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
+        this.$message.error("往来信息不能为空！");
+        return;
+      }
+      if (this.curBustype.corpType == 3) {//内部科室
+        this.invQueryData.invCode = this.idQuery.invCode;
+        this.selectInvProductVisible = true;
+      } else if (this.curBustype.corpType == 2)//供应商信息
+      {
+        this.selectProductVisible = true;
+      }
+
     },
 
     saveChange(row) {
diff --git a/src/views/inout/PanelCreateOrderCodeDetail.vue b/src/views/inout/PanelCreateOrderCodeDetail.vue
index 2268c754..bae910a6 100644
--- a/src/views/inout/PanelCreateOrderCodeDetail.vue
+++ b/src/views/inout/PanelCreateOrderCodeDetail.vue
@@ -21,7 +21,7 @@
       <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
       <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
       <el-table-column label="价格" width="150" prop="price" show-overflow-tooltip></el-table-column>
-      <el-table-column label="生产厂家" width="150" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+      <el-table-column label="生产厂家" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
       <el-table-column label="注册/备案凭证号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
     </el-table>
     <div class="block">