工单和化验地图修改

src/views/currentSystem/work/configuration/flowPath/index.vue

@@ -1,3 +1,4 @@
+<!-- 流程配置 -->
 <template>
   <div class="flowPath">
     <div class="filteroption">
@@ -94,11 +95,12 @@
         :ssbms="ssbms"
         :option="option"
         :isedit="isedit"
+        :loading="loading"
         @remind="remind"
       />
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitOrder">确 定</el-button>
+        <el-button type="primary" @click="submitOrder" :loading="load">确 定</el-button>
         <!-- <el-button type="primary" @click="submitOrders">测 试</el-button> -->
       </span>
     </el-dialog>
@@ -118,6 +120,8 @@ export default {
   components: { TableItem, Merge },
   data() {
     return {
+      // 提交按钮
+      load:false,
       gdlx: '',
       gdlxs: [],
       isedit: false,
@@ -314,7 +318,9 @@ export default {
 
     // 提交
     submitOrder() {
+      this.load = true
       this.$refs.merge.submitForm()
+
     },
     // 提交
     submitOrders() {
@@ -322,6 +328,8 @@ export default {
     },
     // 提示
     remind(data) {
+      // console.log("提示"+JSON.stringify(data))
+      this.load = data[1]
       this.dialogVisible = false
       this.fetchData(this.pagination)
     }

src/views/currentSystem/work/configuration/flowPath/merge/index.vue

@@ -911,11 +911,13 @@ export default {
     },
     // 新增提交
     newAddUser(data) {
+      let load = true
       const _this = this
       gdGdLcPOST(data).then((res) => {
         if (res.code !== -1) {
+          load = false
           _this.$message.success('成功')
-          _this.$emit('remind', '成功')
+          _this.$emit('remind', ['成功', load])
           _this.resetFields()
         }
         // else {
@@ -926,11 +928,13 @@ export default {
 
     // 修改提交
     editSubmit(data) {
+      let load = true
       const _this = this
       gdGdLcPUT(data).then((res) => {
         if (res.code !== -1) {
+          load = false
           _this.$message.success('成功')
-          _this.$emit('remind', '成功')
+          _this.$emit('remind', ['成功', load])
           _this.resetFields()
         }
         // else {

src/views/currentSystem/work/order/handle/handle_merge.vue

@@ -369,12 +369,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="认证人员:">
+              <el-form-item label="处置人员:">
                 <el-input v-model="disposeForm.rzryName" disabled placeholder="未选择认证人员" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="认证时间:">
+              <el-form-item label="处置时间:">
                 <!-- <el-input v-model="disposeForm.rzsj" type="text" disabled placeholder="未选择认证时间" /> -->
                 <el-input
                   v-model="disposeForm.rzsj"