Browse Source

修改报废数量输入问题

dev
caoyizhong 2 years ago
parent
commit
ed42cc95ba
  1. 2
      src/components/jeecg/HDelivery.vue
  2. 3
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  3. 24
      src/views/activiti/form/ProcessSmaterialsScrapForm.vue

2
src/components/jeecg/HDelivery.vue

@ -181,7 +181,7 @@
}
},
callBack(rows) {
console.log(rows[0].id)
// console.log(rows[0].id)
// update--begin--autor:lvdandan-----date:20200630------for------
let orgFieldsArr = this.orgFields.split(',')
let destFieldsArr = this.destFields.split(',')

3
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@ -337,7 +337,8 @@
deliveryTime: { rules: [{ required: true, message: '请选择出库时间!' }] },
processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }
},
materialGroupId: undefined
materialGroupId: undefined,
hiegs:true
}
},
props: {

24
src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@ -361,11 +361,28 @@
onSelect(record){
// console.log(record.row);
if(!!record.row.scrapNumber && !!record.row.materialPrice && !! record.row.id){
let shut = {};
if(this.processSmaterialsScrapListTable.dataSource.length > 0){
let it = this.processSmaterialsScrapListTable.dataSource;
it.forEach( item =>{
//
if(item.materialGroup === record.row.materialGroup){
shut = item;
}
})
}
if(!!shut && record.row.scrapNumber > shut.pleaseSendNumber){
record.row.scrapNumber = shut.pleaseSendNumber;
}else if(!!shut && record.row.scrapNumber < shut.pleaseSendNumber){
}else{
return ;
}
let values = [
{
rowKey: record.row.id,
values: {
// 'scrapNumber': '',
'scrapNumber': record.row.scrapNumber,
'materialAmount': record.row.scrapNumber * record.row.materialPrice,
},
},
@ -390,6 +407,7 @@
this.getAction(this.url.queryById, {
id: r.tableId
}).then((res) => {
// console.log("res.result1111111111",res.result);
if (res.success) {
let formData = res.result
formData.tableName = r.tableName
@ -411,10 +429,11 @@
}
}
this.processOutflowIds=ids.join(",");
console.log(this.processOutflowIds,"传值-------------------------")
// console.log(this.processOutflowIds,"-------------------------")
let params = {}
params.ids = JSON.stringify(ids)
this.requestSubTableData(this.url.list, params, this.processSmaterialsScrapListTable)
// console.log("this.processSmaterialsScrapListTable0",this.processSmaterialsScrapListTable.dataSource)
},
close() {
//todo
@ -608,6 +627,7 @@
param.sysOrgCode = res.departIds
param.createTime = getCurrentTime()
this.data = param
console.log("23412341234",this.data)
let fieldval = pick(this.data, 'createBy', 'company', 'sysOrgCode', 'createTime')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval)

Loading…
Cancel
Save