修改

src/views/material/materialStation/authorize/index.vue

@@ -411,7 +411,7 @@
       <div style="font-size: 16px; padding: 0 20px">
         <vue-easy-print tableShow ref="remarksPrintRef" class="print">
           <div style="line-height: 1.9">
-            <h2 style="text-align: center">项目部授权委托书</h2>
+            <h2 style="text-align: center">委托书</h2>
             <div style="text-indent: 2em">
               滋有
               <span style="text-decoration: underline">（{{ authorizeData.projectDept }}）</span>
@@ -428,7 +428,7 @@
             </div>
             <div>特此委托证明！</div>
             <div>
-              <span>委托人姓名：</span>
+              <span>受托人：</span>
               <span v-if="authorizeData.detailsList && authorizeData.detailsList.length > 0">
                 <img
                   v-if="authorizeData.detailsList[0].signName"

src/views/material/repair/scrapManage/component/homeApply.vue

@@ -45,12 +45,12 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-check" size="mini" @click="handlePassAll">通过</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-close" size="mini" @click="handleFailAll">驳回</el-button>
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
@@ -193,12 +193,20 @@ export default {
         });
         return;
       } else {
-        batchPassApi({'scrapTaskListVoList':this.passTemp}).then((response) => {
+        this.$confirm("确定要通过选中的所有数据吗？", "提示", {
-          if (response.code == 200) {
+          type: "warning",
-            this.$modal.msgSuccess("通过成功");
+          confirmButtonText: "确定",
-          }
+          cancelButtonText: "取消"
-          this.queryParams.pageNum = 1;
+        }).then(() => {
-          this.getList();
+          batchPassApi({'scrapTaskListVoList':this.passTemp}).then((response) => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess("通过成功");
+            }
+            this.queryParams.pageNum = 1;
+            this.getList();
+          });
+        }).catch(() => {
+          // 用户取消操作
         });
       }
     },
@@ -211,12 +219,20 @@ export default {
         });
         return;
       } else {
-        batchRejectApi({'scrapTaskListVoList':this.failTemp}).then((response) => {
+        this.$confirm("确定要驳回选中的所有数据吗？", "提示", {
-          if (response.code == 200) {
+          type: "warning",
-            this.$modal.msgSuccess("驳回成功");
+          confirmButtonText: "确定",
-          }
+          cancelButtonText: "取消"
-          this.queryParams.pageNum = 1;
+        }).then(() => {
-          this.getList();
+          batchRejectApi({'scrapTaskListVoList':this.failTemp}).then((response) => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess("驳回成功");
+            }
+            this.queryParams.pageNum = 1;
+            this.getList();
+          });
+        }).catch(() => {
+          // 用户取消操作
         });
       }
     },

src/views/materialsStation/equipment/totalReturnRecord/index.vue

@@ -71,7 +71,7 @@
           v-model="queryParams.startTime"
           type="date"
           placeholder="开始日期"
-          clearable
+          :clearable="false"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           style="width: 130px"