From 1739543c5e8989b7f29c712834cdd15b0bd2c2a2 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 10 Nov 2025 09:04:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=88=86=E9=83=A8?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=AD=97=E6=AE=B5=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/lease/protocol/index.vue | 52 +++++++++++----------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/views/material/lease/protocol/index.vue b/src/views/material/lease/protocol/index.vue
index 41a03eed..5f064d04 100644
--- a/src/views/material/lease/protocol/index.vue
+++ b/src/views/material/lease/protocol/index.vue
@@ -78,7 +78,7 @@
             <!--      <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" width="100"/>-->
             <el-table-column label="授权人" align="center" prop="authPerson" width="100" />
             <el-table-column label="授权人电话" align="center" prop="phone" width="120" />
-            <el-table-column label="分部工程" align="center" prop="branchProIdsStr" width="150"/>
+<!--            <el-table-column label="分部工程" align="center" prop="branchProIdsStr" width="150"/>-->
             <el-table-column label="租赁单位类型" align="center" width="100">
                 <template slot-scope="scope">
                     <span v-if="scope.row.protocol == '1'">内部单位</span>
@@ -217,28 +217,26 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="12">
-                        <el-form-item label="分部工程" prop="remark">
-                            <el-select
-                                clearable
-                                multiple
-                                filterable
-                                style="width: 100%"
-                                placeholder="请选择分部工程"
-                                v-model="form.branchProIds"
-                            >
-                                <el-option
-                                    :key="dict.value"
-                                    :label="dict.label"
-                                    :value="dict.value * 1"
-                                    v-for="dict in dict.type.branch_project"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+<!--                    <el-col :span="12">-->
+<!--                        <el-form-item label="分部工程" prop="remark">-->
+<!--                            <el-select-->
+<!--                                clearable-->
+<!--                                multiple-->
+<!--                                filterable-->
+<!--                                style="width: 100%"-->
+<!--                                placeholder="请选择分部工程"-->
+<!--                                v-model="form.branchProIds"-->
+<!--                            >-->
+<!--                                <el-option-->
+<!--                                    :key="dict.value"-->
+<!--                                    :label="dict.label"-->
+<!--                                    :value="dict.value * 1"-->
+<!--                                    v-for="dict in dict.type.branch_project"-->
+<!--                                />-->
+<!--                            </el-select>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
 
-                <el-row>
                   <el-col :span="12">
                     <el-form-item label="所属项目部" prop="projectUnitId">
                       <treeselect
@@ -258,6 +256,10 @@
                     </el-form-item>
                   </el-col>
 
+                </el-row>
+
+                <el-row>
+
                   <el-col :span="12">
                     <el-form-item label="备注" prop="remark">
                       <el-input
@@ -360,9 +362,9 @@
                 <el-descriptions-item label="租赁单位类型">
                     {{ form.protocol === '1' ? '内部单位' : '外部单位' }}
                 </el-descriptions-item>
-                <el-descriptions-item label="分部工程">
-                    {{ form.branchProIdsStr }}
-                </el-descriptions-item>
+<!--                <el-descriptions-item label="分部工程">-->
+<!--                    {{ form.branchProIdsStr }}-->
+<!--                </el-descriptions-item>-->
                 <el-descriptions-item label="备注">
                     {{ form.remark }}
                 </el-descriptions-item>

From d580421cc741420fbd721ef260c40857899e0295 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 10 Nov 2025 09:31:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/lease/outBound/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index 34e22b2c..0012fe1b 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -135,7 +135,7 @@
         :show-overflow-tooltip="true"
       /> -->
             <el-table-column label="协议号" align="center" prop="agreementCode" width="140px" />
-            <el-table-column label="租赁申请单号" align="center" prop="code" width="140px"></el-table-column>
+            <el-table-column label="领料单号" align="center" prop="code" width="140px"></el-table-column>
             <el-table-column label="业务联系单号" align="center" prop="businessCode" width="140px"></el-table-column>
             <el-table-column label="申请数量" align="center" prop="preCountNum"></el-table-column>
 

From 61dbeb0315a250e401c0012a32fcbc337725f141 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 10 Nov 2025 15:53:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/exitPermit/index.vue       | 49 ++++++++++++++++---
 .../leasePublish/component/homeApply.vue      | 18 +++++--
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/views/business/exitPermit/index.vue b/src/views/business/exitPermit/index.vue
index a41bc5a5..c653af4a 100644
--- a/src/views/business/exitPermit/index.vue
+++ b/src/views/business/exitPermit/index.vue
@@ -33,6 +33,7 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
         <el-button type="success" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-form-item>
     </el-form>
@@ -152,18 +153,22 @@
             style="width: 100%"
           />
         </el-form-item>
-        <el-form-item label="领料单号" prop="code">
+        <el-form-item label="领料单号" prop="codeList">
           <el-select
-            v-model="form.code"
+            v-model="form.codeList"
             placeholder="请选择领料单号"
             style="width: 100%"
             clearable
             filterable
+            multiple
             :filter-method="filterCodeList"
           >
             <el-option v-for="(item, index) in codeList" :key="index" :label="item.code" :value="item.code" />
           </el-select>
         </el-form-item>
+        <el-form-item label="备注:" prop="remark">
+          <el-input v-model="form.remark" type="textarea" maxlength="999" placeholder="请输入备注" style="width: 100%" clearable />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
@@ -182,11 +187,26 @@ import {getExitPermitList, addExitPermit, getCodeListApi} from '@/api/materialsS
 import chapter from "@/utils/chapter";
 import vueEasyPrint from 'vue-easy-print'
 import printJS from 'print-js'
+import { formatTime } from '@/utils/bonus'
 
 export default {
   components: { vueEasyPrint },
   name: 'IdCardUploadComponent',
   data() {
+    const validateCodeList = (rule, value, callback) => {
+      if ((!value || value.length === 0) && !this.form.remark) {
+        callback(new Error('领料单号和备注至少填写一个'))
+      } else {
+        callback()
+      }
+    }
+    const validateRemark = (rule, value, callback) => {
+      if (!value && (!this.form.codeList || this.form.codeList.length === 0)) {
+        callback(new Error('备注和领料单号至少填写一个'))
+      } else {
+        callback()
+      }
+    }
     return {
       // 非单个禁用
       single: true,
@@ -226,8 +246,10 @@ export default {
         name: '',
         material: '',
         carCode: '',
+        // 默认当前时间
         addDate: '',
-        code: ''
+        codeList: '',
+        remark: '',
       },
       // 表单验证规则
       rules: {
@@ -240,9 +262,8 @@ export default {
         addDate: [
           { required: true, message: "日期不能为空", trigger: "change" }
         ],
-        code: [
-          { required: true, message: "领料单号不能为空", trigger: "change" }
-        ]
+        codeList: [{ validator: validateCodeList, trigger: 'change' }],
+        remark: [{ validator: validateRemark, trigger: 'blur' }]
       },
       codeList: [],
       fullCodeList: [],
@@ -273,6 +294,10 @@ export default {
     handleAdd() {
       this.resetForm();
       this.open = true;
+      this.form.addDate = new Date().toLocaleDateString('zh-CN')
+      this.$nextTick(() => {
+        this.$refs.form.clearValidate()
+      })
       this.getCodeList()
     },
 
@@ -297,6 +322,7 @@ export default {
 
     // 提交表单
     submitForm() {
+      console.log('🚀 ~ this.form:', this.form)
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.isLoading = true;
@@ -433,7 +459,16 @@ export default {
           .slice(0, 200)
 
       }, 500)
-    }
+    },
+    handleExport() {
+        const currentTime = formatTime(new Date())
+        
+        this.download(
+          '/material/back_apply_info/exportExitPermitList',
+          { ...this.queryParams },
+          `出门证_${currentTime}.xlsx`
+        )
+      },
   }
 }
 </script>
diff --git a/src/views/business/leasePublish/component/homeApply.vue b/src/views/business/leasePublish/component/homeApply.vue
index 7947ce25..80317c54 100644
--- a/src/views/business/leasePublish/component/homeApply.vue
+++ b/src/views/business/leasePublish/component/homeApply.vue
@@ -91,6 +91,11 @@
       <el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true" width="80">
       </el-table-column>
       <el-table-column label="备注" align="center" width="100" prop="remark" :show-overflow-tooltip="true"/>
+      <el-table-column label="是否授权" align="center" width="100" prop="remark" :show-overflow-tooltip="true">
+        <template slot-scope="{ row }">
+          <span>{{ row.isAuth == '0' ? '已授权' : '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="300" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" style="margin-bottom: 10px" type="normal"
@@ -104,9 +109,12 @@
             v-if="scope.row.taskStatusName == '未完成'"
             @click="handleStop(scope.row)"
             >终止</el-button>
-          <el-button size="mini" type="warning"
-             @click="handleLld(scope.row)"
-            >业务联单</el-button>
+          <el-button v-if="scope.row.isAuth != '0'" size="mini" type="warning" @click="handleLld(scope.row)">
+            业务联单
+          </el-button>
+          <el-button v-if="scope.row.isAuth == '0'" size="mini" type="warning" @click="handleAuthorization(scope.row)">
+            项目部授权委托书
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -515,6 +523,10 @@ export default {
         loading.close()
       }
     },
+    handleAuthorization (row) {
+      // 打开新页面
+      window.open(row.fileUrl, '_blank')
+    },
     // 处理时间格式 2021-09-01 转换为 2021年09月01日
     handleTimeFormat(time) {
       if (time) {