第一个审核人

src/views/activiti/applyList.vue

@@ -502,7 +502,7 @@
           );
           return;
         }
-
+        console.log("isView>>>>>>>>>>>>",isView)
         isView = isView||false;
         this.lcModa.disabled = isView;
         this.lcModa.hieg = isView;

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -44,13 +44,13 @@
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" @change="materialType"
                                  v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true"
-                                 dictCode="material_type" placeholder="请选择物资类型"/>
+                                 dictCode="material_type" placeholder="请选择物资类型" :disabled="issh"/>
             </a-form-item>
           </a-col>
           <a-col :span="8" v-if="task">
             <a-form-item label="被调拨部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['beAllotDepartment',validatorRules.beAllotDepartment]"
-                               @change='Department'/>
+                               @change='Department'  />
             </a-form-item>
           </a-col>
           <a-col :span="8
@@ -94,8 +94,8 @@
       </a-form>
     </j-form-container>
     <div class="div_process">
-      <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center" >
+      <a-form-item v-if="!disabled || !task" :wrapperCol="{ span: 24 }" style="text-align: center" >
-        <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
+        <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit" >保存</a-button>
         <a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请
         </a-button>
         <a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
@@ -174,6 +174,7 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               options: []
               // props:{title: 'show title'}
               // scopedSlots: { customRender: 'edit' },//引入的插槽
@@ -189,6 +190,7 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               options: []
             },
             {
@@ -198,6 +200,7 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             },
             {
@@ -207,6 +210,7 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             },
             {
@@ -216,6 +220,7 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             },
             {
@@ -249,6 +254,7 @@
               type: FormTypes.inputNumber,
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             },
             {
@@ -257,6 +263,7 @@
               type: FormTypes.inputNumber,
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             },
             {
@@ -265,6 +272,7 @@
               type: FormTypes.date,
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             },
             {
@@ -274,6 +282,7 @@
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             },
             {
@@ -282,6 +291,7 @@
               type: FormTypes.input,
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             }
           ]
@@ -305,6 +315,7 @@
         },
         btndisabled: false,
         isHava:false,
+        issh:false,
         describes: '',
         assignees: '',
         validatorRules: {
@@ -328,8 +339,10 @@
       },
       /*是否新增*/
       isNew: { type: Boolean, default: false, required: false },
-      /*是否处理流程*/
+      /*第一个处理理流程*/
       task: { type: Boolean, default: false, required: false },
+      /*是否处理流程*/
+      taskT: { type: Boolean, default: false, required: false },
       //流程表单data
       formData: {
         type: Object,
@@ -388,7 +401,9 @@
         // console.log(record)
         let isDB = true
         if (record.row.materialGroup !== '' && record.row.materialGroup !== undefined) {
-
+            if (this.issh){
+              return;
+            }
           if (record.row.id !== '' && record.row.id !== undefined && this.materialGroupId !== record.row.materialGroup) {
             // console.log("执行materialGroup")
             this.fetchMerchandiseNews(record.row.materialGroup, 1)
@@ -605,8 +620,38 @@
       },
       /*回显数据*/
       init() {
+        this.taskT =true
         this.btndisabled = true
+        this.issh =true
         var r = this.processData
+          let userInfo=sessionStorage.getItem("USER_INFORMATION");
+          let res=JSON.parse(userInfo);
+          let param={}
+          param.id=r.procDefId;
+          param.tableName=r.tableName;
+          param.tableId=r.tableId;
+          param.username =res.username
+          this.getAction("/hy/processMaterialsAllot/getOne",param).then(res => {
+            console.log("res>>>>>>>>>>>>>>>>>>>>>",res)
+            if (res.success) {
+              if (res.result){
+                this.heid = false
+                getAction(this.url.unitWasteNameUrl, null).then((res) => {
+                  if (res.success) {
+                    if (this.processMaterialsAllotListTable.columns[6].options.length > 0) {
+                      this.processMaterialsAllotListTable.columns[6].options = []
+                    }
+                    res.result.forEach(item => {
+                      this.processMaterialsAllotListTable.columns[6].options.push({
+                        title: item.departName,
+                        value: item.libraryAssociationIdInvisible
+                      })
+                    })
+                  }
+                })
+              }
+            }
+          });
         this.getAssignees(r)
         // console.log("2323232323232323232323232323232323232323",r)
         if (!r.tableId){
@@ -830,7 +875,6 @@
             }
             console.log('value>>>>>>>>>>>>>>>>>>>>>>>>>>>>', this.libraryAssociationIdInvisible)
           })
-
         }
 
       },

src/views/activiti/todoManage.vue

@@ -396,6 +396,25 @@ export default {
         return;
       }
       this.lcModa.disabled = true;
+      //获取是不是第一个审核人
+      if (r.processName ==='物资调拨流程'){
+        let userInfo=sessionStorage.getItem("USER_INFORMATION");
+        let res=JSON.parse(userInfo);
+        console.log("userInfo>>>>>>>>>>>",res.username)
+        let param={}
+        param.id=r.procDefId;
+        param.tableName=r.tableName;
+        param.tableId=r.tableId;
+        param.username =res.username
+        this.getAction("/hy/processMaterialsAllot/getOne",param).then(res => {
+          console.log("res>>>>>>>>>>>>>>>>>>",res)
+          if (res.success) {
+            if (res.result){
+             // this.lcModa.disabled = false;
+            }
+          }
+        });
+      }
       this.lcModa.title = '查看流程业务信息：'+r.processName;
       this.lcModa.formComponent = this.getFormComponent(r.routeName).component;
       this.lcModa.processData = r;