Merge branch 'dev_test' into dev_20230829_change

# Conflicts:
#	src/pages/home2/index.vue

src/App.vue

@@ -10,7 +10,7 @@
 <!--                scrolling="0"-->
 <!--        ></iframe>-->
         <!--   数小福   -->
-        <customerService></customerService>
+        <customerService v-if="customerServiceShow"></customerService>
         <!--    <router-view v-if="!isBoolean"/>-->
         <span v-if="this.$route.name === 'Login'|| !isBoolean">
           <router-view/>
@@ -96,6 +96,7 @@
     import {mapGetters, mapState} from 'vuex'
     import {webLoginType, ssoLogoutUrlDev} from '@/sysConfig'
     import customerService from "@/components/customerService";
+    import isMobile from "./store/isMobile";
 
     export default {
         name: 'App',
@@ -239,6 +240,9 @@
             userAvator() {
                 return this.$store.getters.userInfo.avator || require('@/assets/images/avator_default.png')
             },
+            customerServiceShow () {
+              return !isMobile()
+            },
             ...mapGetters([
                 'getWebSocketList', 'getTheme', 'getMenuList'
             ]),

src/pages/details/otherBussStandardDetails/index.vue

@@ -4,7 +4,8 @@
     <!--title 标题-->
     <div class="details-header">
       <span>{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName}}》 企标详情</span>
-      <b style="float:right;font-size: 25px;color: #ff9900">{{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(1) }}</b>
+      <!--<b style="float:right;font-size: 25px;color: #ff9900">{{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(1) }}</b>-->
+      <b style="float:right;font-size: 25px;color: #ff9900">{{ score }}</b>
       <!--      之前的，先注掉-->
       <!--      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>-->
     </div>
@@ -45,14 +46,17 @@
                         </el-table-column>
                         <el-table-column prop="targetScore" label="指标分值" width="165">
                           <template slot-scope="scope">
-                            <el-col :span="20">
-                              <el-rate
-                                  v-model="scope.row.targetScore"
-                                  @change="targetScoreChange(scope.row)"
-                                  allow-half>
-                              </el-rate>
+                            <el-col>
+                              <div style="display: flex">
+                                <el-rate
+                                    v-model="scope.row.targetScore"
+                                    @change="targetScoreChange(scope.row)"
+                                    allow-half>
+                                </el-rate>
+                                <b style="color: #ff9900">{{ scope.row.targetScore * 2 }}</b>
+                              </div>
                             </el-col>
-                            <b style="margin-top: 5px;margin-left: -2%;color: #ff9900">{{ scope.row.targetScore * 2 }}</b>
+                            <!--<b style="margin-top: 5px;margin-left: -2%;color: #ff9900">{{ scope.row.targetScore * 2 }}</b>-->
                           </template>
                         </el-table-column>
                         <el-table-column property="reason" label="简述理由">
@@ -110,7 +114,7 @@
                             <el-form-item>
                               <el-radio v-model="commentAverageScoreTag" label="1" border @change="tabsClick">质量评价总平均分</el-radio>
                               <b style="margin-top: 30px;margin-left: 5px;font-size: 20px;color: #ff9900">{{
-                                  qualityCommentScore * 2
+                                  qualityCommentScore
                                 }}</b>
                             </el-form-item>
                           </el-col>
@@ -118,7 +122,7 @@
                             <el-form-item>
                               <el-radio v-model="commentAverageScoreTag" label="2" border @change="tabsClick">动态评价总平均分</el-radio>
                               <b style="margin-top: 30px;margin-left: 5px;font-size: 20px;color: #ff9900">{{
-                                  dynamicCommentScore * 2
+                                  dynamicCommentScore
                                 }}</b>
                             </el-form-item>
                           </el-col>
@@ -141,8 +145,9 @@
                                 <template slot-scope="scope">
                                   <el-tooltip class="item" effect="dark" :content="scope.row.processNode" placement="right">
                                   <el-button type="default"
+                                             :class="currentPeople === scope.$index ? 'active' : ''"
                                              style="width: 180px;" size="mini"
-                                             @click="historyPeopleChange(scope.row)">
+                                             @click="historyPeopleChange(scope.row, scope.$index)">
                                     {{ scope.row.userName + '-' + scope.row.processNode.substring(0,9) }}
                                   </el-button>
                                   </el-tooltip>
@@ -165,7 +170,8 @@
                                   show-overflow-tooltip>
                                 <template slot-scope="scope">
                                   <el-button type="default"
-                                             style="width: 100px;" size="mini" @click="historyPeopleChange(scope.row)">
+                                             :class="currentPeople === scope.$index ? 'active' : ''"
+                                             style="width: 100px;" size="mini" @click="historyPeopleChange(scope.row, scope.$index)">
                                     {{ scope.row.userName }}
                                   </el-button>
                                 </template>
@@ -1335,6 +1341,7 @@ export default {
   },
   data () {
     return {
+      score: 0,
       externalStatus:'',
       QFTP: false,
       textOptions: [],
@@ -1573,6 +1580,7 @@ export default {
       importForm: {
         content: ''
       },
+      currentPeople: 0, // 历史评价-当前评价人索引
       STANDSOURCEREVISION: []
     }
   },
@@ -1581,7 +1589,9 @@ export default {
   watch: {
   },
   methods: {
-    historyPeopleChange(row){
+    historyPeopleChange(row, index){
+      this.currentPeople = index
+
       this.historyInfoLoading = true
       const qualityAllData = {
         lawId: this.$route.params.id,
@@ -1628,7 +1638,112 @@ export default {
       }
 
     },
+    getScore () {
+      //查询动态评价总平均分和质量评价总平均分
+      let standId = this.$route.params.id
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+        _this: this
+      }, res => {
+        if (res.ok) {
+          this.score = res.data.finalScore.toFixed(2)
+          this.qualityCommentScore = res.data.quality.toFixed(2)
+          this.dynamicCommentScore = res.data.dynamic.toFixed(2)
+        }
+      }, e => {
+      })
+    },
+    getPeopleTable () {
+      return new Promise((resolve,reject) => {
+        // 历史评价
+        if (this.commentActiveName === 'historyComment') {
+          // 刷新质量评价评分人表格和动态评价评分人表格
+          let standId = this.$route.params.id
+          // 质量评价人
+          if (this.commentAverageScoreTag === '1') {
+            const qualityRequest = {
+              lawId: standId,
+              evaluationType: 'quality'
+            }
+            this.$http._getData('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest).then(res => {
+              this.qualityHistoryPeopleTable = res.data.records
+              this.qualityFirstHistoryPeopleId = res.data.records[0].userId
+              resolve(res)
+            })
+          } else {
+            // 动态评价人
+            const dynamicRequest = {
+              lawId: standId,
+              evaluationType: 'dynamic'
+            }
+            this.$http._getData('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest).then(res => {
+              this.dynamicHistoryPeopleTable = res.data.records
+              this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
+              resolve(res)
+            })
+          }
+        }
+      })
+    },
+    getHistoryData () {
+      this.historyInfoLoading = true
+      if (this.commentAverageScoreTag === '1'){
+        this.indexType = 'quality'
+        //查询评分表
+        const allData = {
+          lawId: this.$route.params.id,
+          userId: this.qualityFirstHistoryPeopleId,
+          evaluationType: this.indexType,
+          processNode: this.qualityHistoryPeopleTable.length>0?this.qualityHistoryPeopleTable[0].processNode:null
+        }
+        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+          _this: this
+        }, res => {
+          this.qualityHistoryCommentTable = res.data
+          this.historyInfoLoading = false
+
+        }, e => {
+          this.historyInfoLoading = false
+        })
+      }
+      else if (this.commentAverageScoreTag === '2'){
+        this.indexType = 'dynamic'
+        this.dynamicHistoryCommentTable = []
+        //查询评分表
+        const allData = {
+          lawId: this.$route.params.id,
+          userId: this.dynamicFirstHistoryPeopleId,
+          evaluationType: this.indexType
+        }
+        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+          _this: this
+        }, res => {
+          if(res.data && res.data.length > 0){
+            this.dynamicHistoryCommentTable = res.data
+            this.historyCommentForm.revise = res.data[0].targetScore
+            this.historyCommentForm.reviseReason = res.data[0].commentReason
+
+            let averageScore = 0
+            res.data.forEach(item => {
+              if (item.valueType === 'number'){
+                averageScore += parseInt(item.targetScore)
+              }
+            })
+            averageScore = averageScore / 4
+            this.historyCommentForm.averageScore = averageScore
+          }else {
+            this.historyCommentForm.averageScore = 0
+          }
+          this.historyInfoLoading = false
+        }, e => {
+          this.historyInfoLoading = false
+        })
+      }
+    },
     tabsClickBtn(tab, event){
+      this.commentAverageScoreTag = '1'
+      this.tabsClick()
+
+      /*
       if (this.commentActiveName === 'dynamicComment'){
           this.indexType = 'dynamic'
         //查询评分表
@@ -1684,8 +1799,11 @@ export default {
       this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
         _this: this
       }, res => {
-        this.qualityCommentScore = res.data.quality.toFixed(3)/2
-        this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+        if (res.ok) {
+          this.score = res.data.finalScore.toFixed(2)
+          this.qualityCommentScore = res.data.quality.toFixed(2)
+          this.dynamicCommentScore = res.data.dynamic.toFixed(2)
+        }
 
       }, e => {
       })
@@ -1716,8 +1834,37 @@ export default {
       }, e => {
       })
 
+
+       */
     },
     tabsClick(tab, event){
+      this.getScore()
+      this.getPeopleTable().then(() => {
+        // 动态评价
+        if (this.commentActiveName === 'dynamicComment'){
+          this.indexType = 'dynamic'
+          //查询评分表
+          const allData = {
+            lawId: this.$route.params.id,
+            userId: this.qualityFirstHistoryPeopleId,
+            evaluationType: this.indexType,
+          }
+          this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+            _this: this
+          }, res => {
+            this.qualityHistoryCommentTable = res.data
+            this.historyInfoLoading = false
+
+          }, e => {
+            this.historyInfoLoading = false
+          })
+        }else if (this.commentActiveName === 'historyComment'){
+          // 历史评价
+          this.currentPeople = 0
+          this.getHistoryData()
+        }
+      })
+      /*
       this.historyInfoLoading = true
       if (this.commentAverageScoreTag === '1'){
           this.indexType = 'quality'
@@ -1777,8 +1924,11 @@ export default {
       this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
         _this: this
       }, res => {
-        this.qualityCommentScore = res.data.quality.toFixed(3)/2
-        this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+        if (res.ok) {
+          this.score = res.data.finalScore.toFixed(2)
+          this.qualityCommentScore = res.data.quality.toFixed(2)
+          this.dynamicCommentScore = res.data.dynamic.toFixed(2)
+        }
 
       }, e => {
       })
@@ -1808,7 +1958,7 @@ export default {
 
       }, e => {
       })
-
+      */
     },
     targetScoreChange(row){
       if (this.targetScore1 === '') {
@@ -1921,14 +2071,20 @@ export default {
             }, e => {
             })
             //刷新动态评价总平均分和质量评价总平均分
+            this.getScore()
+            /*
             this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
               _this: this
             }, res => {
-              this.qualityCommentScore = res.data.quality.toFixed(3)/2
-              this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+              if (res.ok) {
+                this.score = res.data.finalScore.toFixed(2)
+                this.qualityCommentScore = res.data.quality.toFixed(2)
+                this.dynamicCommentScore = res.data.dynamic.toFixed(2)
+              }
 
             }, e => {
             })
+             */
           }
         }, e => {
         })
@@ -1947,7 +2103,13 @@ export default {
           sums[index] = '';
           return;
         }
-        const values = data.map(item => Number(item[column.property]));
+        const values = data.map(item => {
+          if (column.property === 'scoreMin') {
+            //  此时不存在scoreMin，需要重新计算
+            this.setScoreMin(item)
+          }
+          return Number(item[column.property])
+        });
         if (!values.every(value => isNaN(value))) {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
@@ -3110,6 +3272,10 @@ export default {
     },
 
     qbBtn() {
+      // 默认动态评价
+      this.commentActiveName = 'dynamicComment'
+      this.commentAverageScoreTag = '1'
+
       if (this.commentActiveName === 'dynamicComment'){
         this.indexType = 'dynamic'
         //查询评分表
@@ -3191,11 +3357,16 @@ export default {
       this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION
     }, e => {
     })
+    this.getScore()
+    /*
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
       _this: this
     }, res => {
-      this.qualityCommentScore = res.data.quality.toFixed(3)/2
-      this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+      if (res.ok) {
+        this.score = res.data.finalScore.toFixed(2)
+        this.qualityCommentScore = res.data.quality.toFixed(2)
+        this.dynamicCommentScore = res.data.dynamic.toFixed(2)
+      }
 
     }, e => {
     })
@@ -3224,6 +3395,7 @@ export default {
 
     }, e => {
     })
+    */
     this.$http.get('sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', {indexType:this.indexType}, {
       _this: this
     }, res => {
@@ -3446,6 +3618,11 @@ export default {
           }
         }
         .modular-header-btn{
+          .active {
+            color: #409EFF;
+            border-color: #c6e2ff;
+            background-color: #ecf5ff;
+          }
           & > button{
             height: 30px;
             line-height: 30px;

src/pages/home2/components/release/index.vue

@@ -23,6 +23,7 @@
                   width="55">
           </el-table-column>
           <el-table-column
+                  width="200"
                   label="标准编号">
               <template slot-scope="scope">
                   <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>

src/pages/home2/components/release2/index.vue

@@ -24,8 +24,12 @@
                   type="index"
                   align="center"
                   width="55">
+            <template slot-scope="{scope, column, $index}">
+              {{ ($index + 1) + (page - 1) * pageSize }}
+            </template>
           </el-table-column>
           <el-table-column
+                  width="200"
                   label="标准编号">
               <template slot-scope="scope">
                   <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>

src/pages/home2/components/releaseBuss/index.vue

@@ -23,6 +23,7 @@
                   width="55">
           </el-table-column>
           <el-table-column
+                  width="200"
                   label="标准编号">
               <template slot-scope="scope">
                   <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>
@@ -32,7 +33,10 @@
                   prop="standName"
                   label="标准名称">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
+                  <span @click="handlePreview(scope.row)" style="display: flex;align-items: center">
+                    <span>{{ scope.row.standardName }}</span>
+                    <img v-if="checkTime(scope.row.releaseDate)" src="/static/images/new.png" style="width: 30px;margin-left: 5px">
+                  </span>
               </template>
           </el-table-column>
           <el-table-column
@@ -56,6 +60,7 @@
 </template>
 
 <script>
+const moment = require('moment')
 export default {
   name: 'ReleaseBuss',
   components: {},
@@ -79,6 +84,9 @@ export default {
     // this.addDate()
   },
   methods: {
+      checkTime (time) {
+        return moment(time.slice(0,10)).diff(moment(), 'day') > -3
+      },
       pageChange(page) {
           this.page = page
           this.pageSize = this.$store.getters.userInfo.configContent

src/pages/home2/components/releaseBuss2/index.vue

@@ -24,8 +24,12 @@
                   type="index"
                   align="center"
                   width="55">
+            <template slot-scope="{scope, column, $index}">
+              {{ ($index + 1) + (page - 1) * pageSize }}
+            </template>
           </el-table-column>
           <el-table-column
+                  width="200"
                   label="标准编号">
               <template slot-scope="scope">
                   <span @click="handlePreview(scope.row)">{{ scope.row.standard }}</span>
@@ -35,7 +39,10 @@
                   prop="standName"
                   label="标准名称">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
+                  <span @click="handlePreview(scope.row)" style="display: flex;align-items: center">
+                    {{ scope.row.standardName }}
+                    <img v-if="checkTime(scope.row.releaseDate)" src="/static/images/new.png" style="width: 30px;margin-left: 5px">
+                  </span>
               </template>
           </el-table-column>
           <el-table-column
@@ -57,6 +64,7 @@
 </template>
 
 <script>
+const moment = require('moment')
 export default {
   name: 'ReleaseBuss2',
   components: {},
@@ -80,6 +88,9 @@ export default {
     // this.addDate()
   },
   methods: {
+      checkTime (time) {
+        return moment(time.slice(0,10)).diff(moment(), 'day') > -3
+      },
       pageChange(page) {
           this.page = page
           this.pageSize = this.$store.getters.userInfo.configContent
@@ -148,12 +159,12 @@ export default {
     font-size: 13px;
   }
     /deep/.more {
-        position: absolute;
-        right: 0;
-        bottom: 2px;
-        font-size: 15px;
-        float: right;
-        color: #4788c0;
+        //position: absolute;
+        //right: 0;
+        //bottom: 2px;
+        //font-size: 15px;
+        //float: right;
+        //color: #4788c0;
         &:hover {
             color: #3a8ee6;
             cursor: pointer;

src/pages/home2/components/releaseUs/index.vue

@@ -23,6 +23,7 @@
                   width="55">
           </el-table-column>
           <el-table-column
+                  width="200"
                   prop="standard"
                   label="标准编号">
               <template slot-scope="scope">

src/pages/home2/components/releaseUs2/index.vue

@@ -24,8 +24,12 @@
                   type="index"
                   align="center"
                   width="55">
+            <template slot-scope="{scope, column, $index}">
+              {{ ($index + 1) + (page - 1) * pageSize }}
+            </template>
           </el-table-column>
           <el-table-column
+                  width="200"
                   prop="standard"
                   label="标准编号">
               <template slot-scope="scope">

src/pages/home2/index.vue

@@ -32,7 +32,11 @@
                <release messageType="GWBZFG"></release>
              </el-tab-pane>
            <el-tab-pane name="releaseBuss" style="overflow-y: auto;height: 100%">
-               <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
+               <span slot="label" style="position: relative"><i class="el-icon-s-promotion"></i>
+                 企业标准发布
+                 <span v-if="isNew" class="more-doc"></span>
+                 <!--<img v-if="isNew" src="/static/images/new.png" style="width: 30px;margin-left: 5px">-->
+               </span>
                <releaseBuss></releaseBuss>
            </el-tab-pane>
            <el-tab-pane name="releaseQA" style="overflow-y: auto;height: 100%">
@@ -55,6 +59,8 @@
 </template>
 
 <script>
+const moment = require('moment')
+
 import searchGroup from './components/searchGroup'
 import release from './components/release'
 import releaseUs from './components/releaseUs'
@@ -82,9 +88,33 @@ export default {
   data() {
     return {
       activeName: 'solicitOpinions',
+      isNew: false
     }
   },
+  created() {
+    this.getAdvice()
+  },
   methods: {
+    getAdvice() {
+      this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+        messageType: 'QYBZFB',
+        page: 1,
+        pageSize: 1
+      }, {
+        _this: this
+      }, res => {
+        if (res.data && res.data.records && res.data.records.length > 0) {
+          if (res.data.records[0].releaseDate && res.data.records[0].releaseDate!== '') {
+            this.isNew = this.checkTime(res.data.records[0].releaseDate)
+          }
+        }
+      }, e => {
+
+      })
+    },
+    checkTime (time) {
+      return moment(time.slice(0,10)).diff(moment(), 'day') > -3
+    },
     handleTabClick(tab, event) {},
     //退出登录
     logout(){
@@ -219,4 +249,14 @@ export default {
     background: #FFFFFF;
   }
 }
+.more-doc {
+  width: 5px;
+  height: 5px;
+  display: inline-block;
+  background: #D81E06;
+  border-radius: 50%;
+  position: absolute;
+  top: -2px;
+  right: -8px;
+}
 </style>

src/pages/localTool/standardRecognition/index.vue

@@ -34,6 +34,9 @@
             width="50"
             align="center"
           >
+            <template slot-scope="{scope, column, $index}">
+              {{ ($index + 1) + (handleSelectForm.page - 1) * handleSelectForm.pageSize }}
+            </template>
           </el-table-column>
           <el-table-column
             prop="fileType"

src/pages/phone/components/standardSystemPopup.vue

@@ -10,6 +10,14 @@
       <van-icon name="cross" size="22px" @click="handleCancel" />
     </h3>
     <div class="popup-main">
+      <van-field name="radio" label="标准状态">
+        <template #input>
+          <van-radio-group v-model="textStatusName" direction="horizontal">
+            <van-radio name="全部">全部</van-radio>
+            <van-radio name="现行有效">现行有效</van-radio>
+          </van-radio-group>
+        </template>
+      </van-field>
       <standardSystemTree ref="standardSystemTreeRef" :data="standardSystemTreeData" :loading="loading" @checkedKey="getCheckedKey"></standardSystemTree>
     </div>
     <div class="popup-footer">
@@ -31,6 +39,7 @@ export default {
     return {
       popupShow: true,
       checkedKeys: [], // 选择的标准体系
+      textStatusName: '现行有效',
       standardSystemTreeData: [],
       loading: false,
       api: {
@@ -64,7 +73,8 @@ export default {
     handleOk () {
       // if (this.checkedKeys.length > 0) {
         this.popupShow = false
-        this.$emit('standSystemKeys', this.checkedKeys)
+        // this.$emit('standSystemKeys', this.checkedKeys)
+      this.$emit('searchQuery', { checkedKeys: this.checkedKeys, textStatusName: this.textStatusName })
       // } else {
       //   // this.$toast('请至少选择一项');
       //   this.$message.error('请至少选择一项')
@@ -81,7 +91,8 @@ export default {
     },
     handleReset () {
       this.popupShow = false
-      this.$emit('standSystemKeys', [])
+      // this.$emit('standSystemKeys', [])
+      this.$emit('searchQuery', { checkedKeys: [], textStatusName: '现行有效' })
     },
     async getData () {
       let url = this.api.getListStand

src/pages/phone/components/standardSystemTree.vue

@@ -9,7 +9,7 @@
        :lazy="false"
        :show-checkbox="true"
        node-key="id"
-       :default-expanded-keys="data[0].id"
+       :default-expanded-keys="[data[0].id]"
        :check-strictly="true"
        :expand-on-click-node="false"
        :check-on-click-node="true"

src/pages/phone/domesticDetails.vue

@@ -3,12 +3,15 @@
     <div class="other-standard-details v-class" :style="'height:' + (screenHeight) + 'px'">
         <!--title 标题-->
         <div class="details-header">
-      <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
+          <span v-if="$route.query.pageType === 'BUSS'">{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName}}》 企标详情</span>
+          <template v-if="$route.query.pageType !== 'BUSS'">
+          <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
         }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》</span>
             <span v-else>{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
         }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》</span>
+          </template>
         </div>
         <!--主体内容-->
         <div class="details-content" style="position: relative">
@@ -36,6 +39,18 @@
                                      style="border-top:none; border-bottom: none;">
                                     <div class="basic-information-content">
                                         <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
+                                      <template v-if="$route.query.pageType === 'BUSS'">
+                                        <el-row :gutter="5" class="">
+                                          <el-col :span="8">
+                                            <label>企标号</label>
+                                          </el-col>
+                                          <el-col :span="16">
+                                            <span>{{ sarStandardsInfoEO.standCode || '-' }}</span>
+                                          </el-col>
+                                        </el-row>
+                                      </template>
+
+                                      <template v-if="$route.query.pageType !== 'BUSS'">
                                         <el-row :gutter="5" class="">
                                             <el-col :span="8">
                                                 <label>标准号</label>
@@ -47,6 +62,8 @@
                                                 <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                                             </el-col>
                                         </el-row>
+                                      </template>
+
                                         <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
                                         <el-row :gutter="5" class="">
                                             <el-col :span="8">
@@ -217,6 +234,7 @@
                                                 </el-col>
                                             </el-row>
                                         </template>
+                                      <template v-if="$route.query.pageType !== 'BUSS'">
                                         <el-row :gutter="5" class="half">
                                             <el-col :span="8">
                                                 <label title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
@@ -225,6 +243,19 @@
                                                 <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                                             </el-col>
                                         </el-row>
+                                      </template>
+
+                                        <template v-if="$route.query.pageType === 'BUSS'">
+                                          <el-row :gutter="5" class="half">
+                                            <el-col :span="8">
+                                              <label title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
+                                            </el-col>
+                                            <el-col :span="16">
+                                              <span>{{ sarStandardsInfoEO.textStatusBussShow || '-' }}</span>
+                                            </el-col>
+                                          </el-row>
+                                        </template>
+
                                         <el-row :gutter="5" class="half">
                                             <el-col :span="8">
                                                 <label>发布日期</label>
@@ -233,6 +264,19 @@
                                                 <span>{{ sarStandardsInfoEO.issueTime || '-' }}</span>
                                             </el-col>
                                         </el-row>
+
+                                      <template v-if="$route.query.pageType === 'BUSS'">
+                                        <el-row :gutter="5" class="half">
+                                          <el-col :span="8">
+                                            <label>企标实施日期</label>
+                                          </el-col>
+                                          <el-col :span="16">
+                                            <span>{{ sarStandardsInfoEO.putTime || '-' }}</span>
+                                          </el-col>
+                                        </el-row>
+                                      </template>
+
+                                      <template v-if="$route.query.pageType !== 'BUSS'">
                                         <el-row :gutter="5" class="half">
                                             <el-col :span="8">
                                                 <label>标准体系</label>
@@ -253,6 +297,7 @@
                         </span>
                                             </el-col>
                                         </el-row>
+                                      </template>
                                         <template v-for="(child, childIndex) in item.child2">
                                             <el-row :gutter="5" class="half">
                                                 <el-col :span="8">
@@ -2665,7 +2710,11 @@
             },
             selectStandMessage() {
                 return new Promise((resolve, reject) => {
-                    this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
+                  let url = 'sarStandardsInfo/sar-standards-info/getStandInfoById'
+                  if (this.$route.query.pageType === 'BUSS') {
+                    url = 'lawss/sarBussionessStand/getStandInfoById'
+                  }
+                    this.$http.get(url, {id: this.sarStandardsInfoEO.id}, {
                         _this: this
                     }, res => {
                         this.sarStandardsInfoEO = res.data || {}
@@ -3153,7 +3202,8 @@
             queryDisplayLocation() {
                 return new Promise((resolve, reject) => {
                     this.$http.get('lawssBase/utArea/getAreaList', {
-                        sarType: 'INLAND_STAND'
+                        // sarType: 'INLAND_STAND'
+                        sarType: this.$route.query.pageType
                     }, {
                         _this: this
                     }, res => {

src/pages/phone/domesticStand.vue

@@ -34,7 +34,8 @@
          <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
        </div>
        <div class="standContent">
-         <div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName}}</div>
+         <!--<div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName !== '' ? item.standEnName : item.nameshow }}</div>-->
+         <div class="standState">{{(item.nameshow && item.nameshow !== '') ? item.nameshow : (item.standName && item.standName !== '') ? item.standName : item.standEnName }}</div>
 <!--         <div class="standSubTime">标准性质:-->
 <!--           <span v-if="natureMap[item.standNature] === '强制性' "-->
 <!--                 style="color: #F56C6C; padding-left: 5px;">-->
@@ -58,6 +59,11 @@
                       {{ lawsMap[item.lawsTextState] }}
          </span>
          </div>
+         <div class="standSubTime" v-else-if="$route.query.standType === 'bussstand'" >标准状态:
+           <span v-if="item.textStatusBussName === '废止'" style="color: #F56C6C; padding-left: 5px;"> {{ item.textStatusBussName }} </span>
+           <span v-else-if="item.textStatusBussName === '参考' || item.textStatusBussName === '被代替'" style="color: #35720B; padding-left: 5px;">{{ item.textStatusBussName }}</span>
+           <span v-else style=" padding-left: 5px;">{{ item.textStatusBussName }}</span>
+         </div>
          <div class="standSubTime" v-else >标准状态:
            <span v-if="textStatusMap[item.textStatus] === '废止'"
                  style="color: #F56C6C; padding-left: 5px;">
@@ -88,6 +94,7 @@
          <span style="padding-left: 10px;min-width: 200px;">发布日期：
            {{ item.issueTime ? (item.issueTime !== '' ? $moment(item.issueTime).format("YYYY-MM-DD") : "          ") : "          " }}</span>
            <span style="padding-left: 15px;" v-if="titleType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
+           <span style="padding-left: 15px;" v-else-if="$route.query.standType === 'bussstand'">实施日期： {{item.putTime}}</span>
            <span style="padding-left: 15px;" v-else>实施日期： {{item.SSRQ}}</span>
          </div>
 
@@ -102,7 +109,7 @@
      <div v-else-if="!listFlag && moreFlag"  @click="moreList" >点击加载更多</div>
      <van-loading v-else size="24px" color="#3170A8">加载中...</van-loading>
    </div>
-   <standardSystemPopup :init-keys="standSystemKeys" @standSystemKeys="setStandSystemKeys" ref="standardSystemPopupRef" />
+   <standardSystemPopup :init-keys="standSystemKeys" @searchQuery="setSearchQuery" ref="standardSystemPopupRef" />
  </div>
 </template>
 
@@ -131,18 +138,38 @@ export default {
       textStatusMap: {},// 文本状态id与name对应
       natureMap:{},
       lawsMap:{},
+      textStatus: '现行有效',
       standSystemKeys: []
     }
   },
   methods:{
     jumpDetails(item){
-      this.$router.push({
-        name: 'domesticDetails',
-        query: {
-          id: item.id,
-          pageType: 'INLAND_STAND'
-        }
-      })
+      if (this.titleType === 'INLAND') {
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'INLAND_STAND'
+          }
+        })
+      } else if (this.titleType === 'FOREIGN') {
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'FOREIGN_STAND'
+          }
+        })
+      } else if (this.titleType === 'bussstand') {
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'BUSS'
+          }
+        })
+      }
+
     },
     scrool(){
       this.scrolled = this.$refs.cardBox.scrollTop
@@ -190,6 +217,7 @@ export default {
           selectIndex: 'stand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatus: this.textStatus,
           selectType: 'titleSearch',
           standType: 'INLAND',
           page: this.page,
@@ -227,6 +255,7 @@ export default {
           selectIndex: 'stand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatus: this.textStatus,
           selectType: 'titleSearch',
           standType: 'FOREIGN',
           page: this.page,
@@ -249,6 +278,7 @@ export default {
           selectIndex: 'bussstand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatusBuss: this.textStatus,
           selectType: 'titleSearch',
           standType: 'bussstand',
           page: this.page,
@@ -355,6 +385,7 @@ export default {
           selectIndex: 'stand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatus: this.textStatus,
           selectType: 'titleSearch',
           standType: 'INLAND',
           page: this.page,
@@ -410,6 +441,7 @@ export default {
           selectIndex: 'stand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatus: this.textStatus,
           selectType: 'titleSearch',
           standType: 'FOREIGN',
           page: this.page,
@@ -440,6 +472,7 @@ export default {
           selectIndex: 'bussstand',
           selectValue: this.searchKey,
           standSystem: this.standSystemKeys,
+          textStatusBuss: this.textStatus,
           selectType: 'titleSearch',
           standType: 'bussstand',
           page: this.page,
@@ -572,6 +605,11 @@ export default {
     onChoose () {
       this.$refs.standardSystemPopupRef.open()
     },
+    setSearchQuery (searchQuery) {
+      this.standSystemKeys = searchQuery.checkedKeys
+      this.textStatus = searchQuery.textStatusName
+      this.onSearch()
+    },
     setStandSystemKeys (standSystemKeys) {
       this.standSystemKeys = standSystemKeys
       this.onSearch()

src/pages/phone/phoneHome.vue

@@ -40,6 +40,7 @@
         <span class="content-span">标准化动态</span>
       </div>
     </div>
+    <div class="footer" style="">系统开发中...</div>
   </div>
 </template>
 
@@ -199,5 +200,12 @@ export default {
       font-weight: 500;
     }
   }
+  .footer{
+    color: #3170A7;
+    position: absolute;
+    bottom: 10px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
 }
 </style>

src/pages/phone/standDynamics.vue

@@ -199,6 +199,8 @@ export default {
       this.page++;
       if (this.messageType == "ZLZX") {
         this.getAdvice();
+
+        console.log(this.$refs.cardBoxThree.scrollTop)
       } else {
         this.onDynamics();
       }
@@ -243,6 +245,10 @@ export default {
     //获取数据
     getAdvice(first = false) {
       this.listFlag = false;
+      let scrollTop = 0
+      if (this.$refs.cardBoxThree) {
+       scrollTop = this.$refs.cardBoxThree.scrollTop
+      }
       this.$http.get("fileMaterialCenter/file-material", {
         page: first ? 1 : this.page,
         pageSize: 10,
@@ -255,6 +261,9 @@ export default {
           if (mList.length) {
             if (!first && this.standardReleaseList.length) {
               this.standardReleaseList = this.standardReleaseList.concat(mList);
+              this.$nextTick(() => {
+                this.$refs.cardBoxThree.scrollTop = scrollTop
+              })
             } else {
               this.standardReleaseList = mList;
             }
@@ -322,6 +331,7 @@ export default {
   mounted() {
     this.onDynamics();
     this.getAdvice();
+    this.$refs.cardBoxThree.addEventListener('scroll', this.scroolThree);
     //从数据库中查询下拉框数据
     this.$http.get("sys/dictype/getDicTypeListCode", {}, {
       _this: this

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -542,6 +542,7 @@ export default {
     },
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -556,8 +557,9 @@ export default {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     handleSubmit() {
@@ -566,6 +568,7 @@ export default {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
+              this.saveLoading = true
               this.$http.post('lawss/activiti/startProcessRollBack', {
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
@@ -597,9 +600,11 @@ export default {
                       this.$router.push('/processCenter')
                     }
                     this.isSubmit = false
+                    this.saveLoading = false
                   })
                 } else {
                   this.isSubmit = false
+                  this.saveLoading = false
                   this.$message.warning('流程启动失败')
                 }
               })

src/pages/processCenter/pages/creatProcess/bzdy/step2.vue

@@ -256,6 +256,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.saveLoading = true
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -270,6 +272,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                    this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             // 请求转换流程图
@@ -324,6 +329,7 @@
             },
             handleSave() {
                 this.saveLoading = true
+                this.isSubmit = true
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
@@ -331,16 +337,17 @@
                     commentText2: this.commentText2,
                 }))
                 saveTaskForPub(_formData).then(res => {
-                    this.saveLoading = false
                     this.$message.success('保存成功')
-                }).catch(e => {
+                }).finally(() => {
                     this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         var json = this.json
                         json.commentText = this.commentText2
                         json.responUserList = this.form.responUserList
@@ -355,6 +362,7 @@
                                 this.$router.push('/processCenter')
                             }
                             this.isSubmit = false
+                            this.saveLoading = false
                         })
                     } else {
                         return this.$message.warning('请完善基础信息')

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -328,6 +328,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.saveLoading = true
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -342,6 +344,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                    this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             // 请求转换流程图
@@ -429,6 +434,7 @@
             },
             handleSave() {
                 this.saveLoading = true
+                this.isSubmit = true
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
@@ -437,15 +443,16 @@
                     commentText3: this.commentText3,
                 }))
                 saveTaskForPub(_formData).then(res => {
-                    this.saveLoading = false
                     this.$message.success('保存成功')
-                }).catch(e => {
+                }).finally(() => {
                     this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             // 接受按钮
             handleAccept(){
                 this.isSubmit = true
+                this.saveLoading = true
                 execTask({
                     todoId: this.todoId // 当前节点ID
                 }).then(res => {
@@ -453,6 +460,8 @@
                         this.$message.success('接收成功')
                         this.$router.push('/processCenter')
                     }
+                }).finally(() => {
+                    this.saveLoading = false
                     this.isSubmit = false
                 })
             },
@@ -461,6 +470,7 @@
                     if (valid) {
                         this.json.dyhz = this.form.dyhz
                         this.isSubmit = true
+                        this.saveLoading = true
                         var json = this.json
                         json.commentText = this.commentText3
                         json.fileId = this.form.fileId
@@ -476,6 +486,7 @@
                                 this.$router.push('/processCenter')
                             }
                             this.isSubmit = false
+                            this.saveLoading = false
                         })
                     } else {
                         return this.$message.warning('请完善基础信息')

src/pages/processCenter/pages/creatProcess/bzdy/step4.vue

@@ -210,6 +210,7 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -304,6 +305,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.isSubmit = true
+                this.saveLoading = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -318,6 +321,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                    this.isSubmit = false
+                    this.saveLoading = false
                 })
             },
             // 请求转换流程图
@@ -355,6 +361,7 @@
             },
             handleSubmit() { // 同意
                 this.isSubmit = true
+                this.saveLoading = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText4
@@ -368,11 +375,13 @@
                         this.$router.push('/processCenter')
                     }
                     this.isSubmit = false
+                    this.saveLoading = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText4) {
                     this.isSubmit = true
+                    this.saveLoading = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText4
@@ -386,6 +395,7 @@
                             this.$router.push('/processCenter')
                         }
                         this.isSubmit = false
+                        this.saveLoading = false
                     })
                 } else {
                     this.$message.warning('请输入审批意见')

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -299,6 +299,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.saveLoading = true
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -313,6 +315,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.saveLoading = false
+                  this.isSubmit = false
                 })
             },
             // 请求转换流程图
@@ -387,6 +392,7 @@
             },
             handleSave() {
                 this.saveLoading = true
+                this.isSubmit = true
                 let json = this.form
                 json.responUserList = this.tableData
                 this.form.docUser = this.newDocUser
@@ -399,14 +405,16 @@
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
-                }).catch(e => {
+                }).finally(() => {
                     this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
+                        this.saveLoading = true
                         let json = this.jsonData
                         json.commentText = this.commentText5
                         json.hzfileId = this.form.hzfileId
@@ -423,6 +431,7 @@
                                 this.$router.push('/processCenter')
                             }
                             this.isSubmit = false
+                            this.saveLoading = false
                         })
                     }
                 })

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -202,6 +202,7 @@
                 @back="handleSubmitNo"
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                :isSubmitBack="isSubmit"
                 show-transfer
                 @transfer="handleTransfer"
                 @submit="handleSubmit"
@@ -294,6 +295,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.saveLoading = true
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -308,6 +311,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.saveLoading = false
+                  this.isSubmit = false
                 })
             },
             // 请求转换流程图
@@ -382,6 +388,7 @@
             },
             handleSubmit() {
                 this.isSubmit = true
+                this.saveLoading = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText6
@@ -395,11 +402,13 @@
                         this.$router.push('/processCenter')
                     }
                     this.isSubmit = false
+                    this.saveLoading = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText6) {
                     this.isSubmit = true
+                    this.saveLoading = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText6
@@ -413,6 +422,7 @@
                             this.$router.push('/processCenter')
                         }
                         this.isSubmit = false
+                        this.saveLoading = false
                     })
                 } else {
                     this.$message.warning('请输入审批意见')

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -201,6 +201,8 @@
                 approval
                 @back="handleSubmitNo"
                 :submitLoading="isSubmit"
+                :isSubmitBack="isSubmit"
+                :saveLoading="isSubmit"
                 show-transfer
                 @transfer="handleTransfer"
                 @submit="handleSubmit"
@@ -293,6 +295,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -307,6 +310,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.isSubmit = false
                 })
             },
             // 请求转换流程图

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -199,7 +199,8 @@
                 show-submit
                 approval
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-back
                 show-transfer
@@ -294,6 +295,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -308,6 +310,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.isSubmit = false
                 })
             },
             // 请求转换流程图

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -233,7 +233,8 @@
                 approval
                 @back="handleSubmitNo"
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 show-transfer
                 @transfer="handleTransfer"
                 @submit="handleSubmit"
@@ -337,6 +338,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -351,6 +353,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                    this.isSubmit = false
                 })
             },
             // 请求转换流程图

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -580,7 +580,6 @@ export default {
       queryTaskFirst({
         bpnId: this.$route.query.bpnId
       }).then(res => {
-      debugger
         let obj = JSON.parse(res.mes)
         let mes = {}
         if(obj.json !== undefined){
@@ -805,6 +804,7 @@ export default {
     // 保存按钮
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -816,11 +816,11 @@ export default {
         commentInfo: this.commentInfo
       }))
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 提交按钮
@@ -839,6 +839,7 @@ export default {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
+              this.saveLoading = true
               let paramsInfo = new FormData()
               // paramsInfo.append('id', this.bpnId || '')
               paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
@@ -864,8 +865,13 @@ export default {
                     }
                     this.$router.push("/processCenter");
                   }
+                }).finally(() => {
+                  this.saveLoading = false
                   this.isSubmit = false
                 })
+              }).catch(() => {
+                this.isSubmit = false
+                this.saveLoading = false
               })
             } else {
               this.$message.warning('请完成流程信息的人员选择')

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue

@@ -208,7 +208,7 @@
       show-submit
       show-back
       backBTNTexts="不涉及"
-      :isSubmitBack="isBack"
+      :isSubmitBack="isSubmit"
       :submitLoading="isSubmit"
       @back="handleSubmitNo"
       @submit="handleSubmit"
@@ -380,7 +380,7 @@ export default {
         }
         this.$refs['rh_pageData'].validate((valid) => {
           if (valid) {
-            this.isBack = true
+            this.isSubmit = true
             const params = new FormData();
             params.set('json', JSON.stringify(json))
             params.set('userId', this.$store.getters.userInfo.userId)
@@ -390,8 +390,9 @@ export default {
                 this.$message.success('退回成功')
                 this.$router.push("/processCenter");
               }
-              this.isBack = false
-            });
+            }).finally(() => {
+              this.isSubmit = false
+            })
           }
         })
       }
@@ -417,6 +418,7 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
             this.isSubmit = false
           });
         }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -467,6 +467,7 @@ export default {
     // 保存按钮
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
@@ -477,11 +478,11 @@ export default {
         commentStep3: this.commentStep3
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(e => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 提交按钮
@@ -496,6 +497,7 @@ export default {
       this.$refs['rh_pageData'].validate((valid) => {
         if (valid) {
           this.isSubmit = true
+          this.saveLoading = true
           const params = new FormData();
           params.set('json', JSON.stringify(json))
           params.set('userId', this.$store.getters.userInfo.userId)
@@ -505,8 +507,10 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(e => {
+            this.saveLoading = false
             this.isSubmit = false
-          });
+          })
         }
       })
 

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue

@@ -228,7 +228,7 @@
       show-back
       backBTNTexts="驳回"
       :submitLoading="isSubmit"
-      :isSubmitBack="isBack"
+      :isSubmitBack="isSubmit"
       @back="handleSubmitNo"
       @submit="handleSubmit"
     >
@@ -373,7 +373,7 @@ export default {
         }
         this.$refs['rh_pageData'].validate((valid) => {
           if (valid) {
-            this.isBack = true
+            this.isSubmit = true
             const params = new FormData();
             params.set('json', JSON.stringify(json))
             params.set('userId', this.$store.getters.userInfo.userId)
@@ -383,8 +383,9 @@ export default {
                 this.$message.success('退回成功')
                 this.$router.push("/processCenter");
               }
-              this.isBack = false
-            });
+            }).finally(() => {
+              this.isSubmit = false
+            })
           }
         })
       }
@@ -412,8 +413,9 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
             this.isSubmit = false
-          });
+          })
         }
       })
     },

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -722,6 +722,7 @@ export default {
     // 保存按钮
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
@@ -730,10 +731,10 @@ export default {
         commentStep5: this.commentStep5
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(() => {
+        this.isSubmit = false
         this.saveLoading = false
       })
     },
@@ -748,6 +749,7 @@ export default {
       this.$refs['rh_pageData'].validate((valid) => {
         if (valid) {
           this.isSubmit = true
+          this.saveLoading = true
           const params = new FormData();
           params.set('json', JSON.stringify(json))
           params.set('userId', this.$store.getters.userInfo.userId)
@@ -757,8 +759,10 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
             this.isSubmit = false
-          });
+            this.saveLoading = false
+          })
         }
       })
 

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue

@@ -226,7 +226,7 @@
       v-if="taskInfo !== '标准法规工程师汇总修订完毕'"
       show-submit
       show-back
-      :isSubmitBack="isBack"
+      :isSubmitBack="isSubmit"
       :submitLoading="isSubmit"
       @back="handleSubmitNo"
       @submit="handleSubmit"
@@ -396,7 +396,7 @@ export default {
         }
         this.$refs['rh_pageData'].validate((valid) => {
           if (valid) {
-            this.isBack = true
+            this.isSubmit = true
             const params = new FormData();
             params.set('json', JSON.stringify(json))
             params.set('userId', this.$store.getters.userInfo.userId)
@@ -406,8 +406,9 @@ export default {
                 this.$message.success('提交成功')
                 this.$router.push("/processCenter");
               }
-              this.isBack = false
-            });
+            }).finally(() => {
+              this.isSubmit = false
+            })
           }
         })
       }
@@ -446,8 +447,9 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
             this.isSubmit = false
-          });
+          })
         }
       })
     }

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -713,6 +713,7 @@ export default {
     /** 保存按钮*/
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -725,11 +726,11 @@ export default {
 
       }))
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     /** 提交按钮*/
@@ -748,6 +749,7 @@ export default {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
+              this.saveLoading = true
               let paramsInfo = new FormData()
               // paramsInfo.append('id', this.bpnId || '')
               paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
@@ -774,7 +776,11 @@ export default {
                     this.$router.push("/processCenter");
                   }
                   this.isSubmit = false
+                  this.saveLoading = false
                 })
+              }).catch(e => {
+                this.saveLoading = false
+                this.isSubmit = false
               })
             } else {
               this.$message.warning('请完成流程信息的人员选择')

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue

@@ -205,7 +205,7 @@
       show-back
       backBTNTexts="不涉及"
       :submitLoading="isSubmit"
-      :isSubmitBack="isBack"
+      :isSubmitBack="isSubmit"
       @back="handleSubmitNo"
       @submit="handleSubmit"
     >
@@ -341,7 +341,7 @@ export default {
         }
         this.$refs['ch_pageData'].validate((valid) => {
           if (valid) {
-            this.isBack = true
+            this.isSubmit = true
             const params = new FormData();
             params.set('json', JSON.stringify(json))
             params.set('userId', this.$store.getters.userInfo.userId)
@@ -351,8 +351,9 @@ export default {
                 this.$message.success('退回成功')
                 this.$router.push("/processCenter");
               }
-              this.isBack = false
-            });
+            }).finally(() => {
+              this.isSubmit = false
+            })
           }
         })
       }
@@ -379,8 +380,9 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
             this.isSubmit = false
-          });
+          })
         }
       })
 

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue

@@ -397,6 +397,7 @@ export default {
     // 保存按钮
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
@@ -407,11 +408,11 @@ export default {
         ch_pageData: this.ch_pageData,
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 提交按钮
@@ -426,6 +427,7 @@ export default {
       this.$refs['ch_pageData'].validate((valid) => {
         if (valid) {
           this.isSubmit = true
+          this.saveLoading = true
           const params = new FormData();
           params.set('json', JSON.stringify(json))
           params.set('userId', this.$store.getters.userInfo.userId)
@@ -435,8 +437,10 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
+            this.saveLoading = false
             this.isSubmit = false
-          });
+          })
         }
       })
 

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue

@@ -209,7 +209,7 @@
       show-submit
       show-back
       :submitLoading="isSubmit"
-      :isSubmitBack="isBack"
+      :isSubmitBack="isSubmit"
       @back="handleSubmitNo"
       @submit="handleSubmit"
     >
@@ -323,7 +323,7 @@ export default {
         }
         this.$refs['ch_pageData'].validate((valid) => {
           if (valid) {
-            this.isBack = true
+            this.isSubmit = true
             const params = new FormData();
             params.set('json', JSON.stringify(json))
             params.set('userId', this.$store.getters.userInfo.userId)
@@ -333,8 +333,9 @@ export default {
                 this.$message.success('退回成功')
                 this.$router.push("/processCenter");
               }
-              this.isBack = false
-            });
+            }).finally(() => {
+              this.isSubmit = false
+            })
           }
         })
       }
@@ -361,8 +362,9 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
             this.isSubmit = false
-          });
+          })
         }
       })
     },

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -502,6 +502,7 @@ export default {
     // 保存按钮
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
@@ -510,11 +511,11 @@ export default {
         commentStep5: this.commentStep5
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 提交按钮
@@ -527,6 +528,7 @@ export default {
       }
       this.$refs['ch_pageData'].validate((valid) => {
         if (valid) {
+          this.saveLoading = true
           this.isSubmit = true
           const params = new FormData();
           params.set('json', JSON.stringify(json))
@@ -537,8 +539,10 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
+            this.saveLoading = false
             this.isSubmit = false
-          });
+          })
         }
       })
 

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue

@@ -212,7 +212,7 @@
       v-if="taskInfo !== '标准法规工程师修订完毕'"
       show-submit
       show-back
-      :isSubmitBack="isBack"
+      :isSubmitBack="isSubmit"
       :submitLoading="isSubmit"
       @back="handleSubmitNo"
       @submit="handleSubmit"
@@ -375,7 +375,7 @@ export default {
         }
         this.$refs['ch_pageData'].validate((valid) => {
           if (valid) {
-            this.isBack = true
+            this.isSubmit = true
             const params = new FormData();
             params.set('json', JSON.stringify(json))
             params.set('userId', this.$store.getters.userInfo.userId)
@@ -385,8 +385,9 @@ export default {
                 this.$message.success('提交成功')
                 this.$router.push("/processCenter");
               }
-              this.isBack = false
-            });
+            }).finally(() => {
+              this.isSubmit = false
+            })
           }
         })
       }
@@ -425,8 +426,9 @@ export default {
               this.$message.success('提交成功')
               this.$router.push("/processCenter");
             }
+          }).finally(() => {
             this.isSubmit = false
-          });
+          })
         }
       })
 

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -1056,6 +1056,7 @@ export default {
     },
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -1069,11 +1070,11 @@ export default {
         sarType: this.sarType
       }))
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     handleSubmit() {
@@ -1129,6 +1130,7 @@ export default {
                 this.$message.warning('请选择责任人')
               } else {
                 this.isSubmit = true
+                this.saveLoading = true
                 this.$http.post('lawss/activiti/startProcessRollBack', {
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
@@ -1164,10 +1166,13 @@ export default {
                         }
                         this.$router.push('/processCenter')
                       }
+                      this.isSubmit = false
+                      this.saveLoading = false
                     })
                   } else {
                     this.$message.warning('流程启动失败')
                     this.isSubmit = false
+                    this.saveLoading = false
                   }
                 })
               }

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -332,6 +332,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.saveLoading = true
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -346,6 +348,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.saveLoading = false
+                  this.isSubmit = false
                 })
             },
           // 点击跳转标准详情
@@ -454,6 +459,7 @@
             },
             handleSave() {
                 this.saveLoading = true
+                this.isSubmit = true
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
@@ -464,10 +470,10 @@
                     standInData: this.sarType
                 }))
                 saveTaskForPub(_formData).then(res => {
-                    this.saveLoading = false
                     this.$message.success('保存成功')
-                }).catch(e => {
+                }).finally(() => {
                     this.saveLoading = false
+                    this.isSubmit = false
                 })
             },
             handleSubmit() {
@@ -483,6 +489,7 @@
                             this.$message.warning('请选择执行人')
                         } else {
                             this.isSubmit = true
+                            this.saveLoading = true
                             var json = this.json
                             json.itemList = this.itemList
                             json.commentText = this.commentText2
@@ -496,6 +503,7 @@
                                     this.$router.push('/processCenter')
                                 }
                                 this.isSubmit = false
+                                this.saveLoading = false
                             })
                         }
                     } else {

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -714,6 +714,8 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+              this.saveLoading = true
+              this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -728,6 +730,9 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.saveLoading = false
+                  this.isSubmit = false
                 })
             },
             // 请求转换流程图
@@ -831,6 +836,7 @@
             },
             handleSave() {
                 this.saveLoading = true
+                this.isSubmit = true
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
@@ -844,7 +850,8 @@
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
-                }).catch(e => {
+                }).finally(() => {
+                    this.isSubmit = false
                     this.saveLoading = false
                 })
             },
@@ -918,6 +925,7 @@
                             this.$message.warning('请选择责任人')
                         } else {
                             this.isSubmit = true
+                            this.saveLoading = true
                             var json = this.json
                             json.commentText = this.commentText3
                             json.itemList = this.itemList
@@ -932,6 +940,7 @@
                                     this.$router.push('/processCenter')
                                 }
                                 this.isSubmit = false
+                                this.saveLoading = false
                             })
                         }
                     } else {

src/pages/processCenter/pages/creatProcess/bzjd/step4.vue

@@ -256,7 +256,8 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -384,6 +385,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+                this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -398,6 +400,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                    this.isSubmit = false
                 })
             },
           // 点击跳转标准详情

src/pages/processCenter/pages/creatProcess/bzjd/step5.vue

@@ -255,7 +255,8 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-transfer
                 @transfer="handleTransfer"
@@ -381,6 +382,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+              this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -395,6 +397,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                    this.isSubmit = false
                 })
             },
           // 点击跳转标准详情

src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue

@@ -258,7 +258,8 @@
         <ProcessFooter v-if="false"
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-transfer
                 @transfer="handleTransfer"
@@ -385,6 +386,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+              this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -399,6 +401,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.isSubmit = false
                 })
             },
           // 点击跳转标准详情

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -258,7 +258,8 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
+                :saveLoading="isSubmit"
+                :isSubmitBack="isSubmit"
                 @submit="handleSubmit"
                 show-transfer
                 @transfer="handleTransfer"
@@ -384,6 +385,7 @@
                 this.drawerModal = true
             },
             checkedRole (data) {
+              this.isSubmit = true
                 changeAssigneeNew({
                     taskId: this.$route.query.taskIds, // 任务id
                     userId:this.$store.getters.userInfo.userId, // 委托人
@@ -398,6 +400,8 @@
                     } else {
                         this.$message.warning(res.message)
                     }
+                }).finally(() => {
+                  this.isSubmit = false
                 })
             },
           // 点击跳转标准详情

src/pages/processCenter/pages/creatProcess/bzpg/step1.vue

@@ -923,6 +923,7 @@ export default {
     handleSave() {
       if(!this.submitFlag){
         this.saveLoading = true;
+        this.isSubmit = true
         this.listForm.dataList = this.dataList
         let _formData = new FormData();
         _formData.append("id", this.bpnId || "");
@@ -936,13 +937,14 @@ export default {
           commentText: this.commentText
         }));
         saveTaskFirst(_formData).then(res => {
-          this.saveLoading = false;
           this.$message.success("保存成功");
-        }).catch(e => {
+        }).finally(() => {
           this.saveLoading = false;
+          this.isSubmit = false
         });
       }else{
         this.saveLoading = true;
+        this.isSubmit = true
         this.listForm.dataList = this.dataList
         let _formData = new FormData();
         _formData.append("id", this.bpnId || "");
@@ -955,11 +957,11 @@ export default {
           commentText: this.commentText
         }));
         saveTaskForPub(_formData).then(res => {
-          this.saveLoading = false;
           this.$message.success("保存成功");
           this.bpnId = res.result;
-        }).catch(e => {
+        }).finally(() => {
           this.saveLoading = false;
+          this.isSubmit = false
         });
       }
     },
@@ -977,7 +979,6 @@ export default {
           }
         })
         if(peopleFlag){
-          this.isSubmit = true;
           this.listForm.dataList = this.dataList;
           this.listForm.commentText = this.commentText;
           let json = Object.assign(this.listForm, this.roleForm);
@@ -986,6 +987,8 @@ export default {
               if (valid) {
                 this.$refs["roleForm"].validate((valid) => {
                   if (valid) {
+                    this.isSubmit = true;
+                    this.saveLoading = true
                     this.$http.post("lawss/activiti/startProcessRollBack", {
                       createUser: this.$store.getters.userInfo.userId,
                       createUserName: this.$store.getters.userInfo.userName,
@@ -1020,7 +1023,11 @@ export default {
                             this.$router.push("/processCenter");
                           }
                           this.isSubmit = false;
+                          this.saveLoading = false
                         });
+                      } else {
+                        this.isSubmit = false
+                        this.saveLoading = false
                       }
                     });
                   } else {
@@ -1038,6 +1045,8 @@ export default {
               if (valid) {
                 this.$refs["roleForm"].validate((valid) => {
                   if (valid) {
+                    this.saveLoading = true
+                    this.isSubmit = true
                     let specialJson = {
                       createUser: this.$store.getters.userInfo.userId,
                       createUserName: this.$store.getters.userInfo.userName,
@@ -1076,6 +1085,7 @@ export default {
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false;
+                      this.saveLoading = false
                     });
                   } else {
                     this.isSubmit = false;

src/pages/processCenter/pages/creatProcess/bzpg/step2.vue

@@ -202,9 +202,9 @@
     show-back
     show-transfer
     show-submit
-    :transfer-loading="isTransfer"
     :submitLoading="isSubmit"
-    :saveLoading="saveLoading"
+    :saveLoading="isSubmit"
+    :isSubmitBack="isSubmit"
     :approval="true"
     @transfer="handleTransfer"
     @back="beforeBack"
@@ -359,14 +359,13 @@ export default {
     },
     //确认转办
     checkedRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -375,6 +374,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图

src/pages/processCenter/pages/creatProcess/bzpg/step3.vue

@@ -379,7 +379,6 @@
       show-save
       show-transfer
       show-submit
-      :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
@@ -746,6 +745,7 @@ export default {
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
           this.isSubmit = true;
+          this.saveLoading = true;
           this.$http.post("lawss/activiti/completeTask", {
             taskIds: this.taskIds,
             userId: this.userId,
@@ -758,6 +758,7 @@ export default {
               this.$router.push("/processCenter");
             }
             this.isSubmit = false;
+            this.saveLoading = false;
           }, e => {
           });
         }else{
@@ -769,6 +770,7 @@ export default {
     //保存
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       // this.listForm.dataList = this.dataList;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
@@ -780,11 +782,11 @@ export default {
         commentText: this.commentText
       }));
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false;
       });
     },
     checkedRole2(data) {
@@ -795,14 +797,14 @@ export default {
     },
     //确认转办
     checkedRole(data) {
-      this.assigneeNewLoading = true;
+      this.saveLoading = true;
+      this.isSubmit = true;
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false;
         if (res.success) {
           this.drawerModal = false;
           this.$message.success("调整成功");
@@ -811,6 +813,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.saveLoading = false;
+        this.isSubmit = false;
       })
     },
     // 请求转换流程图

src/pages/processCenter/pages/creatProcess/bzpg/step4.vue

@@ -267,7 +267,6 @@
     <ProcessFooter
       show-transfer
       show-submit
-      :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
@@ -450,6 +449,7 @@ export default {
         this.listForm.dataList = this.dataList
         const json = JSON.stringify(this.listForm);
         this.isSubmit = true
+        this.saveLoading = true
         this.$http.post('lawss/activiti/completeTask', {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -462,20 +462,21 @@ export default {
             this.$router.push('/processCenter')
           }
           this.isSubmit = false
+          this.saveLoading = false
         }, e => {
         });
       }
     },
     //确认转办
     checkedRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -484,6 +485,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
+        this.saveLoading = false
       })
     },
     // 请求转换流程图

src/pages/processCenter/pages/creatProcess/bzpg/step5.vue

@@ -448,7 +448,6 @@
       :show-submit="submitShow"
       :show-confirm="acceptShow"
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
       @transfer="handleTransfer"
@@ -697,7 +696,8 @@ export default {
     },
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.saveLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
@@ -713,6 +713,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -840,6 +843,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       let _formData = new FormData();
       this.listForm.dataList = this.dataList;
       _formData.append("id", this.bpnId || "");
@@ -853,13 +857,15 @@ export default {
         this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     // 接受按钮
     handleAccept(){
       this.isSubmit = true
+      this.saveLoading = true;
       execTask({
         todoId: this.todoId // 当前节点ID
       }).then(res => {
@@ -867,6 +873,8 @@ export default {
           this.$message.success('接收成功')
           this.$router.push('/processCenter')
         }
+      }).finally(() => {
+        this.saveLoading = false;
         this.isSubmit = false
       })
     },
@@ -917,6 +925,7 @@ export default {
             this.listForm.dataList = this.dataList;
             const json = JSON.stringify(this.listForm);
             this.isSubmit = true
+            this.saveLoading = true
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.taskIds,
               userId: this.userId,
@@ -929,6 +938,7 @@ export default {
                 this.$router.push("/processCenter");
               }
               this.isSubmit = false;
+              this.saveLoading = false;
             }, e => {
 
             });

src/pages/processCenter/pages/creatProcess/bzpg/step6.vue

@@ -352,8 +352,8 @@
       show-submit
       show-transfer
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :transfer-loading="isTransfer"
+      :saveLoading="isSubmit"
+      :isSubmitBack="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -477,14 +477,13 @@ export default {
     },
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -493,6 +492,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图

src/pages/processCenter/pages/creatProcess/bzpg/step7.vue

@@ -361,7 +361,6 @@
       show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
-      :transfer-loading="isTransfer"
       :approval="true"
       @transfer="handleTransfer"
       @submit="handleSubmit"
@@ -490,14 +489,14 @@ export default {
     },
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.saveLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -506,6 +505,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -633,6 +635,7 @@ export default {
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
+      this.saveLoading = false
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -645,6 +648,7 @@ export default {
           this.$router.push('/processCenter')
         }
         this.isSubmit = false
+        this.saveLoading = false
       }, e => {
       });
 

src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue

@@ -371,7 +371,6 @@
       show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
-      :transfer-loading="isTransfer"
       :approval="true"
       @transfer="handleTransfer"
       @submit="handleSubmit"
@@ -502,14 +501,14 @@ export default {
     },
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.saveLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -518,6 +517,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -646,6 +648,7 @@ export default {
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
+      this.saveLoading = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -658,6 +661,7 @@ export default {
           this.$router.push('/processCenter')
         }
         this.isSubmit = false
+        this.saveLoading = false
       }, e => {
       });
 

src/pages/processCenter/pages/creatProcess/bzpg/step8.vue

@@ -361,7 +361,6 @@
       show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
-      :transfer-loading="isTransfer"
       :approval="true"
       @transfer="handleTransfer"
       @submit="handleSubmit"
@@ -490,7 +489,8 @@ export default {
     },
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.saveLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
@@ -506,6 +506,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -633,6 +636,7 @@ export default {
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
+      this.saveLoading = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -645,6 +649,7 @@ export default {
           this.$router.push('/processCenter')
         }
         this.isSubmit = false
+        this.saveLoading = false
       }, e => {
       });
 

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -1051,6 +1051,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       this.listForm.dataList = this.dataList
       this.listForm.fileName = this.fileInfoList
       let _formData = new FormData();
@@ -1068,8 +1069,9 @@ export default {
         this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     //提交事件
@@ -1087,6 +1089,7 @@ export default {
             this.$refs["Form"].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
+                this.saveLoading = true
                 this.$http.post("lawss/activiti/startProcessRollBack", {
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
@@ -1121,7 +1124,11 @@ export default {
                         this.$router.push("/processCenter");
                       }
                       this.isSubmit = false
+                      this.saveLoading = false
                     });
+                  } else {
+                    this.isSubmit = false
+                    this.saveLoading = false
                   }
                 });
               } else {

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -197,7 +197,7 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transferLoading="isTransfer"
+      :transferLoading="isSubmit"
       @transfer="handleTransfer"
       @submit="handleSubmit"
     >
@@ -379,14 +379,13 @@ export default {
     },
     //确认转办
     checkedRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -395,6 +394,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -377,7 +377,6 @@
       show-save
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @transfer="handleTransfer"
       @save="handleSave"
@@ -519,14 +518,14 @@ export default {
   methods: {
     //确认转办
     checkedRole (data) {
-      this.assigneeNewLoading = true
+      this.saveLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -535,6 +534,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -847,6 +849,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "4");
@@ -856,11 +859,11 @@ export default {
         commentText: this.commentText
       }));
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     //提交事件
@@ -869,6 +872,7 @@ export default {
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
+      this.saveLoading = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -881,6 +885,7 @@ export default {
           this.$router.push('/processCenter')
         }
         this.isSubmit = false
+        this.saveLoading = false
       });
     },
     //标准表格选择框改变

src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue

@@ -199,9 +199,9 @@
       show-transfer
       show-back
       show-submit
-      :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
       :approval="true"
       @transfer="handleTransfer"
       @back="beforeBack"
@@ -296,14 +296,14 @@ export default {
   methods: {
     //确认转办
     checkedRole (data) {
-      this.assigneeNewLoading = true
+      this.saveLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -312,6 +312,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -475,6 +478,7 @@ export default {
     //提交事件
     handleSubmit() {
       this.isSubmit = true;
+      this.saveLoading = true
       this.listForm.approvalOpinion = "2";
       this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -490,6 +494,7 @@ export default {
             this.$router.push("/processCenter");
           }
           this.isSubmit = false
+          this.saveLoading = false
         });
     },
     //选择标准取消事件

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue

@@ -187,6 +187,7 @@ export default {
       this.$refs["Form"].validate((valid) => {
         if (valid) {
           this.isSubmit = true
+          this.saveLoading = true
           this.$http.post("lawss/activiti/startProcessRollBack", {
             createUser: this.$store.getters.userInfo.userId,
             createUserName: this.$store.getters.userInfo.userName,
@@ -219,7 +220,11 @@ export default {
                   this.$router.push("/processCenter");
                 }
                 this.isSubmit = false
+                this.saveLoading = false
               });
+            } else {
+              this.saveLoading = false
+              this.isSubmit = false
             }
           });
         } else {
@@ -230,6 +235,7 @@ export default {
     },
     handleSave(){
       this.saveLoading = true;
+      this.isSubmit = true;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -240,11 +246,11 @@ export default {
         roleForm: this.roleForm,
       }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false;
       });
     },
   },

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue

@@ -91,7 +91,7 @@
       show-save
       show-submit
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
+      :saveLoading="isSubmit"
       @save="handleSave"
       @submit="handleSubmit"
     >

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue

@@ -390,9 +390,9 @@
       show-save
       show-submit
       show-record
-      :recordLoading="recordLoading"
+      :recordLoading="isSubmit"
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
+      :saveLoading="isSubmit"
       @record="handleRecord"
       @save="handleSave"
       @submit="handleSubmit"
@@ -641,6 +641,7 @@ export default {
       let json = {
         signFlag: '2',
       };
+      this.isSubmit = true;
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.$route.query.taskIds,
         userId: this.$store.getters.userInfo.userId,
@@ -670,6 +671,7 @@ export default {
           wbbzform: this.wbbzform,
           signFlag: '1',
         };
+        this.isSubmit = true;
         this.$refs["wbbzForm"].validate((valid) => {
           if (valid) {
             this.$http.post("lawss/activiti/completeTask", {

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue

@@ -223,8 +223,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -369,6 +369,7 @@ export default {
         };
         this.$refs["wbbzForm"].validate((valid) => {
           if (valid) {
+            this.isSubmit = true
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.$route.query.taskIds,
               userId: this.$store.getters.userInfo.userId,
@@ -389,7 +390,6 @@ export default {
       }
     },
     handleSubmit() {
-      this.isSubmit = true;
       if (this.participantsData.length < 1) {
         this.$message.warning("项目信息不能为空");
       } else {
@@ -406,6 +406,7 @@ export default {
         };
         this.$refs["wbbzForm"].validate((valid) => {
           if (valid) {
+            this.isSubmit = true;
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.$route.query.taskIds,
               userId: this.$store.getters.userInfo.userId,
@@ -433,14 +434,13 @@ export default {
     },
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -449,6 +449,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
   },

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue

@@ -223,8 +223,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -369,6 +369,7 @@ export default {
         };
         this.$refs["wbbzForm"].validate((valid) => {
           if (valid) {
+            this.isSubmit = true
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.$route.query.taskIds,
               userId: this.$store.getters.userInfo.userId,
@@ -389,7 +390,6 @@ export default {
       }
     },
     handleSubmit() {
-      this.isSubmit = true
       if (this.participantsData.length < 1) {
         this.$message.warning("项目信息不能为空");
       } else {
@@ -406,6 +406,7 @@ export default {
         };
         this.$refs["wbbzForm"].validate((valid) => {
           if (valid) {
+            this.isSubmit = true
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.$route.query.taskIds,
               userId: this.$store.getters.userInfo.userId,
@@ -433,14 +434,13 @@ export default {
     },
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -449,6 +449,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
   },

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue

@@ -223,8 +223,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -369,6 +369,7 @@ export default {
         };
         this.$refs["wbbzForm"].validate((valid) => {
           if (valid) {
+            this.isSubmit = true;
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.$route.query.taskIds,
               userId: this.$store.getters.userInfo.userId,
@@ -389,7 +390,6 @@ export default {
       }
     },
     handleSubmit() {
-      this.isSubmit = true
       if (this.participantsData.length < 1) {
         this.$message.warning("项目信息不能为空");
       } else {
@@ -406,6 +406,7 @@ export default {
         };
         this.$refs["wbbzForm"].validate((valid) => {
           if (valid) {
+            this.isSubmit = true
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.$route.query.taskIds,
               userId: this.$store.getters.userInfo.userId,
@@ -433,14 +434,13 @@ export default {
     },
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -449,6 +449,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
   },

src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue

@@ -186,6 +186,7 @@ export default {
       this.$refs["Form"].validate((valid) => {
         if (valid) {
           this.isSubmit = true
+          this.saveLoading = true
           this.$http.post("lawss/activiti/startProcessRollBack", {
             createUser: this.$store.getters.userInfo.userId,
             createUserName: this.$store.getters.userInfo.userName,
@@ -218,7 +219,11 @@ export default {
                   this.$router.push("/processCenter");
                 }
                 this.isSubmit = false
+                this.saveLoading = false
               });
+            } else {
+              this.saveLoading = false
+              this.isSubmit = false
             }
           });
         } else {
@@ -229,6 +234,7 @@ export default {
     },
     handleSave(){
       this.saveLoading = true;
+      this.isSubmit = true;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -239,11 +245,11 @@ export default {
         roleForm: this.roleForm,
       }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false;
       });
     },
   },

src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue

@@ -323,9 +323,9 @@
       show-save
       show-submit
       show-record
-      :recordLoading="recordLoading"
+      :recordLoading="isSubmit"
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
+      :saveLoading="isSubmit"
       @record="handleRecord"
       @save="handleSave"
       @submit="handleSubmit"
@@ -561,7 +561,7 @@ export default {
     },
     //不备案
     handleRecord(){
-      this.recordLoading = true
+      this.isSubmit = true
       this.dlFlag = '0'
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
@@ -578,14 +578,14 @@ export default {
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
-        this.recordLoading = false
+        this.isSubmit = false
       }, e => {
 
       });
     },
     //流程保存
     handleSave() {
-      this.saveLoading = true
+      this.isSubmit = true
       this.wbbzform.fileName = this.fileInfoList
       this.wbbzform.commentText = this.commentText;
       this.wbbzform.participantsData = this.participantsData
@@ -600,11 +600,10 @@ export default {
         form: this.wbbzform,
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
-        this.saveLoading = false
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     //流程提交

src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue

@@ -278,8 +278,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -384,14 +384,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -400,6 +399,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     processTable() {

src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue

@@ -278,8 +278,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -384,14 +384,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -400,6 +399,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     processTable() {

src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue

@@ -953,32 +953,41 @@
                                     type="index"
                                     label="序号"
                                     width="80"
-                                    align="center"
-                            ></el-table-column>
+                                    align="center">
+                              <template slot-scope="scope">
+                                <span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.$index + 1 }}</span>
+                              </template>
+                            </el-table-column>
                             <el-table-column
                                     label="企标标准号"
                                     align="center"
                             >
                                 <template slot-scope="scope">
-                                    <a @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
+                                    <a :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                                 </template>
                             </el-table-column>
                             <el-table-column
                                     prop="standName"
                                     label="中文名称"
                                     align="center">
+                              <template slot-scope="scope">
+                                <span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.standName }}</span>
+                              </template>
                             </el-table-column>
                             <el-table-column
                                     prop="standEnName"
                                     label="英文名称"
                                     align="center">
+                              <template slot-scope="scope">
+                                <span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.standEnName }}</span>
+                              </template>
                             </el-table-column>
                             <el-table-column
                                     prop="textStatus"
                                     label="文本状态"
                                     align="center">
                               <template slot-scope="scope">
-                                <span>{{ scope.row.standStatusShow }}</span>
+                                <span :style="{color: scope.row.standStatusShow === '作废'? '#F56C6C': '#333'}">{{ scope.row.standStatusShow }}</span>
                               </template>
                             </el-table-column>
                             <el-table-column label="操作" align="center" width="80">
@@ -2097,6 +2106,9 @@
                             _this: this
                           }, res => {
                             if(res && res.data){
+                              if (res.data.textStatusBussShow === '作废') {
+                                this.$message.error('本版本已作废')
+                              }
                               const bringData = res.data
                               this.FBGBUSSFileList=[]
                               this.BZSMBUSSFileList=[]

src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue

@@ -2620,7 +2620,7 @@
                                             if(res.ok){
                                               this.completeTask()
                                             }else{
-                                              this.$message.error(res.data)
+                                              this.$message.error(res.message)
                                             }
                                           })
                                     }else{
@@ -2693,7 +2693,9 @@
                     this.form.topId = this.pId
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
-                    this.form.issueTime = this.dateFormatter()
+                    if (this.form.standStatus !== '3') {
+                      this.form.issueTime = this.dateFormatter()
+                    }
                     this.form['id'] = item.id
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue

@@ -1122,7 +1122,7 @@ export default {
     form: {
       handler: function (val) {
         if(val){
-          this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList);
+          this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,false,this.fileList,'',this.madelSubList);
         }
       },
       deep: true //对象的深度验证

src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue

@@ -2977,6 +2977,7 @@
                 if (type === 'preview') {
                     this.$onlineEditPreview(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form)
                 } else {
+                    this.handleSave()
                     this.$onlineEdit(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form)
                 }
             },
@@ -3444,7 +3445,7 @@
                                                     if (res.success) {
                                                         this.$message.success(res.message)
                                                         const planForm = {}
-                                                        planForm.id = this.form.planId
+                                                        planForm.id = this.form.esId
                                                         planForm.reviseStatus = this.form.reviseStatus
                                                         planForm.standCode = this.form.DTQBBHBUSS
                                                         planForm.processType = "buss1"

src/pages/processCenter/pages/creatProcess/qbrk/step1.vue

@@ -3471,7 +3471,7 @@
                                             if (res.success) {
                                                 this.$message.success(res.message)
                                                 const planForm = {}
-                                                planForm.id = this.form.planId
+                                                planForm.id = this.form.esId
                                                 planForm.reviseStatus = this.form.reviseStatus
                                                 planForm.standCode = this.form.DTQBBHBUSS
                                                 planForm.processType = "buss1"

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -2786,7 +2786,7 @@
                         // 自动匹配配置标准
                         this.saveConfStand(res.data)
                         const planForm = {}
-                        planForm.id = this.form.planId
+                        planForm.id = this.form.esId
                         planForm.planStatus = '4'
                         planForm.reviseStatus = this.form.reviseStatus
                         planForm.standCode = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS : this.form.standCode

src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue

@@ -2772,7 +2772,7 @@
                             if (res.success) {
                                 this.$message.success(res.message)
                                 const planForm = {}
-                                planForm.id = this.form.planId
+                                planForm.id = this.form.esId
                                 planForm.reviseStatus = this.form.reviseStatus
                                 planForm.standCode = this.form.DTQBBHBUSS
                                 planForm.processType = "buss1";

src/pages/processCenter/pages/creatProcess/wbsm/step1.vue

@@ -644,6 +644,7 @@ export default {
     // 保存按钮
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -655,11 +656,11 @@ export default {
         commentText: this.commentText
       }))
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
+      }).finally(e => {
         this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 提交按钮
@@ -681,6 +682,7 @@ export default {
           this.$refs["Form"].validate((valid) => {
             if (valid) {
               this.isSubmit = true
+              this.saveLoading = true
               this.$http.post("lawss/activiti/startProcessRollBack", {
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
@@ -714,7 +716,11 @@ export default {
                       this.$router.push("/processCenter");
                     }
                     this.isSubmit = false
+                    this.saveLoading = false
                   });
+                } else {
+                  this.saveLoading = false
+                  this.isSubmit = false
                 }
               });
             } else {
@@ -739,6 +745,7 @@ export default {
           this.$refs["Form"].validate((valid) => {
             if (valid) {
               this.isSubmit = true
+              this.saveLoading = true
               this.$http.post("lawss/activiti/completeTask", {
                 taskIds: this.$route.query.taskIds,
                 userId: this.$store.getters.userInfo.userId,
@@ -751,6 +758,7 @@ export default {
                   this.$router.push("/processCenter");
                 }
                 this.isSubmit = false
+                this.saveLoading = false
               });
             } else {
               return this.$message.warning("请完善人员信息");

src/pages/processCenter/pages/creatProcess/wbsm/step2.vue

@@ -144,8 +144,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -256,14 +256,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -272,6 +271,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     processTable() {
@@ -397,6 +398,7 @@ export default {
           roleForm: this.roleForm
         }
         var json = JSON.stringify(son)
+        this.isSubmit = true
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -408,6 +410,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false
         }, e => {
         });
       }

src/pages/processCenter/pages/creatProcess/wbsm/step3.vue

@@ -144,8 +144,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -256,14 +256,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -272,6 +271,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     processTable() {
@@ -397,6 +398,7 @@ export default {
           roleForm: this.roleForm
         }
         var json = JSON.stringify(son)
+        this.isSubmit = true
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -408,6 +410,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false
         }, e => {
         });
       }

src/pages/processCenter/pages/creatProcess/wbsm/step4.vue

@@ -144,8 +144,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -256,14 +256,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -272,6 +271,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     processTable() {
@@ -397,6 +398,7 @@ export default {
           roleForm: this.roleForm
         }
         var json = JSON.stringify(son)
+        this.isSubmit = true
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -408,6 +410,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false
         }, e => {
         });
       }

src/pages/processCenter/pages/creatProcess/wbsm/step5.vue

@@ -144,8 +144,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -256,14 +256,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -272,6 +271,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     processTable() {
@@ -397,6 +398,7 @@ export default {
           roleForm: this.roleForm
         }
         var json = JSON.stringify(son)
+        this.isSubmit = true
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -408,6 +410,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false
         }, e => {
         });
       }

src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue

@@ -608,6 +608,7 @@ export default {
     // 保存按钮
     handleSave() {
       this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
@@ -619,12 +620,12 @@ export default {
         commentText: this.commentText
       }))
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
-        this.saveLoading = false
-      })
+      }).finally(() => {
+        this.isSubmit = false;
+        this.saveLoading = false;
+      });
     },
     // 提交按钮
     handleSubmit() {
@@ -650,6 +651,7 @@ export default {
             this.$refs['roleForm'].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
+                this.saveLoading = true
                 let paramsInfo = new FormData()
                 // paramsInfo.append('id', this.bpnId || '')
                 paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
@@ -680,7 +682,13 @@ export default {
                       this.$router.push("/processCenter");
                     }
                     this.isSubmit = false
-                  })
+                  }).finally(() => {
+                    this.isSubmit = false;
+                    this.saveLoading = false;
+                  });
+                }).catch(e => {
+                  this.isSubmit = false;
+                  this.saveLoading = false;
                 })
               }
             })
@@ -698,6 +706,8 @@ export default {
                     commentText: this.commentText
                   }
                 };
+                this.isSubmit = true
+                this.saveLoading = true
                 this.$http.post("lawss/activiti/completeTaskNew", {
                   taskIds: this.$route.query.taskIds,
                   userId: this.$store.getters.userInfo.userId,
@@ -719,6 +729,7 @@ export default {
                     this.$router.push("/processCenter");
                   }
                   this.isSubmit = false;
+                  this.saveLoading = false;
                 });
               } else {
                 this.isSubmit = false;

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -151,8 +151,8 @@
       show-transfer
       show-back
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :transferLoading="turnLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       @back="beforeBack"
       @transfer="handleTurnTo"
       @save="handleSave"
@@ -322,7 +322,7 @@ export default {
     },
     // 保存按钮
     handleSave() {
-      this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
@@ -331,11 +331,10 @@ export default {
         commentInfo: this.commentInfo
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
-        this.saveLoading = false
+      }).finally(e => {
+        this.isSubmit = false
       })
     },
     //驳回按钮
@@ -370,13 +369,13 @@ export default {
         params.set('json', JSON.stringify(json))
         params.set('userId', this.$store.getters.userInfo.userId)
         params.set('taskIds', this.taskIds)
+        this.isSubmit = true
         completeTask(params).then(res => {
           if(res.success === true) {
             this.$message.success('提交成功')
             this.$router.push("/processCenter");
           }
-          this.isSubmit = false
-        }).catch(e => {
+        }).finally(() => {
           this.isSubmit = false
         })
       }
@@ -384,7 +383,6 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      this.isSubmit = true
       let zqa = new Map();
       for (let lastDataListElement of this.dataList) {
         let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
@@ -420,20 +418,20 @@ export default {
       params.set('json', JSON.stringify(json))
       params.set('userId', this.$store.getters.userInfo.userId)
       params.set('taskIds', this.taskIds)
+      this.isSubmit = true
       completeTask(params).then(res => {
           if(res.success === true) {
             this.$message.success('提交成功')
             this.$router.push("/processCenter");
           }
-        this.isSubmit = false
-        }).catch(e => {
+        }).finally(e => {
         this.isSubmit = false
       })
     },
 
     drawerCheck (data) {
       if (this.drawerTitle === '转办处理人') {
-        this.turnLoading = true
+        this.isSubmit = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
           assignee: data[0].id, // 被委托人
@@ -447,6 +445,8 @@ export default {
           } else {
             this.$message.warning(res.message)
           }
+        }).finally(() => {
+          this.isSubmit = false
         })
       } else {
         this.roleRow = data[0]

src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue

@@ -154,8 +154,8 @@
       show-submit
       show-transfer
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :transferLoading="turnLoading"
+      :saveLoading="isSubmit"
+      :isSubmitBack="isSubmit"
       @transfer="handleTurnTo"
       @back="handleSubmitNo"
       @save="handleSave"
@@ -366,11 +366,14 @@ export default {
         params.set('json', JSON.stringify(json))
         params.set('userId', this.$store.getters.userInfo.userId)
         params.set('taskIds', this.taskIds)
+        this.isSubmit = true
         completeTask(params).then(res => {
           if (res.success) {
             this.$message.success('驳回成功')
             this.$router.push('/processCenter')
           }
+        }).finally(() => {
+          this.isSubmit = false
         })
        } else {
           this.$message.warning('请输入反馈意见')
@@ -407,7 +410,7 @@ export default {
       for(let item of zqa) {
         list.push(item[1])
       }
-      this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
@@ -416,16 +419,14 @@ export default {
         textarea: this.textarea
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
-        this.saveLoading = false
+      }).finally(e => {
+        this.isSubmit = false
       })
     },
     // 提交按钮
     handleSubmit() {
-      this.isSubmit = true
       let flag=false
       this.dataList.forEach(item => {
         if (item.dutyPeople === '') {
@@ -462,20 +463,20 @@ export default {
       params.set('json', JSON.stringify(json))
       params.set('userId', this.$store.getters.userInfo.userId)
       params.set('taskIds', this.taskIds)
+      this.isSubmit = true
       completeTask(params).then(res => {
         if (res.success === true) {
           this.$message.success('提交成功')
           this.$router.push("/processCenter");
         }
-        this.isSubmit = false
-      }).catch(e => {
+      }).finally(e => {
         this.isSubmit = false
       })
     },
 
     drawerCheck (data) {
       if (this.drawerTitle === '转办处理人') {
-        this.turnLoading = true
+        this.isSubmit = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
           assignee: data[0].id, // 被委托人
@@ -483,12 +484,13 @@ export default {
           pId: this.pId // 流程实例
         }).then(res =>{
           if (res.success) {
-            this.turnLoading = false
             this.$message.success('调整成功')
             this.$router.push("/processCenter")
           } else {
             this.$message.warning(res.message)
           }
+        }).finally(() => {
+          this.isSubmit = false
         })
       } else {
         this.roleForm = data[0]

src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue

@@ -153,8 +153,8 @@
       show-submit
       show-transfer
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :transferLoading="turnLoading"
+      :saveLoading="isSubmit"
+      :isSubmitBack="isSubmit"
       @transfer="handleTurnTo"
       @back="handleSubmitNo"
       @save="handleSave"
@@ -341,12 +341,15 @@ export default {
         params.set('json', JSON.stringify(json))
         params.set('userId', this.$store.getters.userInfo.userId)
         params.set('taskIds', this.taskIds)
+        this.isSubmit = true
         completeTask(params).then(res => {
           if (res.success) {
             this.$message.success('驳回成功')
             this.$router.push('/processCenter')
           }
-        })
+        }).finally(() => {
+          this.isSubmit = false;
+        });
        } else {
           this.$message.warning('请输入反馈意见')
          }
@@ -382,7 +385,7 @@ export default {
       for(let item of zqa) {
         list.push(item[1])
       }
-      this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
@@ -391,16 +394,14 @@ export default {
         textarea: this.textarea
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
-        this.saveLoading = false
+      }).finally(e => {
+        this.isSubmit = false
       })
     },
     // 提交按钮
     handleSubmit() {
-      this.isSubmit = true
       let flag=false
       this.dataList.forEach(item => {
         if (item.dutyPeople === '') {
@@ -437,20 +438,20 @@ export default {
       params.set('json', JSON.stringify(json))
       params.set('userId', this.$store.getters.userInfo.userId)
       params.set('taskIds', this.taskIds)
+      this.isSubmit = true
       completeTask(params).then(res => {
         if (res.success === true) {
           this.$message.success('提交成功')
           this.$router.push("/processCenter");
         }
-        this.isSubmit = false
-      }).catch(e => {
+      }).finally(e => {
         this.isSubmit = false
       })
     },
 
     drawerCheck (data) {
       if (this.drawerTitle === '转办处理人') {
-        this.turnLoading = true
+        this.isSubmit = true
         changeAssigneeNew({
           taskId: this.taskIds, // 任务id
           assignee: data[0].id, // 被委托人
@@ -458,12 +459,13 @@ export default {
           pId: this.pId // 流程实例
         }).then(res =>{
           if (res.success) {
-            this.turnLoading = false
             this.$message.success('调整成功')
             this.$router.push("/processCenter")
           } else {
             this.$message.warning(res.message)
           }
+        }).finally(() => {
+          this.isSubmit = false
         })
       } else {
         this.roleForm = data[0]

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -155,8 +155,7 @@
       :show-submit="submitShow"
       :show-confirm="acceptShow"
       :submitLoading="isSubmit"
-      :saveLoading="saveLoading"
-      :transferLoading="turnLoading"
+      :saveLoading="isSubmit"
       @transfer="handleTurnTo"
       @save="handleSave"
       @submit="handleSubmit"
@@ -389,21 +388,21 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     drawerCheck (data) {
-      this.turnLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.userId, // 委托人
         pId: this.pId // 流程实例
       }).then(res =>{
-        this.isSubmit = true
         if (res.success) {
-          this.turnLoading = false
           this.$message.success('调整成功')
           this.$router.push("/processCenter")
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
       this.modalshowflag = false
     },
@@ -429,7 +428,7 @@ export default {
       for(let item of zqa) {
         list.push(item[1].standardInfoList)
       }
-      this.saveLoading = true
+      this.isSubmit = true
       let _formData = new FormData()
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
@@ -438,11 +437,10 @@ export default {
         commentInput: this.commentInput
       }))
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-      }).catch(e => {
-        this.saveLoading = false
+      }).finally(e => {
+        this.isSubmit = false
       })
     },
     // 接受按钮
@@ -455,12 +453,12 @@ export default {
           this.$message.success('接收成功')
           this.$router.push('/processCenter')
         }
-        this.isSubmit = false
-      })
+      }).finally(() => {
+        this.isSubmit = false;
+      });
     },
     // 提交按钮
     handleSubmit() {
-      this.isSubmit = true
       let flag = false
       this.dataList.forEach(item => {
         if (item.fileText.length === 0) {
@@ -479,15 +477,15 @@ export default {
       params.set('json', JSON.stringify(json))
       params.set('userId', this.$store.getters.userInfo.userId)
       params.set('taskIds', this.taskIds)
+      this.isSubmit = true
       completeTask(params).then(res => {
         if(res.success === true) {
           this.$message.success('提交成功')
           this.$router.push("/processCenter");
         }
-        this.isSubmit = false
-      }).catch(e => {
-        this.isSubmit = false
-      })
+      }).finally(() => {
+        this.isSubmit = false;
+      });
     },
 
     //未整改项抽屉中的查询按钮

src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue

@@ -135,8 +135,7 @@
       show-transfer
       @back="handleSubmitNo"
       :submitLoading="isSubmit"
-      :isSubmitBack="backLoading"
-      :transferLoading="turnLoading"
+      :isSubmitBack="isSubmit"
       @transfer="handleTurnTo"
       @submit="handleSubmit"
       submitBTNText="同意"
@@ -312,7 +311,7 @@ export default {
       })
     },
     drawerCheck (data) {
-      this.turnLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
@@ -320,12 +319,13 @@ export default {
         pId: this.pId // 流程实例
       }).then(res =>{
         if (res.success) {
-          this.turnLoading = false
           this.$message.success('调整成功')
           this.$router.push("/processCenter")
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
       this.modalshowflag = false
     },
@@ -335,13 +335,13 @@ export default {
       this.drawerTitle = '转办处理人'
     },
     handleSubmitNo() {
-      this.backLoading = true
       if (this.commentText) {
         var json = {
           responUserList: this.dataList,
           actionFlag: 1,
           commentText: this.commentText
         }
+        this.isSubmit = true
         this.$http.post('lawss/activiti/completeTask', {
           json: JSON.stringify(json),
           taskId: this.taskIds,
@@ -350,12 +350,11 @@ export default {
           if (res.success) {
             this.$message.success('驳回成功')
             this.$router.push('/processCenter')
-            this.backLoading = false
           }
+          this.isSubmit = false
         })
       } else {
         this.$message.warning('请输入反馈意见')
-        this.backLoading = false
       }
     },
     //未整改项抽屉中的查询按钮

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -814,6 +814,7 @@ export default {
     //流程保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       this.listForm.dataList = this.dataList
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
@@ -826,11 +827,11 @@ export default {
         commentText: this.commentText
       }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     //流程提交事件
@@ -858,6 +859,7 @@ export default {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
+                  this.saveLoading = true
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
@@ -891,7 +893,11 @@ export default {
                           this.$router.push("/processCenter");
                         }
                         this.isSubmit = false;
+                        this.saveLoading = false
                       });
+                    } else {
+                      this.saveLoading = false
+                      this.isSubmit = false;
                     }
                   });
                 } else {

src/pages/processCenter/pages/creatProcess/xmpg/step2.vue

@@ -141,7 +141,7 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
-    <ProcessFooter :saveLoading="saveLoading" :submitLoading="isSubmit" :transfer-loading="isTransfer" show-save
+    <ProcessFooter :saveLoading="saveLoading" :submitLoading="isSubmit" show-save
                    show-submit
                    show-transfer @save="handleSave" @submit="handleSubmit" @transfer="handleTransfer">
     </ProcessFooter>
@@ -219,7 +219,8 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole(data) {
-      this.assigneeNewLoading = true;
+      this.saveLoading = true;
+      this.isSubmit = true;
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
@@ -235,6 +236,9 @@ export default {
         } else {
           this.$message.warning(res.message);
         }
+      }).finally(() => {
+        this.saveLoading = false;
+        this.isSubmit = false;
       });
     },
     // 请求转换流程图
@@ -423,6 +427,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "6");
@@ -432,11 +437,11 @@ export default {
         commentText: this.commentText
       }));
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     //提交事件
@@ -449,7 +454,6 @@ export default {
       dataChildren.forEach((item, index) => {
         dataListChildren = dataListChildren.concat(item);
       });
-      this.isSubmit = true;
       this.listForm.breakdownList.map(item => {
         if(item.termsConditions){
           item.termsConditions = ''
@@ -461,9 +465,10 @@ export default {
       const json = JSON.stringify(this.listForm);
       if(this.nodeList.length == 0){
         this.$message.warning('请先分发责任人')
-        this.isSubmit = false;
         return
       }
+      this.isSubmit = true;
+      this.saveLoading = true
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -476,6 +481,7 @@ export default {
           this.$router.push("/processCenter");
         }
         this.isSubmit = false;
+        this.saveLoading = false
       }, e => {
       });
     },

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -376,7 +376,6 @@
       :show-submit="submitShow"
       :show-confirm="acceptShow"
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
       @transfer="handleTransfer"
@@ -609,14 +608,14 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole(data) {
-      this.assigneeNewLoading = true;
+      this.saveLoading = true;
+      this.isSubmit = true;
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false;
         if (res.success) {
           this.drawerModal = false;
           this.$message.success("调整成功");
@@ -625,6 +624,9 @@ export default {
         } else {
           this.$message.warning(res.message);
         }
+      }).finally(() => {
+        this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     // 请求转换流程图
@@ -903,6 +905,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "6");
@@ -912,16 +915,17 @@ export default {
         commentText: this.commentText
       }));
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     // 接受按钮
     handleAccept() {
       this.isSubmit = true;
+      this.saveLoading = true;
       execTask({
         todoId: this.todoId // 当前节点ID
       }).then(res => {
@@ -929,7 +933,9 @@ export default {
           this.$message.success("接收成功");
           this.$router.push("/processCenter");
         }
-        this.isSubmit = false;
+      }).finally(() => {
+        this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     handlePrice() {
@@ -985,6 +991,7 @@ export default {
             }
           });
           this.isSubmit = true;
+          this.saveLoading = true;
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
           this.$http.post("lawss/activiti/completeTask", {
@@ -999,6 +1006,7 @@ export default {
               this.$router.push("/processCenter");
             }
             this.isSubmit = false;
+            this.saveLoading = false;
           }, e => {
           });
         }

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -270,8 +270,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :saveLoading="isSubmit"
+      :isSubmitBack="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -337,14 +337,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -353,6 +352,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -514,6 +515,7 @@ export default {
         this.listForm.passFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        this.isSubmit = true;
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -525,6 +527,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false;
         }, e => {
         });
       }

src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue

@@ -269,8 +269,7 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :saveLoading="isSubmit"
       :approval="true"
       @transfer="handleTransfer"
       @submit="handleSubmit"
@@ -336,14 +335,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -352,6 +350,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -269,8 +269,7 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :saveLoading="isSubmit"
       :approval="true"
       @transfer="handleTransfer"
       @submit="handleSubmit"
@@ -334,14 +333,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -350,6 +348,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图

src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

@@ -575,6 +575,7 @@ export default {
     //流程保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -586,11 +587,11 @@ export default {
         commentText: this.commentText
       }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     //流程提交事件
@@ -617,6 +618,7 @@ export default {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
+                  this.saveLoading = true;
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
@@ -650,7 +652,11 @@ export default {
                           this.$router.push("/processCenter");
                         }
                         this.isSubmit = false;
+                        this.saveLoading = false;
                       });
+                    } else {
+                      this.saveLoading = false;
+                      this.isSubmit = false;
                     }
                   });
                 } else {

src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue

@@ -681,6 +681,7 @@ export default {
     //流程保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -692,11 +693,11 @@ export default {
         commentText: this.commentText
       }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
+      }).finally(() => {
         this.saveLoading = false;
+        this.isSubmit = false
       });
     },
     //流程提交事件
@@ -723,6 +724,7 @@ export default {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
+                  this.saveLoading = true;
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
@@ -755,8 +757,12 @@ export default {
                           }
                           this.$router.push("/processCenter");
                         }
+                        this.saveLoading = false
                         this.isSubmit = false;
                       });
+                    } else {
+                      this.saveLoading = false
+                      this.isSubmit = false
                     }
                   });
                 } else {

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -293,8 +293,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -360,14 +360,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -376,6 +375,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -516,6 +517,7 @@ export default {
         this.listForm.bzFlag = "2";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        this.isSubmit = true;
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -527,6 +529,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false
         }, e => {
         });
       }

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -292,8 +292,8 @@
       show-submit
       show-transfer
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :isSubmitBack="isSubmit"
+      :saveLoading="isSubmit"
       :approval="true"
       @submit="handleSubmit"
       @transfer="handleTransfer"
@@ -358,14 +358,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -374,6 +373,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -293,7 +293,7 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
+      :isSubmitBack="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
@@ -360,14 +360,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -376,6 +375,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -516,6 +517,7 @@ export default {
         this.listForm.dlFlag = "2";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        this.isSubmit = true;
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -527,6 +529,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false;
         }, e => {
         });
       }

src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue

@@ -196,8 +196,8 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
-      :saveLoading="saveLoading"
+      :saveLoading="isSubmit"
+      :isSubmitBack="isSubmit"
       :approval="true"
       @back="beforeBack"
       @transfer="handleTransfer"
@@ -260,14 +260,13 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -276,6 +275,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -367,6 +368,7 @@ export default {
         this.listForm.BZFlag = "2";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        this.isSubmit = true
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -378,6 +380,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false
         }, e => {
         });
       }

src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue

@@ -207,7 +207,6 @@
       show-transfer
       show-submit
       :submitLoading="isSubmit"
-      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
       @transfer="handleTransfer"
@@ -290,14 +289,14 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole (data) {
-      this.assigneeNewLoading = true
+      this.saveLoading = true
+      this.isSubmit = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
@@ -306,6 +305,9 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.saveLoading = false
+        this.isSubmit = false
       })
     },
     // 请求转换流程图
@@ -428,6 +430,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.isSubmit = true
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "6");
@@ -437,12 +440,12 @@ export default {
         commentText: this.commentText
       }));
       saveTaskForPub(_formData).then(res => {
-        this.saveLoading = false;
         this.$message.success("保存成功");
         this.bpnId = res.result;
-      }).catch(e => {
-        this.saveLoading = false;
-      });
+      }).finally(() => {
+        this.saveLoading = false
+        this.isSubmit = false
+      })
     },
     //提交事件
     handleSubmit() {
@@ -450,6 +453,7 @@ export default {
         this.$message.warning("请选择架构经理");
       } else {
         this.isSubmit = true;
+        this.saveLoading = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -464,6 +468,7 @@ export default {
             this.$router.push("/processCenter");
           }
           this.isSubmit = false;
+          this.saveLoading = false;
         }, e => {
         });
       }