diff --git a/src/api/mes/base/processInfo.js b/src/api/mes/base/processInfo.js
new file mode 100644
index 0000000..b0b3d07
--- /dev/null
+++ b/src/api/mes/base/processInfo.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询工序信息列表
+export function listProcessInfo(query) {
+ return request({
+ url: '/mes/base/processInfo/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询工序信息详细
+export function getProcessInfo(objId) {
+ return request({
+ url: '/mes/base/processInfo/' + objId,
+ method: 'get'
+ })
+}
+
+// 新增工序信息
+export function addProcessInfo(data) {
+ return request({
+ url: '/mes/base/processInfo',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改工序信息
+export function updateProcessInfo(data) {
+ return request({
+ url: '/mes/base/processInfo',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除工序信息
+export function delProcessInfo(objId) {
+ return request({
+ url: '/mes/base/processInfo/' + objId,
+ method: 'delete'
+ })
+}
diff --git a/src/views/mes/base/baseStaffInfo/index.vue b/src/views/mes/base/baseStaffInfo/index.vue
index 67d1a90..e2ea789 100644
--- a/src/views/mes/base/baseStaffInfo/index.vue
+++ b/src/views/mes/base/baseStaffInfo/index.vue
@@ -113,6 +113,7 @@
+
@@ -131,14 +132,14 @@
v-hasPermi="['mes/base:baseStaffInfo:edit']"
>修改
- 删除
-
+
+
+
+
+
+
+
+
@@ -170,9 +171,9 @@
-
-
-
+
+
+
+
+
+
@@ -240,6 +244,7 @@ export default {
loading: true,
// 选中数组
ids: [],
+ codes: [],
// 非单个禁用
single: true,
// 非多个禁用
@@ -265,7 +270,9 @@ export default {
teamCode: null,
phoneNumber: null,
sex: null,
- passWord: null
+ passWord: null,
+ wageCoefficient: null,
+ delFlag: '0'
},
// 表单参数
form: {},
@@ -289,7 +296,7 @@ export default {
{ key: 1, label: `员工ID`, visible: true },
{ key: 2, label: `员工名称`, visible: true },
{ key: 3, label: `员工类型`, visible: true },
- { key: 4, label: `卡号`, visible: true },
+ { key: 4, label: `卡号`, visible: false },
{ key: 5, label: `班组编号`, visible: true },
{ key: 6, label: `手机号`, visible: true },
{ key: 7, label: `用户性别`, visible: true },
@@ -299,7 +306,8 @@ export default {
{ key: 11, label: `创建时间`, visible: true },
{ key: 12, label: `更新者`, visible: false },
{ key: 13, label: `更新时间`, visible: false },
- { key: 14, label: `备注`, visible: false }
+ { key: 14, label: `备注`, visible: false },
+ { key: 15, label: `工资系数`, visible: true },
],
// 班组选项
teamMembersList: []
@@ -343,6 +351,7 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
+ wageCoefficient: 1,
remark: null
}
this.resetForm('form')
@@ -360,6 +369,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
+ this.codes = selection.map(item => item.staffId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
@@ -401,8 +411,8 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
- const objIds = row.objId || this.ids
- this.$modal.confirm('是否确认删除员工信息编号为"' + objIds + '"的数据项？').then(function() {
+ const objIds = row.objId || this.codes
+ this.$modal.confirm('是否确认删除员工编号为"' + objIds + '"的数据项？').then(function() {
return delBaseStaffInfo(objIds)
}).then(() => {
this.getList()
diff --git a/src/views/mes/base/processInfo/index.vue b/src/views/mes/base/processInfo/index.vue
new file mode 100644
index 0000000..0fa6368
--- /dev/null
+++ b/src/views/mes/base/processInfo/index.vue
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+