From 22f562c0b29595f7cdcb3e87d3d9fdf07b6303bf Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Fri, 18 Apr 2025 10:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/return/dialogFormExame.vue |   4 +-
 .../picking/apply/component/AddPicking.vue    |  32 +--
 .../picking/apply/component/home.vue          | 218 ++++++++++++++++--
 .../claimAndreturn/picking/outbound/index.vue |   2 +-
 4 files changed, 219 insertions(+), 37 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue b/sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue
index 4691a3a2..d8773e38 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue
@@ -8,7 +8,7 @@
     append-to-body
     width="800px"
   >
-    <div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;">
+    <div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;font-size: 13px;">
       <vue-easy-print tableShow ref="printRef">
         <div class="order_box">
           <div class="order_box_one">
@@ -32,7 +32,7 @@
             </div>
           </div>
         </div>
-        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
+        <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;font-size: 13px">
           <el-table-column label="编号" align="center" type="index" />
           <el-table-column
             label="类型名称"
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index a6c29889..02be5912 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -158,15 +158,17 @@
                 </el-button>
             </el-col>
 
-            <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col> -->
+            <el-col :span="1.5">
+                <el-button
+                    v-if="!isView"
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出</el-button
+                >
+            </el-col>
         </el-row>
 
         <el-table
@@ -821,9 +823,13 @@ export default {
         },
         /** 导出按钮操作 */
         handleExport() {
-            // this.download('system/role/export', {
-            //   ...this.queryParams
-            // }, `role_${new Date().getTime()}.xlsx`)
+            this.download(
+                'base/tm_task/exportLeaseApplyListAll',
+                {
+                    taskId: this.taskId,
+                },
+                `领料任务详情_${new Date().getTime()}.xlsx`,
+            )
         },
 
         checkNum(row) {
@@ -853,7 +859,6 @@ export default {
             } else {
                 this.handleData(val)
             }
-
         },
         handleData(val) {
             let nodes = null
@@ -907,7 +912,6 @@ export default {
             } catch (error) {
                 console.log('🚀 ~ handleDeviceType ~ error:', error)
             }
-
         },
         //// 将数据处理成 表格中需要的数据
         handelTableItemData(node) {
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
index c412ce21..6e346d1a 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -190,10 +190,10 @@
                 show-overflow-tooltip
             />
             <el-table-column
-              label="单位类型"
-              align="center"
-              prop="typeId"
-              show-overflow-tooltip
+                label="单位类型"
+                align="center"
+                prop="typeId"
+                show-overflow-tooltip
             />
             <el-table-column
                 label="领料工程"
@@ -251,8 +251,10 @@
                             scope.row.taskStatus == 98
                         "
                         >{{
-                            scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0]
-                                .companyAuditRemark || ''
+                            (scope.row.leaseApplyInfoList &&
+                                scope.row.leaseApplyInfoList[0]
+                                    .companyAuditRemark) ||
+                            ''
                         }}
                     </span>
                     <span
@@ -261,7 +263,9 @@
                             scope.row.taskStatus == 99
                         "
                         >{{
-                            scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].deptAuditRemark ||
+                            (scope.row.leaseApplyInfoList &&
+                                scope.row.leaseApplyInfoList[0]
+                                    .deptAuditRemark) ||
                             ''
                         }}
                     </span>
@@ -271,7 +275,9 @@
                             scope.row.taskStatus == 100
                         "
                         >{{
-                            scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark ||
+                            (scope.row.leaseApplyInfoList &&
+                                scope.row.leaseApplyInfoList[0]
+                                    .directAuditRemark) ||
                             ''
                         }}
                     </span>
@@ -281,19 +287,28 @@
                             scope.row.taskStatus < 98
                         "
                         >{{
-                            scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark ||
+                            (scope.row.leaseApplyInfoList &&
+                                scope.row.leaseApplyInfoList[0]
+                                    .directAuditRemark) ||
                             ''
                         }}</span
                     >
                     <span v-if="scope.row.taskStatus > 100">{{
-                        scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark || ''
+                        (scope.row.leaseApplyInfoList &&
+                            scope.row.leaseApplyInfoList[0]
+                                .directAuditRemark) ||
+                        ''
                     }}</span>
                     <!-- <span v-else>{{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
                 </template>
             </el-table-column>
             <el-table-column label="备注" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
-                    {{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].remark || '' }}
+                    {{
+                        (scope.row.leaseApplyInfoList &&
+                            scope.row.leaseApplyInfoList[0].remark) ||
+                        ''
+                    }}
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="180">
@@ -337,6 +352,13 @@
                         style="color: #f56c6c"
                         >删除</el-button
                     >
+                    <el-button
+                        icon="el-icon-tickets"
+                        style="color: #67c23a"
+                        type="text"
+                        @click="openLld(scope.row)"
+                        >领料单</el-button
+                    >
                 </template>
             </el-table-column>
         </el-table>
@@ -349,10 +371,147 @@
             :page-sizes="[5, 10, 15, 20, 30]"
             @pagination="getList"
         />
+
+        <!-- 领料单弹窗 -->
+        <el-dialog :visible.sync="open" width="800px" append-to-body>
+            <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
+                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+                    <div
+                        class="title"
+                        style="
+                            text-align: center;
+                            font-weight: 600;
+                            font-size: 16px;
+                        "
+                    >
+                        领料单
+                    </div>
+                    <div
+                        class="info"
+                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
+                    >
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>领料单位：</span>{{ leaseApplyData.unitName }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>工程名称：</span>{{ leaseApplyData.proName }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>时间：</span>{{ leaseApplyData.updateTimes }}
+                        </div>
+                        <div
+                            class="item"
+                            style="
+                                width: 50%;
+                                flex-shrink: 0;
+                                margin-bottom: 5px;
+                                font-size: 14px;
+                            "
+                        >
+                            <span>编号：</span>{{ leaseApplyData.code }}
+                        </div>
+                    </div>
+                    <el-table
+                        :data="leaseApplyDetails"
+                        class="table"
+                        border
+                        style="margin-top: 20px; padding: 1px"
+                    >
+                        <!--          <el-table-column type="selection" width="55" align="center" />-->
+                        <el-table-column
+                            label="序号"
+                            align="center"
+                            type="index"
+                        />
+                        <el-table-column
+                            label="类型名称"
+                            align="center"
+                            prop="typeName"
+                        />
+                        <el-table-column
+                            label="规格型号"
+                            align="center"
+                            prop="typeModelName"
+                        />
+                        <el-table-column
+                            label="计量单位"
+                            align="center"
+                            prop="unitName"
+                        />
+                        <el-table-column
+                            label="预领数量"
+                            align="center"
+                            prop="preNum"
+                        />
+                        <el-table-column
+                            label="备注"
+                            align="center"
+                            prop="remark"
+                        />
+                        <el-table-column
+                            label="出库方式"
+                            align="center"
+                            prop="manageTypeName"
+                        />
+                    </el-table>
+
+                    <div
+                        class="fillIn"
+                        style="
+                            margin-top: 30px;
+                            display: flex;
+                            justify-content: space-between;
+                        "
+                    >
+                        <div class="item" style="width: 25%">
+                            <span>审核：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>领料：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>仓库：</span>
+                        </div>
+                        <div class="item" style="width: 25%">
+                            <span>操作人：</span>
+                        </div>
+                    </div>
+                </vue-easy-print>
+            </div>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="print">打 印</el-button>
+                <el-button @click="open = false">关 闭</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
+import vueEasyPrint from 'vue-easy-print'
 import {
     listType,
     getType,
@@ -366,10 +525,12 @@ import {
     getUnitData,
     getProData,
     deleteTask,
+    getLeaseListAll,
 } from '@/api/claimAndRefund/receive'
 
 export default {
     // name: "ReceiveApply",
+    components: { vueEasyPrint },
     dicts: ['sys_normal_disable'],
     props: {
         routerParams: {
@@ -381,6 +542,8 @@ export default {
     },
     data() {
         return {
+            open: false,
+            leaseApplyData: {}, // 领料单数据
             // 遮罩层
             loading: false,
             // 选中数组
@@ -461,15 +624,15 @@ export default {
 
             const res = await getLeaseAuditListAll(params)
             console.log('🚀 ~ getList ~ res:', res)
-            res.data.rows.forEach(item => {
-              switch (item.typeId) {
-                case '0':
-                  item.typeId = '内部单位';
-                  break;
-                case '1':
-                  item.typeId = '外部单位';
-                  break;
-              }
+            res.data.rows.forEach((item) => {
+                switch (item.typeId) {
+                    case '0':
+                        item.typeId = '内部单位'
+                        break
+                    case '1':
+                        item.typeId = '外部单位'
+                        break
+                }
             })
             this.loading = false
             this.leaseAuditList = res.data.rows
@@ -629,6 +792,21 @@ export default {
                 this.$store.dispatch('dict/cleanDict')
             })
         },
+        //打开领料单
+        async openLld(row) {
+            this.open = true
+
+            const res = await getLeaseListAll({ taskId: row.taskId })
+
+            this.leaseApplyDetails = res.rows[0].leaseApplyDetails
+            this.leaseApplyData = res.rows[0]
+
+            console.log('this.leaseApplyData ============', this.leaseApplyData)
+        },
+        // 领料单 打印
+        print() {
+            this.$refs.remarksPrintRef.print()
+        },
     },
     watch: {
         $route: {
diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
index 59a98837..d5dbfd16 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
@@ -1199,7 +1199,7 @@ export default {
         handleExportOuter() {
             this.download(
                 'base/leaseOutDetails/exportOutboundOrder',
-                { parentId: this.outboundParams.parentId },
+                { ...this.outboundParams },
                 `出库单_${new Date().getTime()}.xlsx`,
             )
         },