吊挂管理-吊挂基本信息-管面页面优化 2.13

zhc4dev
zhc077 2 years ago
parent 66c5a60f4f
commit 4876dc4b81
  1. 10
      ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue
  2. 37
      ant-design-vue-jeecg/src/views/hanger/HangerManage.vue
  3. 1
      ant-design-vue-jeecg/src/views/productplan/ProductplanManage.vue
  4. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java
  5. 1
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java

@ -106,6 +106,11 @@ export default {
return parseInt(index) + 1; return parseInt(index) + 1;
} }
}, },
{
title: '工单编号',
align: "center",
dataIndex: 'orderCode'
},
{ {
title: '吊挂编号', title: '吊挂编号',
align: "center", align: "center",
@ -131,6 +136,11 @@ export default {
align: "center", align: "center",
dataIndex: 'duration' dataIndex: 'duration'
}, },
{
title: '创建时间',
align: "center",
dataIndex: 'createTime'
},
{ {
title: '状态', title: '状态',
align: "center", align: "center",

@ -6,6 +6,7 @@
<div> <div>
<j-vxe-table <j-vxe-table
ref="xTable" ref="xTable"
bordered
toolbar toolbar
:toolbarConfig="toolbarConfig" :toolbarConfig="toolbarConfig"
row-number row-number
@ -53,12 +54,12 @@ export default {
{ {
title: '车间', title: '车间',
key: 'workshopName', key: 'workshopName',
width: '220px', // width: '220px',
}, },
{ {
title: '吊挂编号', title: '吊挂编号',
key: 'code', key: 'code',
width: '220px', // width: '220px',
}, },
{ {
title: '工站数量', title: '工站数量',
@ -69,7 +70,7 @@ export default {
title: '工站编号', title: '工站编号',
key: 'point', key: 'point',
type: JVXETypes.input, type: JVXETypes.input,
width: '220px', // width: '220px',
/*validateRules: [ /*validateRules: [
{ {
required: true, // required: true, //
@ -144,23 +145,25 @@ export default {
}, },
created() { created() {
this.loadParameter(); this.loadParameter();
// this.getStationList();
}, },
methods: {
async getStationList() { /* updated() {
const {data: res} = await this.$axios.get(this.url.getStationList, {params: {id: this.id}}) console.log("beforeUpdate-------",JSON.stringify(this.stationIdList));
if (res.success) { console.log("this.$refs.vxe.columns[5].options-------",this.$refs.xTable.columns);
// this.dataSource = res.result.records || res.result; // this.$data.columns[5].options = this.stationIdList;
this.stationIdList = JSON.stringify(res.result); if (this.$refs.xTable.columns.concat('stationName2')) {
console.log("the getStationList=" + this.stationIdList) // this.$refs.xTable.columns[5].options = this.stationIdList
console.log("this.columns[6].options------------:" + this.columns[6].options); console.log("concat")
this.columns[6].options = this.stationIdList; this.$refs.xTable.columns[5].options= this.stationIdList;
} else { this.$refs.xTable.columns[4].options= this.stationIdList;
this.$message.warning(res.message) }
} // this.$forceUpdate();
}, // this.$refs.xTable.columns[6].options = this.stationIdList
// this.$refs.xTable.columns[7].options = this.stationIdList
},*/
methods: {
// //
handleTableSave({$table, target}) { handleTableSave({$table, target}) {
console.log("生产计划工序保存开始-----------------") console.log("生产计划工序保存开始-----------------")

@ -33,6 +33,7 @@
<j-vxe-table <j-vxe-table
ref="xTable" ref="xTable"
toolbar toolbar
bordered
:toolbarConfig="toolbarConfig" :toolbarConfig="toolbarConfig"
row-number row-number
row-selection row-selection

@ -100,12 +100,12 @@ public class HangRecord implements Serializable {
*/ */
@Excel(name = "时长", width = 15) @Excel(name = "时长", width = 15)
@ApiModelProperty(value = "时长") @ApiModelProperty(value = "时长")
private Integer duration; private String duration;
/** /**
* 状态 * 状态
*/ */
@Excel(name = "状态", width = 15) @Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
@Dict(dicCode = "hang_record_status") @Dict(dicCode = "hang_record_status")
private Integer status; private String status;
} }

@ -86,6 +86,7 @@ public class HangRecordServiceImpl extends ServiceImpl<HangRecordMapper, HangRec
BeanUtils.copyProperties(obj, hangRecord1); BeanUtils.copyProperties(obj, hangRecord1);
hangRecord1.setHangCode(hangCode); hangRecord1.setHangCode(hangCode);
hangRecord1.setPoint(point); hangRecord1.setPoint(point);
hangRecord1.setId(null);
saveList.add(hangRecord1); saveList.add(hangRecord1);
}); });
return saveList; return saveList;

Loading…
Cancel
Save