This commit is contained in:
parent
b154723dd0
commit
2a962e471e
|
|
@ -9,7 +9,8 @@
|
||||||
|
|
||||||
<a-button v-if="!getDataId()" @click="pageSelectOrder" :disabled="pageStatus == 'approved'">选择订单</a-button>
|
<a-button v-if="!getDataId()" @click="pageSelectOrder" :disabled="pageStatus == 'approved'">选择订单</a-button>
|
||||||
<a-button type="primary" @click="ok" :disabled="pageStatus == 'approved'">保存</a-button>
|
<a-button type="primary" @click="ok" :disabled="pageStatus == 'approved'">保存</a-button>
|
||||||
<a-button v-if="false" @click="pageApproved" type="primary" :disabled="!this.getDataId() || pageStatus == 'approved'">审批
|
<a-button v-if="false" @click="pageApproved" type="primary"
|
||||||
|
:disabled="!this.getDataId() || pageStatus == 'approved'">审批
|
||||||
</a-button>
|
</a-button>
|
||||||
<a-button @click="print">打印</a-button>
|
<a-button @click="print">打印</a-button>
|
||||||
|
|
||||||
|
|
@ -33,7 +34,7 @@
|
||||||
<a-collapse-panel v-for="(info, index) in infos" :key="info.key" :header="info.header">
|
<a-collapse-panel v-for="(info, index) in infos" :key="info.key" :header="info.header">
|
||||||
|
|
||||||
<a-icon slot="extra" type="delete" @click.stop="removeInfo(index)" />
|
<a-icon slot="extra" type="delete" @click.stop="removeInfo(index)" />
|
||||||
<component-detail :dataId="getDataId()" :itemData="info.data" @reloadData="pageInit"></component-detail>
|
<component-detail ref="componentDetail" :dataId="getDataId()" :itemData="info.data" @reloadData="pageInit"></component-detail>
|
||||||
|
|
||||||
</a-collapse-panel>
|
</a-collapse-panel>
|
||||||
</a-collapse>
|
</a-collapse>
|
||||||
|
|
@ -57,7 +58,8 @@
|
||||||
|
|
||||||
<h4 style="margin-top: 5px;">出现问题及建议反馈</h4>
|
<h4 style="margin-top: 5px;">出现问题及建议反馈</h4>
|
||||||
<vxe-form :data="formOptions2.data" ref="xForm" :title-width="formOptions2.titleWidth"
|
<vxe-form :data="formOptions2.data" ref="xForm" :title-width="formOptions2.titleWidth"
|
||||||
:title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items" :titleColon="false" vertical>
|
:title-align="formOptions2.titleAlign" :rules="formOptions2.rules" :items="formOptions2.items" :titleColon="false"
|
||||||
|
vertical>
|
||||||
</vxe-form>
|
</vxe-form>
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -197,24 +199,24 @@ export default {
|
||||||
|
|
||||||
{ field: 'problem', title: '出现问题及建议反馈', span: 8, itemRender: { name: '$input', props: {} } },
|
{ field: 'problem', title: '出现问题及建议反馈', span: 8, itemRender: { name: '$input', props: {} } },
|
||||||
{
|
{
|
||||||
title: '模具师傅', span: 8,
|
title: '模具师傅', span: 8,
|
||||||
field: 'mold_master_user_detail',
|
field: 'mold_master_user_detail',
|
||||||
dataRule: {
|
dataRule: {
|
||||||
fromField: "id",
|
fromField: "id",
|
||||||
saveField: "mold_master_uid" // 如果表单项存储的是对象,将从fromField中取得值保存到saveField
|
saveField: "mold_master_uid" // 如果表单项存储的是对象,将从fromField中取得值保存到saveField
|
||||||
},
|
},
|
||||||
itemRender: {
|
itemRender: {
|
||||||
name: 'MkFormDataSelector', props: {
|
name: 'MkFormDataSelector', props: {
|
||||||
params: {
|
params: {
|
||||||
dataType: "object",
|
dataType: "object",
|
||||||
valueField: "id",
|
valueField: "id",
|
||||||
textField: "name",
|
textField: "name",
|
||||||
listdataFieldName: 'MesStaff',
|
listdataFieldName: 'MesStaff',
|
||||||
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
|
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
field: 'progress', title: '进度', span: 16, itemRender: {
|
field: 'progress', title: '进度', span: 16, itemRender: {
|
||||||
name: 'MkFormProgress', props: {
|
name: 'MkFormProgress', props: {
|
||||||
|
|
@ -244,7 +246,7 @@ export default {
|
||||||
items: [
|
items: [
|
||||||
|
|
||||||
|
|
||||||
{ showTitle:false, field: 'problem', title: '', span: 24, itemRender: { name: '$textarea', props: {} } },
|
{ showTitle: false, field: 'problem', title: '', span: 24, itemRender: { name: '$textarea', props: {} } },
|
||||||
|
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
@ -334,7 +336,7 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
loadCount : 0,
|
loadCount: 0,
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -390,7 +392,7 @@ export default {
|
||||||
|
|
||||||
|
|
||||||
this.formOptions2.data = {
|
this.formOptions2.data = {
|
||||||
problem : a.data[this.detailDataFieldName].problem
|
problem: a.data[this.detailDataFieldName].problem
|
||||||
}
|
}
|
||||||
|
|
||||||
this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_production_order_component || []));
|
this.detailsData = JSON.parse(JSON.stringify(a.data[this.detailDataFieldName].mold_production_order_component || []));
|
||||||
|
|
@ -432,7 +434,7 @@ export default {
|
||||||
|
|
||||||
let keys = [];
|
let keys = [];
|
||||||
let infos = [];
|
let infos = [];
|
||||||
this.loadCount ++;
|
this.loadCount++;
|
||||||
this.detailsData.forEach(item => {
|
this.detailsData.forEach(item => {
|
||||||
|
|
||||||
if (!item.component_id) {
|
if (!item.component_id) {
|
||||||
|
|
@ -600,9 +602,9 @@ export default {
|
||||||
this.formOptions.data.horizontal_frame_time = this.getDateValue(detail.horizontal_frame_time);
|
this.formOptions.data.horizontal_frame_time = this.getDateValue(detail.horizontal_frame_time);
|
||||||
|
|
||||||
}
|
}
|
||||||
if(detail.mold_master_uid){
|
if (detail.mold_master_uid) {
|
||||||
this.formOptions.data.mold_master_uid = detail.mold_master_uid;
|
this.formOptions.data.mold_master_uid = detail.mold_master_uid;
|
||||||
this.formOptions.data.mold_master_user_detail = {id:detail.mold_master_user_detail.id,name:detail.mold_master_user_detail.name};
|
this.formOptions.data.mold_master_user_detail = { id: detail.mold_master_user_detail.id, name: detail.mold_master_user_detail.name };
|
||||||
}
|
}
|
||||||
|
|
||||||
this.formOptions.data = JSON.parse(JSON.stringify(this.formOptions.data))
|
this.formOptions.data = JSON.parse(JSON.stringify(this.formOptions.data))
|
||||||
|
|
@ -750,6 +752,17 @@ export default {
|
||||||
postdata.mold_production_order_component = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
|
postdata.mold_production_order_component = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
|
||||||
postdata.mold_production_order_component_processes = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
|
postdata.mold_production_order_component_processes = !this.isEdit ? [] : { insertList: [], deleteList: [], updateList: [] };
|
||||||
|
|
||||||
|
let componentDetails = this.$refs['componentDetail'];
|
||||||
|
|
||||||
|
if (componentDetails) {
|
||||||
|
componentDetails.forEach(componentDetail => {
|
||||||
|
if (componentDetail.postDataUpdate) {
|
||||||
|
console.log("postDataUpdate");
|
||||||
|
componentDetail.postDataUpdate();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
this.infos.forEach(info => {
|
this.infos.forEach(info => {
|
||||||
if (!info.data.postdata) {
|
if (!info.data.postdata) {
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue