java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改申请人信息回显

dev
caoyizhong 2 years ago
parent
0e609584ff
commit
40b318e06c
4 changed files with 98 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/views/burst/form/purchase/ProcessIndustrialDeliveryForm.vue
  2. 30
      src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
  3. 34
      src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
  4. 107
      src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue

32
src/views/burst/form/purchase/ProcessIndustrialDeliveryForm.vue
Unescape View File

@ -2,46 +2,46 @@
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-form ref="form" :form="form" slot="detail">
<a-row>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planType">
<j-select-user-by-dep v-model="model.planType" disabled/>
<j-select-user-by-dep v-decorator="['createBy']" disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
<j-select-company v-model="model.company" multi disabled/>
<j-select-company v-decorator="['company']" multi disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId">
<j-select-depart v-model="model.departId" multi disabled/>
<j-select-depart v-decorator="['departId']" multi disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryType">
<!-- <a-input-number v-model="model.deliveryType" placeholder="请输入物资类型" style="width: 100%" />-->
<j-dict-select-tag type="list" v-model="form.deliveryType"
<j-dict-select-tag type="list" v-decorator="['deliveryType']"
dictCode="explosive_type"
placeholder="请选择物资类型" @change="elect"/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batch">
<a-input v-model="model.batch" placeholder="请输入批次" ></a-input>
<a-input v-decorator="['batch']" placeholder="请输入批次" ></a-input>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="文件Id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fileId">
<a-input v-model="model.fileId" placeholder="请输入文件Id" ></a-input>
<a-input v-decorator="['fileId']" placeholder="请输入文件Id" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-form>
</j-form-container>
<!-- 子表单区域 -->
<a-tabs v-model="activeKey" @change="handleChangeTabs">
@ -94,6 +94,7 @@ import { FormTypes, getRefPromise, VALIDATE_NO_PASSED, validateFormAndTables } f
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import { getStringArry } from '@api/manage'
import pick from 'lodash.pick'
export default {
name: 'ProcessIndustrialDeliveryForm',
@ -456,9 +457,18 @@ import { getStringArry } from '@api/manage'
},
popupCallback(company, row, puwwcid) {
let res = JSON.parse(row)
this.model.planType = res.username
this.model.company = company
this.model.departId = res.departIds
let param = {}
param.createBy = res.username
param.company = company
param.departId = res.departIds;
//查询数据
// this.getSortNum(res.departIds);
// param.createTime = getCurrentTime();
this.data = param
let fieldval = pick(this.data, 'createBy', 'company', 'departId')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval);
})
},
addBefore(){
this.processIndustrialDeliveryMaterialTable.dataSource=[]

30
src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
Unescape View File

@ -2,39 +2,39 @@
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-form ref="form" :form="form" slot="detail">
<a-row>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planType">
<j-select-user-by-dep v-model="model.planType" disabled/>
<j-select-user-by-dep v-decorator="['createBy']" v-model="model.planType" disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
<j-select-company v-model="model.company" multi disabled/>
<j-select-company v-decorator="['createBy']" v-model="model.company" multi disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId">
<j-select-depart v-model="model.departId" multi disabled/>
<j-select-depart v-decorator="['createBy']" v-model="model.departId" multi disabled/>
</a-form-model-item>
</a-col>
<a-col :span="8" >
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<!-- <a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>-->
<j-dict-select-tag type="list" v-model="form.type"
<j-dict-select-tag type="list" v-model="form.type" v-decorator="['createBy']"
dictCode="explosive_type"
placeholder="请选择物资类型" @change="elect"/>
</a-form-model-item>
</a-col>
<a-col :span="8" >
<a-form-model-item label="文件Id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fileId">
<a-input v-model="model.fileId" placeholder="请输入文件Id" ></a-input>
<a-input v-decorator="['createBy']" v-model="model.fileId" placeholder="请输入文件Id" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-form>
</j-form-container>
<!-- 子表单区域 -->
<a-tabs v-model="activeKey" @change="handleChangeTabs">
@ -87,6 +87,7 @@ import { getAction, getStringArry } from '@/api/manage'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import pick from 'lodash.pick'
export default {
name: 'ProcessIndustrialRestoreForm',
@ -464,9 +465,18 @@ import { getAction, getStringArry } from '@/api/manage'
},
popupCallback(company, row, puwwcid) {
let res = JSON.parse(row)
this.model.planType = res.username
this.model.company = company
this.model.departId = res.departIds
let param = {}
param.createBy = res.username
param.company = company
param.departId = res.departIds;
//查询数据
// this.getSortNum(res.departIds);
// param.createTime = getCurrentTime();
this.data = param
let fieldval = pick(this.data, 'createBy', 'company', 'departId')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval);
})
},
addBefore(){
this.processIndustrialRestoreMaterialTable.dataSource=[]

34
src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
Unescape View File

@ -2,27 +2,27 @@
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-form ref="form" :form="form" slot="detail">
<a-row>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planType">
<j-select-user-by-dep v-model="model.planType" disabled />
<j-select-user-by-dep v-decorator="['createBy']" disabled />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
<j-select-company v-model="model.company" multi disabled />
<j-select-company v-decorator="['company']" multi disabled />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId">
<j-select-depart v-model="model.departId" multi disabled />
<j-select-depart v-decorator="['departId']" multi disabled />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fileId">
<a-input v-model="model.fileId" placeholder="请输入文件"></a-input>
<a-input v-decorator="['fileId']" placeholder="请输入文件"></a-input>
</a-form-model-item>
</a-col>
@ -30,13 +30,13 @@
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<!-- <a-input v-model="model.type" placeholder="请输入物资类型"></a-input>-->
<!-- <a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>-->
<j-dict-select-tag type="list" v-model="form.type"
<j-dict-select-tag type="list" v-decorator="['type']"
dictCode="explosive_type"
placeholder="请选择物资类型" @change="elect" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-form>
</j-form-container>
<!-- 子表单区域 -->
<a-tabs v-model="activeKey" @change="handleChangeTabs">
@ -90,6 +90,7 @@ import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import { validateDuplicateValue } from '@/utils/util'
import { getStringArry } from '@api/manage'
import pick from 'lodash.pick'
export default {
name: 'ProcessIndustrialScrapsForm',
@ -255,6 +256,10 @@ export default {
}
},
created() {
let company = sessionStorage.getItem('PARENT_ID')
let puwwcid = sessionStorage.getItem('PUWWC_Id')
let userInfo = sessionStorage.getItem('USER_INFORMATION')
this.popupCallback(company, userInfo, puwwcid)
},
methods: {
//物资类型切换
@ -475,9 +480,18 @@ export default {
popupCallback(company, row, puwwcid)
{
let res = JSON.parse(row)
this.model.planType = res.username
this.model.company = company
this.model.departId = res.departIds
let param = {}
param.createBy = res.username
param.company = company
param.departId = res.departIds;
//查询数据
// this.getSortNum(res.departIds);
// param.createTime = getCurrentTime();
this.data = param
let fieldval = pick(this.data, 'createBy', 'company', 'departId')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval);
})
}
,
addBefore()

107
src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue
Unescape View File

@ -2,26 +2,26 @@
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-form ref="form" :form="form" slot="detail">
<a-row>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planType">
<j-select-user-by-dep v-model="model.planType" disabled />
<j-select-user-by-dep v-decorator="['createBy']" disabled />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
<j-select-company v-model="model.company" multi disabled />
<j-select-company v-decorator="['company']" multi disabled />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId">
<j-select-depart v-model="model.departId" multi disabled />
<j-select-depart v-decorator="['departId']" multi disabled />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="存储位置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="storageLocation">
<a-input v-model="model.storageLocation" placeholder="请输入存储位置"></a-input>
<a-input v-decorator="['storageLocation']" placeholder="请输入存储位置"></a-input>
</a-form-model-item>
</a-col>
@ -29,18 +29,18 @@
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<!-- <a-input v-model="model.type" placeholder="请输入物资类型"></a-input>-->
<!-- <a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>-->
<j-dict-select-tag type="list" v-model="form.type"
dictCode="explosive_type"
<j-dict-select-tag type="list" v-decorator="['type']"
dictCode="explosive_type" :trigger-change="true"
placeholder="请选择物资类型" @change="elect" />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="文件ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fileId">
<a-input v-model="model.fileId" placeholder="请输入文件ID"></a-input>
<a-form-model-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fileId">
<a-input v-decorator="['fileId']" placeholder="请输入文件"></a-input>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-form>
</j-form-container>
<!-- 子表单区域 -->
<a-tabs v-model="activeKey" @change="handleChangeTabs">
@ -93,6 +93,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import { getStringArry } from '@api/manage'
import pick from 'lodash.pick'
export default {
name: 'ProcessIndustrialStorageForm',
@ -288,8 +289,29 @@ export default {
}
},
created() {
let company = sessionStorage.getItem('PARENT_ID')
let puwwcid = sessionStorage.getItem('PUWWC_Id')
let userInfo = sessionStorage.getItem('USER_INFORMATION')
this.popupCallback(company, userInfo, puwwcid);
},
methods: {
popupCallback(company, row, puwwcid) {
let res = JSON.parse(row)
let param = {}
param.createBy = res.username
param.company = company
param.departId = res.departIds;
//查询数据
// this.getSortNum(res.departIds);
// param.createTime = getCurrentTime();
this.data = param
let fieldval = pick(this.data, 'createBy', 'company', 'departId');
this.$nextTick(() => {
this.form.setFieldsValue(fieldval);
console.log("-=-=执行了",fieldval)
})
},
//物资类型切换
elect(val) {
if (val != undefined) {
@ -327,64 +349,6 @@ export default {
this.describes = this.describes + '---' + formData.processIndustrialStorageMaterialList[i].materialName
}
}
})
},
props: {
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
},
/*是否处理流程*/
task: { type: Boolean, default: false, required: false },
/*采购类型*/
isPlanType: { type: Boolean, default: false, required: false }
},
computed: {
formDisabled() {
return this.disabled
}
},
created() {
let company = sessionStorage.getItem('PARENT_ID')
let puwwcid = sessionStorage.getItem('PUWWC_Id')
let userInfo = sessionStorage.getItem('USER_INFORMATION')
this.popupCallback(company, userInfo, puwwcid)
},
methods: {
popupCallback(company, row, puwwcid) {
let res = JSON.parse(row)
this.model.planType = res.username
this.model.company = company
this.model.departId = res.departIds
},
//物资类型切换
elect(val) {
if (val != undefined) {
this.assigneesText = val
}
},
//通过
saveAndpassTask() {
this.handleSubmit(true)
},
//驳回
backTask() {
},
//通过
passTask() {
},
//提交申请
applySubmit(e) {
this.getAllTable().then(tables => {
return validateFormAndTables(this.form, tables)
}).then(allValues => {
if (typeof this.classifyIntoFormData !== 'function') {
throw this.throwNotFunction('classifyIntoFormData')
}
let formData = this.classifyIntoFormData(allValues)
console.log('=--=-=-', formData)
/* if (formData.processIndustrialPurchaseMaterialList==0){
this.$message.error('请填写清单内容')
return
@ -397,10 +361,7 @@ export default {
}
}
*/
formData.fileId = getStringArry(formData.fileId)
// if (this.materialPrice != 0 && this.materialPrice != null) {
// formData.materialPrice = this.materialPrice;
@ -618,11 +579,9 @@ export default {
close() {
this.visible = false
this.$emit('close')
this.$refs.form.clearValidate()
// this.$refs.form.clearValidate()
}
}
}
}
</script>

Write Preview
Loading…
Cancel
Save