分开保存并通过

2 years ago · 1b8fed01f6
1 changed files with 93 additions and 93 deletions
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@ -148,7 +148,9 @@
        </a-form-item>
      </div>
      <a-form-item v-if="isPlanType" :wrapperCol="{ span: 24 }" style="text-align: center">
-        <a-button type="primary" @click="saveAndpassTask">保存并通过</a-button>
+
+        <a-button type="primary" @click="handleSubmit">保存</a-button>
+        <a-button style="margin-left: 8px" type="primary" @click="saveAndpassTask">通过</a-button>
        <!--                <a-button type="primary"  @click="ewrold">下载</a-button>-->
        <a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
      </a-form-item>
@ -514,7 +516,8 @@
          materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
          needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
          processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] },
-          sort: { rules: [{ required: true, type:'number', max:999999999999, message: '请输入序号!(0 ~ 12个数字)'},
+          sort: {
+            rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个数字)' }
              // { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'}
              // {validator: this.lengthCheck}
            ]
@ -598,7 +601,7 @@
      //如果是流程中表单，则需要加载流程表单data
      //this.showFlowData()
      if (!this.isPlanType) {
-        this.isGetOneAndLast=true;
+        this.isGetOneAndLast = true
      }

      this.getAllTable()
@ -623,15 +626,15 @@
      lengthCheck(rule, value, callback) {
        if (value.toString().length >= 12) {
          // console.log("长度太长了");
-          callback("长度应当在0 ~ 12 字符")
+          callback('长度应当在0 ~ 12 字符')
        }
      },
      selectRowChange(a, b, c) {
        // console.log("执行了",a,b,c);
      },
      shifu() {
-        console.log("执行了");
-        this.isShifu = true;
+        console.log('执行了')
+        this.isShifu = true
      },

      // handleChange(value, key, column) {
@ -680,8 +683,8 @@
          this.hiegs = false
          // this.fetchData();
          // this.fetchDataRake()
-          this.assigneesText = val;
-          this.fetchMerchandiseNews();
+          this.assigneesText = val
+          this.fetchMerchandiseNews()
        }
      },
      //物料组选择触发
@ -811,20 +814,20 @@
        // }
        // console.log("5555出发了",record.row);
        // if ( !!record.row.materialNumber && isEr) {
-        let b = false;
+        let b = false
        if (this.isShifu) {
          // console.log("0出发了",record);
          for (const res of this.bigIdMerchandiseNewsList) {
            if (res.id === record.row.materialNumber) {
-              b = true;
+              b = true
            }
          }
          if (!b) {
            // console.log("进来了111");
-            await this.fetchMerchandiseNews(null,record.row.materialNumber );
+            await this.fetchMerchandiseNews(null, record.row.materialNumber)
          }
        }
-        this.isShifu = false;
+        this.isShifu = false
        if (record.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity') {
          if (!!record.row.materialNumber && this.isBu !== record.row.materialNumber) {
            // console.log("2出发了");
@ -839,7 +842,7 @@
                  descriptionId: item.descriptionId
                }
                this.form.setFieldsValue({
-                  putUnder: item.materialDepart,
+                  putUnder: item.materialDepart
                })
              }
            })
@ -866,14 +869,13 @@
                    ]
                    // console.log("sadf1111")
                    this.$refs.processUdgetPlanMaterial.setValues(values)
-                    return ;
+                    return

                  }
                })

              })

-
              this.processUdgetPlanMaterialTable.columns[0].options.push({
                title: materialName.materialClassify,
                value: materialName.descriptionId
@ -893,22 +895,18 @@
                }
              ]
              this.$refs.processUdgetPlanMaterial.setValues(values)
-              this.isBu = record.row.materialNumber;
+              this.isBu = record.row.materialNumber
              isEr = false
            }
          }
        }

-
-
        if (!!record.row.materialQuantity && !!record.row.materialPrice && isEr) {
          // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
          // console.log("3出发了");
          //如果单价大于5万
          if (record.row.materialPrice > 50000) {
            this.materialPrice = record.row.materialPrice
-            console.log("record.row.materialPrice ",)
-            console.log(record.row.materialPrice)
          }
          //回填数据
          if (record.row.id !== undefined) {
@ -942,7 +940,7 @@
            id: id
          }
          if (!!this.assigneesText) {
-            par.materialType = this.assigneesText;
+            par.materialType = this.assigneesText
          }
          this.bigIdMerchandiseNews = []
          this.bigIdMerchandiseNewsList = []
@ -993,12 +991,12 @@
                  })
                })
              }
-              this.bigIdMerchandiseNewsList = res.result;
+              this.bigIdMerchandiseNewsList = res.result
              // resolve( this.bigIdMerchandiseNewsList );
            }
-            resolve( this.bigIdMerchandiseNewsList );
+            resolve(this.bigIdMerchandiseNewsList)
+          })
        })
-        });

      },
      //  fetchMerchandiseNews(value){ //查询物料清单信息
@ -1168,11 +1166,9 @@
            }
          }
          formData.fileId = getStringArry(formData.fileId)
-           if (this.materialPrice!=0){
-             if (this.materialPrice!=0){
+            if (this.materialPrice != 0 && this.materialPrice != null) {
              formData.materialPrice = this.materialPrice
            }
-          }
          formData.describes = this.describes
          if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) {
            this.$message.error('需求时间不能小于当前流程发起时间')
@ -1186,7 +1182,7 @@
              formData.procDeTitle = this.processData.name
              formData.title = this.processData.description
              //formData.sourceCapital
-              console.log("this.planType++",this.planType)
+              console.log('this.planType++', this.planType)
              if (!formData.tableName) formData.tableName = this.processData.businessTable
              var url = this.url.addFromTableApply
              let method = 'post'
@ -1205,15 +1201,15 @@
                this.btndisabled = true
                httpAction(url, formData, method).then((res) => {
                  if (res.success) {
-                    this.$message.success("提交申请成功！")
+                    this.$message.success('提交申请成功！')
                    //todo 将表单的数据传给父组件
                    this.$emit('loadData')
-                    this.close();
+                    this.close()
                  } else {
                    this.$message.error(res.message)
                  }
                }).finally(() => {
-                  this.btndisabled = false;
+                  this.btndisabled = false
                })
              }
            }
@ -1242,7 +1238,7 @@
        console.log(this.data, '数据回显')
        let fieldval = pick(this.data, 'id', 'planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'sort', 'orderNumber', 'fileId', 'opinion', 'sourceCapital')
        this.$nextTick(() => {
-          this.assigneesText=this.data.materialType;
+          this.assigneesText = this.data.materialType
          this.form.setFieldsValue(fieldval)
        })
        // 加载子表数据
@ -1291,8 +1287,7 @@

          for (let i = 0; i < this.listId.length; i++) {
            // console.log(this.listId[i])\
-            this.descriptionId(this.listId[i]);
-
+            this.descriptionId(this.listId[i])

            this.fetchMerchandiseNews(this.listId[i])
          }
@ -1354,11 +1349,10 @@
              this.$message.error('请选择采购类型')
              return
            } else {
-              this.handleSubmit();
-              this.passTask();
+              this.passTask()
            }
          }
-        });
+        })
      },
      // handler
      handleSubmit(e) {
@ -1376,8 +1370,14 @@
              this.describes = this.describes + '---' + formData.processUdgetPlanMaterialList[i].materialName
            }
          }
+          if (this.isPlanType) {
+            if (!formData.planType) {
+              this.$message.error('请选择采购类型')
+              return
+            }
+          }
          formData.fileId = getStringArry(formData.fileId)
-           if (this.materialPrice!=0){
+          if (this.materialPrice != 0 && this.materialPrice != null) {
            formData.materialPrice = this.materialPrice
          }
          formData.describes = this.describes
@ -1418,7 +1418,7 @@
                    this.$message.error(res.message)
                  }
                }).finally(() => {
-                  this.btndisabled = false;
+                  this.btndisabled = false
                })
              }
            }