From 766689767788a2ff2259942b58cf55133b713d64 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 31 Dec 2024 15:44:20 +0800
Subject: [PATCH 1/2] 1

---
 src/views/material/archives/index.vue         | 151 +++++++++---------
 src/views/material/ma/standardBox/index.vue   |  58 +++----
 .../scrapManage/component/homeApply.vue       |  28 ++--
 3 files changed, 119 insertions(+), 118 deletions(-)

diff --git a/src/views/material/archives/index.vue b/src/views/material/archives/index.vue
index 18c9a6ea..b4cbf790 100644
--- a/src/views/material/archives/index.vue
+++ b/src/views/material/archives/index.vue
@@ -14,7 +14,7 @@
             prefix-icon="el-icon-search"
             style="margin-bottom: 20px"
           />
-          <el-button 
+          <el-button
             size="mini" style="margin: 0 10px;height: 32px;" type="primary"
             @click.stop="() => addTreeMainType()">
             新建分类
@@ -80,26 +80,26 @@
         <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="关键字" prop="keyword">
             <el-input v-model="queryParams.keyword" placeholder="请输入关键字" clearable style="width: 240px" @keyup.enter.native="handleQuery"/>
-          </el-form-item> 
+          </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>
           </el-form-item>
         </el-form> -->
 
-        <el-row :gutter="16" style="margin-bottom: 20px;"> 
+        <el-row :gutter="16" style="margin-bottom: 20px;">
           <el-col :span="2">
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="">上传</el-button>
-          </el-col> 
+          </el-col>
           <el-col :span="2">
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">下载</el-button>
-          </el-col> 
+          </el-col>
           <el-col :span="2">
             <el-button type="warning" plain icon="el-icon-download" :disabled="single" size="mini" @click="handleReName">重命名</el-button>
-          </el-col> 
+          </el-col>
           <el-col :span="2">
             <el-button type="warning" plain icon="el-icon-download" :disabled="multiple" size="mini" @click="handleAllDel">删除</el-button>
-          </el-col> 
+          </el-col>
           <el-col :span="4" style="float: right;">
             <el-button type="primary" plain icon="el-icon-plus" size="mini"  @click="handleAdd">新建文件夹</el-button>
           </el-col>
@@ -108,7 +108,7 @@
           <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item v-for="(item,index) in breadcrumbList" :key="item.id">
               <span @click="breadClick(item,index)" style="cursor: pointer;">{{item.docName}}</span>
-            </el-breadcrumb-item> 
+            </el-breadcrumb-item>
           </el-breadcrumb>
         </el-row>
         <el-table v-loading="loading" :data="tableDataList"  @selection-change="handleSelectionChange" row-key="detailsId">
@@ -119,7 +119,7 @@
                 </template>
           </el-table-column>
           <el-table-column label="文件名称" align="left" prop="docName" show-overflow-tooltip width="300">
-            <template slot-scope="scope"> 
+            <template slot-scope="scope">
               <i v-if="scope.row.docType=='文件夹'" class="el-icon-folder-opened"></i>
               <span @click="getSubDetails(scope.row)" style="cursor: pointer;margin-left: 20px;">{{ scope.row.docName }}</span>
             </template>
@@ -140,8 +140,8 @@
           <el-table-column label="类 型 " align="center" prop="docType" show-overflow-tooltip/>
           <el-table-column label="年 度" align="center" prop="year" show-overflow-tooltip/>
           <el-table-column label="修改时间 " align="center" prop="updateTime" show-overflow-tooltip/>
-          <el-table-column label="上传人员 " align="center" prop="createBy" show-overflow-tooltip/> 
-          
+          <el-table-column label="上传人员 " align="center" prop="createBy" show-overflow-tooltip/>
+
         </el-table>
 
         <pagination
@@ -153,7 +153,7 @@
         />
       </el-col>
     </el-row>
- 
+
 
     <el-dialog :visible.sync="dialogVisible">
       <img width="100%" height="650px" :src="dialogImageUrl" alt />
@@ -167,15 +167,15 @@
             <el-form-item label="所属上级">
               <el-input style="width: 100%" disabled v-model="addFormParams.label"/>
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
-        <el-row :gutter="24"> 
+        <el-row :gutter="24">
           <el-col :span="24">
             <el-form-item label="名称" prop="archivesName">
               <el-input style="width: 100%" v-model="addFormParams.archivesName" />
             </el-form-item>
           </el-col>
-        </el-row> 
+        </el-row>
         <el-row style="text-align: right">
           <el-form-item>
             <el-button size="small" type="primary" style="color: #fff;" @click="onSubmit">保 存</el-button>
@@ -192,9 +192,9 @@
             <el-form-item label="旧的名称:">
               <el-input style="width: 100%" disabled v-model="reNameForm.oldName"/>
             </el-form-item>
-          </el-col> 
+          </el-col>
         </el-row>
-        <el-row :gutter="24"> 
+        <el-row :gutter="24">
           <el-col :span="24">
             <el-form-item label="新的名称" prop="newName">
               <el-input style="width: 100%" v-model="reNameForm.newName" />
@@ -212,13 +212,13 @@
   </div>
 </template>
 
-<script> 
+<script>
 import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css"; 
-import { 
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {
   getArchivesTypeListApi,getAddArchivesTypeApi,updateArchivesTypeApi,delArchivesTypeApi,
   getArchivesDetailsLstApi, addArchivesDetailsApi, updateArchivesDetailsApi, delArchivesDetailsApi
-} from "@/api/archives/archives"; 
+} from "@/api/archives/archives";
 import { imgUpLoad } from "@/api/system/upload";
 
 
@@ -240,37 +240,37 @@ export default {
       // 总条数
       total: 0,
       unitValueOptions: [{id:"0",name:"整数"},{id:"1",name:"小数"}],
-      // 库管员用户数据 
+      // 库管员用户数据
       // keeperDataRange: [],
       KeeperOptions: [],//选择库管员数据
-      repairerOptions: [],//维修员用户数据   
+      repairerOptions: [],//维修员用户数据
       // 类型名称
       archivesName: undefined,
       // 左侧树-树选项
       treeOptions: undefined,
-      treeTemp: [], 
+      treeTemp: [],
       //列表数据
       tableDataList: [],
       // 是否显示弹出层
       open: false,
       // 弹出层标题
-      title: "",    
+      title: "",
       // 表单参数
       form: {
         companyId: "",
-      },     
+      },
       levelTemp: undefined,
       idTemp: undefined,
-      parentId: undefined, 
+      parentId: undefined,
       defaultProps: {
         children: "children",
         label: "label",
-      }, 
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10
-      }, 
+      },
       // 表单校验
       rules: {
         // leasePrice: [
@@ -288,10 +288,10 @@ export default {
       addShowVisible: false,
       addTitle: "", // 新增弹框标题
       addFormParams: {
-        infoId: "", 
-        level: "", 
+        infoId: "",
+        level: "",
         archivesName: ""
-      }, 
+      },
       addFormParamsRules: {
         archivesName: [
           {
@@ -308,7 +308,7 @@ export default {
       reNameForm:{
         oldName:"",
         newName:""
-      }, 
+      },
       reNameFormRules: {
         newName: [
           {
@@ -329,7 +329,7 @@ export default {
     },
   },
   created() {
-    this.getTreeData(); 
+    this.getTreeData();
   },
   methods: {
     /** 查询新增页面-上级类型下拉树结构 */
@@ -348,12 +348,12 @@ export default {
                 level:'',
                 docName:firstNode.label
               }
-              this.breadcrumbList.push(obj) 
+              this.breadcrumbList.push(obj)
               this.getList();
             }
             // else{
             //   this.queryParams.typeId = this.treeOptions[0].id;
-            //   this.queryParams.level = 0; 
+            //   this.queryParams.level = 0;
             //   this.getList();
             // }
         }
@@ -373,15 +373,15 @@ export default {
           }
         });
       } catch (error) {}
-    }, 
+    },
     onMousemove(data) {
       this.isMousemoveId = data.id;
     },
     onMouseleave() {
       this.isMousemoveId = null;
-    }, 
+    },
     // treeChange(val) {
-    //   console.log(val, "树节点"); 
+    //   console.log(val, "树节点");
     //   this.form.companyId = val.companyId;
     // },
     //树节点新建按钮
@@ -394,20 +394,20 @@ export default {
     appendTreeNode(data) {
       console.log(data)
       this.levelTemp = data.level;
-      this.idTemp = data.id;  
-      this.parentId = data.parentId; 
+      this.idTemp = data.id;
+      this.parentId = data.parentId;
         Object.assign(this.addFormParams, data);
         this.addFormParams.archivesName = "";
         this.addTitle = "新增";
-        this.addShowVisible = true; 
+        this.addShowVisible = true;
     },
     /* 树节点删除 */
     removeTreeNode(data) {
       // this.$message.success('删除--')
-      console.log(data, "删除时的数据源--"); 
+      console.log(data, "删除时的数据源--");
       let delParam = {
-        infoId: data.id, 
-        parentId: data.parentId, 
+        infoId: data.id,
+        parentId: data.parentId,
       }
       this.$modal
         .confirm("是否确认删除数据项？")
@@ -424,7 +424,7 @@ export default {
     editTreeNode(data) {
       this.levelTemp = data.level;
       this.idTemp = data.id;
-      this.parentId = data.parentId; 
+      this.parentId = data.parentId;
       Object.assign(this.addFormParams, data);
       this.addTitle = "修改";
       this.addFormParams.archivesName = data.label;
@@ -435,35 +435,35 @@ export default {
       const addParams = {
         infoId: this.idTemp,
         level: this.levelTemp,
-        parentId: this.parentId, 
+        parentId: this.parentId,
         archivesName:this.addFormParams.archivesName
-      }; 
+      };
       const editParams = {
-        infoId: this.idTemp, 
-        parentId: this.parentId, 
+        infoId: this.idTemp,
+        parentId: this.parentId,
         archivesName:this.addFormParams.archivesName
-      }; 
+      };
 
       const addDetailsParam = {
         infoId:this.queryParams.infoId,
         detailsId:this.queryParams.detailsId,
         level:this.queryParams.level,
         docName:this.addFormParams.archivesName
-      }; 
+      };
       this.$refs["addFormParamsRef"].validate(async (valid) => {
         if (valid) {
           if(this.addTitle === "新建类别"){ //左侧树tree-新建类别
             const res = await getAddArchivesTypeApi({archivesName:this.addFormParams.archivesName});
             if (res.code === 200) {
               this.$message.success("新建成功！");
-              this.addShowVisible = false; 
+              this.addShowVisible = false;
               this.getTreeData();
-            } 
+            }
           }else if (this.addTitle === "新增") {//左侧树tree-新增类别
             const res = await getAddArchivesTypeApi(addParams);
             if (res.code === 200) {
               this.$message.success("新增成功！");
-              this.addShowVisible = false; 
+              this.addShowVisible = false;
               this.getTreeData();
             }
           }else if (this.addTitle === "新建文件夹") {//右侧table-新建文件夹
@@ -471,13 +471,13 @@ export default {
             if (res.code === 200) {
               this.$message.success("新建成功！");
               this.addShowVisible = false;
-              this.getList(); 
+              this.getList();
             }
           } else {
             const res = await updateArchivesTypeApi(editParams);
             if (res.code === 200) {
               this.$message.success("修改成功！");
-              this.addShowVisible = false; 
+              this.addShowVisible = false;
               this.getTreeData();
             }
           }
@@ -516,7 +516,7 @@ export default {
           docName:row.docName,
         }
         this.breadcrumbList.push(obj)
-        this.getList() 
+        this.getList()
       }
     },
     // 节点单击事件 - 左侧树
@@ -525,7 +525,7 @@ export default {
       if (data.level != 1) {
         this.queryParams.infoId = data.id;
         this.queryParams.detailsId=""
-        this.queryParams.level="" 
+        this.queryParams.level=""
         this.queryParams.pageNum = 1;
         this.breadcrumbList=[]
         let obj = {
@@ -536,8 +536,8 @@ export default {
           docName:data.label
         }
         this.breadcrumbList.push(obj)
-        this.getList(); 
-      } 
+        this.getList();
+      }
     },
     // 面包屑单击事件-右侧
     breadClick(item,index){
@@ -548,21 +548,21 @@ export default {
         this.queryParams.level=item.level;
         this.queryParams.infoId="";
         this.queryParams.pageNum = 1;
-        this.$set(this, 'breadcrumbList', this.breadcrumbList.slice(0,index+1)); 
+        this.$set(this, 'breadcrumbList', this.breadcrumbList.slice(0,index+1));
         this.getList()
       }else{
         this.queryParams.detailsId="";
         this.queryParams.level="";
         this.queryParams.infoId=item.infoId;
-        this.queryParams.pageNum = 1; 
-        this.$set(this, 'breadcrumbList', this.breadcrumbList.slice(0,index+1)); 
+        this.queryParams.pageNum = 1;
+        this.$set(this, 'breadcrumbList', this.breadcrumbList.slice(0,index+1));
         this.getList()
       }
     },
     //新建文件夹按钮
     handleAdd(){
       this.addTitle = "新建文件夹";
-      this.addFormParams.archivesName=""; 
+      this.addFormParams.archivesName="";
       this.addShowVisible = true;
     },
      /** 搜索按钮操作 */
@@ -571,7 +571,7 @@ export default {
       this.getList();
     },
     /** 重置按钮操作 */
-    resetQuery() { 
+    resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.infoId = undefined;
       this.queryParams.pageNum = 1;
@@ -585,7 +585,7 @@ export default {
       this.ids = selection.map((item) => item);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
-    }, 
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -595,10 +595,10 @@ export default {
     reset() {
       this.form = { parentId: ""};
       this.resetForm("form");
-    }, 
+    },
     //查看
     handleView(row) {
-      console.log(row) 
+      console.log(row)
     },
     handleReName(){
       this.handleUpdate(this.ids[0])
@@ -616,16 +616,17 @@ export default {
       let param = {
         detailsId:this.rowData.detailsId,
         infoId:this.rowData.detailsId,
-        docName:this.reNameForm.newName
+        docName:this.reNameForm.newName,
+        parentId:this.rowData.parentId
       }
       this.$refs["reNameForm"].validate(async (valid) => {
-        if (valid) { 
+        if (valid) {
             const res = await updateArchivesDetailsApi(param);
             if (res.code === 200) {
               this.$message.success("修改成功！");
-              this.reNameShowVisible = false; 
+              this.reNameShowVisible = false;
               this.getList()
-            } 
+            }
         }
       });
 
@@ -634,7 +635,7 @@ export default {
     handleDelete(row) {
       let archivesDetailsList=[
         {detailsId:row.detailsId}
-      ] 
+      ]
       this.$modal
         .confirm("是否确认删除数据项？")
         .then(function () {
@@ -674,7 +675,7 @@ export default {
       //   },
       //   `物资类型信息_${new Date().getTime()}.xlsx`
       // );
-    }, 
+    },
 
 
   },
diff --git a/src/views/material/ma/standardBox/index.vue b/src/views/material/ma/standardBox/index.vue
index e5a1288e..0a2d509a 100644
--- a/src/views/material/ma/standardBox/index.vue
+++ b/src/views/material/ma/standardBox/index.vue
@@ -1,4 +1,4 @@
-<template> 
+<template>
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
             <el-form-item label="日期">
@@ -12,7 +12,7 @@
                     start-placeholder="开始日期"
                     @change="onTimeChange"
                 ></el-date-picker>
-            </el-form-item> 
+            </el-form-item>
             <el-form-item label="关键字" prop="keyWord">
                 <el-input
                     v-model="queryParams.keyWord"
@@ -28,7 +28,7 @@
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
                 <el-button type="success" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
             </el-form-item>
-        </el-form> 
+        </el-form>
         <!-- <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini">导出数据</el-button>
@@ -49,8 +49,8 @@
             </el-table-column>
             <el-table-column label="标准箱名称" align="center" prop="boxName" show-overflow-tooltip/>
             <el-table-column label="标准箱编码" align="center" prop="boxCode" show-overflow-tooltip/>
-            <el-table-column label="标准箱机具数" align="center" prop="devNum" show-overflow-tooltip/> 
-            <el-table-column label="创建日期" align="center" prop="createTime" show-overflow-tooltip/> 
+            <el-table-column label="标准箱机具数" align="center" prop="devNum" show-overflow-tooltip/>
+            <el-table-column label="创建日期" align="center" prop="createTime" show-overflow-tooltip/>
             <el-table-column label="操作" align="center" width="400">
                 <template slot-scope="{ row }">
                     <el-button size="mini" @click="handleView(row)">
@@ -67,14 +67,14 @@
                     </el-button>
                 </template>
             </el-table-column>
-        </el-table> 
+        </el-table>
         <pagination :total="total"
                     v-show="total > 0"
                     :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"
         />
-        
+
         <!-- 标准箱设备明细 -->
         <el-dialog title="标准箱设备明细" :visible.sync="open" width="1000px" append-to-body>
             <el-form :model="queryDialogForm" ref="queryDialogForm" size="small" :inline="true"  label-width="80px">
@@ -99,9 +99,9 @@
                 <el-table-column label="物资类型" align="center" prop="typeName"   show-overflow-tooltip/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName"   show-overflow-tooltip/>
                 <el-table-column label="设备编码" align="center" prop="maCode" show-overflow-tooltip/>
-                <el-table-column label="录入人" align="center" prop="createBy" show-overflow-tooltip/> 
+                <el-table-column label="录入人" align="center" prop="createBy" show-overflow-tooltip/>
                 <!-- <el-table-column label="操作" align="center" width="120">
-                    <template slot-scope="{ row }">  
+                    <template slot-scope="{ row }">
                         <el-button size="mini" type="danger">
                             删除
                         </el-button>
@@ -113,14 +113,14 @@
                     :page.sync="queryDialogForm.pageNum"
                     :limit.sync="queryDialogForm.pageSize"
                     @pagination="getDialogList"
-            /> 
-        </el-dialog> 
+            />
+        </el-dialog>
 
         <!-- 二维码下载对话框 -->
         <el-dialog title="标准箱二维码" :visible.sync="uploadOpen" width="450px" append-to-body :close-on-click-modal="false">
             <div style="text-align: center" ref="codeBox">
                 <div class="uploadImg">
-                    <div id="qrcode" class="qrcode" ref="codeItem"></div> 
+                    <div id="qrcode" class="qrcode" ref="codeItem"></div>
                 </div>
                 <div class="boxCode">编号：{{ rowObj.boxCode }}</div>
             </div>
@@ -143,7 +143,7 @@ export default {
         return {
             total: 0, //                总条数
             loading: false, //           遮罩层
-            showSearch: true, //        显示搜索条件 
+            showSearch: true, //        显示搜索条件
             tableList: [], //            列表数据源
             queryTime: [], //           日期数据源
             selectList: [], //          列表选中数据
@@ -164,7 +164,7 @@ export default {
                 pageSize: 10,
             },
             totalDialog:0,
-            tableListDialog:[], 
+            tableListDialog:[],
             uploadOpen: false,
             rowObj:{},
             boxCode:""
@@ -187,7 +187,7 @@ export default {
         },
         // 获取列表
         async getList() {
-            this.loading = true 
+            this.loading = true
             const res = await getQrCodeBoxListApi(this.queryParams)
             this.tableList = res.data.rows
             this.total = res.data.total
@@ -207,23 +207,23 @@ export default {
             this.queryParams.pageSize = 10
             this.queryParams.startTime = ''
             this.getList()
-        }, 
+        },
         handleAdd(){
-            console.log('新增') 
+            console.log('新增')
             addQrCodeBoxApi({}).then((response) => {
             if (response.code == 200) {
               this.$modal.msgSuccess("新增成功");
             }
             this.getList()
           });
-        }, 
+        },
         //二维码查看
-        handleView(row) { 
+        handleView(row) {
             this.rowObj = row
-            this.uploadOpen = true 
+            this.uploadOpen = true
             this.boxCode = row.boxCode
             let str = row.boxCode
-            this.$nextTick(() => { 
+            this.$nextTick(() => {
                 this.$refs.codeItem.innerHTML = ''
                 var qrcode = new QRCode(this.$refs.codeItem, {
                     text: str, //二维码内容
@@ -232,7 +232,7 @@ export default {
                     colorDark: '#000000',
                     colorLight: '#ffffff',
                     correctLevel: QRCode.CorrectLevel.H,
-                }) 
+                })
             }, 500)
         },
         //二维码下载
@@ -256,11 +256,11 @@ export default {
             this.resetQueryDialog()
         },
         // 获取列表数据
-        async getDialogList() {  
+        async getDialogList() {
             const res = await getBoxDetailListApi(this.queryDialogForm)
             this.tableListDialog = res.rows
             // this.tableListDialog = [{maType:"抱杆",typeName:"10t",maCode:"bg121334343",updateBy:"张三"},{maType:"抱杆",typeName:"10t",maCode:"bg121334343",updateBy:"张三"},{maType:"抱杆",typeName:"10t",maCode:"bg121334343",updateBy:"张三"},{maType:"抱杆",typeName:"10t",maCode:"bg121334343",updateBy:"张三"}]
-            this.totalDialog = res.total 
+            this.totalDialog = res.total
             this.totalDialog = 3
         },
         //弹窗搜索
@@ -269,9 +269,9 @@ export default {
             this.getDialogList()
         },
          //弹窗搜索重置
-        resetQueryDialog() { 
+        resetQueryDialog() {
             this.resetForm('queryDialogForm')
-            this.queryDialogForm.pageNum = 1 
+            this.queryDialogForm.pageNum = 1
             this.getDialogList()
         },
 
@@ -281,7 +281,7 @@ export default {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning',
-            }).then(() => { 
+            }).then(() => {
                 let param = {
                     boxId:row.boxId
                 }
@@ -290,7 +290,7 @@ export default {
                 this.getList();
                 this.$modal.msgSuccess("删除成功");
             }).catch(() => {});
-        }, 
+        },
         // 导出数据
         handleExport() {
             console.log('数据导出')
@@ -327,4 +327,4 @@ export default {
     width: 60px !important;
     margin-bottom: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/material/repair/scrapManage/component/homeApply.vue b/src/views/material/repair/scrapManage/component/homeApply.vue
index 8428685a..e85e3f98 100644
--- a/src/views/material/repair/scrapManage/component/homeApply.vue
+++ b/src/views/material/repair/scrapManage/component/homeApply.vue
@@ -140,7 +140,7 @@
         align="center"
         prop="type"
         :show-overflow-tooltip="true"
-      /> 
+      />
       <el-table-column
         label="维修单号"
         align="center"
@@ -156,7 +156,7 @@
       <el-table-column
         label="提交时间"
         align="center"
-        prop="createTime" 
+        prop="createTime"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
@@ -222,7 +222,7 @@
   </div>
 </template>
 
-<script> 
+<script>
 import {
   getScrapApplyListApi,
 } from "@/api/repair/scrapManage";
@@ -231,11 +231,11 @@ import {
 } from "@/api/repair/repair";
 export default {
   name: "Home",
-  dicts: ['repair_task_status'],  
+  dicts: ['repair_task_status'],
   data() {
     return {
       // 遮罩层
-      loading: true,  
+      loading: true,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -245,19 +245,19 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      total: 0,   
+      total: 0,
       // 字典表格数据
-      tableList: [], 
+      tableList: [],
       // 日期范围
-      dateRange: [], 
-      statusList: [{value:"0",label:"进行中"},{value:"1",label:"已审核"},{value:"2",label:"驳回"},], 
+      dateRange: [],
+      statusList: [{value:"0",label:"进行中"},{value:"1",label:"已审核"},{value:"2",label:"驳回"},],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         time: null,
         keyWord: "",
-        status: undefined, 
+        status: undefined,
       },
       passTemp: [],
       failTemp: [],
@@ -298,7 +298,7 @@ export default {
         startTime: this.queryParams.time && this.queryParams.time[0],
         endTime: this.queryParams.time && this.queryParams.time[1],
         pageSize: this.queryParams.pageSize,
-        pageNum: this.queryParams.pageNum, 
+        pageNum: this.queryParams.pageNum,
       };
       getScrapApplyListApi(params).then((response) => {
         this.tableList = response.rows;
@@ -360,7 +360,7 @@ export default {
     handleUpdate(row) {
       this.$emit("addTools", row.taskId, row.id,row);
     },
- 
+
 //  ---------------------------------------
     /** 删除按钮操作 */
     handleDeletePurchase(row) {
@@ -378,7 +378,7 @@ export default {
           this.$modal.msgSuccess("删除成功");
         })
         .catch(() => {});
-    }, 
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download(
@@ -390,7 +390,7 @@ export default {
         },
         `修试审核_${new Date().getTime()}.xlsx`
       );
-    }, 
+    },
   },
 };
 </script>

From b0324fad0b90a2bd6992cee6df2e61aadde96c7b Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 31 Dec 2024 15:46:09 +0800
Subject: [PATCH 2/2] 1

---
 src/views/material/lease/outBound/index.vue | 48 ++++++++++-----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue
index d9919479..c3cfb6fb 100644
--- a/src/views/material/lease/outBound/index.vue
+++ b/src/views/material/lease/outBound/index.vue
@@ -195,7 +195,7 @@
           <el-button
             size="mini"
             type="warning"
-            @click="handleLld(scope.row)" 
+            @click="handleLld(scope.row)"
             >领料单</el-button
           >
           <el-button
@@ -236,7 +236,7 @@
           <el-input
             v-model="queryOutInfo.keyWord"
             placeholder="请输入规格型号"
-            clearable 
+            clearable
             maxlength="20"
           />
         </el-form-item>
@@ -340,7 +340,7 @@
           <el-input
             v-model="queryOutView.keyWord"
             placeholder="请输入规格型号"
-            clearable 
+            clearable
             maxlength="20"
           />
         </el-form-item>
@@ -352,7 +352,7 @@
             @click="handleQueryOutView"
             >查询</el-button
           >
-          <el-button 
+          <el-button
             icon="el-icon-refresh"
             size="mini"
             @click="resetQueryOutView"
@@ -802,12 +802,12 @@
                 controls-position="right" type="number"
                 style="width: 100%" clearable placeholder="请输入出库数量"
                 :min="0" @input="checkNum(scope.row)"
-            ></el-input>  
+            ></el-input>
           </template>
         </el-table-column>
       </el-table>
     </el-dialog>
-  
+
      <!-- 编码管理查看弹窗 -->
      <el-dialog
      :title="titleView"
@@ -908,7 +908,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        time: null, //申请时间 
+        time: null, //申请时间
         taskStatus: "",
         keyWord: "",
       },
@@ -987,9 +987,9 @@ export default {
       const params = {
         keyWord: this.queryParams.keyWord,
         startTime: this.queryParams.time && this.queryParams.time[0],
-        endTime: this.queryParams.time && this.queryParams.time[1], 
+        endTime: this.queryParams.time && this.queryParams.time[1],
         pageSize: this.queryParams.pageSize,
-        pageNum: this.queryParams.pageNum, 
+        pageNum: this.queryParams.pageNum,
       };
       if(!this.queryParams.taskStatus){
         params.statusList=[3, 4, 5]
@@ -1049,7 +1049,7 @@ export default {
         // this.dialogTotal = response.
         // this.loading = false;
       });
-    }, 
+    },
     //出库搜索按钮
     handleQueryOutInfo() {
       this.queryOutInfo.pageNum = 1;
@@ -1059,7 +1059,7 @@ export default {
     resetQueryOutInfo() {
       this.queryOutInfo.keyWord=""
       this.getDialogList();
-    },  
+    },
 
     /** 出库按钮操作 */
     handleOut(row) {
@@ -1220,9 +1220,9 @@ export default {
         // 其他配置选项
       });
     },
-    
+
     //领料单打印
-    print() {
+        print() {
       this.$refs.remarksPrintRef.print();
     },
 
@@ -1257,20 +1257,20 @@ export default {
     },
 
     //输入出库数量
-    checkNum(row) { 
-      console.log(row) 
+    checkNum(row) {
+      console.log(row)
       let maxNum = row.outNum;
       if(row.unitValue==1){
         row.inputNum=Number(String(row.inputNum).replace(/[^\d.]/g,''))
       }else{
         row.inputNum=Number(String(row.inputNum).replace(/[^\d]/g,''))
-      } 
+      }
       if (row.inputNum <= 0) {
         row.inputNum = 0;
       }
       if (row.inputNum > row.outNum) {
         row.inputNum = maxNum;
-      } 
+      }
     },
 
     printView() {
@@ -1290,7 +1290,7 @@ export default {
     // context.clearRect(0, 0, canvas.width, canvas.height);
     //let text = "XXX专用章";
     //let companyName = "XXX科技股份有限公司";
-  
+
     // 绘制印章边框
     let width = canvas.width / 2;
     let height = canvas.height / 2;
@@ -1299,10 +1299,10 @@ export default {
     context.beginPath();
     context.arc(width, height, 80, 0, Math.PI * 2); //宽、高、半径
     context.stroke();
-  
+
     //画五角星
     this.create5star(context, width, height, 20, "#f00", 0);
-  
+
     // 绘制印章名称
     context.font = "18px 宋体";
     context.textBaseline = "middle"; //设置文本的垂直对齐方式
@@ -1310,7 +1310,7 @@ export default {
     context.lineWidth = 1;
     context.strokeStyle = "#ff2f2f";
     context.strokeText(text, width, height + 50);
-  
+
     // 绘制印章单位
     context.translate(width, height); // 平移到此位置,
     context.font = "16px 宋体";
@@ -1325,7 +1325,7 @@ export default {
       } else {
         context.rotate(angle);
       }
-  
+
       context.save();
       context.translate(65, 0); // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离
       context.rotate(Math.PI / 2); // 旋转90度,让字平行于x轴
@@ -1333,8 +1333,8 @@ export default {
       context.strokeText(c, 0, 0); // 此点为字的中心点
       context.restore();
     }
-    },
-  
+  },
+
     //绘制五角星
     create5star(context, sx, sy, radius, color, rotato) {
       context.save();