大中型在节点上分配绩效

src/components/workflowBoard.vue

@@ -173,6 +173,7 @@ export default {
       commit.landIsRecord = this.nodeBusinessInfo.landIsRecord;
       commit.ifSkip = this.nodeBusinessInfo.ifSkip;
       commit.ifPay = this.nodeBusinessInfo.ifPay;
+      commit.isAllot = this.nodeBusinessInfo.isAllot;
       let isOk = true
       this.$emit('workflowCommitVerify',{"commit":commit},val =>{
         if (!val.state){

src/views/major/todoDetail.vue

@@ -1120,7 +1120,7 @@
             <template slot-scope="props">
               <el-button round type="danger" @click="saveProduction(props.row)"
                 :disabled="!updateProductionNode.includes(currentNode.nodeCode)">更新产品信息</el-button>
-              <el-button v-if="currentNode.nodeCode=='CHECK_STATEMENT' || currentNode.nodeCode=='CHECK_REPORT' || currentNode.nodeCode=='CHECK_LETTER'" type="success" round @click="openAllotDialog(props.row)">分配人员绩效</el-button>
+              <el-button :type="props.row.isAllot!=0?'success':'info'" v-if="currentNode.nodeCode=='CHECK_STATEMENT' || currentNode.nodeCode=='CHECK_REPORT' || currentNode.nodeCode=='CHECK_LETTER'" round @click="openAllotDialog(props.row)">分配人员绩效</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -1819,26 +1819,7 @@
     <el-button type="primary" @click="saveRefuseReason()">确 定</el-button>
   </div>
   </el-dialog>
-    <!-- <el-dialog :visible.sync="notSubmitDialog" width="45%" center top="35vh" custom-class="doWarehouseClass" @closed="remindClean()">
-      <el-divider content-position="left">
-          <h3 >
-            <div style="color: red;"><i class="el-icon-warning"></i> 上报协会提醒</div>
-          </h3>
-      </el-divider>
-      <el-form ref="notRecordFrom" v-model="notSubmitRemind">
-        <el-row>
-          <el-col :xs="24" :sm="12" :lg="24" :span="6">
-            <el-form-item  label-width="45px" :class="['postInfo-container-item','reason']">
-              <el-input :value="notSubmitRemind.reportNo +'  报告需要上报协会！'" :class="['filter-item','resaon_input']" disabled readonly style=" width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="notSubmitDialog=false">暂不处理</el-button>
-        <el-button type="primary" @click="doPassNotSubmit()">已知晓</el-button>
-      </span>
-    </el-dialog> -->
+    
   </div>
 </template>
 <script>
@@ -2046,7 +2027,8 @@ export default {
         reportNos: [],
         currentNodeInstanceCode: null,
         ifCheckTask: true,
-        ifPay: null
+        ifPay: null,
+        isAllot:null
       },
       major: {
         id: null,
@@ -3000,6 +2982,7 @@ export default {
             if (this.productions.length > 0) {
               this.nodeBusinessInfo.doSecondCheck = this.productions[0].secondCheck;
               this.nodeBusinessInfo.doThirdCheck = this.productions[0].thirdCheck;
+              this.nodeBusinessInfo.isAllot = this.productions[0].isAllot;
             }
 
             //回显上传的文档
@@ -3496,6 +3479,24 @@ export default {
               })
               return;
             }
+            if (commit.isAllot===0){
+              verify.state = false;
+              callback(verify);
+              this.$confirm('产品还未分配绩效, 是否现在分配?', '提示', {
+                confirmButtonText: '现在分配',
+                cancelButtonText: '以后分配',
+                type: 'warning'
+              }).then(() => {
+                let p = new Object();
+                p.reportNo = this.productions[0].reportNo;
+                p.id = this.productions[0].id;
+                p.majorId = this.productions[0].majorId;
+                this.openAllotDialog(p);
+              }).catch(() => {
+                this.nodeBusinessInfo.isAllot = 1;
+                this.commit("PASS")
+              });
+            }
             break;
           case "RECHECK_REPORT":
           case "THIRD_CHECK_REPORT":
@@ -4065,7 +4066,7 @@ export default {
             duration: 2000
           });
           this.allotDialog = false;
-          this.getList();
+          this.getProductions(this.majorId, (this.reportNo == null ? this.statementNo : this.reportNo));
         } else {
           this.$notify({
             title: '失败',