From 74a0d87455feacbfd269b8c9b7a4886594b2f4ca Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Tue, 3 Dec 2024 09:18:08 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/back/component/home.vue   | 74 +++++++--------
 src/views/material/basic/bmProject/index.vue | 53 ++++++-----
 src/views/material/ma/partType/index.vue     | 12 +--
 src/views/material/ma/supplier/index.vue     | 96 ++++++++++----------
 src/views/material/ma/type/index.vue         | 11 ++-
 5 files changed, 129 insertions(+), 117 deletions(-)

diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue
index 0de1573a..ec910ed2 100644
--- a/src/views/material/back/component/home.vue
+++ b/src/views/material/back/component/home.vue
@@ -7,7 +7,7 @@
             :inline="true"
             v-show="showSearch"
             label-width="100px"
-        >   
+        >
             <el-form-item label="退料申请时间" prop="time">
                 <el-date-picker
                     v-model="queryParams.time"
@@ -35,7 +35,7 @@
                     filterable
                     style="width: 240px"
                     placeholder="请选择"
-                >   
+                >
                     <el-option
                         v-for="dict in dict.type.back_task_status"
                         :key="dict.value"
@@ -57,11 +57,11 @@
                         :options="unitList"
                         :props="selectTreeProps"
                         filterable
-                        clearable 
-                        collapse-tags 
-                        @change="unitChange" 
+                        clearable
+                        collapse-tags
+                        @change="unitChange"
                         placeholder="请选择退料单位"
-                    ></el-cascader> 
+                    ></el-cascader>
                 <!-- <el-select
                     v-model="queryParams.unitId"
                     clearable
@@ -78,16 +78,16 @@
                     ></el-option>
                 </el-select> -->
             </el-form-item>
-            <el-form-item label="工程名称" prop="proId">
+            <el-form-item label="退料工程" prop="proId">
                 <el-cascader v-model="projectId"
                         :show-all-levels="false"
                         :options="proList"
                         :props="selectTreeProps"
                         filterable clearable
-                        collapse-tags 
+                        collapse-tags
                         @change="proChange"
-                        placeholder="请选择退料工程"  
-                    ></el-cascader> 
+                        placeholder="请选择退料工程"
+                    ></el-cascader>
                 <!-- <el-select
                     v-model="queryParams.proId"
                     clearable
@@ -128,11 +128,11 @@
                 <el-button
                 type="success"
                 plain  icon="el-icon-refresh"
-                size="mini" 
+                size="mini"
                 >提交</el-button>
             </el-col> -->
             <el-col :span="1.5">
-                <el-button 
+                <el-button
                     icon="el-icon-download"
                     size="mini"
                     @click="handleExport"
@@ -169,7 +169,7 @@
                 label="序号"
                 type="index"
             />
-          
+
             <el-table-column
                 label="退料单位"
                 align="center"
@@ -274,19 +274,19 @@
                         plain
                         icon="el-icon-edit"
                         v-if="scope.row.taskStatus!=2"
-                        @click="handleUpdate(scope.row)" 
+                        @click="handleUpdate(scope.row)"
                         >编辑</el-button
                     >
                     <el-button
                         size="mini"
                         type="success"
-                        plain 
+                        plain
                         icon="el-icon-refresh"
                         v-if="scope.row.taskStatus!=2"
-                        @click="handleSubmit(scope.row)" 
+                        @click="handleSubmit(scope.row)"
                         >提交</el-button
                     >
-                     
+
                     <el-button
                         size="mini"
                         type="danger"
@@ -312,7 +312,7 @@
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
         />
- 
+
         <!-- 退料单 -->
         <dialogFormByCq
             :dialogTitle="title"
@@ -370,7 +370,7 @@
 </template>
 
 <script>
- 
+
 import {
     getBackApplyList,
     getProjectList,
@@ -386,7 +386,7 @@ import {
 //     // getUseNumByTypeId
 // } from '@/api/claimAndRefund/receive.js'
 import dialogFormByCq from '@/views/material/back/component/dialogFormByCq.vue'
- 
+
 export default {
     name: '',
     dicts: ['back_task_status'],
@@ -439,8 +439,8 @@ export default {
                 value: 'id',
                 // multiple: true,
             },
-            unitId: null, 
-            projectId: null, 
+            unitId: null,
+            projectId: null,
             dialogQueryParams: {
                 pageNum: 1,
                 pageSize: 10,
@@ -511,32 +511,32 @@ export default {
                     projectId: this.queryParams.proId /*  */,
                 }
                 const res = await getUnitList(params)
-                this.unitList = res.data 
+                this.unitList = res.data
         },
-        unitChange(val){ 
-            if(val&&val.length>0){  
+        unitChange(val){
+            if(val&&val.length>0){
                 this.queryParams.unitId=this.unitId[this.unitId.length - 1]
             }else if(val&&val.length==0){
                 this.queryParams.unitId=""
             }
-            this.GetProData() 
+            this.GetProData()
         },
-        
+
         // 获取 工程名称 列表数据
         async GetProData() {
                 const params = {
                     unitId: this.queryParams.unitId,
                 }
                 const res = await getProjectList(params)
-                this.proList = res.data 
+                this.proList = res.data
         },
-        proChange(val){ 
+        proChange(val){
             if(val&&val.length>0){
                 this.queryParams.proId=this.projectId[this.projectId.length - 1]
             }else if(val&&val.length==0){
                 this.queryParams.proId=""
             }
-            this.GetUnitData() 
+            this.GetUnitData()
         },
 
         /** 查询列表 startTime,结束日期endTime  */
@@ -591,7 +591,7 @@ export default {
          /** 查看按钮操作 */
         handleSee(row) {
             this.$emit("queryReturn",row.id);
-        }, 
+        },
         // 退料单
         handleUpdateOrder() {
             this.title = '查看'
@@ -608,7 +608,7 @@ export default {
         //     this.openTextThree = '提交成功！'
         //     this.openTwo = true
         // },
-         
+
         handleSubmit(row){
             this.$modal.confirm('是否确认提交所选择的退料任务？') .then(() => {
                     let param = {
@@ -616,10 +616,10 @@ export default {
                         taskId:row.taskId
                     }
                     submitBackApply(param).then((res) => {
-                        this.getList() 
+                        this.getList()
                         this.$message.success('操作成功!')
-                    }) 
-                }).catch(() => { 
+                    })
+                }).catch(() => {
                 })
         },
         /** 删除按钮操作 */
@@ -633,10 +633,10 @@ export default {
                     return backApplyRemove({id:row.id})
                 })
                 .then(() => {
-                    this.getList() 
+                    this.getList()
                     this.$message.success('操作成功!')
                 })
-                .catch(() => { 
+                .catch(() => {
                 })
         },
         handlePrint(row) {
diff --git a/src/views/material/basic/bmProject/index.vue b/src/views/material/basic/bmProject/index.vue
index e65c16d3..63e53006 100644
--- a/src/views/material/basic/bmProject/index.vue
+++ b/src/views/material/basic/bmProject/index.vue
@@ -47,25 +47,25 @@
                     >新建</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
                     type="warning"
                     plain
                     icon="el-icon-download"
                     size="mini"
-                    @click="handleExport"
-                    >导入数据</el-button
-                >
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    >导出数据</el-button
-                >
+                    @click="handleExport">
+                  导出数据
+                </el-button>
             </el-col>
 
             <right-toolbar
@@ -139,10 +139,16 @@
                 prop="telphone"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+                label="i8工程编号"
+                align="center"
+                prop="externalId"
+                :show-overflow-tooltip="true"
+            />
             <el-table-column
                 label="工程状态"
                 align="center"
-                prop="proStatus"
+                prop="proStatusName"
                 :show-overflow-tooltip="true"
             >
             </el-table-column>
@@ -207,7 +213,7 @@
                 />
             </el-form-item>
             </el-col>
-  
+
         </el-row>
 
         <el-row :gutter="24">
@@ -235,7 +241,7 @@
               placeholder="请选择工程类型"
               style="width: 100%"
             >
-            <el-option 
+            <el-option
                 v-for="keeper in proDataRange"
                 :key="keeper.value"
                 :label="keeper.label"
@@ -244,7 +250,7 @@
             </el-select>
           </el-form-item>
             </el-col>
-  
+
         </el-row>
 
         <el-row :gutter="24">
@@ -279,7 +285,7 @@
             </el-select>
           </el-form-item>
             </el-col>
-  
+
         </el-row>
 
 
@@ -302,7 +308,7 @@
             />
           </el-form-item>
             </el-col>
-  
+
         </el-row>
 
          <el-row :gutter="24">
@@ -324,7 +330,7 @@
             />
           </el-form-item>
             </el-col>
-  
+
         </el-row>
 
          <el-row :gutter="24">
@@ -345,7 +351,7 @@
             />
           </el-form-item>
             </el-col>
-  
+
         </el-row>
 
         <el-row :gutter="24">
@@ -362,7 +368,7 @@
         </el-form-item>
             </el-col>
         </el-row>
-    
+
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submitForm" :loading="isLoading">确 定</el-button>
@@ -488,7 +494,6 @@ export default {
         this.getProjectType()
     },
     methods: {
-
         async getProjectType(){
            let prodataRes =  await queryProDataApi('bm_project_type');
             this.proDataRange = prodataRes.data.map((item) => {
@@ -613,7 +618,7 @@ export default {
             this.reset()
             getProjectListDetail(row.proId).then((response) => {
                 this.form = response.data
-                this.form.impUnit =Number(this.form.impUnit) 
+                this.form.impUnit =Number(this.form.impUnit)
             })
             this.open = true
             this.title = '编辑工程'
diff --git a/src/views/material/ma/partType/index.vue b/src/views/material/ma/partType/index.vue
index 45a171eb..3b5969c7 100644
--- a/src/views/material/ma/partType/index.vue
+++ b/src/views/material/ma/partType/index.vue
@@ -79,9 +79,9 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item label="关键字" prop="keyword">
+          <el-form-item label="关键字" prop="keyWord">
             <el-input
-              v-model="queryParams.keyword"
+              v-model="queryParams.keyWord"
               placeholder="请输入关键字"
               clearable
               style="width: 240px"
@@ -356,8 +356,8 @@
       </el-form>
     </el-dialog>
   </div>
-</template> 
-  
+</template>
+
   <script>
 import {
   getListByPartType,
@@ -568,7 +568,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.keyWord = null;
+      this.keyWord = null;
       this.handleQuery();
     },
 
@@ -796,4 +796,4 @@ export default {
   > .el-tree-node__content {
   background-color: #8decf1;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/material/ma/supplier/index.vue b/src/views/material/ma/supplier/index.vue
index 2157aecf..6d3cde8d 100644
--- a/src/views/material/ma/supplier/index.vue
+++ b/src/views/material/ma/supplier/index.vue
@@ -8,9 +8,9 @@
             clearable
             @keyup.enter.native="handleQuery"
             maxlength="20"
-          />   
+          />
         </el-form-item>
-  
+
         <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>
@@ -27,7 +27,7 @@
                               v-hasPermi="['ma:info:add']"
                               >新增</el-button
                           >
-                      </el-col>  
+                      </el-col>
                        <el-col :span="1.5">
                           <el-button
                           type="warning"
@@ -37,14 +37,14 @@
                           @click="handleExport"
                           >导出
                           </el-button>
-                      </el-col> 
+                      </el-col>
                       <right-toolbar
                           :showSearch.sync="showSearch"
                           @queryTable="getList"
                       ></right-toolbar>
       </el-row>
 
-  
+
       <el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="teamId">
         <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> -->
         <el-table-column label="序号" align="center" width="80" type="index">
@@ -83,7 +83,7 @@
                         </template>
                     </el-table-column>
       </el-table>
-  
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -91,7 +91,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-  
+
      <!-- 新增或修改弹窗 -->
      <el-dialog :title="title" :visible.sync="showHouse" width="1000px"   append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
@@ -115,7 +115,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-     
+
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="法人代表" prop="legalPerson" >
@@ -135,7 +135,7 @@
                             />
                         </el-form-item>
                     </el-col>
-                </el-row>   
+                </el-row>
 
                 <el-row>
                     <el-col :span="12">
@@ -147,8 +147,8 @@
                             />
                         </el-form-item>
                     </el-col>
-                </el-row> 
-           <el-row >  
+                </el-row>
+           <el-row >
              <el-col :span="12">
                <el-form-item label="主要联系范围" prop="businessScope">
                 <el-input
@@ -159,8 +159,8 @@
                   show-word-limit
                   >
                 </el-input>
-                </el-form-item>      
-             </el-col> 
+                </el-form-item>
+             </el-col>
 
             <el-col :span="12">
                <el-form-item label="备注" prop="remark">
@@ -173,9 +173,9 @@
                   show-word-limit
                   >
                 </el-input>
-                </el-form-item> 
+                </el-form-item>
             </el-col>
-           </el-row> 
+           </el-row>
         <el-form-item label="营业执照">
           <el-upload
               class = "upload-demo"
@@ -215,21 +215,21 @@
               <i class="el-icon-plus avatar-uploader-icon" ></i>
           </el-upload>
         </el-form-item>
-          
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
       </el-dialog>
-  
+
       <!-- 图片查看弹窗 -->
     <el-dialog :visible.sync="dialogVisible" width="600px" height="600px" >
       <img width="100%" height="500px" :src="dialogImageUrl"  />
     </el-dialog>
     </div>
-  </template> 
-  
+  </template>
+
   <script>
   import { getListFacturer,getFacturerDetail,editFacturer,addFacturer,delFacturer,deleteFile } from "@/api/ma/supplier";
   import { imgUpLoadThree, fileUpLoad } from '@/api/system/upload'
@@ -244,27 +244,27 @@
         uploadKey: Date.now(),
         // 遮罩层
         loading: false,
-  
+
         loadingTwo: false,
-  
-  
+
+
         // 是否显示项目部Id
         showName: false,
-  
+
         // 是否显示施工预警信息
         showWarn: false,
-  
+
 
         // 非单个禁用
         single: true,
         // 非多个禁用
         multiple: true,
-  
-  
+
+
         // 显示搜索条件
         showSearch: true,
         showHouse: false,
-       
+
         // 总条数
         total: 0,
         totalTwo : 0,
@@ -321,7 +321,7 @@
             message: "请输入正确的联系电话",
             trigger: "blur"
           }
-        ],    
+        ],
         },
 
         //上传
@@ -334,7 +334,7 @@
       };
     },
     computed: {
-   
+
       //图片上传1张后，隐藏上传框
       uploadDisabled() {
           return this.businessLicenseListTemp.length > 2
@@ -374,7 +374,7 @@
                     this.$modal.msgError(error)
                 })
         },
-      
+
       //上传组件-图片查看
       picturePreview(file) {
 
@@ -437,7 +437,7 @@
       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 })
       }
@@ -478,7 +478,7 @@
         fileList.forEach(file=>{
                   if(extension === 'pdf'){
                       this.urlTemp = require('../../../../assets/file.png');
-                  
+
                   }
         });
         this.businessLicenseListTemp = fileList;
@@ -519,7 +519,7 @@
                 this.businessLicenseListTemp.forEach(item=>{
                   if(item.name.includes('/')){
                   const fileNameWithTimestamp = item.name.split('/').pop();
-                  const parts = fileNameWithTimestamp.split('_'); 
+                  const parts = fileNameWithTimestamp.split('_');
                    const fileType = item.name.split('.').pop();
                   const mainFileName = parts.slice(0, parts.length - 1).join('_');
                   item.name = mainFileName + '.' +fileType;
@@ -532,7 +532,7 @@
                 this.title = '修改'
             })
         },
-        // 表单重置 
+        // 表单重置
         reset() {
             this.form = {};
             this.resetForm("form");
@@ -546,9 +546,9 @@
         },
 
         //** 提交按钮 */
-        submitForm() { 
+        submitForm() {
           this.$refs["form"].validate(async valid => {
-          if (valid) {           
+          if (valid) {
               if (this.form.supplierId != undefined) {
                  const reqData = new FormData();
                 if(this.businessLicenseListTemp.length!=0){
@@ -588,8 +588,8 @@
             } else {
                 this.$modal.msgError(res.msg);
             }
-            },   
- 
+            },
+
         async getImaUploadEdit(){
          this.businessLicenseFileList = []
             const {fileTwo} = await this.getFileData()
@@ -611,8 +611,8 @@
                 this.$modal.msgError(res.msg);
             }
             }
-            }, 
-        
+            },
+
         async addFacturerTemp(form){
                 this.form.bmFileInfos=this.businessLicenseFileList
                 addFacturer(form).then(response => {
@@ -640,7 +640,7 @@
 
         async deleteFile(){
             if(this.delBusinessFileIdList.length>0){
-            this.delBusinessFileIdList.forEach(async item=>{            
+            this.delBusinessFileIdList.forEach(async item=>{
              const urlcode = Base64.encode(item)
              const urlen = encodeURIComponent(urlcode)
              await deleteFile(urlen);
@@ -659,7 +659,7 @@
             }
             const blob = await response.blob();
             const reader = new FileReader();
-            
+
             reader.onloadend = () => {
               this.base64Data = reader.result; // 获取 Base64 数据并存储
             };
@@ -694,13 +694,13 @@
                 })
                 .catch(() => {})
         },
-       
+
         handleExport() {
-            this.download('/material/wh_house_info/export', {
+            this.download('/material/ma_supplier_info/export', {
               ...this.queryParams
-            }, `仓库管理_${new Date().getTime()}.xlsx`)
+            }, `物资厂家管理_${new Date().getTime()}.xlsx`)
         },
-  
+
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
@@ -740,7 +740,7 @@
   overflow: revert;
 }
 ::v-deep .el-upload-list__item-actions{
-  overflow:hidden; 
+  overflow:hidden;
 }
 .upload-demo{
   display: flex;
@@ -790,4 +790,4 @@
   color: #fff;
   font-size: 20px;
 }
-  </style>
\ No newline at end of file
+  </style>
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index 446bcb9d..c05cc1e3 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -247,7 +247,7 @@
                 maxlength="30"
                 :disabled="isLevel1Disabled"
               />
-              <!-- <el-option 
+              <!-- <el-option
                                     v-for="keeper in keeperDataRange"
                                     :key="keeper.value"
                                     :label="keeper.label"
@@ -398,6 +398,7 @@
                 v-model="form.name3"
                 placeholder="请输入"
                 maxlength="20"
+                type="number"
                 style="width: 170px"
               />
             </el-form-item>
@@ -408,6 +409,7 @@
                 v-model="form.name2"
                 placeholder="请输入"
                 maxlength="20"
+                type="number"
                 style="width: 170px"
               />
             </el-form-item>
@@ -422,6 +424,7 @@
                 v-model="form.name1"
                 placeholder="请输入"
                 maxlength="20"
+                type="number"
                 style="width: 160px"
               />
             </el-form-item>
@@ -435,6 +438,7 @@
               <el-input
                 v-model="form.name10"
                 placeholder="请输入"
+                type="number"
                 maxlength="20"
                 style="width: 160px"
               />
@@ -474,6 +478,7 @@
             <el-form-item label="检验周期" prop="testCycle">
               <el-input
                 v-model="form.testCycle"
+                type="number"
                 placeholder="请输入"
                 maxlength="20"
                 style="width: 150px"
@@ -485,6 +490,7 @@
             <el-form-item label="抽检比例(%)" prop="name11">
               <el-input
                 v-model="form.name11"
+                type="number"
                 placeholder="请输入"
                 maxlength="20"
                 style="width: 170px"
@@ -526,6 +532,7 @@
             <el-form-item label="持荷时间(分)" prop="holdingTime">
               <el-input
                 v-model="form.holdingTime"
+                type="number"
                 placeholder="请输入"
                 maxlength="20"
                 style="width: 170px"
@@ -807,7 +814,7 @@ export default {
       getMaTypeList().then((response) => {
         this.treeOptions = response.data;
         console.log(this.treeOptions)
-        if (this.treeOptions.length > 0 ){ 
+        if (this.treeOptions.length > 0 ){
             if(this.treeOptions[0].children&&this.treeOptions[0].children.length > 0) {
               const firstNode = this.treeOptions[0].children[0];
               this.queryParams.typeId = firstNode.id;