修改调拨流程判断

src/views/activiti/applyList.vue

@@ -227,8 +227,9 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
+            width: '80px',
             key:'rowIndex',
             align:"center",
             customRender:function (t,r,index) {
@@ -237,7 +238,7 @@
           },
           {
             title: '标题',
-            align:"left",
+            // align:"left",
             dataIndex: 'title',
             align:"center",
             scopedSlots: { customRender: 'logContent' },
@@ -358,6 +359,9 @@
         loadingData: false
       }
     },
+    created(){
+      this.searchReset();
+    },
     methods: {
       initDictConfig() {
         //初始化字典 - 流程分类

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -799,7 +799,30 @@
         this.getAllTable().then(tables => {
           return validateFormAndTables(this.form, tables)
         }).then(allValues => {
-          console.log('所有数据', allValues)
+          // console.log('所有数据', allValues)
+          // console.log('所有数据allValues.tablesValue[0].values[0]', allValues.tablesValue[0].values[0])
+          if(!allValues.tablesValue[0].values[0]  ){
+              this.$message.warning("请填写调拨物资！");
+              return
+          }else{
+            let all = false;
+            allValues.tablesValue[0].values.forEach( it => {
+              if(!it.allotNumber){
+                this.$message.warning("请填写完整调拨物资数据！");
+                all = true;
+                return
+              }
+              if(!it.allotTarget){
+                this.$message.warning("请选择接收调拨目标！");
+                all = true;
+                return
+              }
+            });
+            if(all){
+              return
+            }
+
+          }
           if (typeof this.classifyIntoFormData !== 'function') {
             throw this.throwNotFunction('classifyIntoFormData')
           }
@@ -848,18 +871,18 @@
               console.log('提交方法', method)
               if(this.btndisabled === false){
                 this.btndisabled = true
-                httpAction(url, formData, method).then((res) => {
+                // httpAction(url, formData, method).then((res) => {
-                  if (res.success) {
+                //   if (res.success) {
-                    this.$message.success('提交申请成功！')
+                //     this.$message.success('提交申请成功！')
-                    //todo 将表单的数据传给父组件
+                //     //todo 将表单的数据传给父组件
-                    this.$emit('loadData')
+                //     this.$emit('loadData')
-                    this.close()
+                //     this.close()
-                  } else {
+                //   } else {
-                    this.$message.error(res.message)
+                //     this.$message.error(res.message)
-                  }
+                //   }
-                }).finally(() => {
+                // }).finally(() => {
-                  this.btndisabled = false
+                //   this.btndisabled = false
-                })
+                // })
               }
             }
           })

src/views/activiti/todoManage.vue

@@ -66,7 +66,7 @@
                  :pagination="ipagination" @change="handleTableChange"
                  ref="table"
         >
-          <a-table-column title="#" :width="50">
+          <a-table-column title="序号" :width="80" align="center">
             <template slot-scope="t,r,i">
               <span> {{i+1}} </span>
             </template>
@@ -336,6 +336,9 @@
       }
       this.init()
     },
+    created() {
+      this.handleReset();
+    },
     methods: {
 
       onDateChange: function(value, dateString) {
@@ -414,11 +417,13 @@
             if (res.success) {
               this.lcModa.visible = false
               this.$message.success('操作成功')
-              this.modalTaskVisible = false
+              this.modalTaskVisible = false;
+              this.form.comment=null;
               this.getDataList()
             } else {
               console.log(res)
-              this.$message.error(res.message)
+              this.$message.error(res.message);
+              this.form.comment=null;
               return
             }
           })
@@ -431,7 +436,8 @@
               if (res.success) {
                 this.lcModa.visible = false
                 this.$message.success('操作成功')
-                this.modalTaskVisible = false
+                this.modalTaskVisible = false;
+                this.form.comment=null;
                 this.getDataList()
               }
             })
@@ -449,7 +455,8 @@
               if (res.success) {
                 this.lcModa.visible = false
                 this.$message.success('操作成功')
-                this.modalTaskVisible = false
+                this.modalTaskVisible = false;
+                this.form.comment=null;
                 this.getDataList()
               }
             })
@@ -467,12 +474,13 @@
             this.submitLoading = false
             if (res.success) {
               this.$message.success('操作成功')
-              this.modalTaskVisible = false
+              this.modalTaskVisible = false;
+              this.form.comment=null;
               this.getDataList()
             }
           })
         }
-        this.form.comment=null;
+
         this.form.userId=null;
       },
       async detail(r) {

src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue

@@ -131,7 +131,7 @@
           <a-col :span="8">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['accountingAttributes',validatorRules.accountingAttributes]"
-                                 :trigger-change="true" dictCode="material_type"
+                                 :trigger-change="true" dictCode="stronger_material_type"
                                  placeholder="请选择物资类型" />
 <!--              <a-input v-decorator="['accountingAttributes']" type="list" :trigger-change="true" placeholder="请选择核算属性"  />-->