From 12ed603a4f76145e1a63cb5858832382ff47e516 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 5 Jun 2023 10:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81=E6=AF=94?=
 =?UTF-8?q?=E5=AF=B9=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  12 +-
 src/views/inout/DialogCreateOrder.vue         |  12 +-
 src/views/inout/IoDealOrder.vue               |  39 --
 src/views/inout/PanelCreateOrderBizDetail.vue |   2 -
 .../inout/PanelCreateOrderResultDetail.vue    | 489 ++++++++++++++++++
 5 files changed, 509 insertions(+), 45 deletions(-)
 create mode 100644 src/views/inout/PanelCreateOrderResultDetail.vue

diff --git a/.env.production b/.env.production
index 05db49e..4af88f8 100644
--- a/.env.production
+++ b/.env.production
@@ -7,7 +7,7 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5005/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API =  'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
 
@@ -18,11 +18,19 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
 # 文明懂
-VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
 
 # 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_SPMS_SERVER/'
 
+# 吴雨泽
+# VUE_APP_BASE_API = 'http://192.168.0.58:9150/UDI_SPMS_SERVER/'
+
+
+
+# 漳州中医院
+VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
+
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index f9d48d0..b83a310 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -20,7 +20,6 @@
                      v-if="curAction.checkWebNew > 1  && viewType == 1"
           >待配货提交
           </el-button>
-
           <el-button size="mini" type="primary" @click.native="submit(1)"
                      v-if="curAction.checkWebNew == 3"
           >未配货提交
@@ -196,6 +195,14 @@
       </el-form>
     </el-card>
     <el-tabs type="border-card" style="margin: 5px">
+
+      <el-tab-pane label="校验结果" v-if="bizShow && viewBizVisible">
+        <resultDetailPanel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
+                           :viewType="viewType"
+                           :curBustype="curAction"
+                           v-if="isBizDetailAlive"></resultDetailPanel>
+      </el-tab-pane>
+
       <el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible">
         <biz-detail-panel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
                           :viewType="viewType"
@@ -251,6 +258,7 @@ import editCodeDialog from "./DialogEditCode";
 import codesPanel from "./PanelCreateOrderCodes"
 import codeDetailPanel from "./PanelCreateOrderCodeDetail"
 import bizDetailPanel from "./PanelCreateOrderBizDetail"
+import resultDetailPanel from "./PanelCreateOrderResultDetail"
 import A from "../../plugins/KeyScaner"
 import {findByInvUser, getLocalJoinByUser} from '@/api/basic/busType'
 
@@ -364,7 +372,7 @@ export default {
     };
   },
   components: {
-    codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog
+    codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog, resultDetailPanel
   },
   methods: {
     //获取用户仓库列表
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index e08246f..1d2f98c 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -10,21 +10,6 @@
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item class="query-form-item" label="采购部门:">-->
-          <!--              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
-          <!--                         style="width: 90%"-->
-          <!--              >-->
-          <!--                <el-option-->
-          <!--                  v-for="item in deptList"-->
-          <!--                  :key="item.name"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.code">-->
-          <!--                  <span style="float: left">{{ item.name }}</span>-->
-          <!--                </el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
           <el-col :span="8">
             <el-form-item class="query-form-item" label="收货仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
@@ -202,30 +187,6 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
-        <!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
-        <!--  <el-form-item class="query-form-item" label="物资名称:">-->
-        <!--    <el-input-->
-        <!--      v-model="bizQuery.productName"-->
-        <!--      placeholder="请输入物资名称"-->
-        <!--      clearable-->
-        <!--    >-->
-        <!--    </el-input>-->
-        <!--  </el-form-item>-->
-        <!--  <el-form-item>-->
-        <!--    <el-button-group>-->
-        <!--      <el-button-->
-        <!--        type="primary"-->
-        <!--        icon="el-icon-refresh"-->
-        <!--        @click="onBizReset"-->
-        <!--      >重置-->
-        <!--      </el-button>-->
-        <!--      <el-button type="primary" @click="onBizSubmit"-->
-        <!--                 icon="el-icon-search"-->
-        <!--      >查询-->
-        <!--      </el-button>-->
-        <!--    </el-button-group>-->
-        <!--  </el-form-item>-->
-        <!--</el-form>-->
         <el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
                   :row-style="rowStyle"
                   row-key="id"
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 6d60f75..d156fd3 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -43,7 +43,6 @@
       </el-table-column>
       <el-table-column width="120" label="生产日期">
         <template slot-scope="scope">
-
           <el-input v-model="scope.row.productDate" auto-complete="off"
                     oninput="if(value.length>6)value=value.slice(0,6)"
                     :disabled="scope.row.index !== selectedIndex"
@@ -53,7 +52,6 @@
       </el-table-column>
       <el-table-column width="120" label="失效日期">
         <template slot-scope="scope">
-
           <el-input v-model="scope.row.expireDate" auto-complete="off"
                     oninput="if(value.length>6)value=value.slice(0,6)"
                     :disabled="scope.row.index !== selectedIndex"
diff --git a/src/views/inout/PanelCreateOrderResultDetail.vue b/src/views/inout/PanelCreateOrderResultDetail.vue
new file mode 100644
index 0000000..6cb1c17
--- /dev/null
+++ b/src/views/inout/PanelCreateOrderResultDetail.vue
@@ -0,0 +1,489 @@
+<template>
+  <div>
+    <el-table v-loading="loading" :data="detailList" style="width: 100%" border
+              :row-style="rowStyle"
+              row-key="id"
+    >
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+        label="物资名称" width="150"
+        prop="coName"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="规格型号" width="150"
+        prop="spec"
+      ></el-table-column>
+      <el-table-column label="批次号" header-align="center">
+        <el-table-column header-align="center"
+                         label="手录" width="100"
+                         prop="bbatchNo"
+                         show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column header-align="center"
+                         label="扫码"
+                         prop="sbatchNo" width="100"
+                         show-overflow-tooltip
+        ></el-table-column>
+      </el-table-column>
+
+      <el-table-column label="生产日期" header-align="center">
+        <el-table-column header-align="center"
+                         label="手录" width="100"
+                         prop="bproductDate"
+                         show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column header-align="center"
+                         label="扫码" width="100"
+                         prop="sproductDate"
+                         show-overflow-tooltip
+        ></el-table-column>
+      </el-table-column>
+
+      <el-table-column label="失效日期" header-align="center">
+        <el-table-column header-align="center"
+                         label="手录" width="100"
+                         prop="bexpireDate"
+                         show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column header-align="center"
+                         label="扫码" width="100"
+                         prop="sexpireDate"
+                         show-overflow-tooltip
+        ></el-table-column>
+      </el-table-column>
+      <el-table-column label="数量" header-align="center">
+        <el-table-column
+          header-align="center"
+          label="单据数量" width="100"
+          prop="count"
+        ></el-table-column>
+        <el-table-column
+          header-align="center"
+          label="扫码数量" width="100"
+          prop="scanCount"
+        ></el-table-column>
+      </el-table-column>
+
+      <el-table-column
+        label="价格"
+        prop="price" width="100"
+      ></el-table-column>
+      <el-table-column width="100" label="计量单位" prop="measname">
+      </el-table-column>
+      <el-table-column
+        label="生产企业"
+        prop="manufacturer" width="160"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="注册/备案号" width="160"
+        prop="certCode"
+        show-overflow-tooltip
+      ></el-table-column>
+    </el-table>
+
+    <el-dialog
+      title="业务详情-物资录入"
+      :visible.sync="selectProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectProductVisible"
+      :append-to-body='true'
+    >
+      <stockOrderNewSelectProduct
+        :closeDialog="closeDialog"
+        :data="thisData"
+      ></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"
+        :invQueryData="invQueryData"
+        :orderQuery="thisData"
+        :type="2"
+      ></dialogInvProduct>
+    </el-dialog>
+
+    <!--    绑定产品-->
+    <el-dialog
+      title="绑定产品"
+      :visible.sync="selectRlVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="selectRlVisible"
+      append-to-body
+    >
+      <selectRlDialog
+        :curRow="curRow"
+        :type="bizType"
+        v-on:selectBindRl="selectBindRl"
+        v-on:closeBindDialog="closeBindDialog"
+      ></selectRlDialog>
+    </el-dialog>
+
+    <!--    绑定供应商-->
+    <el-dialog
+      title="绑定供应商"
+      :visible.sync="dialogTableVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="dialogTableVisible"
+      width="80%"
+      append-to-body
+    >
+      <DialogSelectUnit
+        :codeId="curRow"
+        :type="bizType"
+        v-on:selectSupUnit="selectSupUnit"
+        v-on:closeBindDialog="closeBindDialog"
+      ></DialogSelectUnit>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import stockOrderNewSelectProduct from "./DialogSelectProduct";
+import dialogInvProduct from "./DialogSelectInvProduct";
+import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
+import {updateBizBind} from "@/api/inout/order";
+import selectRlDialog from "@/views/inout/DialogSelectRl";
+import DialogSelectUnit from "@/views/inout/DialogSelectUnit";
+import {getCheckDetailList} from "@/api/inout/orderDetailBiz";
+
+export default {
+  name: "PanelCreateOrderResultDetail",
+  props: {
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+    refreshPanel: {
+      type: Function,
+      required: true,
+    },
+    refreshOrder: {
+      type: Function,
+      required: true,
+    },
+    viewType: {
+      type: Object,
+      required: true,
+    },
+    curBustype: {
+      type: Object,
+      required: true,
+    },
+
+  },
+  data() {
+    return {
+      bizType: 1,
+      loading: false,
+      query: {
+        orderId: null,
+        code: "",
+        corpOrderId: "",
+      },
+      detailList: [],
+      total: 0,
+      iCount: 0,
+      selectProductVisible: false,
+      selectInvProductVisible: false,
+      thisData: {},
+      selectedIndex: null,
+      invQueryData: {
+        invCode: null,
+      },
+      selectRlVisible: false,
+      dialogTableVisible: false,
+      curRow: null,
+    };
+  },
+  components: {
+    selectRlDialog, DialogSelectUnit,
+    stockOrderNewSelectProduct,
+    dialogInvProduct,
+  },
+  methods: {
+    getOrderDetails() {
+      this.loading = true;
+      this.query.orderIdFk = this.idQuery.billNo;
+      getCheckDetailList(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+        });
+    },
+
+    rowChange(val) {
+      this.currentRow = val;
+      if (this.currentRow.batchNo == '')
+        this.currentRow.batchNo = null;
+      if (this.currentRow.produceDate == '')
+        this.currentRow.produceDate = null;
+      if (this.currentRow.expireDate == '')
+        this.currentRow.expireDate = null;
+      this.selectedIndex = val.index;
+    },
+
+    closeDialog(rData) {
+      this.selectProductVisible = false;
+      this.selectInvProductVisible = false;
+      this.idQuery = rData;
+      this.getOrderDetails();
+    },
+
+    closeDialogC2(rData) {
+      this.idQuery = rData;
+      this.selectInvProductVisible = false;
+      this.getOrderDetails();
+    },
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
+        rowBackground.color = '#f60303';
+        return rowBackground;
+      }
+
+      if (this.viewType == 1)
+        return null;
+
+      if (!row.checkSuccess) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+
+    selectProductFunction() {
+      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) {
+
+      if (row.batchNo == '') {
+        row.batchNo = null;
+      }
+      if (row.produceDate == '') {
+        row.produceDate = null;
+      }
+      if (row.expireDate == '') {
+        row.expireDate = null;
+      }
+
+      updateBizProduct(row)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("保存成功！");
+            this.selectedIndex = null;
+            this.refreshPanel();
+
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+
+    copyDetail(row) {
+      let data = {
+        relId: row.bindRlFk,
+        supId: row.supId,
+        zczbhhzbapzbh: row.certCode,
+        orderEntity: this.idQuery,
+      }
+      this.loading = true;
+      addBizProduct(data)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getOrderDetails();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+
+    deleteDetail(row) {
+      let data = {
+        id: row.id,
+      }
+      this.loading = true;
+      delBizProduct(data)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getOrderDetails();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    bindRl(val) {
+      this.curRow = val;
+      this.selectRlVisible = true;
+    },
+
+    handleUnitClick(row) {
+      this.curRow = row;
+      this.dialogTableVisible = true;
+    },
+
+    selectBindRl(row) {
+      let query = {
+        id: this.curRow.id,
+        bindRlFk: row.id,
+      };
+      updateBizBind(query).then((response) => {
+          if (response.code == 20000) {
+            this.$message.success("绑定成功");
+            this.getOrderDetails();
+          } else
+            this.$message.error(response.message);
+        }
+      ).catch(() => {
+
+      });
+    },
+
+    selectSupUnit(row) {
+      let query = {
+        id: this.curRow.id,
+        supId: row.erpId,
+      };
+      updateBizBind(query).then((response) => {
+        if (response.code == 20000) {
+          this.$message.success("绑定成功");
+          this.getOrderDetails();
+        } else {
+          this.$message.error(response.message);
+        }
+      }).catch(() => {
+      });
+    }
+    ,
+
+
+    closeBindDialog() {
+      this.selectRlVisible = false;
+      this.dialogTableVisible = false;
+      this.refreshPanel();
+    }
+    ,
+  }
+  ,
+  filters: {}
+  ,
+
+  watch: {
+    'idQuery.billNo':
+      {
+        handler() {
+          this.refreshOrder(this.idQuery);
+        }
+        ,
+      }
+  }
+  ,
+
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  }
+  ,
+  created() {
+    if (this.idQuery.billNo != null)
+      this.getOrderDetails();
+  }
+  ,
+}
+;
+</script>
+<style scoped>
+.el-table_fixed, el-table__fixed-right {
+  height: 80% !important;
+}
+
+.el-table__fixed-body-wrapper {
+  height: 80% !important;
+}
+
+
+.ao-text {
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
+}
+
+/**
+解决el-input输入框 type=number时，输入中文光标上移问题
+ */
+.el-input__inner {
+  line-height: 1px !important;
+}
+
+</style>
+
+
+