大中型提成申报审核

src/api/modules/commissonDeclare.js

@@ -17,5 +17,8 @@ export default {
   },
   checkList(params){
     return request.get(`commissionDeclare/major/check`, { params: params })
+  },
+  majorDeclareTodoList(){
+    return request.get(`commissionDeclare/major/check/list`)
   }
 }

src/components/workflowNode.vue

@@ -51,6 +51,9 @@ export default {
             if (this.state === "EDITING"){
                 return this.editing
             }
+            if (this.state === "CLOSED"){
+                return this.closed
+            }
             return this.normal;
         }
     },
@@ -62,6 +65,7 @@ export default {
             finished:require('@/assets/statics/pg6.png'),
             waiting:require('@/assets/statics/pg11.png'),
             editing:require('@/assets/statics/pg5.png'),
+            closed:require('@/assets/statics/pg2.png'),
             nodeClass:"[heartbeat]"
         }
 

src/views/income/major/declareDetail.vue

@@ -70,7 +70,21 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="申报日期：" prop="created" label-width="140px" class="postInfo-container-item">
-              <el-input :value="declareForm.created" :step="1" :max="100" style="width: 100%;" readonly
+              <el-input :value="declareForm.created" style="width: 100%;" readonly
+                disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="审核状态：" prop="declareResult" label-width="140px" class="postInfo-container-item">
+              <el-input :value="declareForm.declareResult"  readonly disabled>
+              </el-input>
+            </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="审核备注：" prop="remarks" label-width="140px" class="postInfo-container-item">
+              <el-input :value="declareForm.remarks+''"  style="width: 100%; color: red;" readonly
                 disabled></el-input>
             </el-form-item>
           </el-col>
@@ -151,7 +165,8 @@ export default {
             rate: 100
           }
         ],
-        production:null
+        production:null,
+        remarks:[]
 
       },
       users: [],
@@ -175,9 +190,10 @@ export default {
           "mainBusiness": this.nodeBusinessInfo.mainBusiness,
           "businessId": this.nodeBusinessInfo.businessId
         }).then(res => {
-          if (res.code === 200) {
-              this.$refs.board.getInstanceArray(this.nodeBusinessInfo.mainBusiness,this.nodeBusinessInfo.businessId);
+          if (res.code === 200 && res.data!=null) {
+              this.nodeBusinessInfo.currentInstanceNodeId = res.data.instanceId;
           }
+          this.$refs.board.getInstanceArray(this.nodeBusinessInfo.mainBusiness,this.nodeBusinessInfo.businessId);
         })
       }
     },
@@ -218,17 +234,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/.doWarehouseClass {
-  border-radius: 10px;
-}
-
-.real-amount {
-  /deep/ .el-form-item__label {
-    color: red;
-    font-weight: bold
-  }
-}
-
 .button-area {
   position: absolute;
   top: 70px;

src/views/income/major/evaluate.vue

@@ -97,10 +97,10 @@
         </el-table-column>
         <el-table-column label="审核状态" align="center">
           <template slot-scope="{row}">
-            <el-tag v-if="row.declareResult==null" type="info" effect="plain">待申报</el-tag>
-            <el-tag v-else-if="row.declareResult=='审核中'" type="warning" effect="plain">审核中</el-tag>
-            <el-tag v-else-if="row.declareResult=='审核通过'" type="success" effect="plain">审核通过</el-tag>
-            <el-tag v-else type="danger" effect="plain">审核拒绝</el-tag>
+            <el-tag  v-if="row.declareResult == null" type="info" effect="plain">待申报</el-tag>
+            <el-tag v-else-if="row.declareResult == '审核中'" type="warning" effect="plain">审核中</el-tag>
+            <el-tag v-else-if="row.declareResult == '审核通过'" type="success" effect="plain">通过</el-tag>
+            <el-tag v-else-if="row.declareResult == '审核拒绝'" type="danger" effect="plain">拒绝</el-tag>
           </template>
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center">