liming 5 лет назад
Родитель
Сommit
2734f04727

+ 12 - 12
src/layout/tDeclarationApproval/tDeclarationApprovalList.vue

@@ -9,8 +9,8 @@
             <el-option label="未审核" value="0"></el-option>
             <el-option label="审核通过" value="1"></el-option>
             <el-option label="审核拒绝" value="2"></el-option>
-            <el-option label="完成" value="10"></el-option>
-            <el-option label="停用" value="-1"></el-option>
+            <el-option label="完成" value="9"></el-option>
+            <el-option label="停用" value="3"></el-option>
           </el-select>
         </el-col>
           <el-col :span="4">
@@ -66,9 +66,9 @@
             <el-table-column property="current_approval" label="审核人" align="center"> </el-table-column>
             <el-table-column label="操作" align="center" width="300px">
               <template slot-scope="scope">
-                <!--<el-button size="mini" type="text" class="other" @click="updateState(scope.row,'10')" v-if="scope.row.current_state === '1'">完成</el-button>
+                <!--<el-button size="mini" type="text" class="other" @click="updateState(scope.row,'9')" v-if="scope.row.current_state === '1'">完成</el-button>
                 <el-button size="mini" type="text" class="other" @click="updateState(scope.row,'-2')" v-if="scope.row.current_state === '0'">审核</el-button>
-                <el-button size="mini" type="text" class="other" @click="updateState(scope.row,'-1')">停用</el-button>-->
+                <el-button size="mini" type="text" class="other" @click="updateState(scope.row,'3')">停用</el-button>-->
                 <el-button size="mini" type="text" class="view" icon="el-icon-view"
                            @click="$router.push({ path: '/tDeclarationApproval/detail', query: { id: scope.row.id } })"></el-button>
                 <!--<el-button size="mini" type="text" class="edit" icon="el-icon-edit"
@@ -201,13 +201,13 @@
             break;
           case '2':
             break;
-          case '-1':
+          case '3':
             this.$emit('updateState', {id:this.tempId,state:this.tempState,result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
             break;
           case '-2':
             this.$emit('updateState', {id:this.tempId,state:'1',result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
             break;
-          case '10':
+          case '9':
             this.$emit('updateState', {id:this.tempId,state:this.tempState,result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
             break;
         }
@@ -222,12 +222,12 @@
             break;
           case '2':
             break;
-          case '-1':
+          case '3':
             break;
           case '-2':
             this.$emit('updateState', {id:this.tempId,state:'2',result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
             break;
-          case '10':
+          case '9':
             break;
         }
       },
@@ -242,7 +242,7 @@
             break;
           case '2':
             break;
-          case '-1':
+          case '3':
             if(row.current_state === state){
               this.$message.error('已停用');
             }else{
@@ -256,7 +256,7 @@
             this.$set(this, `cancel`, '审核拒绝');
             this.$set(this, `dialogFormVisible`, true);
             break;
-          case '10':
+          case '9':
             this.$set(this, `confirm`, '完成');
             this.$set(this, `cancel`, '取消');
             this.$set(this, `dialogFormVisible`, true);
@@ -272,9 +272,9 @@
             return '审核通过';
           case '2':
             return '审核拒绝';
-          case '10':
+          case '9':
             return '完成';
-          case '-1':
+          case '3':
             return '停用';
         }
       },

+ 2 - 2
src/views/tDeclarationApproval/index.vue

@@ -75,11 +75,11 @@
             res = await this.state({id:id,current_approval_id:this.user.uid,state:state,state_description:'',result_description:result});
             this.$checkRes(res, '审核成功', '审核失败');
             break;
-          case '-1':
+          case '3':
             res = await this.state({id:id,current_approval_id:this.user.uid,state:state,state_description:'',result_description:result});
             this.$checkRes(res, '停用成功', '停用失败');
             break;
-          case '10':
+          case '9':
             res = await this.state({id:id,current_approval_id:this.user.uid,state:state,state_description:'',result_description:result});
             this.$checkRes(res, '完成成功', '完成失败');
             break;