Skip to content

M
mes-pad
Commit 8a5b5bd6 authored by chenzj's avatar chenzj
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

parents 01068f2c ac7aec34
Hide whitespace changes
Inline Side-by-side
Showing with 441 additions and 245 deletions
common/http.api.js
View file @ 8a5b5bd6
...@@ -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),
index: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/index', params),
getUserInfo: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/user/getUserInfo', 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),
// 基础服务：登录登出、身份信息、菜单授权、切换系统、字典数据等 /**
lang: (params = {}) => vm.$u.get('/lang/' + params.lang), * 系统设置API
index: (params = {}) => vm.$u.get(config.adminPath + '/mobile/index', params), */
getUserInfo: (params = {}) => vm.$u.get(config.adminPath + '/mobile/user/getUserInfo', params), //获取工序清单
login: (params = {}) => vm.$u.post(config.adminPath + '/mobile/login/loginByPassword', params), getProcessList: (params = {}) =>
sendCode: (params = {}) => vm.$u.post(config.adminPath + '/mobile/login/sendCode', params), vm.$u.get(
registerUser: (params = {}) => vm.$u.post(config.adminPath + '/mobile/user/registerUser', params), config.adminPath + '/mobile/pro/process/getProcessList',
params
/** ),
* 系统设置API getWorkstationList: (params = {}) =>
*/ vm.$u.get(
//获取工序清单 config.adminPath + '/mobile/md/workstation/getWorkstationList',
getProcessList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/process/getProcessList', params
params), ),
getWorkstationList: (params = {}) => vm.$u.get(config.adminPath + getWorkUnitList: (params = {}) =>
'/mobile/md/workstation/getWorkstationList', params), vm.$u.get(config.adminPath + '/md/workunit/getListByUser', 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 = {}) =>
getTaskInfo: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/protask/' + params.taskId), 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 = {}) =>
getTaskInfoByTaskCode: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/protask/getProTaskByTaskCode', params), vm.$u.post(config.adminPath + '/mobile/pro/protask/feedback', params),
// //增加检验
getIpqcCode: (params = {}) => vm.$u.get(config.adminPath + '/system/autocode/get/IPQC_CODE', params), getTaskInfoByTaskCode: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/pro/protask/getProTaskByTaskCode',
//增加缺陷记录 params
addDefectrecord: (params = {}) => vm.$u.putJson(config.adminPath + '/mes/qc/defectrecord', params), ),
//查询缺陷列表 //
getDefectrecordList: (params = {}) => vm.$u.get(config.adminPath + '/mes/qc/defectrecord/list', params), getIpqcCode: (params = {}) =>
//查询检测项 vm.$u.get(config.adminPath + '/system/autocode/get/IPQC_CODE', 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), addDefectrecord: (params = {}) =>
//增加生产日志 vm.$u.putJson(config.adminPath + '/mes/qc/defectrecord', params),
addProductionlog: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/productionlog/add', params), //查询缺陷列表
//增加生产物料扣减 getDefectrecordList: (params = {}) =>
addMaterialusagerecord: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/materialusagerecord', params), vm.$u.get(config.adminPath + '/mes/qc/defectrecord/list', params),
//生产物料扣减列表 //查询检测项
materialusagerecordList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/materialusagerecord/list', params), getIpqcLineList: (params = {}) =>
//查询检验列表 vm.$u.get(config.adminPath + '/mes/qc/ipqcline/list', params),
ipqcList: (params = {}) => vm.$u.get(config.adminPath + '/mes/qc/ipqc/list', params), //生产日志
//增加检验 productionLogList: (params = {}) =>
addIpqc: (params = {}) => vm.$u.postJson(config.adminPath + '/mes/qc/ipqc', params), vm.$u.get(config.adminPath + '/mobile/pro/productionlog/list', params),
//根据字典类型查询字典数据信息 //增加生产日志
getDicts: (params = {}) => vm.$u.get(config.adminPath + '/system/dict/data/type/' + params), addProductionlog: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/productionlog/add', params),
//根据字典类型查询字典数据信息 //增加生产物料扣减
getIssusLinebyWorkorderCodes: (params = {}) => vm.$u.post(config.adminPath + '/mobile/wm/issueline/listByWorkorderCodes', params), addMaterialusagerecord: (params = {}) =>
vm.$u.post(
config.adminPath + '/mobile/pro/materialusagerecord',
/** params
* 工艺工序相关API ),
*/ //生产物料扣减列表
getProcessInfo: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/process/' + params materialusagerecordList: (params = {}) =>
.processId), vm.$u.get(
//获取当前产品的SOP config.adminPath + '/mobile/pro/materialusagerecord/list',
getSopList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/taskissue/getSopList', params), params
//生产投料 ),
addIssue: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/taskissue/add', params), //查询检验列表
//整个领料单投料 ipqcList: (params = {}) =>
addholeIssue: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/taskissue/addIssue', params), vm.$u.get(config.adminPath + '/mes/qc/ipqc/list', params),
//删除投料信息 //增加检验
removeTaskIssue: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/taskissue/' + params addIpqc: (params = {}) =>
.recordId), vm.$u.postJson(config.adminPath + '/mes/qc/ipqc', params),
//获取当前工作站、当前生产任务对应的投料清单 //根据字典类型查询字典数据信息
getTaskIssueList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/pro/taskissue/getlist', getDicts: (params = {}) =>
params), vm.$u.get(config.adminPath + '/system/dict/data/type/' + params),
//查询可用的领料单
getReserveIssue: (params = {}) => vm.$u.get(config.adminPath + //根据字典类型查询字典数据信息
'/mobile/pro/taskissue/getReserveIssueList', params), getIssusLinebyWorkorderCodes: (params = {}) =>
//打印流转单 vm.$u.post(
config.adminPath + '/mobile/wm/issueline/listByWorkorderCodes',
//投料验证 params
listFeedingInspection: (params = {}) => vm.$u.post(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), /**
* 工艺工序相关API
//查询反冲料列表 */
recoilMaterialList: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/getRecoilMaterial', params), getProcessInfo: (params = {}) =>
//增加反冲料 vm.$u.get(config.adminPath + '/mobile/pro/process/' + params.processId),
addRecoilMaterial: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/addRecoilMaterial', params), //获取当前产品的SOP
//删除反冲料 getSopList: (params = {}) =>
deleteRecoilMaterial: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/deleteRecoilMaterial', params), vm.$u.get(
config.adminPath + '/mobile/pro/taskissue/getSopList',
//领料申请 params
listMaterialRequest: (params = {}) => vm.$u.post(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), addIssue: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/taskissue/add', params),
//退料申请 //整个领料单投料
listMaterialReturn: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/listIssueLine', params), addholeIssue: (params = {}) =>
addMaterialReturn: (params = {}) => vm.$u.postJson(config.adminPath + '/mobile/pro/proMaterial/addMaterialReturn', params), vm.$u.post(config.adminPath + '/mobile/pro/taskissue/addIssue', params),
//删除投料信息
removeTaskIssue: (params = {}) =>
vm.$u.post(
config.adminPath + '/mobile/pro/taskissue/' + params.recordId
),
//质量相关api //获取当前工作站、当前生产任务对应的投料清单
//获取当前产品、当前质检类型的质检模板行信息 getTaskIssueList: (params = {}) =>
getQcTemplateLine: (params = {}) => vm.$u.get(config.adminPath + '/mobile/qc/templateindex/getLines', params), vm.$u.get(config.adminPath + '/mobile/pro/taskissue/getlist', params),
//查询可用的领料单
getReserveIssue: (params = {}) =>
//首页相关api vm.$u.get(
getIndexCardInfo: (params = {}) => vm.$u.get(config.adminPath + '/mobile/index/getIndexCardInfo', config.adminPath + '/mobile/pro/taskissue/getReserveIssueList',
params), params
getM2mOrderFlowList: (params = {}) => vm.$u.get(config.adminPath + '/mobile/index/getM2mOrderFlowList', ),
params), //打印流转单
//获取卡可购买套餐包
getM2mOrderPackageList: (params = {}) => vm.$u.get(config.adminPath + //投料验证
'/mobile/index/getM2mOrderPackageList', params), listFeedingInspection: (params = {}) =>
vm.$u.post(
//查看生产工单 config.adminPath + '/mobile/pro/proMaterial/listIssueLine',
getWorkorder: (params = {}) => vm.$u.get(config.adminPath + '/mes/pro/workorder/list', params), params
),
validateFeedingInspection: (params = {}) =>
logout: (params = {}) => vm.$u.get(config.adminPath + '/mobile/login/logout', params), vm.$u.post(
authInfo: (params = {}) => vm.$u.get(config.adminPath + '/authInfo', params), config.adminPath +
menuTree: (params = {}) => vm.$u.get(config.adminPath + '/menuTree', params), '/mobile/pro/proMaterial/validateFeedingInspection',
switchSys: (params = {}) => vm.$u.get(config.adminPath + '/switch/' + params.sysCode), params
dictData: (params = {}) => vm.$u.get(config.adminPath + '/system/dict/data/type/' + params.dictType), ),
validateFeedingInspectionById: (params = {}) =>
// 账号服务：验证码接口、忘记密码接口、注册账号接口等 vm.$u.post(
validCode: (params = {}) => vm.$u.getText('/validCode', params), config.adminPath +
getFpValidCode: (params = {}) => vm.$u.post('/account/getFpValidCode', params), '/mobile/pro/proMaterial/validateFeedingInspectionById',
savePwdByValidCode: (params = {}) => vm.$u.post('/account/savePwdByValidCode', params), params
getRegValidCode: (params = {}) => vm.$u.post('/account/getRegValidCode', params), ),
saveRegByValidCode: (params = {}) => vm.$u.post('/account/saveRegByValidCode', params),
//查询反冲料列表
// APP公共服务 recoilMaterialList: (params = {}) =>
upgradeCheck: () => vm.$u.post('/app/upgrade/check', { vm.$u.post(
appCode: config.appCode, config.adminPath + '/mobile/pro/proMaterial/getRecoilMaterial',
appVersion: config.appVersion 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
),
//领料申请
listMaterialRequest: (params = {}) =>
vm.$u.post(
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
),
addMaterialReturn: (params = {}) =>
vm.$u.postJson(
config.adminPath + '/mobile/pro/proMaterial/addMaterialReturn',
params
),
//质量相关api
//获取当前产品、当前质检类型的质检模板行信息
getQcTemplateLine: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/qc/templateindex/getLines',
params
),
//首页相关api
getIndexCardInfo: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/index/getIndexCardInfo', params),
getM2mOrderFlowList: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/index/getM2mOrderFlowList',
params
),
//获取卡可购买套餐包
getM2mOrderPackageList: (params = {}) =>
vm.$u.get(
config.adminPath + '/mobile/index/getM2mOrderPackageList',
params
),
//查看生产工单
getWorkorder: (params = {}) =>
vm.$u.get(config.adminPath + '/mes/pro/workorder/list', params),
logout: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/login/logout', params),
authInfo: (params = {}) =>
vm.$u.get(config.adminPath + '/authInfo', params),
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),
getFpValidCode: (params = {}) =>
vm.$u.post('/account/getFpValidCode', params),
savePwdByValidCode: (params = {}) =>
vm.$u.post('/account/savePwdByValidCode', params),
getRegValidCode: (params = {}) =>
vm.$u.post('/account/getRegValidCode', params),
saveRegByValidCode: (params = {}) =>
vm.$u.post('/account/saveRegByValidCode', params),
// APP公共服务
upgradeCheck: () =>
vm.$u.post('/app/upgrade/check', {
appCode: config.appCode,
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
// 员工用户查询 ),
empUser: { infoSavePqa: (params = {}) =>
listData: (params = {}) => vm.$u.get(config.adminPath + '/sys/empUser/listData', params), vm.$u.post(config.adminPath + '/sys/user/infoSavePqa', params),
}, },
// 组织机构查询 // 员工用户查询
office: { empUser: {
treeData: (params = {}) => vm.$u.get(config.adminPath + '/sys/office/treeData', params), listData: (params = {}) =>
}, vm.$u.get(config.adminPath + '/sys/empUser/listData', params),
//查看异常模块信息 },
abnormal: {
detail: (params = {}) => vm.$u.get(config.adminPath+'/qc/information/list',params),
newlyAdd: (params = {}) => vm.$u.postJson(config.adminPath+'/qc/report',params),
},
//查看图片
viewpicture: {
//查看工单
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),
},
// 增删改查例子
testData: {
form: (params = {}) => vm.$u.post(config.adminPath + '/test/testData/form', params),
list: (params = {}) => vm.$u.post(config.adminPath + '/test/testData/listData', params),
save: (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: {
// 获取领用单
getToolsByProcessIdAndArrangeCode: (params = {}) => vm.$u.putJson(config.adminPath + '/tm/tmToolRequestUse/getToolsByProcessIdAndArrangeCode', params),
// 获取上下机记录
getRecordsByProcessIdAndArrangeCode: (params = {}) => vm.$u.putJson(config.adminPath + '/tm/tmToolMachinesRecord/getRecordsByProcessIdAndArrangeCode', params),
// 新增
tmToolMachines: (params = {}) => vm.$u.postJson(config.adminPath + '/tm/tmToolMachines', params),
tmToolMachinesRecord: (params = {}) => vm.$u.putJson(config.adminPath + '/tm/tmToolMachinesRecord', params)
}
// 组织机构查询
office: {
treeData: (params = {}) =>
vm.$u.get(config.adminPath + '/sys/office/treeData', params),
},
//查看异常模块信息
abnormal: {
detail: (params = {}) =>
vm.$u.get(config.adminPath + '/qc/information/list', params),
newlyAdd: (params = {}) =>
vm.$u.postJson(config.adminPath + '/qc/report', params),
},
//查看图片
viewpicture: {
//查看工单
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
),
},
// 增删改查例子
testData: {
form: (params = {}) =>
vm.$u.post(config.adminPath + '/test/testData/form', params),
list: (params = {}) =>
vm.$u.post(config.adminPath + '/test/testData/listData', params),
save: (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: {
// 获取领用单
getToolsByProcessIdAndArrangeCode: (params = {}) =>
vm.$u.putJson(
config.adminPath +
'/tm/tmToolRequestUse/getToolsByProcessIdAndArrangeCode',
params
),
// 获取上下机记录
getRecordsByProcessIdAndArrangeCode: (params = {}) =>
vm.$u.putJson(
config.adminPath +
'/tm/tmToolMachinesRecord/getRecordsByProcessIdAndArrangeCode',
params
),
// 新增
tmToolMachines: (params = {}) =>
vm.$u.postJson(config.adminPath + '/tm/tmToolMachines', params),
tmToolMachinesRecord: (params = {}) =>
vm.$u.putJson(config.adminPath + '/tm/tmToolMachines', params),
},
}; };
} }
......
pages/index/index.vue
View file @ 8a5b5bd6
<template> <template>
<view class="common-container"> <view class="common-container">
<!-- <u-button @click="handleTest">跳转测试</u-button> -->
<view class="header"> <view class="header">
<image mode="widthFix" class="header-logo" style="width: 110px;margin: 10px auto;display: block;" <image mode="widthFix" class="header-logo" style="width: 100px;margin: 10px auto;display: block;"
src="/static/logo.png"></image> src="/static/logo.png"></image>
<TabHeader></TabHeader> <TabHeader></TabHeader>
<view class="setting-body" <view class="setting-body"
...@@ -55,6 +56,7 @@ ...@@ -55,6 +56,7 @@
import QcContent from "../mes/qc/index.vue" import QcContent from "../mes/qc/index.vue"
import ProdReport from "../mes/prodReport/index.vue" import ProdReport from "../mes/prodReport/index.vue"
import DictData from '@/components/DictData' import DictData from '@/components/DictData'
import UButton from '../../uview-ui/components/u-button/u-button.vue'
export default { export default {
name: 'HomePage', name: 'HomePage',
...@@ -63,7 +65,8 @@ ...@@ -63,7 +65,8 @@
ProContent, ProContent,
GxContent, GxContent,
QcContent, QcContent,
ProdReport ProdReport,
UButton
}, },
data() { data() {
return { return {
...@@ -97,6 +100,11 @@ ...@@ -97,6 +100,11 @@
uni.$off('changeWorkunit'); uni.$off('changeWorkunit');
}, },
methods: { methods: {
handleTest() {
uni.navigateTo({
url:'/pages/test/test'
})
},
//用户部分点击 //用户部分点击
handleUserTaped() { handleUserTaped() {
console.log("TAPED") console.log("TAPED")
...@@ -198,7 +206,7 @@ ...@@ -198,7 +206,7 @@
} }
.header { .header {
width: 120px; width: 110px;
background-color: #132138; background-color: #132138;
color: aliceblue; color: aliceblue;
font-size: 25px; font-size: 25px;
......
pages/mes/prodReport/components/dModelList.vue
View file @ 8a5b5bd6
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
}, },
], ],
} }
}, },
computed: { computed: {
tableData() { tableData() {
return this.data || [] return this.data || []
} }
}, },
methods: { methods: {
async commonClick(type) { async commonClick(type) {
...@@ -81,16 +81,18 @@ ...@@ -81,16 +81,18 @@
if (!flag) { if (!flag) {
return this.$u.toast('请选择状态相同的数据') return this.$u.toast('请选择状态相同的数据')
} }
} }
const params = { const params = this.tableSelectData.map(v => {
toolMachinesRecordIdList: this.tableSelectData.map(v => v.toolMachinesRecordId), return {
type toolMachinesId: v.toolMachinesId,
} type
const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params) }
if (code == 200) { })
this.$emit('action') const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params)
} if (code == 200) {
this.$emit('action')
}
}, },
toggleAllSelection(checked, arr) { toggleAllSelection(checked, arr) {
...@@ -109,4 +111,4 @@ ...@@ -109,4 +111,4 @@
margin-top: 20rpx; margin-top: 20rpx;
padding: 0 20rpx; padding: 0 20rpx;
} }
</style> </style>
pages/mes/prodReport/index.vue
View file @ 8a5b5bd6
...@@ -16,10 +16,11 @@ ...@@ -16,10 +16,11 @@
<view class="prod-body-left-task"> <view class="prod-body-left-task">
<zb-table <zb-table
ref="zbtable"
:columns="tableColumn" :columns="tableColumn"
:stripe="true" :stripe="true"
rowKey="taskWorkunitId"
@rowClick="rowClick" @rowClick="rowClick"
@cellClick="cellClick"
@toggleRowSelection="toggleRowSelection" @toggleRowSelection="toggleRowSelection"
@toggleAllSelection="toggleAllSelection" @toggleAllSelection="toggleAllSelection"
:border="true" :border="true"
...@@ -697,19 +698,22 @@ export default { ...@@ -697,19 +698,22 @@ export default {
tableColumn: [ tableColumn: [
{ {
type: 'selection', type: 'selection',
width: 35 width: 80
}, },
{ {
name: 'arrangeCode', name: 'arrangeCode',
label: '编排单号', label: '编排单号',
width: 140, width: 200,
func: 'numclik' cellFun: (row, index) => {
console.log(row, index)
this.tableDataDetail = row.proWorkorderList;
this.showRowDeatilFlag = true;
}
}, },
{ {
name: 'startTime', name: 'startTime',
label: '计划开始时间', label: '计划开始时间',
width: 140, width: 140,
func: 'numclik'
}, },
{ {
name: 'endTime', name: 'endTime',
...@@ -737,7 +741,7 @@ export default { ...@@ -737,7 +741,7 @@ export default {
ERROR_STOP: '异常停工', ERROR_STOP: '异常停工',
FINISH: '完工' FINISH: '完工'
}, },
width: 60, width: 100,
align: 'center' align: 'center'
}, },
// { // {
...@@ -748,14 +752,14 @@ export default { ...@@ -748,14 +752,14 @@ export default {
{ {
name: 'taskCode', name: 'taskCode',
label: '任务单号', label: '任务单号',
width: 110 width: 180
},
{
name: 'workorderCode',
label: '生产单号',
width: 120
}, },
// { // {
// name: 'workorderCode',
// label: '生产单号',
// width: 120
// },
// {
// name: 'itemCode', // name: 'itemCode',
// label: '物料编号', // label: '物料编号',
// width: 110, // width: 110,
...@@ -770,7 +774,7 @@ export default { ...@@ -770,7 +774,7 @@ export default {
width: 60 width: 60
}, },
{ {
name: 'quantityQuanlify', name: 'quantityQualify',
label: '合格数量', label: '合格数量',
width: 80, width: 80,
align: 'center' align: 'center'
...@@ -781,12 +785,12 @@ export default { ...@@ -781,12 +785,12 @@ export default {
width: 80, width: 80,
align: 'center' align: 'center'
}, },
{ // {
name: 'clientName', // name: 'clientName',
label: '作业人员', // label: '作业人员',
width: 60, // width: 60,
align: 'center' // align: 'center'
} // }
], ],
dModelData: [], dModelData: [],
tableSelectData: [], tableSelectData: [],
...@@ -944,12 +948,14 @@ export default { ...@@ -944,12 +948,14 @@ export default {
urls: this.viewSop urls: this.viewSop
}); });
}, },
cellClick(row, index, column) { // cellClick(row, index, column) {
if (column.name === 'arrangeCode') { // if (column.name === 'arrangeCode') {
this.tableDataDetail = row.proWorkorderList; // this.tableDataDetail = row.proWorkorderList;
this.showRowDeatilFlag = true; // this.showRowDeatilFlag = true;
} // console.log(e)
}, // e.stopPropagation()
// }
// },
numclik(...arg) { numclik(...arg) {
console.log('99999999', arg); console.log('99999999', arg);
}, },
...@@ -1067,6 +1073,7 @@ export default { ...@@ -1067,6 +1073,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) => {
...@@ -1096,14 +1103,16 @@ export default { ...@@ -1096,14 +1103,16 @@ export default {
}); });
}, },
rowClick(row, index) { rowClick(row, index) {
this.$refs.zbtable.toggleRowSelection(row)
this.curTaskInfo = row; this.curTaskInfo = row;
this.getMaterialUsageRecordList(); this.getMaterialUsageRecordList();
}, },
toggleAllSelection(checked, arr) { toggleAllSelection(checked, arr) {
// console.log(arr, 'this.tableSelectData');
this.tableSelectData = arr; this.tableSelectData = arr;
}, },
toggleRowSelection(checked, arr) { toggleRowSelection(checked, arr) {
console.log(this.tableSelectData, 'this.tableSelectData'); // console.log(arr, 'this.tableSelectData');
this.tableSelectData = arr; this.tableSelectData = arr;
}, },
knifeTemp() { knifeTemp() {
...@@ -1292,6 +1301,8 @@ export default { ...@@ -1292,6 +1301,8 @@ export default {
// this.reset(); // this.reset();
this.feedbackForms = []; this.feedbackForms = [];
this.tableSelectData.forEach((item) => { this.tableSelectData.forEach((item) => {
let tempQualify = item.quantity-item.quantityQualify<0?0:item.quantity-item.quantityQualify;
tempQualify = tempQualify>item.quantityWait?item.quantityWait:tempQualify;
const feedback = { const feedback = {
...item, ...item,
workstationId: item.workstationId, workstationId: item.workstationId,
...@@ -1300,7 +1311,7 @@ export default { ...@@ -1300,7 +1311,7 @@ export default {
taskWorkunitId: item.taskWorkunitId, taskWorkunitId: item.taskWorkunitId,
feedbackChannel: 'PAD', feedbackChannel: 'PAD',
quantity: item.quantity, quantity: item.quantity,
quantityQualify: item.quantity-item.quantityQuanlify-item.quantityUnquanlify,//默认为排产数量-合格数-不合格数 quantityQualify: tempQualify,//默认为排产数量-合格数
quantityUnqualify: 0, quantityUnqualify: 0,
printName: false, printName: false,
nickName: this.vuex_user.nicfeedbackkName, nickName: this.vuex_user.nicfeedbackkName,
...@@ -1358,8 +1369,8 @@ export default { ...@@ -1358,8 +1369,8 @@ export default {
taskId: item.taskId, taskId: item.taskId,
taskCode: item.taskCode, taskCode: item.taskCode,
quantityFeedback: item.quantityQualify+item.quantityUnqualify, quantityFeedback: item.quantityQualify+item.quantityUnqualify,
quantityQualified: item.quantityQualify, quantityQualify: item.quantityQualify,
quantityUnquanlified: item.quantityUnqualify, quantityUnqualify: item.quantityUnqualify,
userName: this.vuex_user.userName, userName: this.vuex_user.userName,
feedbackType: item.feedbackType, feedbackType: item.feedbackType,
routeId: item.routeId, routeId: item.routeId,
...@@ -1411,9 +1422,10 @@ export default { ...@@ -1411,9 +1422,10 @@ export default {
}, },
feedingInspectionScan() { feedingInspectionScan() {
const t = this; const t = this;
const taskInfo = this.tableSelectData[0];
uni.scanCode({ uni.scanCode({
success: function (res) { success: function (res) {
t.$u.api.validateFeedingInspection({ plnr: res.result }).then((res2) => { t.$u.api.validateFeedingInspection({ plnr: res.result,taskId: taskInfo.taskId }).then((res2) => {
if (res2.code === 200) { if (res2.code === 200) {
t.feedingInspectionLoadAndScan(true); t.feedingInspectionLoadAndScan(true);
} }
......
pages/sys/login/login.vue
View file @ 8a5b5bd6
<template> <template>
<view class="login"> <view class="login">
<u-form ref="loginForm" :modelValue="loginForm" :rules="loginRules" class="login-form"> <u-form ref="loginForm" :modelValue="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">MES-PAD</h3> <h3 class="title">MES作业端</h3>
<u-form-item prop="username"> <u-form-item prop="username">
<input <input
v-model="loginForm.username" v-model="loginForm.username"
......
uni_modules/zb-table/components/zb-table/zb-table.vue
View file @ 8a5b5bd6
...@@ -140,6 +140,11 @@ ...@@ -140,6 +140,11 @@
<text v-else>{{ ite.emptyString }}</text> <text v-else>{{ ite.emptyString }}</text>
</view> </view>
</template> </template>
<template v-else-if="ite.cellFun">
<view @click.stop="ite.cellFun(item,index)" class="cellfunction">
<text>{{ ite.filters ? itemFilter(item, ite) : formatterAction(item, ite, index, i) }}</text>
</view>
</template>
<template v-else> <template v-else>
<!-- {{ ite.filters?itemFilter(item,ite):(item[ite.name]==null||item[ite.name]==='')?ite.emptyString:item[ite.name] }}--> <!-- {{ ite.filters?itemFilter(item,ite):(item[ite.name]==null||item[ite.name]==='')?ite.emptyString:item[ite.name] }}-->
{{ ite.filters ? itemFilter(item, ite) : formatterAction(item, ite, index, i) }} {{ ite.filters ? itemFilter(item, ite) : formatterAction(item, ite, index, i) }}
...@@ -796,6 +801,30 @@ export default { ...@@ -796,6 +801,30 @@ export default {
cellClick(row, index, column) { cellClick(row, index, column) {
this.$emit('cellClick', row, index, column) this.$emit('cellClick', row, index, column)
}, },
toggleRowSelection(row) {
const items = this.selectArr.find(v => v[this.rowKey] === row[this.rowKey])
if (items&&Object.keys(items).length > 0) {
this.data.forEach(item => {
if (item[this.rowKey] === row[this.rowKey]) {
this.$set(item, 'checked', false)
}
})
this.selectArr.forEach((item, index) => {
if (item[this.rowKey] === row[this.rowKey]) {
this.selectArr.splice(index, 1)
}
});
this.$emit('toggleRowSelection', false, this.selectArr)
} else {
this.data.forEach(item => {
if (item[this.rowKey] === row[this.rowKey]) {
this.$set(item, 'checked', true)
this.selectArr.push(item)
}
})
this.$emit('toggleRowSelection', true, this.selectArr)
}
},
rowClick(row, index) { rowClick(row, index) {
if (this.highlight) { if (this.highlight) {
this.currentRowIndex = index this.currentRowIndex = index
...@@ -1352,6 +1381,9 @@ export default { ...@@ -1352,6 +1381,9 @@ export default {
//height: 100%; //height: 100%;
width: 100%; width: 100%;
} }
.cellfunction{
text-align: left;
}
.even { .even {
background-color: white; background-color: white;
......
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