From fc4e97d591bda10b2a7273c0fee78e68ce0b37ed Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Mon, 29 Apr 2024 17:38:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201417=20=E8=AE=BE=E5=A4=87=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=BC=96=E7=A0=81=E6=97=B6=EF=BC=8C=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E5=87=A0=E5=8F=B0=E8=AE=BE=E5=A4=87=E9=87=8D=E5=A4=8D=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=87=A0=E6=AC=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/store/newBuy.js               |  9 ++++++
 .../newBuy/newDevices/newDevicesCode.vue      | 32 ++++++++++++++++---
 .../newBuy/newDevices/newDevicesList.vue      |  2 ++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/sgzb-ui/src/api/store/newBuy.js b/sgzb-ui/src/api/store/newBuy.js
index 96dec0ca..26ac03d3 100644
--- a/sgzb-ui/src/api/store/newBuy.js
+++ b/sgzb-ui/src/api/store/newBuy.js
@@ -363,3 +363,12 @@ export function getWholeSetDetails(query) {
     params: query,
   })
 }
+
+// 查看绑定编码详情
+export function getBindCodeDetails(query) {
+  return request({
+    url: '/material/purchaseMacode/details',
+    method: 'get',
+    params: query,
+  })
+}
\ No newline at end of file
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index 467038ea..0b8c6a10 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -65,6 +65,14 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            icon="el-icon-view"
+            :disabled="scope.row.bindNum == 0"
+            @click="handleBindDetails(scope.row)"
+          >
+            查看
+          </el-button>
           <el-button
             size="mini"
             type="primary"
@@ -88,7 +96,7 @@
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
       <el-row :gutter="24" class="mb8">
-        <el-form ref="form" :model="form" :rules="rules" label-width="78px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="78px" v-if="!isDetail">
           <el-input v-model="form.typeId" disabled v-show="false" />
           <el-col :span="7">
             <el-form-item label="编码前缀" prop="exCode">
@@ -145,18 +153,21 @@
         <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <el-input
+              v-if="!isDetail"
               v-model="scope.row.maCode"
               :disabled="scope.row.statusFlag == 0"
               οninput="value=value.replace(/[^0-9.]/g,'')"
             ></el-input>
+            <span v-else>{{ scope.row.maCode }}</span>
           </template>
         </el-table-column>
         <el-table-column label="固定资产编码" align="center" prop="assetsCode">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.assetsCode" v-show="form.fixCode == '0'" maxlength="50"></el-input>
+            <el-input v-model="scope.row.assetsCode" v-if="!isDetail" v-show="form.fixCode == '0'" maxlength="50"></el-input>
+            <span v-else>{{ scope.row.assetsCode }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" v-if="!isDetail">
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-delete" @click="delCode(scope.row)">删除</el-button>
           </template>
@@ -164,7 +175,7 @@
       </el-table>
 
       <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="!isDetail">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -187,6 +198,7 @@ import {
   makeEquipmentNumber,
   editPurchaseMacode,
   delMacodeList,
+  getBindCodeDetails
 } from '@/api/store/newBuy'
 
 import { getTypeList } from '@/api/store/warehousing'
@@ -250,6 +262,7 @@ export default {
         //   { required: true, message: "设备编号不能为空", trigger: "blur" }
         // ],
       },
+      isDetail: false,
     }
   },
   mounted() {
@@ -338,6 +351,7 @@ export default {
       this.codeList = []
       this.open = true
       this.title = '生成编码'
+      this.isDetail = false
       // let param = {
       //   taskId:this.taskId,
       //   typeId:row.typeId,
@@ -484,6 +498,16 @@ export default {
       const obj = { path: '/store/newBuy/newDevicesList' }
       this.$tab.closeOpenPage(obj)
     },
+    async handleBindDetails(row) {
+      console.log('🚀 ~ handleBindDetails ~ row:', row.taskId);
+      this.open = true
+      this.isDetail = true
+      this.title = '编码绑定详情'
+      this.codeList = []
+      const res = await getBindCodeDetails({taskId: row.taskId})
+      console.log('🚀 ~ handleBindDetails ~ res:', res);
+      this.codeList = res.data
+    }
   },
 }
 </script>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index da4821cb..9fb223aa 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -629,6 +629,8 @@
                 this.$tab.closeOpenPage({
                     path: '/store/newBuy/newDevicesCode',
                     query,
+                }).then(() => {
+                    this.$tab.refreshPage()
                 })
             },