diff --git a/src/components/jeecg/HDelivery.vue b/src/components/jeecg/HDelivery.vue index e5d2340..d4a739c 100644 --- a/src/components/jeecg/HDelivery.vue +++ b/src/components/jeecg/HDelivery.vue @@ -189,14 +189,15 @@ if (this.triggerChange) { //v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue this.$emit('callback', rows[0].id) - this.$emit('callType', rows[0].materialType) + this.$emit('mounted', rows[0].id) + this.$emit('callType', rows[0]) 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) + this.$emit('mounted', rows[0].id) + this.$emit('callType', rows[0]) } } } diff --git a/src/components/jeecg/HPlan.vue b/src/components/jeecg/HPlan.vue index 75e7550..ef0be02 100644 --- a/src/components/jeecg/HPlan.vue +++ b/src/components/jeecg/HPlan.vue @@ -197,13 +197,13 @@ //v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue this.$emit('callback', rows[0].id) this.$emit('mounted', rows[0].id) - this.$emit('callType', rows[0].materialType) + this.$emit('callType', rows[0]) } else { //v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值 // this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]]) this.$emit('input', this.showText, rows[0]) this.$emit('mounted', rows[0].id) - this.$emit('callType', rows[0].materialType) + this.$emit('callType', rows[0]) } } } diff --git a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue index a27c406..aab57c9 100644 --- a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue +++ b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue @@ -402,14 +402,6 @@ throw this.throwNotFunction('classifyIntoFormData') } let formData = this.classifyIntoFormData(allValues) - // if (formData.materialType === null || formData.materialType ==='' || formData.materialType === undefined){ - // this.$message.error("物资类型不能为空") - // return; - // } - // if (formData.borrowedDepartments === null || formData.borrowedDepartments ==='' || formData.borrowedDepartments === undefined){ - // this.$message.error("被借用部门不能为空") - // return; - // } this.form.validateFields((err, values) => { if (!err) { formData.procDefId = this.processData.id; diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index 57b6bfa..d2bd85b 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -453,10 +453,9 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany' // }) }, getcallType(type){ - let param={} - param.materialType = type; - this.data=param; - let fieldval =pick(this.data,'materialType') + this.data.materialType = type.materialType; + this.data.processUdgetPlanId=type.id + let fieldval =pick(this.data,'materialType','processUdgetPlanId') this.$nextTick(() => { this.form.setFieldsValue(fieldval) }) diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue index f51b6ca..63cd076 100644 --- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue +++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue @@ -38,8 +38,7 @@ - + @@ -59,7 +58,7 @@ :columns="processSmaterialsScrapListTable.columns" :dataSource="processSmaterialsScrapListTable.dataSource" :maxHeight="300" - :disabled="this.heid" + :disabled="formDisabled" :rowNumber="true" :rowSelection="true" :actionButton="true"/> @@ -244,6 +243,7 @@ add: '/hy/processSmaterialsScrap/add', edit: '/hy/processSmaterialsScrap/edit', queryById: '/hy/processSmaterialsScrap/queryById', + list:"/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId", processSmaterialsScrapList: { list: '/hy/processSmaterialsScrap/queryProcessSmaterialsScrapListByMainId' } @@ -251,10 +251,10 @@ btndisabled: false, validatorRules: { // 'blur'是鼠标失去焦点的时候会触发验证 - materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, - processReturnId: { rules: [{ required: true, message: '关联归还流程不能为空!' }] }, - processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] } - } + processOutflowId: {rules: [{ required: true, message: '关联出库流程不能为空!' }]}, + processReturnId: {rules:[{ required: true, message: '关联归还流程不能为空!' }]}, + processPlan: {rules:[ { required: true, message: '请选择流程计划!'}]} + }, } }, props: { @@ -350,6 +350,11 @@ } }) }, + getPlanList(id){ + let params={} + params.id=id; + this.requestSubTableData(this.url.list, params, this.processSmaterialsScrapListTable) + }, close() { //todo 关闭后的回调 this.$emit('close') @@ -372,11 +377,6 @@ } let formData = this.classifyIntoFormData(allValues) formData.fileId = getStringArry(formData.fileId) - formData.processOutflowId = this.processOutflowId - if (formData.processOutflowId === null || formData.processOutflowId === '' || formData.processOutflowId === undefined) { - this.$message.error('关联的出库流程不能为空') - return - } this.form.validateFields((err, values) => { if (!err) { formData.procDefId = this.processData.id @@ -408,11 +408,10 @@ }) }, - getcallType(type) { - let param = {} - param.materialType = type - this.data = param - let fieldval = pick(this.data, 'materialType') + getcallType(type){ + this.data.materialType = type.materialType; + this.data.processOutflowId=type.id + let fieldval =pick(this.data,'materialType','processOutflowId') this.$nextTick(() => { this.form.setFieldsValue(fieldval) })