From 6fd5a5a974a6198ade32cf8a3116f39684ffd257 Mon Sep 17 00:00:00 2001 From: long <18782126717@163.com> Date: Thu, 5 Jan 2023 16:26:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=AF=E5=90=A6=E9=80=81?= =?UTF-8?q?=E6=A3=80=E7=A7=BB=E5=8A=A8=E5=88=B0=E9=87=87=E8=B4=AD=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tools/ShowAnnouncement.vue | 2 +- .../plan/ProcessMaterialsPlanList.vue | 7 +- .../ProcessMaterialsPlanStatement4.vue | 140 ++++++++++++++++++ .../form/ProcessMaterialWarehousingForm.vue | 71 ++------- src/views/activiti/form/ProcessUdgetPlan.vue | 3 +- .../activiti/form/ProcessUdgetPlanForm.vue | 126 +++++++++++++++- src/views/activiti/todoManage.vue | 5 +- 7 files changed, 283 insertions(+), 71 deletions(-) create mode 100644 src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue diff --git a/src/components/tools/ShowAnnouncement.vue b/src/components/tools/ShowAnnouncement.vue index 0812437..e9595d5 100644 --- a/src/components/tools/ShowAnnouncement.vue +++ b/src/components/tools/ShowAnnouncement.vue @@ -11,7 +11,7 @@ 关闭 去处理 - + diff --git a/src/views/accessrecords/plan/ProcessMaterialsPlanList.vue b/src/views/accessrecords/plan/ProcessMaterialsPlanList.vue index b3a13c2..4a34e57 100644 --- a/src/views/accessrecords/plan/ProcessMaterialsPlanList.vue +++ b/src/views/accessrecords/plan/ProcessMaterialsPlanList.vue @@ -50,6 +50,9 @@ + @@ -61,6 +64,7 @@ import { getAction } from '@api/manage' import ProcessMaterialsPlanStatement2 from '../statement/ProcessMaterialsPlanStatement2' import ProcessMaterialsPlanStatement3 from '../statement/ProcessMaterialsPlanStatement3' + import ProcessMaterialsPlanStatement4 from '../statement/ProcessMaterialsPlanStatement4' export default { name: 'ProcessMaterialsPlanList', @@ -69,7 +73,8 @@ ProcessMaterialWarehousingFlowChart, ProcessMaterialsPlanStatement, ProcessMaterialsPlanStatement2, - ProcessMaterialsPlanStatement3 + ProcessMaterialsPlanStatement3, + ProcessMaterialsPlanStatement4 }, data() { return { diff --git a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue new file mode 100644 index 0000000..b5bfd24 --- /dev/null +++ b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue @@ -0,0 +1,140 @@ + + + + + \ No newline at end of file diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index 8780dfb..fc2f8bf 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -71,16 +71,16 @@ style="width: 100%"/> - + - - + - @@ -471,23 +471,6 @@ id: r.tableId }).then((res) => { if (res.success) { - if (res.result.materialType == 1) { - this.isTargetLibrary = true - } - if (res.result.materialType!=6){ - if (res.result.planType==1){ - this.isIfDirect=true - //isIfInspection - if (res.result.ifDirect==1){ - this.isIfInspection=true - } - }else { - this.isIfDirect=false - } - - }else { - this.isIfDirect=false - } let formData = res.result formData.tableName = r.tableName this.data = formData @@ -537,20 +520,7 @@ } else {//总库没有目标库 formData.targetLibrary = null } - if(formData.planType==1 && formData.materialType !=6){ - console.log('格式化后的数据', formData) - if (formData.ifDirect==null){ - this.$message.error('请选择是否属于直达物资!') - return - }else { - if(formData.ifDirect==1){ - if (formData.ifInspection==null){ - this.$message.error('请选择是否需要送检!') - return - } - } - } - } + this.form.validateFields((err, values) => { if (!err) { @@ -617,19 +587,7 @@ } formData.describes = this.describes console.log('格式化后的数据', formData) - if(formData.planType==1 && formData.materialType !=6){ - if (formData.ifDirect==null){ - this.$message.error('请选择是否属于直达物资!') - return - }else { - if(formData.ifDirect==1){ - if (formData.ifInspection==null){ - this.$message.error('请选择是否需要送检!') - return - } - } - } - } + this.form.validateFields((err, values) => { if (!err) { formData.procDefId = this.processData.id @@ -805,22 +763,12 @@ // } // }) let res = val[0] - if (res.materialType!=6){ - if (res.planType==1){ - this.isIfDirect=true - //isIfInspection - }else { - this.isIfDirect=false - } - }else { - this.isIfDirect=false - } let param = {} param.planType = res.planType - console.log("res+++++++++++++") - console.log(res) + param.ifDirect=res.ifDirect + param.ifInspection=res.ifInspection this.data = param - let fieldval = pick(this.data, 'planType') + let fieldval = pick(this.data, 'planType','ifDirect','ifInspection') this.$nextTick(() => { this.form.setFieldsValue(fieldval) }) @@ -886,7 +834,6 @@ }, popupCallback(company, row, puwwcid) { let res = JSON.parse(row) - console.log(res, '-----------------') let param = {} param.createBy = res.username param.company = company diff --git a/src/views/activiti/form/ProcessUdgetPlan.vue b/src/views/activiti/form/ProcessUdgetPlan.vue index a955a85..97331e8 100644 --- a/src/views/activiti/form/ProcessUdgetPlan.vue +++ b/src/views/activiti/form/ProcessUdgetPlan.vue @@ -4,7 +4,7 @@ + :isSourceCapital="isSourceCapital" :routePlanName="routePlanName"/> @@ -54,6 +54,7 @@ isPlanType: {type: Boolean, default: false, required: false}, /*资金来源*/ isSourceCapital:{type: Boolean, default: false, required: false}, + routePlanName:{type:String,default:'',required: false}, processData:{ type:Object, default:()=>{return {}}, diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index d58fde8..5a325aa 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -76,7 +76,20 @@ placeholder="请选择资金来源"/> - + + + + + + + + + + @@ -115,6 +128,15 @@ + @@ -234,6 +256,7 @@ // editingKey: '', isabled: true, isGetOneAndLast: false, + isIfDirect:false, bigId: [], opinion: '', bigIdRake: [], @@ -242,20 +265,23 @@ bigIdRakeList: [], materialPrice: 0, materialAmount: 0, - getMaterialAmount: 0, describes: '', hiegs: true, historyBigId: [], + historyPrices:[], + historyPrice:{ + }, isHistoryBigId: false, + isIfInspection:false, bigIdMerchandiseNews: [], bigIdMerchandiseNewsList: [], labelCol: { xs: { span: 24 }, - sm: { span: 6 } + sm: { span: 8 } }, wrapperCol: { xs: { span: 24 }, - sm: { span: 18 } + sm: { span: 16 } }, labelCol2: { xs: { span: 24 }, @@ -423,6 +449,17 @@ slotName: 'action' // scopedSlots: {customRender: 'fileSlot'} }, + { + title: '历史记录', + key: 'actionPrice', + type: FormTypes.slot, + disabled: this.disabled, + width: '80px', + // placeholder: '请输入${title}', + // defaultValue: '', + slotName: 'actionPrice' + // scopedSlots: {customRender: 'fileSlot'} + }, { title: '数量', key: 'materialQuantity', @@ -500,6 +537,7 @@ descriptionRake: '/description/processDescription/descriptionName', merchandiseNewsList: '/merchandisenews/processMerchandiseNews/merchandiseNewsList', historyUrl: '/suppliesstronger/processSuppliesStronger/list', + priceQuantityHistory:'/hy/priceQuantityHistory/list', getFirstNode: '/actProcessIns/getFirstNode', processUdgetPlanMaterial: { list: '/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId' @@ -544,6 +582,7 @@ isPlanType: { type: Boolean, default: false, required: false }, /*资金来源*/ isSourceCapital: { type: Boolean, default: false, required: false }, + routePlanName:{type:String,default:'',required: false}, //流程表单data formData: { type: Object, @@ -609,6 +648,7 @@ let userInfo = sessionStorage.getItem('USER_INFORMATION') // userInfo.company=company; if (!this.isNew) { + console.log(this.routePlanName,"---------------------->") this.init() // this.isSourceCapital=true; // this.isPlanType=true; @@ -749,7 +789,28 @@ } }, + async seeHistoryPrice(log){ + this.historyPrices=[]; + console.log(log) + let param={ + relationId:log.rowId, + pageSize: 5 + } + getAction(this.url.priceQuantityHistory, param).then((res) => { + console.log(res); + if (res.success) { + res.result.records.forEach(item => { + if (parseInt(res.result.total) > 0) { + this.isHistoryBigId = true + console.log(item.createBy_dictText); + this.historyPrices.push(item) + } + }) + + } + }) + }, //查看历史价格 async chaKan(log) { // console.log("00000000",log); @@ -1083,6 +1144,13 @@ this.isBu = undefined }, + selectChang(val){ + if (val==1){ + this.isIfInspection=true; + }else { + this.isIfInspection=false; + } + }, /*回显数据*/ init() { this.btndisabled = true @@ -1104,6 +1172,26 @@ // this.fetchDataRake(); this.descriptionFetchDatas() } + if (this.isPlanType && this.routePlanName=='采购员'){ + if (res.result.materialType == 1) { + this.isTargetLibrary = true + } + if (res.result.materialType!=6){ + if (res.result.planType==1){ + this.isIfDirect=true + //isIfInspection + if (res.result.ifDirect==1){ + this.isIfInspection=true + } + }else { + this.isIfDirect=false + } + + }else { + this.isIfDirect=false + } + } + this.editAfter() this.btndisabled = false } else { @@ -1196,6 +1284,20 @@ formData.title = this.processData.title formData.processInstanceId = this.processData.id } + if(formData.planType==1 && formData.materialType !=6){ + console.log('格式化后的数据', formData) + if (formData.ifDirect==null){ + this.$message.error('请选择是否属于直达物资!') + return + }else { + if(formData.ifDirect==1){ + if (formData.ifInspection==null){ + this.$message.error('请选择是否需要送检!') + return + } + } + } + } console.log(formData, '表单数据') if (this.btndisabled === false) { this.btndisabled = true @@ -1236,7 +1338,7 @@ } console.log(this.data, '数据回显') - let fieldval = pick(this.data, 'id', 'planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'sort', 'orderNumber', 'fileId', 'opinion', 'sourceCapital') + let fieldval = pick(this.data, 'id', 'planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'sort', 'orderNumber', 'fileId', 'opinion', 'sourceCapital','ifDirect','ifInspection') this.$nextTick(() => { this.assigneesText = this.data.materialType this.form.setFieldsValue(fieldval) @@ -1407,6 +1509,20 @@ url = this.url.edit method = 'put' } + if(formData.planType==1 && formData.materialType !=6){ + console.log('格式化后的数据', formData) + if (formData.ifDirect==null){ + this.$message.error('请选择是否属于直达物资!') + return + }else { + if(formData.ifDirect==1){ + if (formData.ifInspection==null){ + this.$message.error('请选择是否需要送检!') + return + } + } + } + } console.log(formData, '格式化的数据') if (this.btndisabled === false) { this.btndisabled = true diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue index 4d6984c..fe94618 100644 --- a/src/views/activiti/todoManage.vue +++ b/src/views/activiti/todoManage.vue @@ -153,6 +153,7 @@ :processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType" :isSourceCapital="lcModa.isSourceCapital" :task="true" :hieg="lcModa.hieg" + :routePlanName="lcModa.routePlanName" @afterSubmit="afterSub" @passTask="()=>passTask(lcModa.processData)" @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId" @@ -292,7 +293,8 @@ isNew: false, hieg: true, isSourceCapital: false, - isPlanType: false + isPlanType: false, + routePlanName:'' }, tableName: '', tableId: '', @@ -516,6 +518,7 @@ this.lcModa.isSourceCapital = true this.lcModa.disabled = false this.lcModa.hieg = false + this.lcModa.routePlanName=res3.result.name } } }