+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -116,7 +131,7 @@ export default {
{
title: '工具编号',
align: "center",
- dataIndex: 'nums'
+ dataIndex: 'id'
},
{
title: '工具名称',
diff --git a/ant-design-vue-jeecg/src/views/team/StationList.vue b/ant-design-vue-jeecg/src/views/team/StationList.vue
index 5d09a1e9..e2b50faa 100644
--- a/ant-design-vue-jeecg/src/views/team/StationList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationList.vue
@@ -84,7 +84,9 @@
{{ text }}
- + @@ -92,12 +94,13 @@{{ text }}
- + - 管理 @@ -112,6 +115,10 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+ 导出
+
+ 导入
+
+
+
+
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+
+ 无图片
+ ![]()
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+ 更多
+
+ 详情
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 已选择 {{ selectedRowKeys.length }}项
+ 清空
+
+
+ {{biaoTi}}
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
- {{biaoTi}}
- -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已选择 {{ selectedRowKeys.length }}项
+ 清空
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- 已选择 {{ selectedRowKeys.length }}项
- 清空
-
+
+
+
+
+
+
+
-
-
-
-
-
- {{ item.stationName }}
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
- 提交
+ @valueChange="handleValueChange"
+ @save="handleTableSave"
+ />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 导出
+ 导出
+ 保存
返回
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
+
+
+ {{ item.name }}
+
+
+
+
+
@@ -110,13 +118,16 @@ export default {
ZyPlanProcessModal
},
data() {
+ // this.cacheData = this.dataSource.map(item => ({ ...item }));
+ this.cacheData = [];
return {
description: '生产计划工序管理页面',
+ // columns,
// 表头
columns: [
{
title: '#',
- dataIndex: '',
+ dataIndex: 'productProcessId',
key: 'rowIndex',
width: 60,
align: "center",
@@ -124,21 +135,27 @@ export default {
return parseInt(index) + 1;
}
},
- // {
- // title: '计划id',
- // align: "center",
- // dataIndex: 'planId'
- // },
+ /* {
+ title: '计划id',
+ align: "center",
+ dataIndex: 'planId'
+ },*/
{
title: '工单编号',
align: "center",
- dataIndex: 'workOrderId'
+ dataIndex: 'workOrderId',
+ scopedSlots: {customRender: 'workOrderId'}
},
- {
+ /*{
title: '产品id',
align: "center",
dataIndex: 'productId'
},
+ {
+ title: '工序id',
+ align: "center",
+ dataIndex: 'productProcessId'
+ },*/
{
title: '产品',
align: "center",
@@ -166,8 +183,8 @@ export default {
align: "center",
dataIndex: 'toolsList',
width: 150,
- scopedSlots: {customRender: 'toolsList'}
// scopedSlots: {customRender: this.toolsList}
+ scopedSlots: {customRender: 'toolsList'}
},
{
title: '工具设备列表',
@@ -177,14 +194,50 @@ export default {
scopedSlots: {customRender: 'machineList'}
},
{
- title: '操作',
- dataIndex: 'action',
+ title: '前导工序',
align: "center",
- fixed: "right",
- width: 147,
- scopedSlots: {customRender: 'action'}
- }
+ dataIndex: 'proProcess',
+ width: 150,
+ scopedSlots: {customRender: 'proProcess'}
+ },
+ {
+ title: '后导工序',
+ align: "center",
+ dataIndex: 'proProcess',
+ width: 150,
+ scopedSlots: {customRender: 'postProcess'}
+ },
+ {
+ title: '输入产品',
+ align: "center",
+ dataIndex: 'inputProduct',
+ width: 150,
+ scopedSlots: {customRender: 'inputProduct'}
+ },
+ {
+ title: '成品/半成品',
+ align: "center",
+ dataIndex: 'semiProduct',
+ width: 150,
+ scopedSlots: {customRender: 'semiProduct'}
+ },
+
+ // {
+ // title: 'operation',
+ // dataIndex: 'operation',
+ // scopedSlots: {customRender: 'operation'},
+ // },
+
+ // {
+ // title: '操作',
+ // dataIndex: 'action',
+ // align: "center",
+ // fixed: "right",
+ // width: 147,
+ // scopedSlots: {customRender: 'action'}
+ // }
],
+ editingKey: '',
url: {
list: "/org.jeecg.modules.productplan/zyPlanProcess/getProcessDatalist",
stationToolslist: "/stationTool/list",
@@ -198,7 +251,7 @@ export default {
loadRouteType: false,
planId: "",
dictOptions: {},
- superFieldList: [],
+ // superFieldList: [],
toolsList: [],
machineList: [],
}
@@ -295,48 +348,75 @@ export default {
// initDictConfig() {
// },
getSuperFieldList() {
- let fieldList = [];
- fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''})
- fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''})
- fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''})
- fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''})
- fieldList.push({type: 'string', value: 'processIds', text: '工序id列表', dictCode: ''})
- fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''})
- this.superFieldList = fieldList
+ // let fieldList = [];
+ // fieldList.push({type: 'string', value: 'id', text: 'id', dictCode: ''})
+ // fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''})
+ // fieldList.push({type: 'string', value: 'productName', text: '生产计划id', dictCode: ''})
+ // fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''})
+ // fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''})
+ // fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''})
+ // fieldList.push({type: 'string', value: 'productProcessId', text: '工序id列表', dictCode: ''})
+ // fieldList.push({type: 'string', value: 'productProcessId', text: '工序id列表', dictCode: ''})
+ // fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''})
+ // this.superFieldList = fieldList
},
- // jumpPage1(record) {
- // this.$router.push({
- // // path: '/productplan/ZyProductPlanList',
- // path: '/productplan/ZyPlanProcessDataList',
- //
- // // query: { // 路由携带参数
- // // 'stationId': record.id,
- // // 'stationName': record.stationName,
- // // },
- // });
- // },
- // pf(record) {
- // this.$router.push({
- // path: '/productplan/ZyPlanProcessAddList',
- // query: { // 路由携带参数
- // }
- // });
-
- // getAction("productPlanlist", {id: record.id}).then((res) => {
- // if (res.success) {
- // this.$router.push({
- // path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList',
- // query: { // 路由携带参数
- // }
- // });
- // } else {
- // this.$message.error(res.message)
+ // handleChange(value, key, column) {
+ // const newData = [...this.data];
+ // const target = newData.find(item => key === item.key);
+ // if (target) {
+ // target[column] = value;
+ // this.data = newData;
// }
- // });
// },
- }
-}
+ edit(key) {
+ alert("the edit() record =" + JSON.stringify(key))
+ // const newData = [...this.data];
+ const newData = [...this.dataSource];
+ // const newData = record;
+ console.log("the edit() newData =", JSON.stringify(newData));
+ // this.editingKey = '0';
+ // record.editable = true;
+ // const target = newData.find(item => key === item.key);
+ const target = newData[0];
+ console.log("the edit() target =", JSON.stringify(target));
+ this.editingKey = key;
+ console.log("the edit() editingKey =", this.editingKey);
+ if (target) {
+ // debugger;
+ target.editable = true;
+ this.dataSource = newData;
+ }
+ },
+ save(key) {
+ // const newData = [...this.data];
+ const newData = this.dataSource;
+ console.log("save() newData=", JSON.stringify(newData))
+ const newCacheData = [...this.cacheData];
+ const target = newData.find(item => key === item.key);
+ const targetCache = newCacheData.find(item => key === item.key);
+ if (target && targetCache) {
+ delete target.editable;
+ this.dataSource = newData;
+ Object.assign(targetCache, target);
+ this.cacheData = newCacheData;
+ }
+ this.editingKey = '';
+ },
+ cancel(key) {
+ const newData = this.dataSource;
+ const target = newData.find(item => key === item.key);
+ this.editingKey = '';
+ if (target) {
+ Object.assign(target, this.cacheData.find(item => key === item.key));
+ delete target.editable;
+ this.dataSource = newData;
+ }
+ },
+ },
+};
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
index 0177564e..fd3b237b 100644
--- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue
@@ -20,17 +20,17 @@