From 48fe52f69fb39585e00895f30c4423c6e12333f2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 1 Jul 2024 18:32:56 +0800
Subject: [PATCH] =?UTF-8?q?7/1=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dev/deptDeviceUpkeep.vue            |   7 +-
 src/views/dev/deviceChangeOrder.vue           |   4 +-
 src/views/dev/deviceCheckItemDict.vue         |   2 +-
 src/views/dev/devicePlan.vue                  | 183 ++++++-------
 src/views/dev/devicePlanEdit.vue              |  24 +-
 src/views/dev/deviceRepair.vue                |   2 +-
 src/views/dev/deviceRepairApply.vue           |   2 +-
 src/views/dev/deviceRepairApplyHall.vue       |   2 +-
 src/views/dev/deviceRepairApplyMy.vue         |   2 +-
 src/views/dev/deviceUpkeepItemDict.vue        |   2 +-
 src/views/dev/deviceUpkeepPlan.vue            | 176 +++++++------
 src/views/dev/js/deviceChangeOrder.js         |   8 +
 src/views/dev/js/deviceCheckItemDict.js       |   4 +
 src/views/dev/js/deviceRepair.js              |   4 +
 src/views/dev/js/deviceRepairApply.js         |   4 +
 src/views/dev/js/deviceRepairApplyHall.js     |   3 +
 src/views/dev/js/deviceRepairApplyMy.js       |   3 +
 src/views/dev/js/deviceUpkeepItemDict.js      | 247 +++++++++---------
 src/views/inventory/InvOrderPlaceModify.vue   |  10 +-
 src/views/inventory/InvPlaceChangeModify.vue  |  10 +-
 src/views/inventory/InvProductPlaceModify.vue |   8 +-
 .../inventory/InvProductPlaceOutModify.vue    |   7 +-
 src/views/inventory/addInvRemindSetDialog.vue |   3 +
 .../inventory/count/InvCountOrderModify.vue   |  10 +
 src/views/inventory/stockCompare.js           |   7 +
 src/views/inventory/stockCompare.vue          |   4 +-
 src/views/inventory/supInoutSearchOrder.vue   |  25 +-
 src/views/remind/invRemindMsg.vue             |   6 +-
 src/views/remind/supCertRemindMsg.vue         |   5 +-
 29 files changed, 450 insertions(+), 324 deletions(-)

diff --git a/src/views/dev/deptDeviceUpkeep.vue b/src/views/dev/deptDeviceUpkeep.vue
index dc35317c..7d67fe72 100644
--- a/src/views/dev/deptDeviceUpkeep.vue
+++ b/src/views/dev/deptDeviceUpkeep.vue
@@ -268,7 +268,7 @@
           </div>
           <div class="fr">
             <el-button @click="repairRow = null">取消</el-button>
-            <el-button type="primary" @click="commitRepair">提交</el-button>
+            <el-button type="primary" @click="commitRepair" :loading="commitRepairLoading">提交</el-button>
           </div>
         </div>
         <el-form :model="repairRow" :rules="repairRules" ref="repairForm" label-width="auto">
@@ -546,6 +546,7 @@ export default {
       maxFiles: 3,
       fileSizeLimit: 5,
       uploadedFileNames: '',
+      commitRepairLoading: false,
     }
   },
   created() {
@@ -598,7 +599,9 @@ watch: {
         })
         pData.applyUserPhone = this.repairRow.repairUserPhone
         pData.taskId = this.repairRow.taskId
+        this.commitRepairLoading = true
         deviceRepairApplyAdd(pData).then(res => {
+          this.commitRepairLoading = false
           load.close()
           if (res.code != 20000) {
             this.$message.error(res.message)
@@ -609,12 +612,12 @@ watch: {
           this.getList()
           this.repairRow = null
         }).catch(() => {
+          this.commitRepairLoading = false
           load.close()
         })
       })
     },
     createRepair(row) {
-      console.log("hhhhhhhhhh")
       let data = copyProperties(row, {...repairData});
       this.uploadedFileNames = ""
       this.repairRow = _.extend({}, row, data)
diff --git a/src/views/dev/deviceChangeOrder.vue b/src/views/dev/deviceChangeOrder.vue
index e4ada109..aa6678f6 100644
--- a/src/views/dev/deviceChangeOrder.vue
+++ b/src/views/dev/deviceChangeOrder.vue
@@ -191,8 +191,8 @@
             <!--            <el-button v-if="createActive==0" @click="changeActive(true)" type="primary">下一步</el-button>-->
             <!--            <el-button v-else @click="changeActive(false)" type="primary">上一步</el-button>-->
             <el-button-group>
-              <el-button :disabled="itemList.length===0" type="primary" @click="saveCache">草稿保存</el-button>
-              <el-button :disabled="itemList.length===0" type="primary" @click="saveForm">立即提交</el-button>
+              <el-button :disabled="itemList.length===0" type="primary" @click="saveCache" :loading="draftLoading">草稿保存</el-button>
+              <el-button :disabled="itemList.length===0" type="primary" @click="saveForm" :loading="submitLoading">立即提交</el-button>
             </el-button-group>
           </div>
         </div>
diff --git a/src/views/dev/deviceCheckItemDict.vue b/src/views/dev/deviceCheckItemDict.vue
index a32ff2f9..2631cdb1 100644
--- a/src/views/dev/deviceCheckItemDict.vue
+++ b/src/views/dev/deviceCheckItemDict.vue
@@ -78,7 +78,7 @@
         <div slot="header" class="clearfix">
           <div class="fr">
             <el-button @click="createFlag = false">取消</el-button>
-            <el-button type="primary" @click="saveFunc">保存</el-button>
+            <el-button type="primary" @click="saveFunc" :loading="saveLoading">保存</el-button>
           </div>
         </div>
         <el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto">
diff --git a/src/views/dev/devicePlan.vue b/src/views/dev/devicePlan.vue
index fd79e1f5..ec4253fb 100644
--- a/src/views/dev/devicePlan.vue
+++ b/src/views/dev/devicePlan.vue
@@ -35,7 +35,8 @@
       </div>
       <el-divider style="margin: 15px"></el-divider>
       <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light
-                highlight-current-row>
+                highlight-current-row
+      >
         <el-table-column label="序号" width="50" type="index"/>
         <el-table-column label="计划单号" width="150" prop="planBillNo"/>
         <el-table-column label="计划名称" width="150" prop="name"/>
@@ -95,7 +96,8 @@
       </div>
       <el-table :data="detailList"
                 v-loading="detailLoading" click-row-light
-                highlight-current-row>
+                highlight-current-row
+      >
         <el-table-column label="序号" width="50" type="index"/>
         <el-table-column label="科室名称" prop="deptName"/>
         <el-table-column label="设备编号" prop="deviceCode"/>
@@ -135,7 +137,8 @@
     >
       <devicePlanEdit :originData="planData"
                       :closePlanEdit="closePlanEdit"
-                      :createFlag="createFlag"/>
+                      :createFlag="createFlag"
+      />
     </el-dialog>
 
 
@@ -150,7 +153,8 @@
                          :planId="detailQuery.planId"
                          :projectItem="projectItem"
                          :pullData="planData"
-                         :closeAddDevice="closeAddDevice"/>
+                         :closeAddDevice="closeAddDevice"
+      />
     </el-dialog>
 
 
@@ -160,50 +164,49 @@
 
 
 <script>
-import {devicePlanDel, devicePlanInfo, devicePlanPage, devicePlanSave} from "@/api/dev/devicePlanApi";
+import { devicePlanDel, devicePlanInfo, devicePlanPage, devicePlanSave } from '@/api/dev/devicePlanApi'
 import {
   devicePlanDetailDel,
   devicePlanDetailPage, devicePlanDetailDelByDeviceCode
-} from "@/api/dev/devicePlanDetailApi";
-import {getLoading} from "@/utils";
-import product from "@/views/basic/product/product.vue";
+} from '@/api/dev/devicePlanDetailApi'
+import { getLoading } from '@/utils'
+import product from '@/views/basic/product/product.vue'
 import {
   devicePlanDetailItemAdd, devicePlanDetailItemByDeviceCodeDel,
   devicePlanDetailItemDel,
   devicePlanDetailItemPage
-} from "@/api/dev/devicePlanDetailItemApi";
-import DeviceCheckItemDict from "@/views/dev/deviceCheckItemDict";
-import {deviceCheckGenByPlanId} from "@/api/dev/deviceCheckApi";
-
-import DevicePlanProject from "@/views/dev/devicePlanProject";
-import devicePlanEdit from "@/views/dev/devicePlanEdit";
+} from '@/api/dev/devicePlanDetailItemApi'
+import DeviceCheckItemDict from '@/views/dev/deviceCheckItemDict'
+import { deviceCheckGenByPlanId } from '@/api/dev/deviceCheckApi'
 
+import DevicePlanProject from '@/views/dev/devicePlanProject'
+import devicePlanEdit from '@/views/dev/devicePlanEdit'
 
 let query = {
   page: 1,
   limit: 10,
   name: null,
   chargeDeptCode: null,
-  type:1,
+  type: 1
 }
 
 let detailQuery = {
   page: 1,
   limit: 10,
-  planId: null,
+  planId: null
 }
 let rowDeltailQuery = {
   page: 1,
   limit: 10,
   planId: null,
-  productId: null,
+  productId: null
 }
 
 let itemQuery = {
   page: 1,
   limit: 10,
   planId: null,
-  productId: null,
+  productId: null
 }
 
 let planData = {
@@ -215,12 +218,12 @@ let planData = {
   frequency: 1,
   dateInterval: null,
   remark: null,
-  type:1,
+  type: 1
 }
 
 export default {
-  name: "devicePlan",
-  components: {DeviceCheckItemDict, product, devicePlanEdit, DevicePlanProject},
+  name: 'devicePlan',
+  components: { DeviceCheckItemDict, product, devicePlanEdit, DevicePlanProject },
   computed: {},
   data() {
     return {
@@ -229,14 +232,14 @@ export default {
       loading: false,
       total: .0,
       list: [],
-      query: {...query},
+      query: { ...query },
       //计划设备明细=============================================
       detailLoading: false,
-      detailQuery: {...detailQuery},
+      detailQuery: { ...detailQuery },
       detailList: [],
       detailTotal: 0,
       //巡检项目=============================================
-      itemQuery: {...itemQuery},
+      itemQuery: { ...itemQuery },
       itemList: [],
       itemTotal: 0,
       itemLoading: false,
@@ -244,86 +247,86 @@ export default {
       chooseDeviceList: [],
       chooseItemList: [],
       //新增/编辑计划===================================================
-      planEditTitle: "新增计划",
+      planEditTitle: '新增计划',
       createActive: 0,
       createFlag: false,
       chooseDeviceFlag: false,
       expandRowKeys: [],
       dialogExpandRowKeys: [],
-      planData: {...planData},
+      planData: { ...planData },
       formRule: {
-        name: [{required: true, message: "计划名称不能为空", trigger: ["change", "blur"]}],
-        chargeDeptCode: [{required: true, message: "负责部门不能为空", trigger: ["change", "blur"]}],
-        dateInterval: [{required: true, message: "计划执行区间不能为空", trigger: ["change", "blur"]}],
+        name: [{ required: true, message: '计划名称不能为空', trigger: ['change', 'blur'] }],
+        chargeDeptCode: [{ required: true, message: '负责部门不能为空', trigger: ['change', 'blur'] }],
+        dateInterval: [{ required: true, message: '计划执行区间不能为空', trigger: ['change', 'blur'] }],
         frequency: [{
           required: true,
-          message: "计划执行频率不能为空",
-          trigger: ["change", "blur"]
-        }],
+          message: '计划执行频率不能为空',
+          trigger: ['change', 'blur']
+        }]
       },
       dateInterval: null,
       pickerOptions: {
         disabledDate: time => {
-          let nowDate = new Date().getTime();
-          let pickDate = new Date(time).getTime();
-          return (nowDate >= pickDate);
+          let nowDate = new Date().getTime()
+          let pickDate = new Date(time).getTime()
+          return (nowDate >= pickDate)
         },
         shortcuts: [{
           text: '一个月(30天)',
           onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() + 3600 * 1000 * 24);
-            end.setTime(start.getTime() + 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() + 3600 * 1000 * 24)
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 30)
+            picker.$emit('pick', [start, end])
           }
         }, {
           text: '三个月(90天)',
           onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() + 3600 * 1000 * 24);
-            end.setTime(start.getTime() + 3600 * 1000 * 24 * 30 * 3);
-            picker.$emit('pick', [start, end]);
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() + 3600 * 1000 * 24)
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 30 * 3)
+            picker.$emit('pick', [start, end])
           }
         }, {
           text: '半年(180天)',
           onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() + 3600 * 1000 * 24);
-            end.setTime(start.getTime() + 3600 * 1000 * 24 * 30 * 6);
-            picker.$emit('pick', [start, end]);
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() + 3600 * 1000 * 24)
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 30 * 6)
+            picker.$emit('pick', [start, end])
           }
         }, {
           text: '一年(365天)',
           onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() + 3600 * 1000 * 24);
-            end.setTime(start.getTime() + 3600 * 1000 * 24 * 365);
-            picker.$emit('pick', [start, end]);
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() + 3600 * 1000 * 24)
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
           }
         }]
       },
 
       projectVisible: false,
-      projectItem: null,
+      projectItem: null
     }
   },
   watch: {
     planData(v) {
       if (v.planId != null) {
-        this.$set(v, "dateInterval", [v.startDate, v.endDate])
+        this.$set(v, 'dateInterval', [v.startDate, v.endDate])
       }
     },
-    "planData.dateInterval"(v) {
+    'planData.dateInterval'(v) {
       if (v != null && v.length > 0) {
         this.planData.startDate = v[0]
         this.planData.endDate = v[1]
       }
     },
-    "$refs.dialogTable"(v) {
+    '$refs.dialogTable'(v) {
 
       this.$refs.dialogTable?.doLayout()
     }
@@ -336,12 +339,12 @@ export default {
       if (expandedRows.length == 0) {
         return
       }
-      this.$set(row, "detailData", {
+      this.$set(row, 'detailData', {
         loading: false,
         showSearch: true,
         list: [],
         total: 0,
-        query: {...rowDeltailQuery, planId: row.planId, productId: row.productId}
+        query: { ...rowDeltailQuery, planId: row.planId, productId: row.productId }
       })
       this.getRowDetailList(row.detailData)
     },
@@ -363,9 +366,9 @@ export default {
       })
     },
     deviceCheckGenFunc(row) {
-      this.$confirm("此操作将会创建一个任务单，是否继续", "提示", {
-        confirmButtonText: "继续",
-        cancelButtonText: "取消"
+      this.$confirm('此操作将会创建一个任务单，是否继续', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消'
       }).then(() => {
         let load = getLoading(this)
         deviceCheckGenByPlanId(row.planId).then(res => {
@@ -383,9 +386,9 @@ export default {
       })
     },
     delplan(row) {
-      this.$confirm("此操作将会永久删除该计划，现有任务不受影响，是否继续", "提示", {
-        confirmButtonText: "继续",
-        cancelButtonText: "取消"
+      this.$confirm('此操作将会永久删除该计划，现有任务不受影响，是否继续', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消'
       }).then(() => {
         let load = getLoading(this)
         devicePlanDel(row.planId).then(res => {
@@ -434,9 +437,9 @@ export default {
       })
     },
     delDetailItem(row) {
-      this.$confirm("此操作将会永久删除该条明细，且将在下一次任务生效，现有任务不受影响，是否继续", "提示", {
-        confirmButtonText: "继续",
-        cancelButtonText: "取消"
+      this.$confirm('此操作将会永久删除该条明细，且将在下一次任务生效，现有任务不受影响，是否继续', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消'
       }).then(() => {
         let load = getLoading(this)
         if (!row.deviceCode) {
@@ -469,9 +472,9 @@ export default {
       })
     },
     delDetail(row) {
-      this.$confirm("此操作将会永久删除该条明细，且将在下一次任务生效，现有任务不受影响，是否继续", "提示", {
-        confirmButtonText: "继续",
-        cancelButtonText: "取消"
+      this.$confirm('此操作将会永久删除该条明细，且将在下一次任务生效，现有任务不受影响，是否继续', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消'
       }).then(() => {
         let load = getLoading(this)
         if (row.deviceCode) {
@@ -506,7 +509,7 @@ export default {
     },
     rowClick(row) {
       this.clickRow = row
-      this.detailQuery = {...detailQuery, planId: row.planId}
+      this.detailQuery = { ...detailQuery, planId: row.planId }
       this.getDetailList()
     },
     getDetailList() {
@@ -543,7 +546,7 @@ export default {
                 return
               }
               this.planData.planId = res.data
-              this.detailQuery = {...detailQuery, planId: this.planData.planId}
+              this.detailQuery = { ...detailQuery, planId: this.planData.planId }
               this.getDetailList()
               this.createActive += 1
             }).catch(e => {
@@ -558,8 +561,8 @@ export default {
 
       } else {
         if (this.createActive == 2) {
-          this.planData = {...this.planData}
-          this.detailQuery = {...detailQuery, planId: this.itemQuery.planId}
+          this.planData = { ...this.planData }
+          this.detailQuery = { ...detailQuery, planId: this.itemQuery.planId }
           this.getDetailList()
           load.close()
           this.createActive -= 1
@@ -570,7 +573,7 @@ export default {
               this.$message.error(res.message)
               return
             }
-            this.planData = {...res.data}
+            this.planData = { ...res.data }
             this.createActive -= 1
           }).catch(e => {
             load.close()
@@ -608,11 +611,10 @@ export default {
     },
 
     closePlanEdit() {
-      this.createFlag = false;
+      this.createFlag = false
       this.getList()
     },
 
-
     deviceSelectChangFunc(list) {
       this.chooseDeviceList = list.map(i => i.deviceCode)
     },
@@ -620,16 +622,15 @@ export default {
     //新增编辑计划
     openCreate(planId, row) {
       if (planId != null) {
-        this.planEditTitle = `编辑巡检计划信息${row.planId ? '--(' + row.name + ')' : ''}`;
-        this.planData = row;
+        this.planEditTitle = `编辑巡检计划信息${row.planId ? '--(' + row.name + ')' : ''}`
+        this.planData = row
       } else {
-        this.planEditTitle = "新增计划";
+        this.planEditTitle = '新增计划'
         this.planData = {
-          type:1
-        };
+          type: 1
+        }
       }
-      this.createFlag = true;
-
+      this.createFlag = true
 
       // this.createActive = 0
       // if (createActive != null) {
@@ -667,7 +668,7 @@ export default {
       this.getList()
     },
     onReset() {
-      this.query = {...query}
+      this.query = { ...query }
       this.getList()
     },
     getList() {
@@ -688,11 +689,11 @@ export default {
     },
     setProject(row) {
       this.planData = {
-        type:1
-      };
+        type: 1
+      }
       this.projectVisible = true
       this.projectItem = row
-    },
+    }
   }
 }
 
diff --git a/src/views/dev/devicePlanEdit.vue b/src/views/dev/devicePlanEdit.vue
index 25d891a9..fc28edd5 100644
--- a/src/views/dev/devicePlanEdit.vue
+++ b/src/views/dev/devicePlanEdit.vue
@@ -3,10 +3,10 @@
     <el-card>
       <div slot="header" class="clearfix">
         <div class="fr">
-          <el-button size="mini" type="primary" @click.native="saveOrder(1)"
+          <el-button size="mini" type="primary" @click.native="saveOrder(1)" :loading="draftLoading"
           >草稿保存
           </el-button>
-          <el-button size="mini" type="primary" @click.native="saveOrder(2)"
+          <el-button size="mini" type="primary" @click.native="saveOrder(2)"  :loading="submitLoading"
           >立即提交
           </el-button>
         </div>
@@ -265,6 +265,8 @@ export default {
       projectVisible: false,
       projectItem: null,
       chooseDetailItemFlag: false,
+      draftLoading: false,
+      submitLoading: false,
     }
   },
 
@@ -362,8 +364,20 @@ export default {
     saveOrder(status) {
       this.planData.status = status;
       this.planData.type = this.originData.type;
+      if (status == 1){
+        //草稿保存
+        this.draftLoading = true
+      }else {
+        this.submitLoading = true
+      }
       if (this.$parent.$options.propsData.title == '新增保养计划'){
         deviceUpkeepPlanSave(this.planData).then(res => {
+          if (status == 1){
+            //草稿保存
+            this.draftLoading = false
+          }else {
+            this.submitLoading = false
+          }
           if (res.code != 20000) {
             this.$message.error(res.message)
             return
@@ -374,6 +388,12 @@ export default {
         })
       }else {
         devicePlanSave(this.planData).then(res => {
+          if (status == 1){
+            //草稿保存
+            this.draftLoading = false
+          }else {
+            this.submitLoading = false
+          }
           if (res.code != 20000) {
             this.$message.error(res.message)
             return
diff --git a/src/views/dev/deviceRepair.vue b/src/views/dev/deviceRepair.vue
index 57255c9f..9e407b42 100644
--- a/src/views/dev/deviceRepair.vue
+++ b/src/views/dev/deviceRepair.vue
@@ -102,7 +102,7 @@
             {{ `设备号：${currentRow.deviceCode}` }}
           </div>
           <div class="fr">
-            <el-button type="primary" @click="finishFunc" v-if="!currentRow.finishFlag"  >完成维修</el-button>
+            <el-button type="primary" @click="finishFunc" v-if="!currentRow.finishFlag"  :loading="finishLoading">完成维修</el-button>
           </div>
         </div>
         <el-descriptions border label-style="width:90px" :column="4">
diff --git a/src/views/dev/deviceRepairApply.vue b/src/views/dev/deviceRepairApply.vue
index ae6fbc37..e585274d 100644
--- a/src/views/dev/deviceRepairApply.vue
+++ b/src/views/dev/deviceRepairApply.vue
@@ -147,7 +147,7 @@
           </div>
           <div class="fr">
             <el-button @click="createFlag = false">取消</el-button>
-            <el-button type="primary" @click="saveFunc">保存</el-button>
+            <el-button type="primary" @click="saveFunc" :loading="submitLoading">保存</el-button>
           </div>
         </div>
         <el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto">
diff --git a/src/views/dev/deviceRepairApplyHall.vue b/src/views/dev/deviceRepairApplyHall.vue
index cc53b2b2..718850d5 100644
--- a/src/views/dev/deviceRepairApplyHall.vue
+++ b/src/views/dev/deviceRepairApplyHall.vue
@@ -168,7 +168,7 @@
           </div>
           <div class="fr">
             <el-button @click="detailFlag = false">取消</el-button>
-            <el-button type="primary" @click="commitFunc">提交</el-button>
+            <el-button type="primary" @click="commitFunc" :loading="submitLoading">提交</el-button>
           </div>
         </div>
         <el-form :model="diagnosisData" ref="saveForm" :rules="detailRules" label-width="auto">
diff --git a/src/views/dev/deviceRepairApplyMy.vue b/src/views/dev/deviceRepairApplyMy.vue
index 409b12b3..e3b1bb90 100644
--- a/src/views/dev/deviceRepairApplyMy.vue
+++ b/src/views/dev/deviceRepairApplyMy.vue
@@ -156,7 +156,7 @@
           </div>
           <div class="fr">
             <el-button @click="detailFlag = false">取消</el-button>
-            <el-button type="primary" @click="commitFunc">提交</el-button>
+            <el-button type="primary" @click="commitFunc" :loading="commitLoading">提交</el-button>
           </div>
         </div>
         <el-form :model="diagnosisData" ref="saveForm" :rules="detailRules" label-width="auto">
diff --git a/src/views/dev/deviceUpkeepItemDict.vue b/src/views/dev/deviceUpkeepItemDict.vue
index c24ed777..aecf80c6 100644
--- a/src/views/dev/deviceUpkeepItemDict.vue
+++ b/src/views/dev/deviceUpkeepItemDict.vue
@@ -90,7 +90,7 @@
         <div slot="header" class="clearfix">
           <div class="fr">
             <el-button @click="createFlag = false">取消</el-button>
-            <el-button type="primary" @click="saveFunc">保存</el-button>
+            <el-button type="primary" @click="saveFunc" :loading="saveLoading">保存</el-button>
           </div>
         </div>
         <el-form :model="saveData" ref="saveForm" :rules="formRule" label-width="auto">
diff --git a/src/views/dev/deviceUpkeepPlan.vue b/src/views/dev/deviceUpkeepPlan.vue
index 54b13a19..34609d7f 100644
--- a/src/views/dev/deviceUpkeepPlan.vue
+++ b/src/views/dev/deviceUpkeepPlan.vue
@@ -1,91 +1,92 @@
 <template>
 
   <div>
-  <!--设备保养计划 第一列表-->
-  <el-card>
-    <el-form :model="query" v-if="showSearch" label-width="auto">
-      <el-row :gutter="20">
-        <el-col :span="6">
-          <el-form-item label="计划名称">
-            <el-input v-model.trim="query.name" clearable/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="负责部门">
-            <deptSelect :value.sync="query.chargeDeptCode"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div class="top-right-btn">
-      <el-button-group>
-        <el-button icon="el-icon-view" type="primary" @click="showSearch = !showSearch">显示/隐藏搜索栏</el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh"
-          @click="onReset"
-        >重置
-        </el-button>
-        <el-button type="primary" icon="el-icon-search" @click="search"
-        >查询
-        </el-button>
-        <el-button type="primary" icon="el-icon-plus" @click="openCreate(null,null)"
-        >新增
-        </el-button>
-      </el-button-group>
-    </div>
-    <el-divider style="margin: 15px"></el-divider>
-    <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light
-              highlight-current-row>
-      <el-table-column label="序号" width="50" type="index"/>
-      <el-table-column label="计划单号" width="150" prop="planBillNo"/>
-      <el-table-column label="计划名称" width="150" prop="name"/>
-      <el-table-column label="负责部门" width="120" prop="chargeDeptName"/>
-      <el-table-column label="设备数量" width="120" prop="deviceCount"/>
-      <el-table-column label="单据状态" width="120" prop="chargeDeptName">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.status==1" type="warning">草稿</el-tag>
-          <el-tag v-if="scope.row.status==2" type="success">已提交</el-tag>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="执行状态" width="120" prop="chargeDeptName">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.isActive==true" type="success">执行中</el-tag>
-          <el-tag v-if="scope.row.isActive==false" type="info">未执行</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="开始日期" width="150" prop="startDate"/>
-      <el-table-column label="结束日期" width="150" prop="endDate"/>
-      <el-table-column label="执行频率" width="160" prop="frequency">
-        <template slot-scope="scope">
-          {{ `${scope.row.frequency}天` }}
-        </template>
-      </el-table-column>
-      <el-table-column label="已执行次数" width="200" prop="execCount"/>
-      <el-table-column label="备注" width="200" prop="remark"/>
-      <el-table-column label="操作" width="200" fixed="right">
-        <template slot-scope="scope">
-          <el-button type="text" @click.stop="openCreate(scope.row.planId,scope.row)">
-            编辑
+    <!--设备保养计划 第一列表-->
+    <el-card>
+      <el-form :model="query" v-if="showSearch" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="计划名称">
+              <el-input v-model.trim="query.name" clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="负责部门">
+              <deptSelect :value.sync="query.chargeDeptCode"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="showSearch = !showSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
           </el-button>
-          <el-button type="text" @click="deviceCheckGenFunc(scope.row)"
-          >生成保养单
+          <el-button type="primary" icon="el-icon-search" @click="search"
+          >查询
           </el-button>
-          <el-button type="text" @click.stop="delplan(scope.row)">
-            删除
+          <el-button type="primary" icon="el-icon-plus" @click="openCreate(null,null)"
+          >新增
           </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="query.page"
-      :limit.sync="query.limit"
-      @pagination="getList"
-    />
-  </el-card>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table :data="list" @row-click="rowClick" v-loading="loading" click-row-light
+                highlight-current-row
+      >
+        <el-table-column label="序号" width="50" type="index"/>
+        <el-table-column label="计划单号" width="150" prop="planBillNo"/>
+        <el-table-column label="计划名称" width="150" prop="name"/>
+        <el-table-column label="负责部门" width="120" prop="chargeDeptName"/>
+        <el-table-column label="设备数量" width="120" prop="deviceCount"/>
+        <el-table-column label="单据状态" width="120" prop="chargeDeptName">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.status==1" type="warning">草稿</el-tag>
+            <el-tag v-if="scope.row.status==2" type="success">已提交</el-tag>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="执行状态" width="120" prop="chargeDeptName">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.isActive==true" type="success">执行中</el-tag>
+            <el-tag v-if="scope.row.isActive==false" type="info">未执行</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="开始日期" width="150" prop="startDate"/>
+        <el-table-column label="结束日期" width="150" prop="endDate"/>
+        <el-table-column label="执行频率" width="160" prop="frequency">
+          <template slot-scope="scope">
+            {{ `${scope.row.frequency}天` }}
+          </template>
+        </el-table-column>
+        <el-table-column label="已执行次数" width="200" prop="execCount"/>
+        <el-table-column label="备注" width="200" prop="remark"/>
+        <el-table-column label="操作" width="200" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" @click.stop="openCreate(scope.row.planId,scope.row)">
+              编辑
+            </el-button>
+            <el-button type="text" @click="deviceCheckGenFunc(scope.row)"
+            >生成保养单
+            </el-button>
+            <el-button type="text" @click.stop="delplan(scope.row)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="query.page"
+        :limit.sync="query.limit"
+        @pagination="getList"
+      />
+    </el-card>
 
     <!--    保养计划设备明细-->
     <el-card>
@@ -96,7 +97,8 @@
       </div>
       <el-table :data="detailList"
                 v-loading="detailLoading" click-row-light
-                highlight-current-row>
+                highlight-current-row
+      >
         <el-table-column label="序号" width="50" type="index"/>
         <el-table-column label="科室名称" prop="deptName"/>
         <el-table-column label="设备编号" prop="deviceCode"/>
@@ -138,7 +140,8 @@
                          :planId="detailQuery.planId"
                          :projectItem="projectItem"
                          :pullData="planData"
-                         :closeAddDevice="closeAddDevice"/>
+                         :closeAddDevice="closeAddDevice"
+      />
     </el-dialog>
 
     <!--新增保养计划-->
@@ -151,12 +154,11 @@
     >
       <devicePlanEdit :originData="planData"
                       :closePlanEdit="closePlanEdit"
-                      :createFlag="createFlag"/>
+                      :createFlag="createFlag"
+      />
     </el-dialog>
 
 
-
-
   </div>
 </template>
 
diff --git a/src/views/dev/js/deviceChangeOrder.js b/src/views/dev/js/deviceChangeOrder.js
index f2a0fee2..b5881fc7 100644
--- a/src/views/dev/js/deviceChangeOrder.js
+++ b/src/views/dev/js/deviceChangeOrder.js
@@ -145,6 +145,8 @@ export default {
         invCode: null,
       },
       thisData: {},
+      draftLoading: false,
+      submitLoading: false,
       //==================================================
 
     }
@@ -229,7 +231,9 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });
+      this.draftLoading = true
       saveDraftOrder(this.createData).then(res => {
+        this.draftLoading = false
         loading.close()
         if (res.code != 20000) {
           this.$message.error(res.message)
@@ -240,6 +244,7 @@ export default {
         this.query = {...query}
         this.getList()
       }).catch(() => {
+        this.draftLoading = false
         loading.close()
       })
 
@@ -291,7 +296,9 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });
+      this.submitLoading = true
       saveChangeOrder(this.createData).then(res => {
+        this.submitLoading = false
         loading.close()
         if (res.code != 20000) {
           this.$message.error(res.message)
@@ -302,6 +309,7 @@ export default {
         this.query = {...query}
         this.getList()
       }).catch(() => {
+        this.submitLoading = false
         loading.close()
       })
     },
diff --git a/src/views/dev/js/deviceCheckItemDict.js b/src/views/dev/js/deviceCheckItemDict.js
index f4a18337..19a32073 100644
--- a/src/views/dev/js/deviceCheckItemDict.js
+++ b/src/views/dev/js/deviceCheckItemDict.js
@@ -38,6 +38,7 @@ export default {
                 name: [{required: true, message: "项目名称不能为空", trigger: "change"}],
                 content: [{required: true, message: "项目内容不能为空", trigger: "change"}]
             },
+          saveLoading: false,
         }
     },
     created() {
@@ -79,7 +80,9 @@ export default {
                     return false
                 }
                 let loading = getLoading(this);
+                  this.saveLoading = true
                 saveDeviceCheckItemDict(this.saveData).then(res => {
+                  this.saveLoading = false
                     loading.close()
                     if (res.code != 20000) {
                         this.$message.error(res.message)
@@ -90,6 +93,7 @@ export default {
                     this.query.page = 1
                     this.getList()
                 }).catch(() => {
+                    this.saveLoading = false
                     loading.close
                 })
             })
diff --git a/src/views/dev/js/deviceRepair.js b/src/views/dev/js/deviceRepair.js
index 62fea466..c0fa1d3e 100644
--- a/src/views/dev/js/deviceRepair.js
+++ b/src/views/dev/js/deviceRepair.js
@@ -28,6 +28,7 @@ export default {
       list: [],
       query: {...query},
       user: null,
+      finishLoading: false,
     }
   },
   created() {
@@ -57,7 +58,9 @@ export default {
       //   cancelButtonText: "取消"
       // }).then((r) => {
         let loading = getLoading(this);
+        this.finishLoading = true
         finishRepairByUser(row).then(res => {
+          this.finishLoading = false
           loading.close()
           if (res.code != 20000) {
             this.$message.error(res.message)
@@ -66,6 +69,7 @@ export default {
           this.getList()
           this.finishFuncFlagClose()
         }).catch(e=>{
+          this.finishLoading = false
           loading.close()
         })
       // })
diff --git a/src/views/dev/js/deviceRepairApply.js b/src/views/dev/js/deviceRepairApply.js
index 521232fe..de4a9608 100644
--- a/src/views/dev/js/deviceRepairApply.js
+++ b/src/views/dev/js/deviceRepairApply.js
@@ -70,6 +70,7 @@ export default {
       detailList: [],
       detailTotal: 0,
       repairId: null,
+      submitLoading: false,
       //========detail--end===============================
     }
   },
@@ -136,7 +137,9 @@ export default {
           return false
         }
         let loading = getLoading(that);
+        this.submitLoading = true
         deviceRepairApplyAdd(this.saveData).then(res => {
+          this.submitLoading = false
           loading.close()
           if (res.code != 20000) {
             this.$message.error(res.message)
@@ -147,6 +150,7 @@ export default {
           this.query.page = 1
           this.getList()
         }).catch(() => {
+          this.submitLoading = false
           loading.close
         })
       })
diff --git a/src/views/dev/js/deviceRepairApplyHall.js b/src/views/dev/js/deviceRepairApplyHall.js
index 0cb36b03..f53ba7ed 100644
--- a/src/views/dev/js/deviceRepairApplyHall.js
+++ b/src/views/dev/js/deviceRepairApplyHall.js
@@ -102,6 +102,7 @@ export default {
         }],
         diagnosisInfo: [{required: true, message: "诊断信息不能为空", trigger: ["change", "blur"]}],
       },
+      submitLoading: false
       //========detailDialog--end===============================
     }
   }
@@ -139,7 +140,9 @@ export default {
           return
         }
         this.diagnosisData.diagnosisLivePath = this.uploadedFileNames
+        this.submitLoading = true
         deviceRepairApplyDetailDiagnosis(this.diagnosisData).then(res => {
+          this.submitLoading = false
           if (res.code != 20000) {
             this.$message.error(res.message)
             return
diff --git a/src/views/dev/js/deviceRepairApplyMy.js b/src/views/dev/js/deviceRepairApplyMy.js
index fee4aade..f02516ad 100644
--- a/src/views/dev/js/deviceRepairApplyMy.js
+++ b/src/views/dev/js/deviceRepairApplyMy.js
@@ -95,6 +95,7 @@ export default {
         }],
         diagnosisInfo: [{required: true, message: "诊断信息不能为空", trigger: ["change", "blur"]}],
       },
+      commitLoading: false,
       //========detailDialog--end===============================
     }
   }
@@ -121,7 +122,9 @@ export default {
         if (!b) {
           return
         }
+        this.commitLoading = true
         deviceRepairApplyDetailDiagnosis(this.diagnosisData).then(res => {
+          this.commitLoading = false
           if (res.code != 20000) {
             this.$message.error(res.message)
             return
diff --git a/src/views/dev/js/deviceUpkeepItemDict.js b/src/views/dev/js/deviceUpkeepItemDict.js
index 3bddddd2..43bc812c 100644
--- a/src/views/dev/js/deviceUpkeepItemDict.js
+++ b/src/views/dev/js/deviceUpkeepItemDict.js
@@ -1,136 +1,143 @@
 import {
-    delDeviceCheckItemDict,
-    deviceCheckItemDictPage,
-    genCheckItemCode,
-    saveDeviceCheckItemDict
-} from "@/api/dev/deviceCheckItemDictApi";
-import {getLoading, getLoadingObj} from "@/utils";
+  delDeviceCheckItemDict,
+  deviceCheckItemDictPage,
+  genCheckItemCode,
+  saveDeviceCheckItemDict
+} from '@/api/dev/deviceCheckItemDictApi'
+import { getLoading, getLoadingObj } from '@/utils'
 
 let query = {
-    page: 1,
-    limit: 10,
-    name: null,
-    code: null,
-    type:2,
+  page: 1,
+  limit: 10,
+  name: null,
+  code: null,
+  type: 2
 }
 
 let saveData = {
-    code: null,
-    name: null,
-    content: null,
-    type:2,
+  code: null,
+  name: null,
+  content: null,
+  type: 2
 }
 
 export default {
-    name: "deviceCheckItemDict",
-    props: {isChoose: {required: false, default: false, type: Boolean}, selectChangFunc: {required: false, type: Function}},
-    data() {
-        return {
-            showSearch: true,
-            loading: false,
-            total: .0,
-            list: [],
-            query: {...query},
-            createFlag: false,
-            saveData: {...saveData},
-            formRule: {
-                code: [{required: true, message: "项目编码不能为空", trigger: "change"}],
-                name: [{required: true, message: "项目名称不能为空", trigger: "change"}],
-                content: [{required: true, message: "项目内容不能为空", trigger: "change"}]
-            },
-          options: [
-            { label: '巡检项目', value: '1' },
-            { label: '保养项目', value: '2' }
-          ]
+  name: 'deviceCheckItemDict',
+  props: {
+    isChoose: { required: false, default: false, type: Boolean },
+    selectChangFunc: { required: false, type: Function }
+  },
+  data() {
+    return {
+      showSearch: true,
+      loading: false,
+      total: .0,
+      list: [],
+      query: { ...query },
+      createFlag: false,
+      saveData: { ...saveData },
+      formRule: {
+        code: [{ required: true, message: '项目编码不能为空', trigger: 'change' }],
+        name: [{ required: true, message: '项目名称不能为空', trigger: 'change' }],
+        content: [{ required: true, message: '项目内容不能为空', trigger: 'change' }]
+      },
+      options: [
+        { label: '巡检项目', value: '1' },
+        { label: '保养项目', value: '2' }
+      ],
+      saveLoading: false,
 
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    delFunc(row) {
+      this.$confirm('此操作将会永久删除该数据，是否继续？', '提示', {
+        confirmButtonText: '继续',
+        cancelButtonText: '取消'
+      }).then(() => {
+        let load = getLoading(this)
+        delDeviceCheckItemDict(row.code).then(res => {
+          load.close()
+          if (res.code != 20000) {
+            this.$message.error(res.message)
+            return
+          }
+          this.$message.success(res.message)
+          this.query = { ...query }
+          this.getList()
+        }).catch(() => {
+          load.close()
+        })
+      })
+    },
+    genCode() {
+      genCheckItemCode().then(res => {
+        if (res.code != 20000) {
+          this.$message.error(res.message)
+          return
         }
+        this.saveData.code = res.data
+      })
     },
-    created() {
-        this.getList()
+    saveFunc: function() {
+      this.$refs.saveForm.validate(b => {
+        if (!b) {
+          return false
+        }
+        let loading = getLoading(this)
+        this.saveLoading = true
+        saveDeviceCheckItemDict(this.saveData).then(res => {
+          this.saveLoading = false
+          loading.close()
+          if (res.code != 20000) {
+            this.$message.error(res.message)
+            return
+          }
+          this.$message.success(res.message)
+          this.createFlag = false
+          this.query.page = 1
+          this.getList()
+        }).catch(() => {
+          this.saveLoading = false
+          loading.close
+        })
+      })
     },
-    methods: {
-        delFunc(row) {
-            this.$confirm("此操作将会永久删除该数据，是否继续？", "提示", {
-                confirmButtonText: "继续",
-                cancelButtonText: "取消"
-            }).then(() => {
-                let load = getLoading(this)
-                delDeviceCheckItemDict(row.code).then(res => {
-                    load.close()
-                    if (res.code != 20000) {
-                        this.$message.error(res.message)
-                        return
-                    }
-                    this.$message.success(res.message)
-                    this.query = {...query}
-                    this.getList()
-                }).catch(() => {
-                    load.close()
-                })
-            })
-        },
-        genCode() {
-            genCheckItemCode().then(res => {
-                if (res.code != 20000) {
-                    this.$message.error(res.message)
-                    return
-                }
-                this.saveData.code = res.data
-            })
-        },
-        saveFunc: function () {
-            this.$refs.saveForm.validate(b => {
-                if (!b) {
-                    return false
-                }
-                let loading = getLoading(this);
-                saveDeviceCheckItemDict(this.saveData).then(res => {
-                    loading.close()
-                    if (res.code != 20000) {
-                        this.$message.error(res.message)
-                        return
-                    }
-                    this.$message.success(res.message)
-                    this.createFlag = false
-                    this.query.page = 1
-                    this.getList()
-                }).catch(() => {
-                    loading.close
-                })
-            })
-        },
-        openCreate() {
-            genCheckItemCode().then(res => {
-                if (res.code != 20000) {
-                    this.$message.error(res.message)
-                    return
-                }
-                this.saveData = {...saveData, code: res.data}
-                this.createFlag = true
-            })
-        },
-        search() {
-            this.query.page = 1
-            this.getList()
-        },
-        onReset() {
-            this.query = {...query}
-            this.getList()
-        },
-        getList() {
-            this.loading = true
-            deviceCheckItemDictPage(this.query).then(res => {
-                this.loading = false
-                if (res.code != 20000) {
-                    this.$message.error(res.message)
-                    return
-                }
-                this.list = res.data.list || []
-                this.total = res.data.total || 0
-
-            }).catch(e => {
-                this.loading = false
-            })
+    openCreate() {
+      genCheckItemCode().then(res => {
+        if (res.code != 20000) {
+          this.$message.error(res.message)
+          return
         }
+        this.saveData = { ...saveData, code: res.data }
+        this.createFlag = true
+      })
+    },
+    search() {
+      this.query.page = 1
+      this.getList()
+    },
+    onReset() {
+      this.query = { ...query }
+      this.getList()
+    },
+    getList() {
+      this.loading = true
+      deviceCheckItemDictPage(this.query).then(res => {
+        this.loading = false
+        if (res.code != 20000) {
+          this.$message.error(res.message)
+          return
+        }
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+
+      }).catch(e => {
+        this.loading = false
+      })
     }
+  }
 }
diff --git a/src/views/inventory/InvOrderPlaceModify.vue b/src/views/inventory/InvOrderPlaceModify.vue
index 0a428b33..65b1ba66 100644
--- a/src/views/inventory/InvOrderPlaceModify.vue
+++ b/src/views/inventory/InvOrderPlaceModify.vue
@@ -5,7 +5,7 @@
         style="display: flex; margin: 0px 0 10px 80%; height: 35px"
       >
         <!--        <el-button size="mini" type="primary" @click.native="selectOrder()">选入单据</el-button>-->
-        <el-button size="mini" type="primary" @click.native="saveData()"
+        <el-button size="mini" type="primary" @click.native="saveData()" :loading="saveLoading"
           >提交</el-button
         >
         <el-button
@@ -207,6 +207,7 @@ export default {
       },
       spaceSearchResult: [],
       currentOrderId: null,
+      saveLoading: false,
     };
   },
   methods: {
@@ -239,8 +240,10 @@ export default {
             type: 2,
             oid: this.formData.orderId,
           };
+          this.saveLoading = true
           bindInvOrderSpace(params)
             .then((res) => {
+              this.saveLoading = false
               if (res.code === 20000) {
                 this.$message.success("上架成功");
                 this.clearFormData();
@@ -252,10 +255,13 @@ export default {
               }
             })
             .catch((error) => {
+              this.saveLoading = false
               this.$message.error(error.message);
             });
         })
-        .catch(() => {});
+        .catch(() => {
+          this.saveLoading = false
+        });
     },
     clearFormData() {
       //清空表单数据
diff --git a/src/views/inventory/InvPlaceChangeModify.vue b/src/views/inventory/InvPlaceChangeModify.vue
index 7f38df58..3891b6f2 100644
--- a/src/views/inventory/InvPlaceChangeModify.vue
+++ b/src/views/inventory/InvPlaceChangeModify.vue
@@ -3,7 +3,7 @@
     <el-button-group
       style="display: flex; margin: 0px 0 10px 80%; height: 35px"
     >
-      <el-button size="mini" type="primary" @click.native="saveData()"
+      <el-button size="mini" type="primary" @click.native="saveData()" :loading="saveLoading"
         >提交</el-button
       >
       <el-button size="mini" type="primary" @click.native="closePlaceDialog(1)"
@@ -197,6 +197,7 @@ export default {
       loading: false,
       spaceSearchResult: [],
       spaceChangeSearchResult: [],
+      saveLoading: false,
     };
   },
   methods: {
@@ -226,8 +227,10 @@ export default {
             type: 3, //按物资上架
             orderId: this.orderId,
           };
+          this.saveLoading = true
           bindInvSpace(params)
             .then((res) => {
+              this.saveLoading = false
               if (res.code === 20000) {
                 this.$message.success("变更成功");
                 this.clearFormData();
@@ -239,10 +242,13 @@ export default {
               }
             })
             .catch((error) => {
+              this.saveLoading = false
               this.$message.error(error.message);
             });
         })
-        .catch(() => {});
+        .catch(() => {
+          this.saveLoading = false
+        });
     },
     clearFormData() {
       //清空表单数据
diff --git a/src/views/inventory/InvProductPlaceModify.vue b/src/views/inventory/InvProductPlaceModify.vue
index 312cead6..2df2903a 100644
--- a/src/views/inventory/InvProductPlaceModify.vue
+++ b/src/views/inventory/InvProductPlaceModify.vue
@@ -3,7 +3,7 @@
     <el-button-group
       style="display: flex; margin: 0px 0 10px 80%; height: 35px"
     >
-      <el-button size="mini" type="primary" @click.native="saveData()"
+      <el-button size="mini" type="primary" @click.native="saveData()" :loading="saveLoading"
       >提交
       </el-button
       >
@@ -207,6 +207,7 @@ export default {
       loading: false,
       spaceSearchResult: [],
       sitcomScan: false,
+      saveLoading: false,
     };
   },
   methods: {
@@ -237,8 +238,10 @@ export default {
             type: 1, //按物资上架
             orderId: this.orderId,
           };
+          this.saveLoading = true
           bindInvSpace(params)
             .then((res) => {
+              this.saveLoading = false
               if (res.code === 20000) {
                 this.$message.success("上架成功");
                 this.clearFormData();
@@ -246,14 +249,17 @@ export default {
                   this.$refs.spaceInputRef.focus();
                 });
               } else {
+                this.saveLoading = false
                 this.$message.error(res.message);
               }
             })
             .catch((error) => {
+              this.saveLoading = false
               this.$message.error(error.message);
             });
         })
         .catch(() => {
+          this.saveLoading = false
         });
     },
     updateInvSpaceCode() {
diff --git a/src/views/inventory/InvProductPlaceOutModify.vue b/src/views/inventory/InvProductPlaceOutModify.vue
index 52224cd2..8664fb4d 100644
--- a/src/views/inventory/InvProductPlaceOutModify.vue
+++ b/src/views/inventory/InvProductPlaceOutModify.vue
@@ -3,7 +3,7 @@
     <el-button-group
       style="display: flex; margin: 0px 0 10px 80%; height: 35px"
     >
-      <el-button size="mini" type="primary" @click.native="saveData()"
+      <el-button size="mini" type="primary" @click.native="saveData()" :loading="saveLoading"
       >提交
       </el-button
       >
@@ -120,6 +120,7 @@ export default {
       spaceList: [],
       loading: false,
       spaceSearchResult: [],
+      saveLoading: false,
     };
   },
   methods: {
@@ -149,8 +150,10 @@ export default {
             orderId: this.orderId,
             outCount: this.list.length
           };
+          this.saveLoading = true
           unbindInvOrderSpace(params)
             .then((res) => {
+              this.saveLoading = false
               if (res.code === 20000) {
                 this.$message.success("下架成功");
                 this.clearFormData();
@@ -162,10 +165,12 @@ export default {
               }
             })
             .catch((error) => {
+              this.saveLoading = false
               this.$message.error(error.message);
             });
         })
         .catch(() => {
+          this.saveLoading = false
         });
     },
     clearFormData() {
diff --git a/src/views/inventory/addInvRemindSetDialog.vue b/src/views/inventory/addInvRemindSetDialog.vue
index 2e06bf34..f4f4a631 100644
--- a/src/views/inventory/addInvRemindSetDialog.vue
+++ b/src/views/inventory/addInvRemindSetDialog.vue
@@ -193,13 +193,16 @@ export default {
         this.$message.warning("至少开启一项预警！");
         return;
       }
+      this.formLoading = true
       saveInvRemindSet(this.formData, "add").then((res) => {
+        this.formLoading = false
         if (res.code === 20000) {
           this.closeDialog();
         } else {
           this.$message.error(res.message);
         }
       }).catch((error) => {
+        this.formLoading = false
         this.$message.error(error.message);
         this.closeDialog();
       })
diff --git a/src/views/inventory/count/InvCountOrderModify.vue b/src/views/inventory/count/InvCountOrderModify.vue
index 5088a0cf..b9d65b3b 100644
--- a/src/views/inventory/count/InvCountOrderModify.vue
+++ b/src/views/inventory/count/InvCountOrderModify.vue
@@ -6,11 +6,13 @@
           <el-button
             type="primary"
             @click.native="saveOrder()"
+            :loading="saveLoading"
           >草稿保存
           </el-button>
           <el-button
             type="primary"
             @click.native="submitAudit()"
+            :loading="submitLoading"
           >提交审核
           </el-button>
         </el-button-group>
@@ -416,6 +418,8 @@ export default {
       multiProduct: [],
       selectedIndex: null,
       isCodeAlive: true,
+      saveLoading: false,
+      submitLoading: false,
     }
   },
   methods: {
@@ -468,7 +472,9 @@ export default {
         countType: this.countOrder.countType,
         codeCount: this.formData.codeCount,
       };
+      this.saveLoading = true
       saveCountOrder(orderData).then((res) => {
+        this.saveLoading = false
         if (res.code === 20000) {
           this.formData.orderId = res.data.orderId;
           this.formData.createTime = res.data.createTime;
@@ -480,6 +486,7 @@ export default {
             this.closeDialog();
           }
         } else {
+          this.saveLoading = false
           this.$message.error(res.message);
         }
       });
@@ -500,7 +507,9 @@ export default {
     },
 
     submitAudit() {
+      this.submitLoading = true
       submitAudit(this.formData).then((res) => {
+        this.submitLoading = false
         if (res.code === 20000) {
           this.$message.success("提交成功！");
           this.getList();
@@ -509,6 +518,7 @@ export default {
           this.$message.error(res.message);
         }
       }).catch((error) => {
+        this.submitLoading = false
         this.$message.error(error.message);
       });
     },
diff --git a/src/views/inventory/stockCompare.js b/src/views/inventory/stockCompare.js
index cd72cb1b..17810716 100644
--- a/src/views/inventory/stockCompare.js
+++ b/src/views/inventory/stockCompare.js
@@ -122,6 +122,8 @@ export default {
       },
 
       currentRow: null,
+      uploadCompareLoading: false,
+      compareFuncLoading: false,
     }
   },
   created() {
@@ -161,7 +163,9 @@ export default {
       let query = {
         compareId: this.compareId
       }
+      this.compareFuncLoading = true
       dlThrCpProduct(query).then(res => {
+        this.compareFuncLoading = false
         loading.close();
         if (res.code != 20000) {
           this.$message.error(res.message)
@@ -169,12 +173,15 @@ export default {
         }
         this.getResultList(query)
       }).catch(e => {
+        this.compareFuncLoading = false
         loading.close();
       })
     },
 
     uploadCompare() {
+      this.uploadCompareLoading = true
       uploadCompare(this.compareId).then(res => {
+        this.uploadCompareLoading = false
         if (res.code != 20000) {
           this.$message.error(res.message)
           return
diff --git a/src/views/inventory/stockCompare.vue b/src/views/inventory/stockCompare.vue
index 1654b1b8..d70fb16e 100644
--- a/src/views/inventory/stockCompare.vue
+++ b/src/views/inventory/stockCompare.vue
@@ -247,9 +247,9 @@
           <el-col align="right">
             <el-button-group>
               <el-button type="primary" icon="el-icon-plus" @click="showAddProduct">添加本地产品</el-button>
-              <el-button type="primary" icon="el-icon-download" @click="compareFunc">下载第三产品</el-button>
+              <el-button type="primary" icon="el-icon-download" @click="compareFunc" :loading="compareFuncLoading">下载第三产品</el-button>
               <el-button type="primary" icon="el-icon-upload2"
-                         @click="uploadCompare">提交比对
+                         @click="uploadCompare" :loading="uploadCompareLoading">提交比对
               </el-button>
             </el-button-group>
 
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 11eb93c5..02df0fb1 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -237,10 +237,10 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-document" @click="selectExport">选中导出Excel</el-button>
-          <el-button type="primary" icon="el-icon-document" @click="searchExport">结果导出Excel</el-button>
-          <el-button type="primary" icon="el-icon-printer" @click="optinPrint">选中打印</el-button>
-          <el-button type="primary" icon="el-icon-printer" @click="selectPrint">查询结果打印</el-button>
+          <el-button type="primary" icon="el-icon-document" @click="selectExport" :loading="selectExportLoading">选中导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-document" @click="searchExport" :loading="searchExportLoading">结果导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="optinPrint" :loading="optinPrintLoading">选中打印</el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="selectPrint" :loading="selectPrinttLoading">查询结果打印</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -469,6 +469,10 @@ export default {
 
       fromOptions: [],
       loading: false,
+      selectExportLoading: false,
+      searchExportLoading: false,
+      optinPrintLoading: false,
+      selectPrinttLoading: false,
       total: 0,
       tableHeader:[],
       queryList:[],
@@ -647,7 +651,9 @@ export default {
             return this.$message.error("请选择打印的明细！");
           }
           let query = {id: 4};
+          this.optinPrintLoading = true
           verifyTemplateFile(query).then((res) => {
+            this.optinPrintLoading = false
             if (res.code === 20000) {
               let printParams = {
                 startAduditTime :this.filterQuery.startAduditTime,
@@ -672,9 +678,11 @@ export default {
                 window.open(url);//打开新标签页，预览pdf。
               })
             } else {
+              this.optinPrintLoading = false
               return this.$message.error(res.message);
             }
           }).catch((error) => {
+            this.optinPrintLoading = false
             this.loading = false;
             this.$message.error(error.message);
           })
@@ -693,7 +701,9 @@ export default {
         .then(() => {
 
           let query = {id: 4};
+          this.selectPrinttLoading = true
           verifyTemplateFile(query).then((res) => {
+            this.selectPrinttLoading = false
             if (res.code === 20000) {
               let printParams = {
                 templateId: res.data,
@@ -741,6 +751,7 @@ export default {
               return
             }
           }).catch((error) => {
+            this.selectPrinttLoading = false
             this.loading = false;
             this.$message.error(error.message);
           })
@@ -766,13 +777,17 @@ export default {
           let printParams = {
             list: this.orderSelection
           };
+          this.selectExportLoading = true
           postExcelInoutImport(printParams).then((response) => {
+            this.selectExportLoading = false
             let blob = new Blob([response], {type: "application/vnd.ms-excel"});
             let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
             let a = document.createElement("a");
             a.href = url;
             a.click();
             this.$message("成功")
+          }).catch(() => {
+            this.selectExportLoading = false
           })
         });
 
@@ -820,7 +835,9 @@ export default {
             printParams.confirmStarTime = null;
             printParams.confirmEndTime = null;
           }
+          this.searchExportLoading = true
           excelInoutImport(printParams).then((response) => {
+            this.searchExportLoading = false
             let blob = new Blob([response], {type: "application/vnd.ms-excel"});
             let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
             let a = document.createElement("a");
diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue
index b009e19f..547f2e58 100644
--- a/src/views/remind/invRemindMsg.vue
+++ b/src/views/remind/invRemindMsg.vue
@@ -404,7 +404,7 @@
 
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="closeConfirmDialog">取消</el-button>
-        <el-button type="primary" @click.native="updateHandleMsg()"
+        <el-button type="primary" @click.native="updateHandleMsg()" :loading="updateLoading"
         >提交
         </el-button>
       </div>
@@ -499,6 +499,7 @@ export default {
       confirmMsgVisible: false,
       handleMsg: null,
       rowData: null,
+      updateLoading: false,
 
     };
   },
@@ -664,7 +665,9 @@ export default {
         id: this.rowData.id,
         handleMsg: this.handleMsg
       };
+      this.updateLoading = true
       confirmMsg(params).then((res) => {
+        this.updateLoading = false
         if (res.code === 20000) {
           this.rowData = {};
           this.handleMsg = null;
@@ -675,6 +678,7 @@ export default {
           this.$message.error(res.message);
         }
       }).catch((error) => {
+        this.updateLoading = false
         this.rowData = {};
         this.handleMsg = null;
         this.confirmMsgVisible = false;
diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index 48506af9..f6d81bc7 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -339,7 +339,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="closeDialog">取消</el-button>
-        <el-button type="primary" @click.native="postConfirm()"
+        <el-button type="primary" @click.native="postConfirm()" :loading="confirmLoading"
         >提交
         </el-button>
       </div>
@@ -396,6 +396,7 @@ export default {
       },
       confirmVisible: false,
       confirmQuery: {},
+      confirmLoading: false,
     };
   },
   methods: {
@@ -447,7 +448,9 @@ export default {
       _this.confirmQuery = row;
     },
     postConfirm() {
+      this.confirmLoading = true
       confirmMsg(this.confirmQuery).then((res) => {
+        this.confirmLoading = false
         if (res.code === 20000) {
           this.confirmVisible = false;
           this.$message.success("已确认");