Commit 5b3ca101 authored by 沈翠玲's avatar 沈翠玲

问题清单82

parent a9437bcd
...@@ -79,6 +79,9 @@ const install = (Vue, vm) => { ...@@ -79,6 +79,9 @@ const install = (Vue, vm) => {
// 查看修改报工列表 // 查看修改报工列表
getFeedback: (recordId) => getFeedback: (recordId) =>
vm.$u.get(config.adminPath + '/mes/pro/feedback/' + recordId), vm.$u.get(config.adminPath + '/mes/pro/feedback/' + recordId),
// 作业端试图展示
buttonList: (taskWorkunitIds) =>
vm.$u.get(config.adminPath + '/mobile/pro/protask/buttonList/' + taskWorkunitIds),
// 删除修改报工列表 // 删除修改报工列表
delFeedback: (recordId) => delFeedback: (recordId) =>
vm.$u.delete(config.adminPath + '/mes/pro/feedback/deleteOut5Min/' + recordId), vm.$u.delete(config.adminPath + '/mes/pro/feedback/deleteOut5Min/' + recordId),
......
...@@ -77,9 +77,9 @@ ...@@ -77,9 +77,9 @@
{{ this.vuex_workunit == null ? '请选择工作单元' : this.vuex_workunit.workunitName }} {{ this.vuex_workunit == null ? '请选择工作单元' : this.vuex_workunit.workunitName }}
</view> </view>
<u-button type="primary" @click="commonClick('Refresh')">刷新</u-button> <u-button type="primary" @click="commonClick('Refresh')">刷新</u-button>
<u-button type="primary" @click="commonClick('KnifeTemp')">刀模版上下机</u-button> <u-button type="primary" @click="commonClick('KnifeTemp')" v-if="!buttonShow || buttonShow.processToolView === '1'">刀模版上下机</u-button>
<u-button type="primary" @click="commonClick('FeedingInspection')">投料校验</u-button> <u-button type="primary" @click="commonClick('FeedingInspection')" v-if="!buttonShow || buttonShow.materialView === '1'">投料校验</u-button>
<u-button type="primary" @click="commonClick('RecoilMaterial')">反冲料登记</u-button> <u-button type="primary" @click="commonClick('RecoilMaterial')" v-if="!buttonShow || buttonShow.recoilMaterialView === '1'">反冲料登记</u-button>
<u-button type="success" @click="commonClick('StartTask')">开始作业</u-button> <u-button type="success" @click="commonClick('StartTask')">开始作业</u-button>
<u-button type="warning" @click="commonClick('StopTask')">暂停作业</u-button> <u-button type="warning" @click="commonClick('StopTask')">暂停作业</u-button>
<u-button type="success" @click="commonClick('Prod')">生产报工</u-button> <u-button type="success" @click="commonClick('Prod')">生产报工</u-button>
...@@ -1136,6 +1136,7 @@ export default { ...@@ -1136,6 +1136,7 @@ export default {
curTaskInfo: { curTaskInfo: {
pickingReason: null pickingReason: null
}, },
buttonShow: null,
currentType: 0, currentType: 0,
bomFeeData: [], bomFeeData: [],
bomFeeColumn: [ bomFeeColumn: [
...@@ -1793,6 +1794,21 @@ export default { ...@@ -1793,6 +1794,21 @@ export default {
toggleRowSelection(checked, arr) { toggleRowSelection(checked, arr) {
// console.log(arr, 'this.tableSelectData'); // console.log(arr, 'this.tableSelectData');
this.tableSelectData = arr; this.tableSelectData = arr;
if(this.tableSelectData.length > 0) {
this.$u.api.buttonList(this.tableSelectData[0]['taskWorkunitId']).then(res => {
if (res && res.length > 0) {
this.buttonShow = res[0]
} else {
this.buttonShow = null
}
}).catch(()=>{
this.buttonShow = null
});
} else {
this.buttonShow = null
}
}, },
knifeTemp() { knifeTemp() {
// this.$u.toast('刀具校验通过!'); // this.$u.toast('刀具校验通过!');
......
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