From 5f43342bbca226cfa3414e6a2785eb7d97cfaba5 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 18 Feb 2025 11:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E8=BD=AC=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/businessHandling/directApply.vue | 84 +++++++++++++------
 src/views/business/businessHandling/index.vue |  6 +-
 .../directApplyRecord.vue                     | 25 ++++--
 .../business/businessHandlingRecord/index.vue | 11 ++-
 4 files changed, 88 insertions(+), 38 deletions(-)

diff --git a/src/views/business/businessHandling/directApply.vue b/src/views/business/businessHandling/directApply.vue
index 338495b0..3041855c 100644
--- a/src/views/business/businessHandling/directApply.vue
+++ b/src/views/business/businessHandling/directApply.vue
@@ -71,9 +71,9 @@
         <el-col :span="7" :offset="0">
           <el-card shadow="always" :body-style="{ padding: '20px' }" style="min-width: 400px">
             <!-- card body -->
-            <el-form-item label="转入单位" prop="unitId">
+            <el-form-item label="转入单位" prop="unitIdTo">
               <treeselect
-                v-model="maForm.unitId"
+                v-model="maForm.unitIdTo"
                 :disabled="isDetail"
                 :options="uniteList"
                 :normalizer="normalizer"
@@ -87,9 +87,9 @@
                 @select="uniteChange"
               />
             </el-form-item>
-            <el-form-item label="转入工程" prop="projectId">
+            <el-form-item label="转入工程" prop="projectIdTo">
               <treeselect
-                v-model="maForm.projectId"
+                v-model="maForm.projectIdTo"
                 :disabled="isDetail"
                 :options="projectList"
                 :normalizer="normalizer"
@@ -103,9 +103,9 @@
                 @select="projectChange"
               />
             </el-form-item>
-            <el-form-item label="转入人" prop="leasePerson">
+            <el-form-item label="转入人" prop="leasePersonTo">
               <el-input
-                v-model="maForm.leasePerson"
+                v-model="maForm.leasePersonTo"
                 placeholder="请输入转入人"
                 clearable
                 maxlength="50"
@@ -113,9 +113,9 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="联系电话" prop="phone">
+            <el-form-item label="联系电话" prop="phoneTo">
               <el-input
-                v-model="maForm.phone"
+                v-model="maForm.phoneTo"
                 placeholder="请输入联系电话"
                 clearable
                 maxlength="11"
@@ -136,7 +136,7 @@
               :key="uploadKey"
               :limit="3"
               list-type="picture-card"
-              accept="*/image"
+              accept=".png, .jpg, .jpeg, .pdf"
               :on-change="handleChangeBusinessList"
               :class="{ disabledFbs: uploadDisabled }"
               :on-preview="picturePreviewFbs"
@@ -151,7 +151,10 @@
                   <p class="file-name">{{ file.name }}</p>
                 </div>
                 <span class="el-upload-list__item-actions">
-                  <span class="el-upload-list__item-preview" @click="picturePreviewFbs(file)">
+                  <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                    <i class="el-icon-download" />
+                  </span>
+                  <span v-else class="el-upload-list__item-preview" @click="picturePreviewFbs(file)">
                     <i class="el-icon-zoom-in" />
                   </span>
                   <span
@@ -375,21 +378,21 @@ export default {
         unitId: [
           {
             required: true,
-            message: '请选择租赁单位',
+            message: '请选择转出单位',
             trigger: 'blur'
           }
         ],
         projectId: [
           {
             required: true,
-            message: '请选择租赁工程',
+            message: '请选择转出工程',
             trigger: 'blur'
           }
         ],
         leasePerson: [
           {
             required: true,
-            message: '请输入领料人',
+            message: '请输入转出人',
             trigger: 'blur'
           }
         ],
@@ -401,10 +404,32 @@ export default {
             trigger: 'blur'
           }
         ],
-        applyCode: [
+        unitIdTo: [
           {
             required: true,
-            message: '请输入采购申请编号',
+            message: '请选择转入单位',
+            trigger: 'blur'
+          }
+        ],
+        projectIdTo: [
+          {
+            required: true,
+            message: '请选择转入工程',
+            trigger: 'blur'
+          }
+        ],
+        leasePersonTo: [
+          {
+            required: true,
+            message: '请输入转入人',
+            trigger: 'blur'
+          }
+        ],
+        phoneTo: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          {
+            pattern: /^(?:(?:\+|00)86)?1[3-9]\d{9}$/,
+            message: '请输入正确的手机号码',
             trigger: 'blur'
           }
         ],
@@ -576,13 +601,13 @@ export default {
         return item.uid != file.uid
       })
       const parts = file.name.split('.')
-      const extension = parts.pop()
+      const extension = parts.pop().toLowerCase()
       if (fileList.length > 3) {
         this.$message.warning('最多上传3张附件')
         fileList = fileList.filter(item => {
           return item.uid != file.uid
         })
-      } else if (!(extension === 'png' || extension === 'jpg' || extension === 'jpeg')) {
+      } else if (!(extension === 'png' || extension === 'jpg' || extension === 'jpeg' || extension === 'pdf')) {
         this.$message.warning('文件格式不正确')
         fileList = fileList.filter(item => {
           return item.uid != file.uid
@@ -603,11 +628,11 @@ export default {
           return item.uid != file.uid
         })
       }
-      // fileList.forEach(file => {
-      //   if (extension === 'pdf') {
-      //     this.urlTemp = require('@/assets/file.png')
-      //   }
-      // })
+      fileList.forEach(file => {
+        if (extension === 'pdf') {
+          this.urlTemp = require('@/assets/file.png')
+        }
+      })
       this.maForm.bmFileInfos = fileList
       console.log('🚀 ~ handleChangeBusinessList ~ this.bmFileInfos:', this.bmFileInfos)
       // 手动触发表单验证
@@ -626,14 +651,14 @@ export default {
     updataIf(e) {
       if (e.fileName) {
         const parts = e.fileName.split('.')
-        const extension = parts.pop()
+        const extension = parts.pop().toLowerCase()
         if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
           return false
         } else {
           return true
         }
       } else {
-        const parts = e.name.split('.')
+        const parts = e.name.split('.').toLowerCase()
         const extension = parts.pop()
         if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
           return false
@@ -667,7 +692,16 @@ export default {
         this.delBusinessFileIdList.push(file.url)
       }
       console.log('delBusinessFileIdList', this.delBusinessFileIdList)
-    }
+    },
+    handleDownload(file) {
+      console.log(file)
+      if (file.status === 'ready') {
+        downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+      } else if (file.status === 'success') {
+        downloadFileData({ fileName: file.name, fileUrl: file.url })
+        // downloadFileData({ fileName: file.name,fileUrl:file.url })
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue
index 1ffd079f..77396312 100644
--- a/src/views/business/businessHandling/index.vue
+++ b/src/views/business/businessHandling/index.vue
@@ -751,7 +751,7 @@ export default {
         return item.uid != file.uid
       })
       const parts = file.name.split('.')
-      const extension = parts.pop()
+      const extension = parts.pop().toLowerCase()
       if (fileList.length > 5) {
         this.$message.warning('最多上传5张附件')
         fileList = fileList.filter(item => {
@@ -802,7 +802,7 @@ export default {
     updataIf(e) {
       if (e.fileName) {
         const parts = e.fileName.split('.')
-        const extension = parts.pop()
+        const extension = parts.pop().toLowerCase()
         if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
           return false
         } else {
@@ -810,7 +810,7 @@ export default {
         }
       } else {
         const parts = e.name.split('.')
-        const extension = parts.pop()
+        const extension = parts.pop().toLowerCase()
         if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
           return false
         } else {
diff --git a/src/views/business/businessHandlingRecord/directApplyRecord.vue b/src/views/business/businessHandlingRecord/directApplyRecord.vue
index 00526337..d3d99232 100644
--- a/src/views/business/businessHandlingRecord/directApplyRecord.vue
+++ b/src/views/business/businessHandlingRecord/directApplyRecord.vue
@@ -37,7 +37,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">领料申请</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">直转申请</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
@@ -78,8 +78,17 @@
       <el-table-column label="操作" align="center" width="180">
         <template slot-scope="scope">
           <el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button>
-          <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row, 2)">编辑</el-button>
           <el-button
+            v-if="scope.row.taskStatus == '0'"
+            type="text"
+            size="mini"
+            icon="el-icon-edit"
+            @click="handleEdit(scope.row, 2)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="scope.row.taskStatus == '0'"
             type="text"
             size="mini"
             icon="el-icon-delete"
@@ -128,13 +137,11 @@ export default {
       tableColumns: [
         { label: '申请时间', prop: 'createTime' },
         { label: '申请人', prop: 'createBy' },
-        { label: '领用单位', prop: 'leaseUnit' },
-        { label: '领用工程', prop: 'leaseProject' },
-        { label: '领料物资类型', prop: 'maTypeNames' },
-        { label: '协议号', prop: 'agreementCode' },
-        { label: '采购申请单号', prop: 'applyCode' },
-        { label: '领料人', prop: 'leasePerson' },
-        { label: '领料人电话', prop: 'phone' },
+        { label: '转出单位', prop: 'leaseUnit' },
+        { label: '转出工程', prop: 'leaseProject' },
+        { label: '转入单位', prop: 'leaseUnitTo' },
+        { label: '转入工程', prop: 'leaseProjectTo' },
+        { label: '物资类型', prop: 'maTypeNames' },
         { label: '状态', prop: 'taskStatus' }
       ],
       // 表格数据
diff --git a/src/views/business/businessHandlingRecord/index.vue b/src/views/business/businessHandlingRecord/index.vue
index 9aa05959..cf7772fa 100644
--- a/src/views/business/businessHandlingRecord/index.vue
+++ b/src/views/business/businessHandlingRecord/index.vue
@@ -78,8 +78,17 @@
       <el-table-column label="操作" align="center" width="180">
         <template slot-scope="scope">
           <el-button type="text" size="mini" icon="el-icon-search" @click="handleEdit(scope.row, 1)">查看</el-button>
-          <el-button type="text" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row, 2)">编辑</el-button>
           <el-button
+            v-if="scope.row.taskStatus == '0'"
+            type="text"
+            size="mini"
+            icon="el-icon-edit"
+            @click="handleEdit(scope.row, 2)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-if="scope.row.taskStatus == '0'"
             type="text"
             size="mini"
             icon="el-icon-delete"