diff --git a/ant-design-vue-jeecg/src/views/team/GroupxList.vue b/ant-design-vue-jeecg/src/views/team/GroupxList.vue
index 8fbb58ea..2dc6dd67 100644
--- a/ant-design-vue-jeecg/src/views/team/GroupxList.vue
+++ b/ant-design-vue-jeecg/src/views/team/GroupxList.vue
@@ -140,11 +140,11 @@ export default {
return parseInt(index) + 1;
}
},
- {
- title: '部门编号',
- align: "center",
- dataIndex: 'departId'
- },
+ // {
+ // title: '部门编号',
+ // align: "center",
+ // dataIndex: 'departId'
+ // },
{
title: '部门名称',
align: "center",
diff --git a/ant-design-vue-jeecg/src/views/team/StationList.vue b/ant-design-vue-jeecg/src/views/team/StationList.vue
index 90abc0ef..54ed7ff3 100644
--- a/ant-design-vue-jeecg/src/views/team/StationList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationList.vue
@@ -79,9 +79,10 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
- 工位设备管理
-
- 工位工具管理
+ 管理
+
+
+ 管理
编辑
@@ -155,13 +156,21 @@ export default {
dataIndex: 'description'
},
{
- title: '管理模块',
+ title: '工位设备模块',
dataIndex: 'action1',
align: "center",
// fixed: "right",
width: 80,
scopedSlots: {customRender: 'action1'}
},
+ {
+ title: '工位工具模块',
+ dataIndex: 'action2',
+ align: "center",
+ // fixed: "right",
+ width: 80,
+ scopedSlots: {customRender: 'action2'}
+ },
{
title: '操作',
dataIndex: 'action',
@@ -193,6 +202,7 @@ export default {
query: { // 路由携带参数
'stationId': record.id,
'stationName': record.stationName,
+ 'stationNum': record.stationNum,
},
});
},
@@ -202,6 +212,7 @@ export default {
query: { // 路由携带参数
'stationId': record.id,
'stationName': record.stationName,
+ 'stationNum': record.stationNum,
},
});
},
diff --git a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
index dae8deff..70a4aeee 100644
--- a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue
@@ -131,20 +131,30 @@ export default {
return parseInt(index) + 1;
}
},
+ // {
+ // title: '工位ID',
+ // align: "center",
+ // dataIndex: 'stationId'
+ // },
{
- title: '工位ID',
+ title: '工位序号',
align: "center",
- dataIndex: 'stationId'
+ dataIndex: 'stationNum'
},
{
title: '工位名称',
align: "center",
dataIndex: 'stationName',
},
+ // {
+ // title: '设备ID',
+ // align: "center",
+ // dataIndex: 'machineId'
+ // },
{
- title: '设备ID',
+ title: '设备名称',
align: "center",
- dataIndex: 'machineId'
+ dataIndex: 'machineId_dictText'
},
{
title: '操作',
@@ -164,6 +174,7 @@ export default {
loadRouteType: false,
stationId: "",
stationName: "",
+ stationNum: "",
dictOptions: {},
// superFieldList: [],
}
@@ -193,6 +204,7 @@ export default {
if (this.loadRouteType === false) {
this.stationId = this.$route.query.stationId;
this.stationName = this.$route.query.stationName;
+ this.stationNum = this.$route.query.stationNum;
// this.biaoTi = this.$route.query.styleNames+"款式面料管理";
// console.log("*******传递的stationId:" + this.stationId)
this.loadRouteType = true;
@@ -225,6 +237,7 @@ export default {
}).finally(() => {
this.dataSource.forEach(item => {
item['stationName'] = this.stationName;
+ item['stationNum'] = this.stationNum;
})
this.loading = false
})
diff --git a/ant-design-vue-jeecg/src/views/team/StationToolList.vue b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
index 0162e70f..bb576a5a 100644
--- a/ant-design-vue-jeecg/src/views/team/StationToolList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationToolList.vue
@@ -129,20 +129,30 @@ export default {
return parseInt(index) + 1;
}
},
+ // {
+ // title: '工位ID',
+ // align: "center",
+ // dataIndex: 'stationId'
+ // },
{
- title: '工位ID',
+ title: '工位序号',
align: "center",
- dataIndex: 'stationId'
+ dataIndex: 'stationNum'
},
{
title: '工位名称',
align: "center",
dataIndex: 'stationName',
},
+ // {
+ // title: '工具ID',
+ // align: "center",
+ // dataIndex: 'toolsId'
+ // },
{
- title: '工具ID',
+ title: '工具名称',
align: "center",
- dataIndex: 'toolsId'
+ dataIndex: 'toolsId_dictText'
},
{
title: '操作',
@@ -162,6 +172,7 @@ export default {
loadRouteType: false,
stationId: "",
stationName: "",
+ stationNum: "",
dictOptions: {},
// superFieldList: [],
}
@@ -191,6 +202,7 @@ export default {
if (this.loadRouteType === false) {
this.stationId = this.$route.query.stationId;
this.stationName = this.$route.query.stationName;
+ this.stationNum = this.$route.query.stationNum;
// this.biaoTi = this.$route.query.styleNames+"款式面料管理";
// console.log("*******传递的stationId:" + this.stationId)
this.loadRouteType = true;
@@ -223,6 +235,7 @@ export default {
}).finally(() => {
this.dataSource.forEach(item => {
item['stationName'] = this.stationName;
+ item['stationNum'] = this.stationNum;
})
this.loading = false
})
diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
index 4b4a070d..95003dce 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
@@ -14,14 +14,16 @@
-
+
+
+
-
+
@@ -87,29 +89,42 @@ export default {
created() {
},
methods: {
- getMobile() {
- alert(this.model.enterprisesManager);
- this.mobileVal = "sys_user,phone,username,username='" + this.model.enterprisesManager + "'";
- // this.model.mobile = "123456789";
-
+ async getQuestionBankList() {
let param = {
"username": this.model.enterprisesManager,
}
let that = this;
- getAction(this.url.sysUserList, param).then((res) => {
- if (res.success) {
- console.log("res:" + JSON.stringify(res.result.records[0]))
- console.log("res22222222:" + JSON.stringify(res.result.records[0].phone));
- // this.model.mobile = res.result.records[0].phone;
- // this.model.mobile = JSON.stringify(res.result.records[0].phone)
- if (JSON.stringify(res.result.records[0].phone)!=="") {
- that.model.mobile = "15112345678";
- } else {
- that.model.mobile = JSON.stringify(res.result.records[0].phone)
- }
- }
- });
+ const {data: res} = await this.$axios.get('/jeecg-boot/sys/user/list', {params: param})
+ // this.questionBankList = res.result
+ console.log("userlist:"+JSON.stringify(res))
+ console.log("the phone:"+JSON.stringify(res.result.records[0].phone))
+ let phone = JSON.stringify(res.result.records[0].phone);
+ that.model.mobile = phone;
},
+
+ // getMobile() {
+ // alert(this.model.enterprisesManager);
+ // this.mobileVal = "sys_user,phone,username,username='" + this.model.enterprisesManager + "'";
+ // // this.model.mobile = "123456789";
+ //
+ // let param = {
+ // "username": this.model.enterprisesManager,
+ // }
+ // let that = this;
+ // getAction(this.url.sysUserList, param).then((res) => {
+ // if (res.success) {
+ // console.log("res:" + JSON.stringify(res.result.records[0]))
+ // console.log("res22222222:" + JSON.stringify(res.result.records[0].phone));
+ // // this.model.mobile = res.result.records[0].phone;
+ // // this.model.mobile = JSON.stringify(res.result.records[0].phone)
+ // if (JSON.stringify(res.result.records[0].phone) !== "") {
+ // that.model.mobile = "15112345678";
+ // } else {
+ // that.model.mobile = JSON.stringify(res.result.records[0].phone)
+ // }
+ // }
+ // });
+ // },
add() {
//初始化默认值
this.edit({});
diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
index 4cba59f5..00725843 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
@@ -18,7 +18,8 @@
-
+
+
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java
index 06e19fef..37bb7708 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationMachine.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -44,6 +45,7 @@ public class StationMachine {
*/
@Excel(name = "设备id，uuid，FK，设备表", width = 15)
@ApiModelProperty(value = "设备id，uuid，FK，设备表")
+ @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
private String machineId;
/**
* 创建日期
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
index 8f8231f1..2e93af62 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -44,6 +45,7 @@ public class StationTool {
*/
@Excel(name = "工具id，uuid，FK，工具表", width = 15)
@ApiModelProperty(value = "工具id，uuid，FK，工具表")
+ @Dict(dictTable = "zy_tool", dicText = "name", dicCode = "id")
private String toolsId;
/**
* 创建日期