调拨退回

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -47,7 +47,7 @@
                                  dictCode="material_type" placeholder="请选择物资类型" :disabled="issh"/>
             </a-form-item>
           </a-col>
-          <a-col :span="8"  v-if="task">
+          <a-col :span="8">
             <a-form-item label="被调拨部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['beAllotDepartment',validatorRules.beAllotDepartment]"
                                @change='Department'  />
@@ -229,6 +229,7 @@
               type: FormTypes.inputNumber,
               width: '200px',
               placeholder: '请输入${title}',
+              disabled: this.disabled,
               defaultValue: ''
             },
             // {
@@ -245,7 +246,7 @@
               type: FormTypes.sel_search,
               dictCode: '',
               width: '200px',
-              disabled: !this.disabled,
+              disabled: this.disabled,
               placeholder: '请输入${title}',
               options: []
             },
@@ -687,7 +688,7 @@
       },
       /*通过审批*/
       passTask() {
-        this.handleSubmit()
+        // this.handleSubmit()
         this.$emit('passTask')
       },
       /*驳回审批*/

src/views/activiti/todoManage.vue

@@ -461,24 +461,24 @@
         }
         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
-              }
-            }
-          })
-        }
+        // 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