This commit is contained in:
parent
740ccd452e
commit
d252bdded9
|
|
@ -176,6 +176,27 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
title: '部门', span: 12,
|
||||||
|
field: 'department_detail',
|
||||||
|
dataRule: {
|
||||||
|
fromField: "id",
|
||||||
|
saveField: "department_id" // 如果表单项存储的是对象,将从fromField中取得值保存到saveField
|
||||||
|
},
|
||||||
|
itemRender: {
|
||||||
|
name: 'MkFormDataSelector', props: {
|
||||||
|
params: {
|
||||||
|
dataType: "object",
|
||||||
|
valueField: "id",
|
||||||
|
textField: "name",
|
||||||
|
listdataFieldName: 'BaseDepartment',
|
||||||
|
dataUrl: `${BASE_URL.BASE_URL}/BaseDepartment/v1/base/department/list`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
{ field: 'code', title: '工序编码', span: 12, itemRender: { name: '$input' } },
|
{ field: 'code', title: '工序编码', span: 12, itemRender: { name: '$input' } },
|
||||||
{ field: 'desc', title: '工序描述', span: 12, itemRender: { name: '$input' } },
|
{ field: 'desc', title: '工序描述', span: 12, itemRender: { name: '$input' } },
|
||||||
{ field: 'remark', title: '工序备注', span: 12, itemRender: { name: '$input' } },
|
{ field: 'remark', title: '工序备注', span: 12, itemRender: { name: '$input' } },
|
||||||
|
|
@ -228,6 +249,10 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.pageOptions.formOptions.data = a.data[detailDataFieldName];
|
this.pageOptions.formOptions.data = a.data[detailDataFieldName];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this.lastFormDataJson = JSON.stringify(this.pageOptions.formOptions.data);
|
this.lastFormDataJson = JSON.stringify(this.pageOptions.formOptions.data);
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
}).catch((a) => {
|
}).catch((a) => {
|
||||||
|
|
|
||||||
|
|
@ -42,12 +42,12 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</vxe-column>
|
</vxe-column>
|
||||||
<vxe-column field="department_detail" title="部门" width="160" :params="editor_department" formatter="formatRef"
|
|
||||||
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
|
||||||
<vxe-column field="component_detail" title="部件" width="160" :params="editor_component" formatter="formatRef"
|
<vxe-column field="component_detail" title="部件" width="160" :params="editor_component" formatter="formatRef"
|
||||||
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||||
<vxe-column field="process_detail" title="工序" width="160" :params="editor_processes" formatter="formatRef"
|
<vxe-column field="process_detail" title="工序" width="160" :params="editor_processes" formatter="formatRef"
|
||||||
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||||
|
<vxe-column field="department_detail" title="部门" width="160" :params="editor_department" formatter="formatRef"
|
||||||
|
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
|
||||||
|
|
||||||
|
|
||||||
<vxe-column field="process_uid_detail" title="加工人员" width="160" :params="editor_process_uid"
|
<vxe-column field="process_uid_detail" title="加工人员" width="160" :params="editor_process_uid"
|
||||||
|
|
@ -745,7 +745,6 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
beforeEditMethod({ column, row }) {
|
beforeEditMethod({ column, row }) {
|
||||||
if (this.pageStatus == "approved") {
|
if (this.pageStatus == "approved") {
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -759,9 +758,14 @@ export default {
|
||||||
beforeEditEvent({ column, row }) {
|
beforeEditEvent({ column, row }) {
|
||||||
console.log(column, row);
|
console.log(column, row);
|
||||||
},
|
},
|
||||||
onPulldownSelected({ row, name, params }) {
|
onPulldownSelected({ row,selectedData,column }) {
|
||||||
console.log(row, name, params);
|
console.log(selectedData);
|
||||||
|
|
||||||
|
|
||||||
|
if(column.field=='process_detail' && column.title == '工序'){
|
||||||
|
row.department_detail = selectedData.department_detail || {};
|
||||||
|
row.department_id = selectedData.department_id;
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onPopupSelected({ rows, name, params }) {
|
onPopupSelected({ rows, name, params }) {
|
||||||
console.log(rows, name, params);
|
console.log(rows, name, params);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue