diff --git a/src/views/activiti/Cleared.vue b/src/views/activiti/Cleared.vue
index e3753ed..57a9472 100644
--- a/src/views/activiti/Cleared.vue
+++ b/src/views/activiti/Cleared.vue
@@ -175,7 +175,7 @@
<!--流程表单-->
<a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
<component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
- :processData="lcModa.processData" :isNew="lcModa.isNew" :procInstId="lcModa.procInstId"
+ :processData="lcModa.processData" :isNew="lcModa.isNew" :procInstId="lcModa.procInstId" :separate = "lcModa.separate"
:pictureId="lcModa.pictureId"
:itemId="lcModa.itemId"
@close="lcModa.visible=false,lcModa.disabled = false"></component>
@@ -302,6 +302,7 @@ export default {
this.lcModa.formComponent = this.getFormComponent(r.routeName).component;
this.lcModa.processData = r;
this.lcModa.isNew = false;
+ this.lcModa.separate = true;
this.lcModa.procInstId=r.id;
this.lcModa.visible = true;
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index dfdab9e..74464a1 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -1402,11 +1402,12 @@
/** 查询某个tab的数据 */
requestSubTableDatas(url, params, tab, success) {
- // console.log("url, params, tab, success",url, params, tab, success)
+ console.log("url, params, tab, success",url, params, tab, success)
tab.loading = true
getAction(url, params).then(res => {
let { result } = res
let dataSource = []
+ console.log("<<<result",result);
if (result) {
if (Array.isArray(result)) {
dataSource = result
@@ -1471,7 +1472,7 @@
})
if (this.actualNumber) {
// console.log(item,"===========");
- item.actualSendNumber = null
+ // item.actualSendNumber = null
}
})
tab.dataSource = dataSource
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index 5283b6d..238541f 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -307,6 +307,7 @@
queryPageDepare: '/hy/processMaterialsDelivery/queryPageDepare',//查询部门
wasteMaterialsUrlList: '/wastematerials/processWasteMaterials/list', //查询账外物料组数据
wasteMaterialsUrlId: '/wastematerials/processWasteMaterials/queryById', //查询账外物料组数据
+ wasteMaterialsUrl: '/hy/processSmaterialsScrap/queryByIdOwn', //查询账外物料组数据 自定义
getForm: '/actBusiness/getForm',
add: '/hy/processSmaterialsScrap/add',
edit: '/hy/processSmaterialsScrap/edit',
@@ -766,6 +767,7 @@
}
tab.dataSource = dataSource;
tab.dataSource.forEach(item =>{
+ console.log(item)
let par = { id : item.materialGroup,}
let param = {id : item.equipment,}
getAction(this.url.queryByIdDescription,par).then( res=>{
@@ -787,10 +789,13 @@
}
})
let p = {
- id : item.wasteMaterialsId
+ id : item.wasteMaterialsId,
+ processId: params.id,
+ materialNumber: item.equipment
}
this.BaoFeiNumList = [];
- getAction(this.url.wasteMaterialsUrlId,p).then( res=>{
+ console.log("item====>>>",p)
+ getAction(this.url.wasteMaterialsUrl,p).then( res=>{
// console.log("账外数据",res);
if(res.success){
this.BaoFeiNumList.push(res.result);
diff --git a/src/views/activiti/form/ProcessUdgetPlan.vue b/src/views/activiti/form/ProcessUdgetPlan.vue
index 0c2ed48..c047836 100644
--- a/src/views/activiti/form/ProcessUdgetPlan.vue
+++ b/src/views/activiti/form/ProcessUdgetPlan.vue
@@ -5,7 +5,7 @@
<a-tab-pane tab="流程正文" key="1" forceRender >
<process-udget-plan-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task"
@passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData" :isPlanType="isPlanType" :lead="lead"
- :rname = "rname" :printNumber="printNumber"
+ :rname = "rname" :printNumber="printNumber" :separate = "separate"
:isSourceCapital="isSourceCapital" :routePlanName="routePlanName" :itemId="itemId" :is-buyer-name="isBuyerName"/>
</a-tab-pane>
@@ -63,6 +63,7 @@
rname:{type: String, required: false},
/*采购类型*/
isPlanType: {type: Boolean, default: false, required: false},
+ separate: {type: Boolean, default: false, required: false},
/*资金来源*/
isSourceCapital:{type: Boolean, default: false, required: false},
routePlanName:{type:String,default:'',required: false},
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 111ef28..671a63f 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -65,28 +65,28 @@
<a-col :span="8" v-if="isPlanType">
<a-form-item label="采购类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['planType',validatorRules.planType]"
- :trigger-change="true" dictCode="plan_type"
+ :trigger-change="true" dictCode="plan_type" :disabled="separate"
placeholder="请选择采购类型电商或非电商" @change="selectChangPlanType"/>
</a-form-item>
</a-col>
<a-col :span="8" v-if="isSourceCapital">
<a-form-item label="资金来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['sourceCapital',validatorRules.sourceCapital]"
- :trigger-change="true" dictCode="source_capital"
+ :trigger-change="true" dictCode="source_capital" :disabled="separate"
placeholder="请选择资金来源"/>
</a-form-item>
</a-col>
<a-col :span="8" v-if="isIfDirect">
<a-form-item label="是否直达物资" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['ifDirect',validatorRules.ifDirect]"
- :trigger-change="true" dictCode="if_status"
+ :trigger-change="true" dictCode="if_status" :disabled="separate"
placeholder="请选择是否属于直达物资" @change="selectChang"/>
</a-form-item>
</a-col>
<a-col :span="8" v-if="isIfInspection">
<a-form-item label="是否需要送检" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['ifInspection',validatorRules.ifInspection]"
- :trigger-change="true" dictCode="if_status"
+ :trigger-change="true" dictCode="if_status" :disabled="separate"
placeholder="请选择是否需要送检"/>
</a-form-item>
</a-col>
@@ -619,6 +619,7 @@
lead: { type: Boolean, default: false, required: false },
/*采购类型*/
isPlanType: { type: Boolean, default: false, required: false },
+ separate: { type: Boolean, default: false, required: false },
/*资金来源*/
isSourceCapital: { type: Boolean, default: false, required: false },
routePlanName: { type: String, default: '', required: false },