diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue b/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue
index 860cc04..3bc69bc 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/Detail.vue
@@ -7,7 +7,7 @@
-
打印
+
打印
关闭
@@ -193,7 +193,24 @@ export default {
{ field: 'inlay_deep_hole_time', dataRule: { type: 'timestamp' }, title: '镶件深孔钻到厂日期预计', span: 8, itemRender: { name: '$input', props: { type: 'date' } } },
{ field: 'horizontal_frame_time', dataRule: { type: 'timestamp' }, title: '横架到厂日期预计', span: 8, itemRender: { name: '$input', props: { type: 'date' } } },
{
- field: 'progress', title: '进度', span: 24, itemRender: {
+ title: '模具师傅', span: 8,
+ field: 'mold_master_user_detail',
+ dataRule: {
+ fromField: "id",
+ saveField: "mold_master_uid" // 如果表单项存储的是对象,将从fromField中取得值保存到saveField
+ },
+ itemRender: {
+ name: 'MkFormInputShow', props: {
+ params: {
+ dataType: "object",
+ valueField: "id",
+ textField: "name"
+ }
+ }
+ }
+ },
+ {
+ field: 'progress', title: '进度', span: 16, itemRender: {
name: 'MkFormProgress', props: {
params: {
type: "line"
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/List.vue b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
index 79097e3..ab63fed 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/List.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
@@ -147,11 +147,10 @@ export default {
{ field: 'mold_master_user_detail', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, title: '模具师傅', width: 120 },
{ field: 'mold_order', formatter: 'formatRef', params: { dataType: "object", textField: "code" }, sortable: false, title: '订单编号', width: 120 },
{ field: 'mold_detail', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, sortable: false, title: '模具', width: 120 },
- { field: 'progress', width: 100, cellRender: { name: 'progress' }, sortable: true, title: '总进度', showHeaderOverflow: true },
- // { slots: { default: 'column2' },width: 200, title: '进度明细', showHeaderOverflow: true },
{ slots: { content: 'column3' }, type: "expand", width: 100, title: '进度明细', showHeaderOverflow: true },
- { field: 'create_time', formatter: 'formatDate', width: 100, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
- { field: 'update_time', formatter: 'formatDate', width: 100, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
+ { field: 'progress', minWidth: 150, cellRender: { name: 'progress' }, sortable: true, title: '总进度', showHeaderOverflow: true },
+ // { slots: { default: 'column2' },width: 200, title: '进度明细', showHeaderOverflow: true },
+ { field: 'create_time', formatter: 'formatDate', width: 100, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
// =============================== 表格列 自动生成 Start ===============================