Skip to content

M
mes-pad
Commit aac174dd authored by 李驰骋's avatar 李驰骋
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 6e1852a9 9e0f6f89
Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 211 deletions
common/http.api.js
View file @ aac174dd
...@@ -9,205 +9,347 @@ const install = (Vue, vm) => { ...@@ -9,205 +9,347 @@ const install = (Vue, vm) => {
// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下 // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
vm.$u.api = { vm.$u.api = {
// 基础服务：登录登出、身份信息、菜单授权、切换系统、字典数据等 // 基础服务：登录登出、身份信息、菜单授权、切换系统、字典数据等
lang: (params = {}) => vm.$u.get('/lang/' + params.lang), lang: (params = {}) => vm.$u.get('/lang/' + params.lang),
index: (params = {}) => vm.$u.get(config.adminPath + '/mobile/index', params), index: (params = {}) =>
getUserInfo: (params = {}) => vm.$u.get(config.adminPath + '/mobile/user/getUserInfo', params), vm.$u.get(config.adminPath + '/mobile/index', params),
login: (params = {}) => vm.$u.post(config.adminPath + '/mobile/login/loginByPassword', params), getUserInfo: (params = {}) =>
sendCode: (params = {}) => vm.$u.post(config.adminPath + '/mobile/login/sendCode', params), vm.$u.get(config.adminPath + '/mobile/user/getUserInfo', params),
registerUser: (params = {}) => vm.$u.post(config.adminPath + '/mobile/user/registerUser', params), login: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/login/loginByPassword', params),
sendCode: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/login/sendCode', params),
registerUser: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/user/registerUser', params),
/** /**
* 系统设置API * 系统设置API
*/ */
//获取工序清单 //获取工序清单
getProcessList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/process/getProcessList', getProcessList: (params = {}) =>
params), vm.$u.get(
getWorkstationList: (params = {}) => vm.$u.get(config.adminPath + config.adminPath + '/mobile/pro/process/getProcessList',
'/mobile/md/workstation/getWorkstationList', params), params
getWorkUnitList: (params = {}) => vm.$u.get(config.adminPath + ),
'/md/workunit/getListByUser', params), getWorkstationList: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/md/workstation/getWorkstationList',
params
),
getWorkUnitList: (params = {}) =>
vm.$u.get(config.adminPath + '/md/workunit/getListByUser', params),
/** /**
* 生产管理相关API * 生产管理相关API
**/ **/
//获取当前工作站的生产任务 //获取当前工作站的生产任务
getTaskList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/protask/getTaskList', params), getTaskList: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/pro/protask/getTaskList', params),
//根据任务ID获取任务详情 //根据任务ID获取任务详情
getTaskInfo: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/protask/' + params.taskId), getTaskInfo: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/pro/protask/' + params.taskId),
//修改任务状态 //修改任务状态
changeStatus: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/protask/change', params), changeStatus: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/protask/change', params),
//生产报工 //生产报工
feedback: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/protask/feedback', params), feedback: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/protask/feedback', params),
//增加检验 //增加检验
getTaskInfoByTaskCode: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/protask/getProTaskByTaskCode', params), getTaskInfoByTaskCode: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/pro/protask/getProTaskByTaskCode',
params
),
// //
getIpqcCode: (params = {}) => vm.$u.get(config.adminPath + '/system/autocode/get/IPQC_CODE', params), getIpqcCode: (params = {}) =>
vm.$u.get(config.adminPath + '/system/autocode/get/IPQC_CODE', params),
//增加缺陷记录 //增加缺陷记录
addDefectrecord: (params = {}) => vm.$u.putJson(config.adminPath + '/mes/qc/defectrecord', params), addDefectrecord: (params = {}) =>
vm.$u.putJson(config.adminPath + '/mes/qc/defectrecord', params),
//查询缺陷列表 //查询缺陷列表
getDefectrecordList: (params = {}) => vm.$u.get(config.adminPath + '/mes/qc/defectrecord/list', params), getDefectrecordList: (params = {}) =>
vm.$u.get(config.adminPath + '/mes/qc/defectrecord/list', params),
//查询检测项 //查询检测项
getIpqcLineList: (params = {}) => vm.$u.get(config.adminPath + '/mes/qc/ipqcline/list', params), getIpqcLineList: (params = {}) =>
vm.$u.get(config.adminPath + '/mes/qc/ipqcline/list', params),
//生产日志 //生产日志
productionLogList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/productionlog/list', params), productionLogList: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/pro/productionlog/list', params),
//增加生产日志 //增加生产日志
addProductionlog: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/productionlog/add', params), addProductionlog: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/productionlog/add', params),
//增加生产物料扣减 //增加生产物料扣减
addMaterialusagerecord: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/materialusagerecord', params), addMaterialusagerecord: (params = {}) =>
vm.$u.post(
config.adminPath + '/mobile/pro/materialusagerecord',
params
),
//生产物料扣减列表 //生产物料扣减列表
materialusagerecordList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/materialusagerecord/list', params), materialusagerecordList: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/pro/materialusagerecord/list',
params
),
//查询检验列表 //查询检验列表
ipqcList: (params = {}) => vm.$u.get(config.adminPath + '/mes/qc/ipqc/list', params), ipqcList: (params = {}) =>
vm.$u.get(config.adminPath + '/mes/qc/ipqc/list', params),
//增加检验 //增加检验
addIpqc: (params = {}) => vm.$u.postJson(config.adminPath + '/mes/qc/ipqc', params), addIpqc: (params = {}) =>
vm.$u.postJson(config.adminPath + '/mes/qc/ipqc', params),
//根据字典类型查询字典数据信息 //根据字典类型查询字典数据信息
getDicts: (params = {}) => vm.$u.get(config.adminPath + '/system/dict/data/type/' + params), getDicts: (params = {}) =>
vm.$u.get(config.adminPath + '/system/dict/data/type/' + params),
//根据字典类型查询字典数据信息 //根据字典类型查询字典数据信息
getIssusLinebyWorkorderCodes: (params = {}) => vm.$u.post(config.adminPath + '/mobile/wm/issueline/listByWorkorderCodes', params), getIssusLinebyWorkorderCodes: (params = {}) =>
vm.$u.post(
config.adminPath + '/mobile/wm/issueline/listByWorkorderCodes',
params
),
/** /**
* 工艺工序相关API * 工艺工序相关API
*/ */
getProcessInfo: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/process/' + params getProcessInfo: (params = {}) =>
.processId), vm.$u.get(config.adminPath + '/mobile/pro/process/' + params.processId),
//获取当前产品的SOP //获取当前产品的SOP
getSopList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/taskissue/getSopList', params), getSopList: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/pro/taskissue/getSopList',
params
),
//生产投料 //生产投料
addIssue: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/taskissue/add', params), addIssue: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/taskissue/add', params),
//整个领料单投料 //整个领料单投料
addholeIssue: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/taskissue/addIssue', params), addholeIssue: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/taskissue/addIssue', params),
//删除投料信息 //删除投料信息
removeTaskIssue: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/taskissue/' + params removeTaskIssue: (params = {}) =>
.recordId), vm.$u.post(
config.adminPath + '/mobile/pro/taskissue/' + params.recordId
),
//获取当前工作站、当前生产任务对应的投料清单 //获取当前工作站、当前生产任务对应的投料清单
getTaskIssueList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/taskissue/getlist', getTaskIssueList: (params = {}) =>
params), vm.$u.get(config.adminPath + '/mobile/pro/taskissue/getlist', params),
//查询可用的领料单 //查询可用的领料单
getReserveIssue: (params = {}) => vm.$u.get(config.adminPath + getReserveIssue: (params = {}) =>
'/mobile/pro/taskissue/getReserveIssueList', params), vm.$u.get(
config.adminPath + '/mobile/pro/taskissue/getReserveIssueList',
params
),
//打印流转单 //打印流转单
//投料验证 //投料验证
listFeedingInspection: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/listIssueLine', params), listFeedingInspection: (params = {}) =>
validateFeedingInspection: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/validateFeedingInspection', params), vm.$u.post(
validateFeedingInspectionById: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/validateFeedingInspectionById', params), config.adminPath + '/mobile/pro/proMaterial/listIssueLine',
params
),
validateFeedingInspection: (params = {}) =>
vm.$u.post(
config.adminPath +
'/mobile/pro/proMaterial/validateFeedingInspection',
params
),
validateFeedingInspectionById: (params = {}) =>
vm.$u.post(
config.adminPath +
'/mobile/pro/proMaterial/validateFeedingInspectionById',
params
),
//查询反冲料列表 //查询反冲料列表
recoilMaterialList: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/getRecoilMaterial', params), recoilMaterialList: (params = {}) =>
vm.$u.post(
config.adminPath + '/mobile/pro/proMaterial/getRecoilMaterial',
params
),
//增加反冲料 //增加反冲料
addRecoilMaterial: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/addRecoilMaterial', params), addRecoilMaterial: (params = {}) =>
vm.$u.post(
config.adminPath + '/mobile/pro/proMaterial/addRecoilMaterial',
params
),
//删除反冲料 //删除反冲料
deleteRecoilMaterial: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/deleteRecoilMaterial', params), deleteRecoilMaterial: (params = {}) =>
vm.$u.post(
config.adminPath + '/mobile/pro/proMaterial/deleteRecoilMaterial',
params
),
//领料申请 //领料申请
listMaterialRequest: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/listMaterialRequest', params), listMaterialRequest: (params = {}) =>
addMaterialRequest: (params = {}) => vm.$u.postJson(config.adminPath + '/mobile/pro/proMaterial/addMaterialRequest', params), vm.$u.post(
getWproworkOrderProcessItem: (params = {}) => vm.$u.get(config.adminPath +'/pro/materialRequest/selectworkorder/' + params.workorderId), config.adminPath + '/mobile/pro/proMaterial/listMaterialRequest',
params
),
addMaterialRequest: (params = {}) =>
vm.$u.postJson(
config.adminPath + '/mobile/pro/proMaterial/addMaterialRequest',
params
),
getWproworkOrderProcessItem: (params = {}) =>
vm.$u.get(
config.adminPath +
'/pro/materialRequest/selectworkorder/' +
params.workorderId
),
//退料申请 //退料申请
listMaterialReturn: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/listIssueLine', params), listMaterialReturn: (params = {}) =>
addMaterialReturn: (params = {}) => vm.$u.postJson(config.adminPath + '/mobile/pro/proMaterial/addMaterialReturn', params), vm.$u.post(
config.adminPath + '/mobile/pro/proMaterial/listIssueLine',
params
),
addMaterialReturn: (params = {}) =>
vm.$u.postJson(
config.adminPath + '/mobile/pro/proMaterial/addMaterialReturn',
params
),
//质量相关api //质量相关api
//获取当前产品、当前质检类型的质检模板行信息 //获取当前产品、当前质检类型的质检模板行信息
getQcTemplateLine: (params = {}) => vm.$u.get(config.adminPath + '/mobile/qc/templateindex/getLines', params), getQcTemplateLine: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/qc/templateindex/getLines',
params
),
//首页相关api //首页相关api
getIndexCardInfo: (params = {}) => vm.$u.get(config.adminPath + '/mobile/index/getIndexCardInfo', getIndexCardInfo: (params = {}) =>
params), vm.$u.get(config.adminPath + '/mobile/index/getIndexCardInfo', params),
getM2mOrderFlowList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/index/getM2mOrderFlowList', getM2mOrderFlowList: (params = {}) =>
params), vm.$u.get(
config.adminPath + '/mobile/index/getM2mOrderFlowList',
params
),
//获取卡可购买套餐包 //获取卡可购买套餐包
getM2mOrderPackageList: (params = {}) => vm.$u.get(config.adminPath + getM2mOrderPackageList: (params = {}) =>
'/mobile/index/getM2mOrderPackageList', params), vm.$u.get(
config.adminPath + '/mobile/index/getM2mOrderPackageList',
params
),
//查看生产工单 //查看生产工单
getWorkorder: (params = {}) => vm.$u.get(config.adminPath + '/mes/pro/workorder/list', params), getWorkorder: (params = {}) =>
vm.$u.get(config.adminPath + '/mes/pro/workorder/list', params),
logout: (params = {}) => vm.$u.get(config.adminPath + '/mobile/login/logout', params), logout: (params = {}) =>
authInfo: (params = {}) => vm.$u.get(config.adminPath + '/authInfo', params), vm.$u.get(config.adminPath + '/mobile/login/logout', params),
menuTree: (params = {}) => vm.$u.get(config.adminPath + '/menuTree', params), authInfo: (params = {}) =>
switchSys: (params = {}) => vm.$u.get(config.adminPath + '/switch/' + params.sysCode), vm.$u.get(config.adminPath + '/authInfo', params),
dictData: (params = {}) => vm.$u.get(config.adminPath + '/system/dict/data/type/' + params.dictType), menuTree: (params = {}) =>
vm.$u.get(config.adminPath + '/menuTree', params),
switchSys: (params = {}) =>
vm.$u.get(config.adminPath + '/switch/' + params.sysCode),
dictData: (params = {}) =>
vm.$u.get(
config.adminPath + '/system/dict/data/type/' + params.dictType
),
// 账号服务：验证码接口、忘记密码接口、注册账号接口等 // 账号服务：验证码接口、忘记密码接口、注册账号接口等
validCode: (params = {}) => vm.$u.getText('/validCode', params), validCode: (params = {}) => vm.$u.getText('/validCode', params),
getFpValidCode: (params = {}) => vm.$u.post('/account/getFpValidCode', params), getFpValidCode: (params = {}) =>
savePwdByValidCode: (params = {}) => vm.$u.post('/account/savePwdByValidCode', params), vm.$u.post('/account/getFpValidCode', params),
getRegValidCode: (params = {}) => vm.$u.post('/account/getRegValidCode', params), savePwdByValidCode: (params = {}) =>
saveRegByValidCode: (params = {}) => vm.$u.post('/account/saveRegByValidCode', params), vm.$u.post('/account/savePwdByValidCode', params),
getRegValidCode: (params = {}) =>
vm.$u.post('/account/getRegValidCode', params),
saveRegByValidCode: (params = {}) =>
vm.$u.post('/account/saveRegByValidCode', params),
// APP公共服务 // APP公共服务
upgradeCheck: () => vm.$u.post('/app/upgrade/check', { upgradeCheck: () =>
vm.$u.post('/app/upgrade/check', {
appCode: config.appCode, appCode: config.appCode,
appVersion: config.appVersion appVersion: config.appVersion,
}), }),
commentSave: (params = {}) => vm.$u.post('/app/comment/save', params), commentSave: (params = {}) => vm.$u.post('/app/comment/save', params),
// 个人信息修改 // 个人信息修改
user: { user: {
saveUserInfo: (params = {}) => vm.$u.post(config.adminPath + '/mobile/user/saveUserInfo', params), saveUserInfo: (params = {}) =>
infoSavePwd: (params = {}) => vm.$u.put(config.adminPath + '/system/user/profile/updatePwd', vm.$u.post(config.adminPath + '/mobile/user/saveUserInfo', params),
params), infoSavePwd: (params = {}) =>
infoSavePqa: (params = {}) => vm.$u.post(config.adminPath + '/sys/user/infoSavePqa', params), vm.$u.put(
config.adminPath + '/system/user/profile/updatePwd',
params
),
infoSavePqa: (params = {}) =>
vm.$u.post(config.adminPath + '/sys/user/infoSavePqa', params),
}, },
// 员工用户查询 // 员工用户查询
empUser: { empUser: {
listData: (params = {}) => vm.$u.get(config.adminPath + '/sys/empUser/listData', params), listData: (params = {}) =>
vm.$u.get(config.adminPath + '/sys/empUser/listData', params),
}, },
// 组织机构查询 // 组织机构查询
office: { office: {
treeData: (params = {}) => vm.$u.get(config.adminPath + '/sys/office/treeData', params), treeData: (params = {}) =>
vm.$u.get(config.adminPath + '/sys/office/treeData', params),
}, },
//查看异常模块信息 //查看异常模块信息
abnormal: { abnormal: {
detail: (params = {}) => vm.$u.get(config.adminPath+'/qc/information/list',params), detail: (params = {}) =>
newlyAdd: (params = {}) => vm.$u.postJson(config.adminPath+'/qc/report',params), vm.$u.get(config.adminPath + '/qc/information/list', params),
newlyAdd: (params = {}) =>
vm.$u.postJson(config.adminPath + '/qc/report', params),
}, },
//查看图片 //查看图片
viewpicture: { viewpicture: {
//查看工单 //查看工单
viewWorkorder: (params = {}) => vm.$u.get(config.adminPath+'/mobile/pro/protask/getProWorkder',params), viewWorkorder: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/pro/protask/getProWorkder',
params
),
//查看图片 //查看图片
viewSop: (params = {}) => vm.$u.get(config.adminPath+'/mes/md/sop/getProWorkder/' + params.workorderId), viewSop: (params = {}) =>
vm.$u.get(
config.adminPath + '/mes/md/sop/getProWorkder/' + params.workorderId
),
}, },
// 增删改查例子 // 增删改查例子
testData: { testData: {
form: (params = {}) => vm.$u.post(config.adminPath + '/test/testData/form', params), form: (params = {}) =>
list: (params = {}) => vm.$u.post(config.adminPath + '/test/testData/listData', params), vm.$u.post(config.adminPath + '/test/testData/form', params),
save: (params = {}) => vm.$u.postJson(config.adminPath + '/test/testData/save', params), list: (params = {}) =>
disable: (params = {}) => vm.$u.post(config.adminPath + '/test/testData/disable', params), vm.$u.post(config.adminPath + '/test/testData/listData', params),
enable: (params = {}) => vm.$u.post(config.adminPath + '/test/testData/enable', params), save: (params = {}) =>
delete: (params = {}) => vm.$u.post(config.adminPath + '/test/testData/delete', params), vm.$u.postJson(config.adminPath + '/test/testData/save', params),
disable: (params = {}) =>
vm.$u.post(config.adminPath + '/test/testData/disable', params),
enable: (params = {}) =>
vm.$u.post(config.adminPath + '/test/testData/enable', params),
delete: (params = {}) =>
vm.$u.post(config.adminPath + '/test/testData/delete', params),
}, },
// 刀模版相关 // 刀模版相关
dModel: { dModel: {
// 获取领用单 // 获取领用单
getToolsByProcessIdAndArrangeCode: (params = {}) => vm.$u.putJson(config.adminPath + '/tm/tmToolRequestUse/getToolsByProcessIdAndArrangeCode', params), getToolsByProcessIdAndArrangeCode: (params = {}) =>
vm.$u.putJson(
config.adminPath +
'/tm/tmToolRequestUse/getToolsByProcessIdAndArrangeCode',
params
),
// 获取上下机记录 // 获取上下机记录
getRecordsByProcessIdAndArrangeCode: (params = {}) => vm.$u.putJson(config.adminPath + '/tm/tmToolMachinesRecord/getRecordsByProcessIdAndArrangeCode', params), getRecordsByProcessIdAndArrangeCode: (params = {}) =>
vm.$u.putJson(
config.adminPath +
'/tm/tmToolMachinesRecord/getRecordsByProcessIdAndArrangeCode',
params
),
// 新增 // 新增
tmToolMachines: (params = {}) => vm.$u.postJson(config.adminPath + '/tm/tmToolMachines', params), tmToolMachines: (params = {}) =>
tmToolMachinesRecord: (params = {}) => vm.$u.putJson(config.adminPath + '/tm/tmToolMachinesRecord', params) vm.$u.postJson(config.adminPath + '/tm/tmToolMachines', params),
} tmToolMachinesRecord: (params = {}) =>
vm.$u.putJson(config.adminPath + '/tm/tmToolMachines', params),
},
}; };
} }
......
pages/mes/prodReport/components/dModelList.vue
View file @ aac174dd
...@@ -83,10 +83,12 @@ ...@@ -83,10 +83,12 @@
} }
} }
const params = { const params = this.tableSelectData.map(v => {
toolMachinesRecordIdList: this.tableSelectData.map(v => v.toolMachinesRecordId), return {
toolMachinesId: v.toolMachinesId,
type type
} }
})
const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params) const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params)
if (code == 200) { if (code == 200) {
this.$emit('action') this.$emit('action')
......
pages/mes/prodReport/index.vue
View file @ aac174dd
...@@ -1065,6 +1065,7 @@ export default { ...@@ -1065,6 +1065,7 @@ export default {
workunitName: this.vuex_workunit.workunitName, workunitName: this.vuex_workunit.workunitName,
processId: selectData.processId, processId: selectData.processId,
taskId: selectData.taskId, taskId: selectData.taskId,
taskWorkunitId: selectData.taskWorkunitId,
workorderId: selectData.workorderId, workorderId: selectData.workorderId,
toolRequestUseId: data[0].toolRequestUseId, toolRequestUseId: data[0].toolRequestUseId,
toolMachinesRecordList: data.map((v) => { toolMachinesRecordList: data.map((v) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment