From 82bdb7becd5b0b28c18bed58a432a34a38c99130 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 8 Jan 2025 17:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lease/apply/component/homeApply.vue       |   1 -
 src/views/material/lease/outBound/index.vue   | 124 +++---------------
 .../goodsArrived/component/addTools.vue       |  12 +-
 3 files changed, 26 insertions(+), 111 deletions(-)

diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 9aec54ac..91ad7c25 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -264,7 +264,6 @@
                 <img src="../../../../../assets/signTemp.png" style="width: 45%;height: 30px;" alt="">
                 <img src="../../../../../assets/signTemp.png" style="width: 45%;height: 30px;" alt="">
               </div>
-         
             </div>
           </div>
         </vue-easy-print>
diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index 235242da..12a20ca9 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -596,142 +596,60 @@
     <el-dialog :visible.sync="open" width="800px"  :title="title" 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 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;
-              "
-            >
+          <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.leaseUnit }}
             </div>
-            <div
-              class="item"
-              style="
-                width: 50%;
-                flex-shrink: 0;
-                margin-bottom: 5px;
-                font-size: 14px;
-              "
-            >
+            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
               <span>工程名称：</span>
               {{ leaseApplyData.leaseProject }}
             </div>
-            <div
-              class="item"
-              style="
-                width: 50%;
-                flex-shrink: 0;
-                margin-bottom: 5px;
-                font-size: 14px;
-              "
-            >
+            <div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
               <span>时间：</span>
               <span v-if="leaseApplyData.createTime">{{ leaseApplyData.createTime.split(" ")[0] }}</span>
             </div>
-            <div
-              class="item"
-              style="
-                width: 50%;
-                flex-shrink: 0;
-                margin-bottom: 5px;
-                font-size: 14px;
-              "
-            >
+            <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 :data="leaseApplyDetails"  class="table" border style="margin-top: 20px; padding: 1px">
             <el-table-column label="序号" align="center" type="index" />
             <el-table-column label="类型名称" align="center" prop="maTypeName" />
-            <!--            <el-table-column type="expand">
-              <template slot-scope="scope">
-                <div class="nested-table-container">
-                  <el-table :data="scope.row.maTypeDetails" style="width: 100%">
-                    &lt;!&ndash; 子表格的列 &ndash;&gt;
-                    <el-table-column label="序号" align="center" type="index"/>
-                    <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
-                    <el-table-column
-                      label="规格型号"
-                      align="center"
-                      prop="typeName"
-                      :show-overflow-tooltip="true"
-                    />
-                    <el-table-column
-                      label="单位"
-                      align="center"
-                      prop="unitName"
-                      :show-overflow-tooltip="true"
-                    />
-                    <el-table-column
-                      label="预领数量"
-                      align="center"
-                      prop="preNum"
-                      :show-overflow-tooltip="true"
-                    />
-                  </el-table>
-                </div>
-              </template>
-            </el-table-column>-->
             <el-table-column label="规格型号" align="center" prop="typeName" />
             <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="manageType"
-            >
+            <el-table-column label="出库方式" align="center" prop="manageType">
               <template slot-scope="scope">
                 <span v-if="scope.row.manageType == 0" style="color: blue;" @click="codeInfo(scope.row)">编码出库</span>
                 <span v-if="scope.row.manageType == 1">数量出库</span>
               </template>
             </el-table-column>
-            <!--            <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%">
+          <div class="fillIn" style="margin-top: 30px;display: flex;justify-content: space-between;">
+            <div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;">
               <span>审核：</span>
+              <img src="../../../../assets/signTemp.png" style="width: 80px;height: 30px;" alt="">
             </div>
-            <div class="item" style="width: 25%">
+            <div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;">
               <span>领料：</span>
             </div> 
-            <div class="item" style="width: 25%">
+            <div class="item" style="width: 24%;display: flex;align-items: center;flex-wrap: wrap;">
               <span>制单：</span>
             </div>
-            <div class="item" style="width: 25%">
-              <span>库管：</span>
+            <div class="item" style="width: 28%;display: flex;align-items: center;">
+              <div style="width: 25%;">库管：</div>
+              <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;">
+                <img src="../../../../assets/signTemp.png" style="width: 45%;height: 30px;" alt="">
+                <img src="../../../../assets/signTemp.png" style="width: 45%;height: 30px;" alt="">
+                <img src="../../../../assets/signTemp.png" style="width: 45%;height: 30px;" alt="">
+                <img src="../../../../assets/signTemp.png" style="width: 45%;height: 30px;" alt="">
+              </div> 
             </div>
           </div>
         </vue-easy-print>
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 96910ca0..124e403e 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -170,7 +170,7 @@
                 show-overflow-tooltip
             />
             <el-table-column align="center" label="单位" prop="unitName" />
-            <el-table-column label="采购数量" prop="purchaseNum" align="center">
+            <el-table-column label="采购数量" prop="purchaseNum" align="center" width="120">
                 <template v-slot="scope">
                     <el-input
                         v-model.number="scope.row.purchaseNum"
@@ -183,7 +183,7 @@
             <el-table-column
                 label="购置单价(元含税)"
                 prop="purchaseTaxPrice"
-                align="center" width="200"
+                align="center" width="150"
             >
                 <template v-slot="scope">
                     <el-input-number
@@ -198,7 +198,7 @@
             <el-table-column
                 label="购置单价(元不含税)"
                 prop="purchasePrice"
-                align="center"  width="200"
+                align="center"  width="150"
             >
                 <template slot-scope="scope">
                     <el-input-number
@@ -211,7 +211,7 @@
                 </template>
             </el-table-column>
             <el-table-column label="租赁价(元/天)" prop="rentPrice"
-                align="center"  width="200"
+                align="center"  width="150"
             >
                 <template slot-scope="scope">
                     <el-input-number
@@ -670,9 +670,6 @@ export default {
                         type: 'warning'
                     })
                     this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected)
-                } else if (typeData.storageNum <= 0) {
-                    this.$message.error('所选物资规格类型暂时无库存，无法申请！')
-                    this.tempDeviceType = this.tempDeviceType.filter(id => id !== lastSelected)
                 } else {
                     console.log(typeData,"typeData")
                     if(typeData.rentPrice>0){//判断是否有租赁价格：有禁用;无修改;
@@ -690,6 +687,7 @@ export default {
                         purchaseNum : 1,
                         fixCode: '0',
                         status:1,
+                        isExitFile:'0',
                         bmFileInfos:[]
                         
                     })