From 2167fc83ad9fc372e04c388c9e1527465288663d Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 23 Jul 2024 11:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=96=B0=E5=A2=9E=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndreturn/picking/outbound/index.vue |  1 +
 .../claimAndreturn/picking/protocol/index.vue | 25 +++++++++++++---
 .../warehouseManage/machinery/type/index.vue  | 29 +++++++++++++++++--
 .../toolsAcceptance/component/queryTools.vue  |  2 +-
 4 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index ef365f6c..3e15d819 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -355,6 +355,7 @@
         <el-dialog
             :title="title"
             :visible.sync="openCode"
+            v-if="openCode"
             width="1200px"
             append-to-body
         >
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
index 10d3f56a..0886264a 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/protocol/index.vue
@@ -149,14 +149,24 @@
                 label="协议编号"
                 align="center"
                 prop="agreementCode"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="合同编号"
                 align="center"
                 prop="contractCode"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
+            <el-table-column
+                label="协议类型"
+                align="center"
+                prop="protocol"
+                show-overflow-tooltip
+            >
+                <template slot-scope="{ row }">
+                    {{ row.protocol == 1 ? '内部单位' : '外部单位' }}
+                </template>
+            </el-table-column>
             <!-- <el-table-column
                 label="协议类型"
                 align="center"
@@ -188,13 +198,13 @@
                 label="往来单位"
                 align="center"
                 prop="unitName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="工程名称"
                 align="center"
                 prop="projectName"
-                :show-overflow-tooltip="true"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="签订日期"
@@ -619,6 +629,13 @@ export default {
                         trigger: 'blur',
                     },
                 ],
+                protocol: [
+                    {
+                        required: true,
+                        message: '请选择协议类型',
+                        trigger: 'change',
+                    },
+                ],
             },
             peopleOpen: false,
             noticeOpen: false,
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
index e3da8a86..8c214aac 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
@@ -123,10 +123,21 @@
                     <el-table-column
                         label="内部租赁价"
                         align="center"
-                        key="leasePrice"
                         prop="leasePrice"
                         show-overflow-tooltip
                     />
+                    <el-table-column
+                        label="外部租赁价"
+                        align="center"
+                        prop="rentPrice"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="原值"
+                        align="center"
+                        prop="buyPrice"
+                        show-overflow-tooltip
+                    />
                     <!-- <el-table-column
                         label="原值"
                         align="center"
@@ -739,6 +750,20 @@ export default {
                         trigger: 'blur',
                     },
                 ],
+                rentPrice: [
+                    {
+                        required: true,
+                        message: '外部租赁价格不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                buyPrice: [
+                    {
+                        required: true,
+                        message: '请输入原值',
+                        trigger: 'blur',
+                    },
+                ],
                 keeperUserId: [
                     {
                         required: true,
@@ -796,7 +821,7 @@ export default {
             // 详情展示列配置
             columnList: [
                 { label: '计量单位', content: 'unitName' },
-                { label: '原值', content: 'buyPrice' },
+                // { label: '原值', content: 'buyPrice' },
                 { label: '丢失赔偿', content: 'payPrice' },
                 { label: '图片', content: 'photoUrl', v_slot: 'img' },
                 { label: '文档资料', content: 'documentName', v_slot: 'doc' },
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 147b20a0..c815bec1 100644
--- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
@@ -159,7 +159,7 @@
                     <template v-else> - </template> -->
 
                     <el-button
-                        v-if="row.status != 2"
+                        v-if="row.status != 0 && row.status != 2"
                         type="text"
                         @click="handleQueryFile(row)"
                         >查看附件</el-button