bugfix

src/views/modules/common/approve-component-batch.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-row style="margin-bottom: 20px">
+    <el-row style="margin-bottom: 20px;" v-loading="loading">
       <el-col :span="16">
         <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
           <el-row class="my-row">
@@ -31,7 +31,8 @@
         fileList: [],
         dataRule: {
           remark: [{ required: true, message: '处理意见不能为空', trigger: 'blur' }]
-        }
+        },
+        loading: false
       }
     },
     methods: {
@@ -49,6 +50,7 @@
       dataFormSubmit (val) {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            this.loading = true
             // 添加附件
             let fList = this.fileList
             if (fList.length > 0) {
@@ -70,6 +72,7 @@
                   orgId: this.$store.state.user.orgId
                 })
             }).then(({data}) => {
+              this.loading = false
               if (data && data.code === '200') {
                 this.$message({
                   message: '操作成功',
@@ -83,6 +86,8 @@
               } else {
                 this.$message.error(data.msg)
               }
+            }).catch(e => {
+              this.loading = false
             })
           }
         })

src/views/modules/msg-center/approve.vue

@@ -112,7 +112,7 @@
           width="80"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="isAuth('business:approval:approval') && Number(scope.row.state) !== 3 && checkUser(scope.row)" type="text" size="small" @click="addOrUpdateHandle(scope.row)">处理</el-button>
+            <el-button v-if="isAuth('business:approval:approval') && Number(scope.row.state) !== 3 && Number(scope.row.state) !== 0 && checkUser(scope.row)" type="text" size="small" @click="addOrUpdateHandle(scope.row)">处理</el-button>
             <el-button v-if="isAuth('business:approval:info') && (Number(scope.row.state) === 3 || !checkUser(scope.row))" type="text" size="small" @click="detailHandle(scope.row)">查看</el-button>
           </template>
         </el-table-column>
@@ -129,7 +129,7 @@
     </template>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getApprovalList" @onChose="onChose"/>
-    <el-dialog width="60%" :visible.sync="approveDialogVisible">
+    <el-dialog width="1000px" :visible.sync="approveDialogVisible">
       <approve-component-batch ref="approve" @approveFinished="approveChose" />
     </el-dialog>
   </div>
@@ -350,6 +350,8 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+.batch-dialog-class{
+  min-width: 1000px;
+}
 </style>

src/views/modules/process/process.vue

@@ -47,7 +47,10 @@
               <el-button :disabled="list.length === 0" type='success' size='medium' style='padding:8px 18px; margin-left:20px; font-size:14px;' @click="deploy">部署</el-button>
               <el-button :disabled="list.length === 0" type='primary' size='medium' style='padding:8px 18px; margin-left:20px; font-size:14px;' @click="replace">重置</el-button>
               <el-button :disabled="list.length === 0" type='success' size='medium' style='padding:8px 18px; margin-left:20px; font-size:14px;' @click="confirm">提交</el-button>
-<!--            <span>说明</span>-->
+          </div>
+          <div class="tipInfo">
+            <span>发布提示：</span>
+            <span>发布流程请先点击提交成功后，点击部署！</span>
           </div>
         </div>
       </div>
@@ -413,6 +416,16 @@
     margin: 5px 0 15px -10px;
   }
 }
+.tipInfo {
+  padding: 10px;
+  margin: 10px auto 25px;
+  width: 600px;
+  p {
+    font-size: 14px;
+    color: grey;
+    margin: 5px 0 15px -10px;
+  }
+}
 .confirmBox {
   text-align: center;
 }