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

修改采购数据回显

dev
caoyizhong 2 years ago
parent
cbf10cbe87
commit
22c04ccea7
3 changed files with 268 additions and 70 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. 74
      src/components/jeecg/MBCEditableTable.vue
  2. 181
      src/views/burst/form/purchase/ProcessIndustrialPurchaseForm.vue
  3. 83
      src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue

74
src/components/jeecg/MBCEditableTable.vue
Unescape View File

@ -11,7 +11,8 @@
<a-col>
<!-- 操作按钮 -->
<div v-if="actionButton" class="action-button">
<a-button type="primary" icon="plus" @click="handleClickAdd" :disabled="disabled">新增</a-button>
<a-button type="primary" icon="plus" @click="handleClickAdd"v-if="isabled" :disabled="isabled">新增</a-button>
<a-button type="primary" icon="plus" @click="handleClickAdd" v-else :disabled="isabled">新增</a-button>
<span class="gap"></span>
<template v-if="selectedRowIds.length>0">
<a-popconfirm
@ -715,6 +716,11 @@ export default {
type: String,
},
// 是否禁用新增按钮
isabled: {
type: Boolean,
default: false
},
// 部门信息
sections: {
type: Object,
@ -799,9 +805,7 @@ export default {
lastPushTimeMap: new Map(),
number:0,
url:{
descriptionRakeUrl: "/description/processDescription/list",
merchandiseNewsList: '/burst/processIndustrial/ownList', //查询民爆清单
merchandiseNewsListDB: '/wastematerials/processWasteMaterials/merchandiseNewsName',
}
}
},
@ -970,64 +974,34 @@ export default {
searchOption (input,pro,index){
// console.log("searchOption=========",input,index);
return new Promise(async (resolve, reject) => {
if(index == 1 && !input || index == 3 && !input){
if(index == 1 && !input || index == 2 && !input){
return;
}
let ib = false;
let par = {
materialsNumber: input,
materialType: this.dragSortType,
// materialDepart: this.putUnder
}
let pattern = new RegExp("[\u4E00-\u9FA5]+");
if(pattern.test(input) && index == 1 || pattern.test(input) && index == 3){
ib = true;
}
let url = '' ;
if(!!this.appropriationPlan){
//总库
// url = this.url.merchandiseNewsList;
// console.log("222222222");
}else{
//账外
// console.log("111",this.sections);
if(!!this.materialNature){
console.log("执行了");
par.materialNature = this.materialNature;
}
if(!!this.sections){
if(this.sections.orgType == "2"){
par.departId = this.sections.departIds;
}
if(this.sections.orgType == "3"){
par.departId = this.sections.parentId;
}
}
url = this.url.merchandiseNewsListDB;
type: this.dragSortType,
}
if(index == 1){
par.coding = input;
}else if(index == 2){
par.name = input;
}
await getAction(url,par).then( (res)=>{
// console.log("pad",par);
await getAction(this.url.merchandiseNewsList,par).then( (res)=>{
let a= [];
if(res.success){
console.log("222222222222222===",res.result);
// console.log("222222222222222===",res.result);
let pam = res.result.records||res.result;
pam.forEach( item => {
let isb = false;
let val = '';
if(!!this.appropriationPlan){
val = item.id
}else{
val = item.merchandiseNewsId
}
let name = null;
if(ib){
name = item.merchandiseName;
}else{
name = item.materialsNumber;
}
if(index == 1){
name = item.coding;
}else if(index == 2 ){
name = item.name;
}
a.push({
title : name,
value : val,
disabled: isb
value : item.id,
disabled: false
})
})
this.columns[index].options = a;

181
src/views/burst/form/purchase/ProcessIndustrialPurchaseForm.vue
Unescape View File

@ -101,16 +101,30 @@
<a-tabs v-model="activeKey" @change="handleChangeTabs">
<a-tab-pane tab="采购民爆物资清单" :key="refKeys[0]" :forceRender="true">
<m-b-c-editable-table
:ref="refKeys[0]"
ref="processIndustrialPurchaseMaterial"
:loading="processIndustrialPurchaseMaterialTable.loading"
:columns="processIndustrialPurchaseMaterialTable.columns"
:dataSource="processIndustrialPurchaseMaterialTable.dataSource"
:maxHeight="200"
:disabled="formDisabled"
:dragSortType = this.assigneesText
:rowNumber="true"
@shifu="shifu"
:isabled = this.newlyIncreased
@valueChange="onSelect"
:rowSelection="true"
:actionButton="true"/>
:actionButton="true">
<!-- <template v-slot:actionPrice="props">-->
<!-- <a-tooltip placement="top">-->
<!-- <template v-slot:title="props">-->
<!-- <p v-for="(item,index) in historyPrices" :key="index" >历史价格：{{ item.price }} 历史数量：{{item.quantity}}-->
<!-- 修改人：{{item.createBy_dictText}}</p>-->
<!-- </template>-->
<!-- <a-button @mouseenter="seeHistoryPrice(props)" v-has="'udgePalan:hisotoryPrice'">记录</a-button>-->
<!-- </a-tooltip>-->
<!-- -->
<!-- </template>-->
</m-b-c-editable-table>
</a-tab-pane>
</a-tabs>
<div class="div_process">
@ -148,8 +162,9 @@ import { FormTypes, getRefPromise, VALIDATE_NO_PASSED, validateFormAndTables } f
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import { getCurrentTime, getStringArry, httpAction } from '@api/manage'
import { getAction, getCurrentTime, getStringArry, httpAction } from '@api/manage'
import pick from 'lodash.pick'
import { accMul } from '../../../../../common/common'
export default {
name: 'ProcessIndustrialPurchaseForm',
@ -167,6 +182,7 @@ import pick from 'lodash.pick'
return {
isGetOneAndLast: true, //提交按钮显示
btndisabled: false,
newlyIncreased: true, //新增按钮
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
@ -247,7 +263,8 @@ import pick from 'lodash.pick'
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
options: [],
// validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '系列',
@ -277,14 +294,15 @@ import pick from 'lodash.pick'
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '对比单价',
key: 'contrastPrice',
type: FormTypes.input,
width:"120px",
placeholder: '请输入${title}',
defaultValue:'',
},
// {
// title: '对比单价',
// key: 'contrastPrice',
// type: FormTypes.slot,
// width:"120px",
// placeholder: '请输入${title}',
// defaultValue:'',
// slotName: 'actionPrice'
// },
{
title: '数量',
key: 'materialQuantity',
@ -479,6 +497,8 @@ import pick from 'lodash.pick'
},
url: {
add: "/burst/processIndustrialPurchase/add",
queryById: "/burst/processIndustrial/queryById",
list: "/burst/processIndustrial/list",
edit: "/burst/processIndustrialPurchase/edit",
addFromTableApply: "/burst/processIndustrialPurchase/addFromTableApply",
processIndustrialPurchaseMaterial: {
@ -486,6 +506,9 @@ import pick from 'lodash.pick'
},
},
assigneesText:null, //物资类型
isShifu: false, //是否搜过
MBShuJuList: [], //表格数据
MBShuJu: {}, //民爆对象
}
},
props: {
@ -519,17 +542,145 @@ import pick from 'lodash.pick'
let company = sessionStorage.getItem('PARENT_ID')
let puwwcid = sessionStorage.getItem('PUWWC_Id')
let userInfo = sessionStorage.getItem('USER_INFORMATION')
this.popupCallback(company, userInfo, puwwcid)
this.popupCallback(company, userInfo, puwwcid);
this.getMBShuJu();
},
methods: {
//列表搜索了
shifu() {
this.isShifu = true
},
//列表赋值
fuZhi(id,v){
let values = [
{
rowKey: id,
values: {
'materialNumber': v.coding,
'materialGroup': null,
'materialSeries': !!v.series ? v.series : undefined ,
'materialName': v.name,
'materialUnit': v.unit,
'supplierId': v.manufacturer,
'materialPrice': null,
'materialQuantity': null
}
}
]
// console.log(values);
this.$refs.processIndustrialPurchaseMaterial.setValues(values)
},
//清空
qingKong(id){
let values = [
{
rowKey: id,
values: {
'materialGroup': null,
'materialNumber': undefined,
'materialSeries': '',
'materialName': undefined,
'materialUnit': '',
'supplierId': '',
'materialAmount': '',
}
}
]
this.$refs.processIndustrialPurchaseMaterial.setValues(values);
},
// 列表数据改变
onSelect(record){
console.log("列表值=-",record);
async onSelect(record){
// console.log("列表值=-",record);
if ( record.column.key == "materialNumber" && !!record.row.materialName
|| record.column.key =="materialName" && !!record.row.materialNumber ) {
console.log("select==清空数据",record.row);
this.qingKong(record.row.id);
return
}
if(this.isShifu){
//查询民爆数据
await this.getMBShuJu(record.value);
this.isShifu = false;
this.fuZhi(record.row.id,this.MBShuJu);
}
if(record.column.key =="materialNumber" && !!record.row.id ){
this.MBShuJuList.forEach(item =>{
if(item.id === record.value){
this.fuZhi(record.row.id,item);
}
})
}
//计算金额
if (!!record.row.materialQuantity && !!record.row.materialPrice && !!record.row.id ) {
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
console.log("3出发了");
//回填数据
if (record.row.id !== undefined) {
let values = [
{
rowKey: record.row.id,
values: {
'materialQuantity': record.row.materialQuantity,
'materialAmount': accMul(record.row.materialQuantity,record.row.materialPrice),
}
}
]
this.$refs.processIndustrialPurchaseMaterial.setValues(values)
}
}
},
//查询数据
async getMBShuJu(v){
let par ={};
let url = '';
if(!!v){
par.id = v;
url = this.url.queryById
} else {
url = this.url.list
}
await getAction(url,par).then(res => {
console.log(res,"-=-=0=");
if(res.success){
if(!!v){
this.MBShuJu = res.result;
}else{
this.MBShuJuList = res.result.records;
this.initialData(this.MBShuJuList);
}
}
})
},
//初始列表数据
initialData(newList){
if (this.processIndustrialPurchaseMaterialTable.columns[1].options.length > 0) {
this.processIndustrialPurchaseMaterialTable.columns[1].options = []
}
if (this.processIndustrialPurchaseMaterialTable.columns[2].options.length > 0) {
this.processIndustrialPurchaseMaterialTable.columns[2].options = []
}
let qc = [];
newList.forEach(item => {
qc.push({
title: item.coding,
value: item.id,
disabled: false
})
})
this.processIndustrialPurchaseMaterialTable.columns[1].options = qc;
},
//物资类型切换
elect(val) {
if (val != undefined) {
this.assigneesText = val;
this.newlyIncreased = false;
}
},
//通过

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

@ -20,23 +20,34 @@
</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-decorator="['storageLocation']" placeholder="请输入存储位置"></a-input>
<a-form-model-item label="入目标库" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="storageLocation">
<!-- <a-input v-decorator="['storageLocation']" placeholder="请输入目标库"></a-input>-->
<j-select-depart v-decorator="['storageLocation']" :multiple="false" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-item label="关联预算流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>-->
<h-plan v-decorator="['processUdgetPlanId']" :trigger-change="true"
code="demo" field="name" orgFields="name" @mounted="getPlanList" @PlanIds="getPlanIds"
@callType="getcallType"
destFields="name"/>
</a-form-item>
</a-col>
<a-col :xs="24" :sm="8">
<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-decorator="['type']"
dictCode="explosive_type" :trigger-change="true"
dictCode="explosive_type" :trigger-change="true" disabled
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="fileId">
<a-input v-decorator="['fileId']" placeholder="请输入文件"></a-input>
<a-form-model-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" prop="fileId">
<!-- <a-input v-decorator="['fileId']" placeholder="请输入文件"></a-input>-->
<j-upload v-decorator="['fileId']" :trigger-change="true" style="z-index: 999"></j-upload>
</a-form-model-item>
</a-col>
</a-row>
@ -94,6 +105,8 @@ import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import { getStringArry } from '@api/manage'
import pick from 'lodash.pick'
import HPlan from '@comp/jeecg/HPlan'
export default {
name: 'ProcessIndustrialStorageForm',
@ -101,6 +114,7 @@ export default {
components: {
JFormContainer,
JDate,
HPlan,
JUpload,
JSelectDepart,
JSelectUserByDep,
@ -119,6 +133,14 @@ export default {
xs: { span: 24 },
sm: { span: 16 }
},
labelCol3: {
xs: { span: 24 },
sm: { span: 5 }
},
wrapperCol3: {
xs: { span: 24 },
sm: { span: 5 }
},
model: {
planType: null,
company: null,
@ -295,6 +317,57 @@ export default {
this.popupCallback(company, userInfo, puwwcid);
},
methods: {
getcallType(type) {
this.data.materialType = type.materialType
let fieldval = pick(this.data, 'materialType')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval)
})
},
getPlanIds(val) {
let ids = []
if (!!val) {
for (let i = 0; i < val.length; i++) {
ids.push(val[i].id)
}
}
this.processUdgetPlanIds = ids.join(',')
},
async getPlanList(val) {
if (val.length > 0) {
if (val[0].materialType == 1) {
this.isTargetLibrary = true
} else {
this.isTargetLibrary = false
}
}
let ids = []
if (!!val) {
for (let i = 0; i < val.length; i++) {
ids.push(val[i].id)
}
}
this.processUdgetPlanIds = ids.join(',')
let params = {}
params.ids = JSON.stringify(ids)
console.log(params,"*****************>>")
await this.requestSubTableDatas(this.url.list, params, this.processMaterialWarehousingListTable)
// getAction(this.url.list,params).then((res)=>{
// if(res.success){
// console.log('将要回填的数据',res.result)
// }
// })
let res = val[0]
let param = {}
param.planType = res.planType
param.ifDirect=res.ifDirect
param.ifInspection=res.ifInspection
this.data = param
let fieldval = pick(this.data, 'planType','ifDirect','ifInspection')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval)
})
},
popupCallback(company, row, puwwcid) {
let res = JSON.parse(row)
let param = {}

Write Preview
Loading…
Cancel
Save