From 5aae85cadb0456c7c490884a3635059bbad372e5 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 12 Aug 2024 17:38:28 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/AddPicking1.vue   |  5 +--
 .../toolsAcceptance/component/codingTools.vue |  3 +-
 .../toolsAcceptance/component/home.vue        |  1 -
 .../toolsAcceptance/component/queryTools.vue  |  1 +
 .../newPurchase/toolsAcceptance/index.vue     |  1 +
 .../warehousing/newParts/index.vue            | 44 +++++++++----------
 .../warehousing/newTools/index.vue            |  2 +
 7 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 72fcba5..fe95a43 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -598,7 +598,7 @@ export default {
                 this.queryParams.examineStatusId = '32'
             }
             this.queryParams.unitId = data.unitId
-            this.queryParams.costBearingParty = data?.costBearingParty
+            this.queryParams.costBearingParty = data.costBearingParty
             this.queryParams.proId = data.proId
             this.queryParams.leaseApplyInfo.phone =
                 data.leaseApplyInfoList[0].phone
@@ -633,7 +633,7 @@ export default {
             }
             this.queryParams.unitId = data.unitId
             this.queryParams.proId = data.proId
-            this.queryParams.costBearingParty = data?.costBearingParty
+            this.queryParams.costBearingParty = data.costBearingParty
             this.queryParams.leaseApplyInfo.phone =
                 data.leaseApplyInfoList[0].phone
             this.queryParams.leaseApplyInfo.leasePerson =
@@ -889,4 +889,3 @@ export default {
     },
 }
 </script>
-
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
index 369f8c8..97a9339 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
@@ -791,7 +791,8 @@ export default {
             this.$tab.closeOpenPage(obj)
         },
         async handleBindDetails(row) {
-            console.log('🚀 ~ handleBindDetails ~ row:', row.taskId)
+            console.log('🚀 ~ handleBindDetails ~ row:', row.taskId, row)
+            this.surplusNoBindNum = row.checkNum - row.bindNum
             this.open = true
             this.isDetail = true
             this.title = '编码绑定详情'
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
index 85bc78e..ffff3d6 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
@@ -558,7 +558,6 @@ export default {
             //     .then(() => {
             //         this.$tab.refreshPage()
             //     })
-
             this.$emit('queryTools', row.taskId)
         },
         /** 修改按钮操作 */
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
index dba0d46..a79649d 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
@@ -190,6 +190,7 @@
                     >
                         验收
                     </el-button>
+
                     <!-- <el-button
               size="mini"
               type="text"
diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue
index 0a0cac8..e70377c 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/index.vue
@@ -71,6 +71,7 @@ export default {
         /* 查询工机具 */
         queryTools(taskId) {
             this.isView = true
+
             this.pageContent = '详情信息'
             this.queryTaskId = taskId
             this.isShowComponent = 'QueryTools'
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
index 4b579f7..f16788c 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
@@ -306,18 +306,21 @@
                     </el-select>
         </el-form-item>-->
 
-                <el-form-item label="机具类型" prop="typeId">
-                    <treeselect
+                <el-form-item label="配件类型" prop="typeId">
+                    <el-select
                         v-model="query.typeId"
-                        default-expand-all
-                        :options="equipmentTypeList"
-                        placeholder="请选择规格型号"
-                        :disable-branch-nodes="true"
+                        placeholder="请选择配件类型"
+                        clearable
+                        filterable
                         style="width: 240px"
-                        noChildrenText="没有数据了"
-                        noOptionsText="没有数据"
-                        noResultsText="没有搜索结果"
-                    />
+                    >
+                        <el-option
+                            v-for="typeItem in typeList"
+                            :key="typeItem.partId"
+                            :label="typeItem.partName"
+                            :value="typeItem.partId"
+                        />
+                    </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button
@@ -467,9 +470,13 @@
         </el-dialog>
 
         <!-- 入库单弹窗 -->
-        <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
-            <div style="height: 400px; overflow-y: scroll">
-                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+        <el-dialog :visible.sync="openPrint" width="80%" append-to-body>
+            <div>
+                <vue-easy-print
+                    tableShow
+                    ref="remarksPrintRef"
+                    class="print print-content"
+                >
                     <div
                         class="title"
                         style="
@@ -528,16 +535,7 @@
               <span>车辆信息：</span>
             </div> -->
                     </div>
-                    <el-table
-                        :data="printTableData"
-                        class="table"
-                        style="
-                            margin-top: 20px;
-                            padding-bottom: 1px;
-                            padding-right: 1px;
-                        "
-                        border
-                    >
+                    <el-table :data="printTableData" class="table">
                         <!--          <el-table-column type="selection" width="55" align="center" />-->
                         <el-table-column
                             label="序号"
diff --git a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
index 0333c4c..8afda78 100644
--- a/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
@@ -713,6 +713,7 @@ export default {
                 maCode: row.maCode,
                 typeId: row.typeId,
                 num: row.num,
+                manageType: row.manageType,
             }
 
             let param = {
@@ -766,6 +767,7 @@ export default {
                 maCode: row.maCode,
                 inputNum: row.checkNum,
                 typeId: row.typeId,
+                manageType: row.manageType,
             }
 
             let param = {