diff --git a/.env.development b/.env.development index e6ee0d9..2bb6280 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://10.190.160.130:9566/hy-boot +VUE_APP_API_BASE_URL=http://localhost:9566/hy-boot VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://182.92.73.21:8012/onlinePreview?url= \ No newline at end of file diff --git a/src/components/jeecg/RPlan.vue b/src/components/jeecg/RPlan.vue index 8bf389c..89bd373 100644 --- a/src/components/jeecg/RPlan.vue +++ b/src/components/jeecg/RPlan.vue @@ -195,6 +195,7 @@ export default { } }, callBack(rows) { + console.log("-=-=-=-==",rows); let orgFieldsArr = this.orgFields.split(',') let destFieldsArr = this.destFields.split(',') let resetText = false diff --git a/src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue b/src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue index 3304827..c45e692 100644 --- a/src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue +++ b/src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue @@ -442,7 +442,7 @@ export default { this.data = param let fieldval = pick(this.data, 'planType','ifDirect','ifInspection') this.$nextTick(() => { - console.log("-=-="); + // console.log("-=-="); this.form.setFieldsValue(fieldval); }) }, @@ -550,7 +550,14 @@ export default { if (typeof this.classifyIntoFormData !== 'function') { throw this.throwNotFunction('classifyIntoFormData') } - let formData = this.classifyIntoFormData(allValues) + let formData = this.classifyIntoFormData(allValues); + formData.industrialPurchaseId = this.industrialPurchaseId; + this.Globaler.dictOptions.forEach(it =>{ + // console.log("it",it); + if(it.text == formData.materialType){ + formData.type = it.value; + } + }); console.log('=--=-=-', formData) console.log('=-industrialPurchaseId-=-=-', this.industrialPurchaseId) if (formData.processIndustrialStorageMaterialList.length < 1){