Commit 1ca19e20 authored by 张海景's avatar 张海景

update:隐藏完工入库、工作站改成工作中心

parent 26fd0232
...@@ -52,7 +52,7 @@ const install = (Vue, vm) => { ...@@ -52,7 +52,7 @@ const install = (Vue, vm) => {
/** /**
* 生产管理相关API * 生产管理相关API
**/ **/
//获取当前工作的生产任务 //获取当前工作中心的生产任务
getTaskList: (params = {}) => getTaskList: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/pro/protask/getTaskList', params), vm.$u.get(config.adminPath + '/mobile/pro/protask/getTaskList', params),
//根据任务ID获取任务详情 //根据任务ID获取任务详情
...@@ -165,7 +165,7 @@ const install = (Vue, vm) => { ...@@ -165,7 +165,7 @@ const install = (Vue, vm) => {
vm.$u.post( vm.$u.post(
config.adminPath + '/mobile/pro/taskissue/' + params.recordId config.adminPath + '/mobile/pro/taskissue/' + params.recordId
), ),
//获取当前工作、当前生产任务对应的投料清单 //获取当前工作中心、当前生产任务对应的投料清单
getTaskIssueList: (params = {}) => getTaskIssueList: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/pro/taskissue/getlist', params), vm.$u.get(config.adminPath + '/mobile/pro/taskissue/getlist', params),
//查询可用的领料单 //查询可用的领料单
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<u-modal v-model="showLogoutMenu" :showConfirmButton="false" :showCancelButton="true" width="600px" title="请选择操作"> <u-modal v-model="showLogoutMenu" :showConfirmButton="false" :showCancelButton="true" width="600px" title="请选择操作">
<view class="logoutmenu"> <view class="logoutmenu">
<u-button shape="circle" class="menu_button" @click="" type="primary">更改密码</u-button> <u-button shape="circle" class="menu_button" @click="" type="primary">更改密码</u-button>
<u-button shape="circle" class="menu_button" @click="handleCommand('workunit')" type="warning">切换工作</u-button> <u-button shape="circle" class="menu_button" @click="handleCommand('workunit')" type="warning">切换工作中心</u-button>
<u-button shape="circle" class="menu_button" @click="handleCommand('print')" type="error">默认打印机</u-button> <u-button shape="circle" class="menu_button" @click="handleCommand('print')" type="error">默认打印机</u-button>
<u-button shape="circle" class="menu_button" @click="handleCommand('exit')" type="error">退出登录</u-button> <u-button shape="circle" class="menu_button" @click="handleCommand('exit')" type="error">退出登录</u-button>
</view> </view>
...@@ -129,8 +129,8 @@ export default { ...@@ -129,8 +129,8 @@ export default {
}, },
materialRequestArrays: [], materialRequestArrays: [],
processList: [], //工序清单 processList: [], //工序清单
workstationList: [], //工作清单 workstationList: [], //工作中心清单
workUnitList: [], //工作清单 workUnitList: [], //工作中心清单
curTaskInfo: {}, //打印机的 curTaskInfo: {}, //打印机的
screenHeight: 768, screenHeight: 768,
currentFlag: 0 currentFlag: 0
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
this.showLogoutMenu = true; this.showLogoutMenu = true;
}, },
//检查工作设置情况 //检查工作中心设置情况
checkWorkstation() { checkWorkstation() {
if (this.vuex_workunit == null) { if (this.vuex_workunit == null) {
this.showWorkstationFlag = true; this.showWorkstationFlag = true;
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
} }
}); });
}, },
//获取工作清单 //获取工作中心清单
getWorkstationList(item) { getWorkstationList(item) {
this.currentFlag = item.index; this.currentFlag = item.index;
this.activeProcess = this.processList[item.index].processCode; this.activeProcess = this.processList[item.index].processCode;
...@@ -196,7 +196,7 @@ export default { ...@@ -196,7 +196,7 @@ export default {
if (res.code === 200) { if (res.code === 200) {
this.workstationList = res.data; this.workstationList = res.data;
} else { } else {
this.$u.toast('获取工作清单异常' + res.msg); this.$u.toast('获取工作中心清单异常' + res.msg);
} }
}); });
}, },
...@@ -209,7 +209,7 @@ export default { ...@@ -209,7 +209,7 @@ export default {
} }
}); });
}, },
//设置当前触控屏的工作 //设置当前触控屏的工作中心
setWorkUnit(station) { setWorkUnit(station) {
this.$u.vuex('vuex_workunit', station); this.$u.vuex('vuex_workunit', station);
this.showWorkstationFlag = false; this.showWorkstationFlag = false;
......
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
feedbackFlag: 'Y', //是否在打印流转单的同时报工 feedbackFlag: 'Y', //是否在打印流转单的同时报工
batchCode:'202207191001', batchCode:'202207191001',
tabList:[{ tabList:[{
name:"领用到工作" name:"领用到工作中心"
},{ },{
name:"领用到生产工单" name:"领用到生产工单"
}], }],
......
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
} }
}) })
//监听工作切换事件 //监听工作中心切换事件
uni.$on('switchWorkstation', (station) => { uni.$on('switchWorkstation', (station) => {
this.reset(); this.reset();
this.getTaskList(); this.getTaskList();
......
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
{ {
name: 'workstationName', name: 'workstationName',
label: '工作', label: '工作中心',
width: 160 width: 160
} }
] ]
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<view class="dmodel-table"> <view class="dmodel-table">
<view class="search"> <view class="search">
<u-form :model="tableParams" labelAlign="right" class="tableForm"> <u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item label="工作" label-width="60px" name="workstationName"> <u-form-item label="工作中心" label-width="60px" name="workstationName">
<uni-easyinput type="text" v-model="tableParams.workstationName" placeholder="请输入工作" /> <uni-easyinput type="text" v-model="tableParams.workstationName" placeholder="请输入工作中心" />
</u-form-item> </u-form-item>
<u-form-item label="工作单元编码" label-width="100px" name="workunitCode"> <u-form-item label="工作单元编码" label-width="100px" name="workunitCode">
<uni-easyinput type="text" v-model="tableParams.workunitCode" placeholder="请输入工作单元编码" /> <uni-easyinput type="text" v-model="tableParams.workunitCode" placeholder="请输入工作单元编码" />
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
}, },
{ {
name: 'workstationName', name: 'workstationName',
label: '工作名称', label: '工作中心名称',
width: 160, width: 160,
}, },
{ {
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<view class="prod-body-left"> <view class="prod-body-left">
<!-- <view class="prod-body-left-btns">--> <!-- <view class="prod-body-left-btns">-->
<!-- <view class="workstation">--> <!-- <view class="workstation">-->
<!-- 工作名称:--> <!-- 工作中心名称:-->
<!-- {{ this.vuex_workstation == null ? '请选择工作' : this.vuex_workstation.workstationName }}--> <!-- {{ this.vuex_workstation == null ? '请选择工作中心' : this.vuex_workstation.workstationName }}-->
<!-- &lt;!&ndash; <u-icon name="edit-pen-fill" size="46" color="#2979ff"></u-icon>&ndash;&gt;--> <!-- &lt;!&ndash; <u-icon name="edit-pen-fill" size="46" color="#2979ff"></u-icon>&ndash;&gt;-->
<!-- </view>--> <!-- </view>-->
<!-- <u-button type="primary" @click="changeWorkstation">切换工作</u-button>--> <!-- <u-button type="primary" @click="changeWorkstation">切换工作中心</u-button>-->
<!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('')">生产任务</u-button>&ndash;&gt;--> <!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('')">生产任务</u-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('KnifeTemp')">刀模上架</u-button>&ndash;&gt;--> <!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('KnifeTemp')">刀模上架</u-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('')">生产投料</u-button>&ndash;&gt;--> <!-- &lt;!&ndash; <u-button type="primary" @click="commonClick('')">生产投料</u-button>&ndash;&gt;-->
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<u-button type="primary" @click="commonClick('ViewPpicture')">查看图片</u-button> <u-button type="primary" @click="commonClick('ViewPpicture')">查看图片</u-button>
<u-button type="primary" @click="commonClick('jobAssignment')">作业分派</u-button> <u-button type="primary" @click="commonClick('jobAssignment')">作业分派</u-button>
<u-button type="warning" @click="commonClick('abnormal')">异常报告</u-button> <u-button type="warning" @click="commonClick('abnormal')">异常报告</u-button>
<u-button type="primary" @click="commonClick('StockIn')">完工入库申请</u-button> <!-- <u-button type="primary" @click="commonClick('StockIn')">完工入库申请</u-button> -->
</scroll-view> </scroll-view>
</view> </view>
...@@ -1148,7 +1148,7 @@ export default { ...@@ -1148,7 +1148,7 @@ export default {
}; };
}, },
mounted() { mounted() {
//监听工作切换事件 //监听工作中心切换事件
uni.$on('switchWorkunit', (station) => { uni.$on('switchWorkunit', (station) => {
this.getTaskList(); this.getTaskList();
}); });
...@@ -1160,7 +1160,7 @@ export default { ...@@ -1160,7 +1160,7 @@ export default {
this.screenHeight = res.windowHeight; this.screenHeight = res.windowHeight;
} }
}); });
//监听工作切换事件 //监听工作中心切换事件
uni.$on('switchWorkunit', (station) => { uni.$on('switchWorkunit', (station) => {
// this.reset(); // this.reset();
this.getTaskList(); this.getTaskList();
......
...@@ -58,10 +58,10 @@ const store = new Vuex.Store({ ...@@ -58,10 +58,10 @@ const store = new Vuex.Store({
// 如果vuex_version无需保存到本地永久存储,无需lifeData.vuex_version方式 // 如果vuex_version无需保存到本地永久存储,无需lifeData.vuex_version方式
vuex_config: config, vuex_config: config,
//当前设备绑定的工作 //当前设备绑定的工作中心
vuex_workstation: null, vuex_workstation: null,
vuex_workunit: null, vuex_workunit: null,
//当前工作正在进行的生产任务 //当前工作中心正在进行的生产任务
vuex_task: null, vuex_task: null,
// 打印机服务器信息 // 打印机服务器信息
vuex_printerInfo: lifeData.vuex_printerInfo vuex_printerInfo: lifeData.vuex_printerInfo
......
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