Commit 525190e4 authored by 张海景's avatar 张海景

update:修改开始按钮加接口判断

parent 934324cc
...@@ -50,6 +50,12 @@ const install = (Vue, vm) => { ...@@ -50,6 +50,12 @@ const install = (Vue, vm) => {
//修改任务状态 //修改任务状态
changeStatus: (params = {}) => changeStatus: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/protask/change', params), vm.$u.post(config.adminPath + '/mobile/pro/protask/change', params),
//开始任务加提示
changeCheckMachineTool: (params = {}) =>
vm.$u.get(
config.adminPath +
`/mes/pro/protask/checkMachineTool/${params.taskWorkunitId}`
),
//生产报工 //生产报工
feedback: (params = {}) => feedback: (params = {}) =>
vm.$u.post(config.adminPath + '/mobile/pro/protask/feedback', params), vm.$u.post(config.adminPath + '/mobile/pro/protask/feedback', params),
...@@ -64,7 +70,8 @@ const install = (Vue, vm) => { ...@@ -64,7 +70,8 @@ const install = (Vue, vm) => {
vm.$u.get(config.adminPath + '/system/autocode/get/IPQC_CODE', params), vm.$u.get(config.adminPath + '/system/autocode/get/IPQC_CODE', params),
//查看人员管理 //查看人员管理
userQuery: (params = {}) => vm.$u.get(config.adminPath + '/mes/md/workstationworker/list' ,params), userQuery: (params = {}) =>
vm.$u.get(config.adminPath + '/mes/md/workstationworker/list', params),
//增加缺陷记录 //增加缺陷记录
addDefectrecord: (params = {}) => addDefectrecord: (params = {}) =>
...@@ -354,7 +361,10 @@ const install = (Vue, vm) => { ...@@ -354,7 +361,10 @@ const install = (Vue, vm) => {
tmToolMachinesRecord: (params = {}) => tmToolMachinesRecord: (params = {}) =>
vm.$u.putJson(config.adminPath + '/tm/tmToolMachines', params), vm.$u.putJson(config.adminPath + '/tm/tmToolMachines', params),
tmToolMachinesScancode: (params = {}) => tmToolMachinesScancode: (params = {}) =>
vm.$u.postJson(config.adminPath + '/tm/tmToolMachines/scancode', params), vm.$u.postJson(
config.adminPath + '/tm/tmToolMachines/scancode',
params
),
}, },
}; };
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
v-model="knifeTempVisible" v-model="knifeTempVisible"
width="1600rpx" width="1600rpx"
> >
<u-form label-width="130px" :model="knifeTempSearch" :rules="rules"> <!-- <u-form label-width="130px" :model="knifeTempSearch" :rules="rules">
<u-row> <u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="扫描刃模版条码" prop="quantity"> <u-form-item label="扫描刃模版条码" prop="quantity">
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
</u-form> </u-form> -->
<dModelList :data="dModelData" @action="upDownGetList"/> <dModelList :data="dModelData" @action="upDownGetList"/>
</u-modal> </u-modal>
<!-- //生产报工报工人员 --> <!-- //生产报工报工人员 -->
...@@ -1011,6 +1011,9 @@ userTempVisible: false, ...@@ -1011,6 +1011,9 @@ userTempVisible: false,
if (item.status === 'BEGINNING') { if (item.status === 'BEGINNING') {
status = true; status = true;
} else { } else {
this.$u.api.changeCheckMachineTool({
taskWorkunitId: item.taskWorkunitId
})
this.changeStatus(item.taskId, item.taskWorkunitId,'BEGINNING'); this.changeStatus(item.taskId, item.taskWorkunitId,'BEGINNING');
} }
}); });
...@@ -1770,7 +1773,7 @@ userTempVisible: false, ...@@ -1770,7 +1773,7 @@ userTempVisible: false,
min-height: 400rpx; min-height: 400rpx;
border: 1px solid rgb(232, 232, 232); border: 1px solid rgb(232, 232, 232);
/deep/ .item-tr.trbg .item-td{ /deep/ .item-tr.trbg .item-td{
background:red !important; background:#fb9461 !important;
// color:#fff !important; // color:#fff !important;
} }
} }
......
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