From a911f72b4948297e75dd70a8612fd91994d9775d Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 18 Oct 2024 16:10:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8D=AF=E5=93=81=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/collect/relCode.js                    |  8 ++++
 .../collect/relCode/operateRelCodeSpell.vue   | 15 +++++-
 .../distribution/DialogCreateOrder.vue        |  2 +-
 .../distribution/PanelCreateOrderCodes.vue    | 47 +++++++++++++++++--
 4 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/src/api/collect/relCode.js b/src/api/collect/relCode.js
index bdc5d88..b34ffde 100644
--- a/src/api/collect/relCode.js
+++ b/src/api/collect/relCode.js
@@ -61,3 +61,11 @@ export function scanCodeRelCode(query) {
     data: query
   });
 }
+
+export function updateIoCodeTempEntity(query) {
+  return axios({
+    url: "/udiwms/relCode/updateIoCodeTempEntity",
+    method: "get",
+    params: query
+  });
+}
diff --git a/src/views/collect/relCode/operateRelCodeSpell.vue b/src/views/collect/relCode/operateRelCodeSpell.vue
index 38b92de..1f70a15 100644
--- a/src/views/collect/relCode/operateRelCodeSpell.vue
+++ b/src/views/collect/relCode/operateRelCodeSpell.vue
@@ -209,6 +209,10 @@
         required: true,
         default: null
       },
+      closeCodeDialog: {
+        type: Function,
+        required: true,
+      },
     },
     watch: {
       resetKey(newVal, oldVal) {
@@ -409,6 +413,9 @@
               if (this.parentCode == null){
                 if (data.packLayer == 1) {
                   this.$message.warning("该层级为最小包装层级无需进行码关联操作！");
+                  if (this.closeCodeDialog != null){
+                    this.closeCodeDialog()
+                  }
                   return;
                 }
                 this.relFormData.cpmctymc = data.cpmctymc;
@@ -797,11 +804,15 @@
         this.parentCode = null;
         this.inputDisabled = false
         this.refreshCodesPanel()
+        if (this.closeCodeDialog != null){
+          this.closeCodeDialog()
+        }
       },
       init(){
         if(this.orderQuery != null){
-          this.relFormData = this.orderQuery;
-          this.bhxjsl = this.orderQuery.bhxjsl;
+          this.scanCode = this.orderQuery.code
+          // this.scanCode = "82015700010101701314"
+          this.enterKey();
         }
       }
     },
diff --git a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
index c3fe585..92b259d 100644
--- a/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
+++ b/src/views/pharmaceuticals/distribution/DialogCreateOrder.vue
@@ -251,7 +251,7 @@ import editCodeDialog from "./DialogEditCode";
 import {selectAuthMenuByMenuKeys} from '@/api/system/sysMenuHelp'
 
 
-import codesPanel from "./PanelCreateOrderCodeDetail"
+import codesPanel from "./PanelCreateOrderCodes"
 import codeDetailPanel from "./PanelCreateOrderCodeDetail"
 import bizDetailPanel from "./PanelCreateOrderBizDetail"
 import A from "@/plugins/KeyScaner"
diff --git a/src/views/pharmaceuticals/distribution/PanelCreateOrderCodes.vue b/src/views/pharmaceuticals/distribution/PanelCreateOrderCodes.vue
index 1e303b0..035be5e 100644
--- a/src/views/pharmaceuticals/distribution/PanelCreateOrderCodes.vue
+++ b/src/views/pharmaceuticals/distribution/PanelCreateOrderCodes.vue
@@ -65,7 +65,7 @@
       <!--        show-overflow-tooltip-->
       <!--      ></el-table-column>-->
 
-      <el-table-column label="操作" width="220" fixed="right">
+      <el-table-column label="操作" width="280" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -97,7 +97,15 @@
           >编辑
           </el-button
           >
-        </template>
+            <el-button
+              type="text"
+              size="small"
+              :disabled="scope.row.drugLink == 1"
+              @click.native.stop="association(scope.row)"
+            >关联
+            </el-button
+            >
+          </template>
       </el-table-column>
     </el-table>
     <div class="block">
@@ -110,6 +118,22 @@
       />
     </div>
 
+
+
+    <el-dialog
+      :title="editTitle"
+      :visible.sync="associationCodeVisible"
+      append-to-body width="70%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="associationCodeVisible"
+    >
+      <operateRelCodeSpell
+        :closeCodeDialog="closeCodeDialog"
+        :orderQuery="orderQuery">
+      </operateRelCodeSpell>
+    </el-dialog>
+
     <!--    绑定产品-->
     <el-dialog
       :title="selectRlTitle"
@@ -172,6 +196,8 @@ import selectRlDialog from "./DialogSelectRl";
 import DialogSelectUnit from "./DialogSelectUnit";
 import editCodeDialog from "./DialogEditCode";
 import {parseTime} from "@/utils/coTools";
+import operateRelCodeSpell from "@/views/collect/relCode/operateRelCodeSpell";
+import {updateIoCodeTempEntity} from "@/api/collect/relCode";
 
 export default {
   name: "IoAddCodeDetail",
@@ -200,6 +226,9 @@ export default {
   },
   data() {
     return {
+      orderQuery: null,
+      editTitle: "",
+      associationCodeVisible: false,
       loading: false,
       query: {
         code: "",
@@ -332,8 +361,11 @@ export default {
       }).catch(() => {
       });
     },
-
-
+    association(row) {
+      this.editTitle = "关联条码";
+      this.orderQuery = row;
+      this.associationCodeVisible = true;
+    },
     closeBindDialog() {
       this.selectRlVisible = false;
       this.dialogTableVisible = false;
@@ -343,6 +375,11 @@ export default {
     closeCodeDialog() {
       this.editCodeVisible = false;
       this.editOriginCodeVisible = false;
+      this.associationCodeVisible = false;
+      //前往更新码明细
+      updateIoCodeTempEntity({parentCode:this.orderQuery.code}).then((response) => {
+      }).catch(() => {
+      });
       this.refreshPanel();
     },
 
@@ -362,7 +399,7 @@ export default {
   },
 
   components: {
-    selectRlDialog, DialogSelectUnit, editCodeDialog
+    selectRlDialog, DialogSelectUnit, editCodeDialog,operateRelCodeSpell
   },
 }
 </script>