From 4ceeaa26a6803bbc31e20c6f47854c92d45ba9ae Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Wed, 26 Mar 2025 17:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E5=92=8C?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/store/newBuy.js                       | 10 ++++++++++
 .../picking/apply/component/home.vue          |  2 +-
 .../picking/apply/component/home1.vue         | 11 ++++++++++-
 .../picking/auditing/component/home1.vue      | 19 ++++++++++---------
 .../claimAndreturn/picking/outbound/index.vue |  7 ++++---
 .../component/finishAndDetails.vue            |  7 +++++--
 .../toolsAcceptance/component/addTools.vue    |  6 ++++++
 7 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/api/store/newBuy.js b/src/api/store/newBuy.js
index 0e4eeb2..c4f6887 100644
--- a/src/api/store/newBuy.js
+++ b/src/api/store/newBuy.js
@@ -377,3 +377,13 @@ export function getBindCodeDetails(query) {
 export const postAcceptImgUploadApi = (data) => {
     return request.post('/material/purchaseCheckDetails/uploadPic', data)
 }
+
+
+//新增机具模板下载
+export function downLoadTypeModel(data) {
+    return request({
+        url: '/material/purchaseMacode/downLoadTypeModel',
+        method: 'post',
+        data: data,
+    })
+}
\ No newline at end of file
diff --git a/src/views/claimAndreturn/picking/apply/component/home.vue b/src/views/claimAndreturn/picking/apply/component/home.vue
index b3797ea..6484fc6 100644
--- a/src/views/claimAndreturn/picking/apply/component/home.vue
+++ b/src/views/claimAndreturn/picking/apply/component/home.vue
@@ -9,7 +9,7 @@
             v-show="showSearch"
             label-width="80px"
         >
-            <el-form-item label="关键字" prop="keyWord">
+            <el-form-item label="关键字1" prop="keyWord">
                 <el-input
                     v-model="queryParams.keyWord"
                     placeholder="请输入关键字"
diff --git a/src/views/claimAndreturn/picking/apply/component/home1.vue b/src/views/claimAndreturn/picking/apply/component/home1.vue
index 741764a..d07c58d 100644
--- a/src/views/claimAndreturn/picking/apply/component/home1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/home1.vue
@@ -152,6 +152,7 @@
                 align="center"
                 prop="code"
                 :show-overflow-tooltip="true"
+                width="150"
             />
             <el-table-column
                 label="领料类型"
@@ -171,48 +172,56 @@
                 align="center"
                 prop="unitName"
                 :show-overflow-tooltip="true"
+                width="150"
             />
             <el-table-column
                 label="领料工程"
                 align="center"
                 prop="proName"
                 :show-overflow-tooltip="true"
+                width="150"
             />
             <el-table-column
                 label="协议号"
                 align="center"
                 prop="agreementCode"
                 :show-overflow-tooltip="true"
+                width="150"
             />
             <el-table-column
                 label="领料人"
                 align="center"
                 prop="leasePerson"
                 :show-overflow-tooltip="true"
+                width="100"
             />
             <el-table-column
                 label="联系电话"
                 align="center"
                 prop="leasePhone"
                 :show-overflow-tooltip="true"
+                width="110"
             />
             <el-table-column
                 label="申请人"
                 align="center"
                 prop="applyFor"
                 :show-overflow-tooltip="true"
+                width="100"
             />
             <el-table-column
                 label="预计领料时间"
                 align="center"
                 prop="estimateLeaseTime"
                 :show-overflow-tooltip="true"
+                width="200"
             />
             <el-table-column
                 label="申请时间"
                 align="center"
                 prop="createTimes"
                 :show-overflow-tooltip="true"
+                width="200"
             />
             <el-table-column
                 label="任务状态"
@@ -275,7 +284,7 @@
                     <span v-if="scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList.length > 0 && scope.row.leaseApplyInfoList[0].remark">{{ scope.row.leaseApplyInfoList[0].remark }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="160">
+            <el-table-column label="操作" align="center" width="180"  fixed="right">
                 <template slot-scope="scope">
                     <el-button
                         size="mini"
diff --git a/src/views/claimAndreturn/picking/auditing/component/home1.vue b/src/views/claimAndreturn/picking/auditing/component/home1.vue
index bc2c838..53865e9 100644
--- a/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -107,26 +107,27 @@
                 type="index"
                 :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
             />
-            <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
+            <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150"/>
             <el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span v-if="scope.row.leaseType == 0">工程租赁</span>
                     <span v-if="scope.row.leaseType == 1">长期领用</span>
                 </template>
             </el-table-column>
-            <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-            <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" />
-            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
-            <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
-            <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" />
-            <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
+            <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="130"/>
+            <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="130"/>
+            <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" width="150"/>
+            <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" width="100"/>
+            <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" width="120"/>
+            <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" width="100"/>
             <el-table-column
                 label="预计领料时间"
                 align="center"
                 prop="estimateLeaseTime"
                 :show-overflow-tooltip="true"
+                width="200"
             />
-            <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" />
+            <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" width="200"/>
             <el-table-column
                 label="任务状态"
                 align="center"
@@ -147,7 +148,7 @@
                     >
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="160" align="center">
+            <el-table-column label="操作" width="160" align="center" fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
                     <el-button
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 5b19cdf..1372c6a 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -70,6 +70,7 @@
         align="center"
         prop="preCountNum"
         :show-overflow-tooltip="true"
+        width="90"
       ></el-table-column>
       <el-table-column
         label="申请时间"
@@ -77,10 +78,10 @@
         prop="createTimes"
         :show-overflow-tooltip="true"
       ></el-table-column>
-      <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column label="出库状态" align="center" prop="taskName" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true"   width="90"></el-table-column>
+      <el-table-column label="出库状态" align="center" prop="taskName" :show-overflow-tooltip="true"   width="100"></el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
         <template slot-scope="scope">
           <el-button size="mini" @click="handleView(scope.row)" v-hasPermi="['picking:outbound:view']">查看</el-button>
           <el-button
diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue
index c97b4ed..b3b965f 100644
--- a/src/views/cost/csotSettlement/component/finishAndDetails.vue
+++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue
@@ -402,10 +402,13 @@ export default {
                     exportTitle = '工机具待报废清单'
                     break
             }
-
+            const params = []
+            this.currRowInfo.forEach((e) => {
+                params.push({ ...e });
+            })
             this.downloadJson(
                 exportUrl,
-                JSON.stringify([{ agreementId: this.currRowInfo.agreementId }]),
+                JSON.stringify(params),
                 `${exportTitle}-${new Date().getTime()}.xlsx`,
             )
         },
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
index 0ee394a..90e0146 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
@@ -158,6 +158,12 @@
             <el-col :span="1.5">
                 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave">保存</el-button>
             </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" plain icon="el-icon-download" size="mini" >模板下载</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" plain icon="el-icon-upload2" size="mini" >模板上传</el-button>
+            </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">