From 66854f1b44956ce7d7b86341227fe48a0567b702 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 31 Oct 2022 14:59:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=B5=81=E7=A8=8B=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jeecg/HDelivery.vue | 2 ++ src/components/jeecg/HPlan.vue | 1 - .../form/ProcessMaterialWarehousingForm.vue | 27 +------------------ .../ProcessPermissionAuthorizationForm.vue | 2 +- .../form/ProcessSmaterialsScrapForm.vue | 17 +++++++----- .../activiti/form/ProcessUdgetPlanForm.vue | 12 ++++----- 6 files changed, 20 insertions(+), 41 deletions(-) diff --git a/src/components/jeecg/HDelivery.vue b/src/components/jeecg/HDelivery.vue index 6f8d156..e5d2340 100644 --- a/src/components/jeecg/HDelivery.vue +++ b/src/components/jeecg/HDelivery.vue @@ -189,12 +189,14 @@ if (this.triggerChange) { //v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue this.$emit('callback', rows[0].id) + this.$emit('callType', rows[0].materialType) console.log(1) } else { //v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值 // this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]]) this.$emit('input', this.showText, rows[0].id) console.log(rows[0].id) + this.$emit('callType', rows[0].materialType) } } } diff --git a/src/components/jeecg/HPlan.vue b/src/components/jeecg/HPlan.vue index 7df2aed..75e7550 100644 --- a/src/components/jeecg/HPlan.vue +++ b/src/components/jeecg/HPlan.vue @@ -193,7 +193,6 @@ this.showText =rows[0].id // update--end--autor:lvdandan-----date:20200630------for：多选时未带回多个值------ } - console.log("传过来的值>>>>>>>>>>>",rows[0].materialType) if (this.triggerChange) { //v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue this.$emit('callback', rows[0].id) diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index 24d7562..fe887dc 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -366,23 +366,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany' throw this.throwNotFunction('classifyIntoFormData') } let formData = this.classifyIntoFormData(allValues) - formData.processUdgetPlanId=this.processUdgetPlanId - // if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ - // this.$message.error("物资类型不能为空") - // return; - // } - // if (formData.targetLibrary === null || formData.targetLibrary ==='' || formData.targetLibrary === undefined){ - // this.$message.error("入库目标库不能为空") - // return; - // } - // if (formData.processUdgetPlanId === null || formData.processUdgetPlanId ==='' || formData.processUdgetPlanId === undefined){ - // this.$message.error("关联预算流程不能为空") - // return; - // } - // if (formData.warehousingBatch === null || formData.warehousingBatch ==='' || formData.warehousingBatch === undefined){ - // this.$message.error("入库总批次不能为空") - // return; - // } + console.log('格式化后的数据',formData) this.form.validateFields((err, values) => { if (!err) { @@ -468,7 +452,6 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany' // }) }, getcallType(type){ - console.log("传过来的类型>>>>>>>>>>>>",type) let param={} param.materialType = type; this.data=param; @@ -476,19 +459,11 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany' this.$nextTick(() => { this.form.setFieldsValue(fieldval) }) - // params.id=id; - // this.requestSubTableData(this.url.list, params, this.processMaterialWarehousingListTable) - // getAction(this.url.list,params).then((res)=>{ - // if(res.success){ - // console.log('将要回填的数据',res.result) - // } - // }) }, popupCallback(company,row) { let res=JSON.parse(row); console.log('获取我的数据',res.id) let param={} - param.createBy=res.username; param.company=company; param.sysOrgCode=res.departIds; diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue index 4279bf3..8636a0d 100644 --- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue +++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue @@ -69,7 +69,7 @@ - 提 交 + 提 交 diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue index 23d3edf..5f3be4b 100644 --- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue +++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue @@ -31,12 +31,12 @@ - + - + @@ -365,10 +365,6 @@ } let formData = this.classifyIntoFormData(allValues) formData.processOutflowId=this.processOutflowId; - // if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ - // this.$message.error("物资类型不能为空") - // return; - // } if (formData.processOutflowId === null || formData.processOutflowId ==='' || formData.processOutflowId === undefined){ this.$message.error("关联的出库流程不能为空") return; @@ -404,6 +400,15 @@ }) }, + getcallType(type){ + let param={} + param.materialType = type; + this.data=param; + let fieldval =pick(this.data,'materialType') + this.$nextTick(() => { + this.form.setFieldsValue(fieldval) + }) + }, addBefore(){ this.form.resetFields() this.processSmaterialsScrapListTable.dataSource=[] diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index ddde578..82b7848 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -107,7 +107,6 @@