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

出库流程关联类型

dev
0.0 2 years ago
parent
ceba6da737
commit
66854f1b44
6 changed files with 20 additions and 41 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. 2
      src/components/jeecg/HDelivery.vue
  2. 1
      src/components/jeecg/HPlan.vue
  3. 27
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  4. 2
      src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
  5. 17
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue
  6. 2
      src/views/activiti/form/ProcessUdgetPlanForm.vue

2
src/components/jeecg/HDelivery.vue
Unescape View File

@ -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)
}
}
}

1
src/components/jeecg/HPlan.vue
Unescape View File

@ -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)

27
src/views/activiti/form/ProcessMaterialWarehousingForm.vue
Unescape View File

@ -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;

2
src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
Unescape View File

@ -69,7 +69,7 @@
</a-form-item>
</a-col>
<a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
<a-button @click="submitForm">提 交</a-button>
<a-button @click="handleSubmit">提 交</a-button>
</a-col>
</a-row>
</a-form>

17
src/views/activiti/form/ProcessSmaterialsScrapForm.vue
Unescape View File

@ -31,12 +31,12 @@
</a-col>
<a-col :span="8" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" @change="materialType" v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
<j-dict-select-tag type="list" @change="materialType" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" disabled/>
</a-form-item>
</a-col>
<a-col :span="8" >
<a-form-item label="关联出库流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
<h-delivery v-model="processOutflowId" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/>
<h-delivery v-model="processOutflowId" code="demo" field="name" orgFields="name" destFields="name" @callType="getcallType" :multi="true"/>
</a-form-item>
</a-col>
<a-col :span="8" >
@ -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=[]

2
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -107,7 +107,6 @@
</template>
<script>
import { validateTables } from '../../../utils/JEditableTableUtil'
const VALIDATE_NO_PASSED = Symbol()
import pick from 'lodash.pick'
@ -122,7 +121,6 @@
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import { fetchDescription } from '@/utils/basics/basicsquery'
export default {

Write Preview
Loading…
Cancel
Save