前后:待办;目录审批

src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

@@ -39,7 +39,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 	supplierTypeCode := this.GetString("SupplierTypeCode")
 	supplierName := this.GetString("SupplierName")
 	wfNames := ""
-	wfNames = workflow.OIL_ENUSER_SUPPLIER_APPLY  + "," + workflow.OIL_ENUSER_APPEND_APPLY + "," + workflow.OIL_INFO_CHANGE + "," + workflow.OIL_AUDIT_APPLY + "," + workflow.OIL_SUPPLIER_VERIFY+ "," + workflow.OIL_DAILY_CONTRACT_EVALUATION+ "," + workflow.OIL_ANNUAL_CONTRACT_EVALUATION
+	wfNames = workflow.OIL_ENUSER_SUPPLIER_APPLY  + "," + workflow.OIL_ENUSER_APPEND_APPLY + "," + workflow.OIL_INFO_CHANGE + "," + workflow.OIL_AUDIT_APPLY + "," + workflow.OIL_SUPPLIER_VERIFY+ "," + workflow.OIL_DAILY_CONTRACT_EVALUATION+ "," + workflow.OIL_ANNUAL_CONTRACT_EVALUATION+ "," + workflow.OIL_Catalog
 
 	var todoliststemp []todolist.TodoList
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -11,7 +11,7 @@
           <span><i class="icon icon-table2"></i></span>
           <span style="float: right;">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="saveEntity" v-if="isEdit && formData.Status <= 0">保存信息</el-button>
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="submitEntity" v-if="isEdit && formData.Status <= 0">提交审批</el-button>
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="submitEntity" v-if="isEdit && formData.Status <= 0" :loading="loading">提交审批</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 1">初审</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 2">复审</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 5">审批</el-button>
@@ -296,7 +296,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogMakeSure = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="makeSure()">确 定</el-button>
+        <el-button type="primary" size="small" @click="makeSure()" :loading="loading">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -375,7 +375,7 @@
         showadddialog: false,
         auditBtn: false,
         isEdit: true,
-
+        loading: false,
         ValidityDate: null,
         cardType: '',
         auditstepcode: '',
@@ -524,6 +524,7 @@
           })
           return
         }
+        this.loading = true
         let params = this.shenheForm
         api.auditEntity(this.formData.Id, params, this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -581,13 +582,15 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          this.showadddialog = false
+          this.loading = true
           api.commitAudit(this.formData.Id, this.$axios).then(res => {
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
                 message: res.data.message
               })
-              this.showadddialog = false
+              // this.showadddialog = false
               this.initDatas()
             } else {
               this.$message({
@@ -595,6 +598,7 @@
                 message: res.data.message
               })
             }
+            this.loading = false
           })
         })
       },