Skip to content

X
xgdlapp
Commit 89d92328 authored by 李苏's avatar 李苏 💬
Browse files
Options

徐工道路新增界面。修改

parent dc322a14
Show whitespace changes
Inline Side-by-side
Showing with 376 additions and 576 deletions
.hbuilderx/launch.json 0 → 100644
View file @ 89d92328
{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
// launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
"version": "0.0",
"configurations": [{
"app-plus" :
{
"launchtype" : "local"
},
"default" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
}
]
}
.idea/vcs.xml 0 → 100644
View file @ 89d92328
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
App.vue
View file @ 89d92328
...@@ -149,6 +149,8 @@ ...@@ -149,6 +149,8 @@
@import "plugin/colorui/main.css"; @import "plugin/colorui/main.css";
@import "plugin/colorui/icon.css"; @import "plugin/colorui/icon.css";
@import "plugin/colorui/animation.css"; @import "plugin/colorui/animation.css";
.cu-modal{z-index: 500;}
.uni-modal{z-index: 1100;}
.nav-list { .nav-list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
......
api/api.js
View file @ 89d92328
import { http } from '@/common/service/service.js' import { http } from '@/common/service/service.js'
import configService from '@/common/service/config.service.js'; import configService from '@/common/service/config.service.js';
const apiService = { const apiService = {
/**
* 登录
*/
login(params) { login(params) {
return http.post('/login',params) return http.post('/login',params)
}, },
/**
* 手机号码登录
*/
phoneNoLogin(params) { phoneNoLogin(params) {
return http.post('/sys/phoneLogin',params); return http.post('/sys/phoneLogin',params);
}, },
/**
* 退出
*/
logout(params) { logout(params) {
return http.post('/sys/logout',params); return http.post('/sys/logout',params);
}, },
/*数据请求 */
postData(url,params){ postData(url,params){
return http.post(url,params); return http.post(url,params);
}, },
......
api/dlapi.js 0 → 100644
View file @ 89d92328
import {
http
} from '@/common/service/service.js'
import configService from '@/common/service/config.service.js';
import tip from '@/common/util/tip.js'
import eventBus from '@/common/util/eventBus.js'
function filter(e) {
if (e.data.success) {
return e.data.data
} else {
tip.toast(e.data.message || "操作失败")
}
}
export function login(params) {
return http.post('/login', params).then(e => {
return filter(e)
})
}
export function getPower(params) {
return http.post('/frame/init/mobile', params || {}).then(e => {
return filter(e)
})
}
/* 托盘查询 */
export function getTryinfo(params) {
params.ckid = eventBus.$ckid
return http.post('/xgwcs/tpmx/searchTpmxsByCode', params || {}).then(e => {
return filter(e)
})
}
/* 托盘调整 */
export function adjustTry(params) {
params.ckid = eventBus.$ckid
return http.post('/xgwcs/tp/adjustTpByCode ', params || {}).then(e => {
return filter(e)
})
}
/* 清空托盘 */
export function emptyTry(params) {
params.ckid = eventBus.$ckid
return http.post('/xgwcs/tp/emptyTpByCode', params || {}).then(e => {
return filter(e)
})
}
common/service/service.js
View file @ 89d92328
...@@ -62,15 +62,8 @@ uni.getStorageInfo({ ...@@ -62,15 +62,8 @@ uni.getStorageInfo({
// 必须使用异步函数，注意 // 必须使用异步函数，注意
http.interceptor.response(async (response) => { /* 请求之后拦截器 */ http.interceptor.response(async (response) => { /* 请求之后拦截器 */
// if (response.data.code !== 200) { // 服务端返回的状态码不等于200，则reject()
// return Promise.reject(response)
// }
return response return response
}, (response) => { }, (response) => {
// 请求错误做点什么
tip.alert("网络请求异常，请检查网络")
// this.$tip.alert("网络请求异常，请检查网络");
console.log("请求错误做点什么",response);
if (response) { if (response) {
let data = response.data let data = response.data
const token = uni.getStorageSync(ACCESS_TOKEN) const token = uni.getStorageSync(ACCESS_TOKEN)
......
pages/dl_cmaterial/index.vue
View file @ 89d92328
...@@ -38,17 +38,17 @@ ...@@ -38,17 +38,17 @@
<input disabled="" v-model="wlinfor.wlcode">{{wlinfor.wlcode?'物料已添加':'点击选择物料'}}<text class="lg text-gray" :class="'cuIcon-' + 'right'"></text></input> <input disabled="" v-model="wlinfor.wlcode">{{wlinfor.wlcode?'物料已添加':'点击选择物料'}}<text class="lg text-gray" :class="'cuIcon-' + 'right'"></text></input>
</view> </view>
<view class="flex flex-wrap padding bg-grey white radio"> <view class="flex flex-wrap padding bg-grey white radio">
<view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{wlinfor.wlname}}</span></view> <view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{wlinfor.wlname||""}}</span></view>
<view class="basis-sm margin-top-xs margin-bottom-xs radius"><span></span></view> <view class="basis-sm margin-top-xs margin-bottom-xs radius"><span></span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">规格:<span>{{wlinfor.wlgg}}</span></view> <view class="basis-lg margin-top-xs margin-bottom-xs radius">规格:<span>{{wlinfor.wlgg||""}}</span></view>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">批号:<span>{{wlinfor.wlph}}</span></view> <view class="basis-sm margin-top-xs margin-bottom-xs radius">批号:<span>{{wlinfor.wlph||""}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">托盘号:<span>{{wlinfor.tpcode}}</span></view> <view class="basis-lg margin-top-xs margin-bottom-xs radius">托盘号:<span>{{wlinfor.tpcode||""}}</span></view>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">数量:<span>{{wlinfor.ztsl}}</span></view> <view class="basis-sm margin-top-xs margin-bottom-xs radius">数量:<span>{{wlinfor.ztsl||""}}</span></view>
</view> </view>
<view class="cu-form-group justify-around" style="padding: 0;"> <view class="cu-form-group justify-around" style="padding: 0;">
<view class="cu-form-group "> <view class="cu-form-group ">
<view class="title" style="padding: 0;">任务单号</view> <view class="title" style="padding: 0;">任务单号</view>
<input disabled="">{{rwdh}}</input> <input disabled="">{{rwdh||""}}</input>
</view> </view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title " style="padding: 0;">任务状态</view> <view class="title " style="padding: 0;">任务状态</view>
...@@ -57,21 +57,24 @@ ...@@ -57,21 +57,24 @@
</view> </view>
<view class="cu-form-group "> <view class="cu-form-group ">
<view class="title " style="padding: 0;">AGV任务单号</view> <view class="title " style="padding: 0;">AGV任务单号</view>
<input disabled="" style="padding: 0;">{{agvrwdh}}</input> <input disabled="" style="padding: 0;">{{agvrwdh||""}}</input>
</view> </view>
<view class="cu-form-group "> <view class="cu-form-group ">
<view class="title " style="padding: 0;">AGV任务状态</view> <view class="title " style="padding: 0;">AGV任务状态</view>
<input disabled="" style="padding: 0;">{{agvrwzt}}</input> <input disabled="" style="padding: 0;">{{agvrwzt||""}}</input>
</view> </view>
<view class="padding flex align-center bg-white justify-around" > <view class="padding flex align-center bg-white justify-around" v-if="gwObj.status==1">
<button class="cu-btn bg-gradual-green wid22" @tap="cmbt()">叫料</button> <button class="cu-btn bg-gradual-green wid22" @tap="cmbt()">叫料</button>
<button class="cu-btn bg-gradual-red wid22" @tap="cancelbt()" >取消</button> <button class="cu-btn bg-gradual-red wid22" @tap="cancelbt()" >取消</button>
<button class="cu-btn bg-gradual-orange wid22" @tap="lockingbt()">锁定</button> <button class="cu-btn bg-gradual-orange wid22" @tap="lockingbt()">锁定</button>
</view> </view>
<view class="padding flex align-center bg-white justify-around" > <view class="padding flex align-center bg-white justify-around" v-if="gwObj.status==3">
<button class="cu-btn bg-gradual-orange " @tap="lockingbt()">取消锁定</button>
</view>
<view class="padding flex align-center bg-white justify-around" v-if="gwObj.status==2">
<button class="cu-btn bg-gradual-red wid30" @tap="adjustbt()" >托盘调整</button> <button class="cu-btn bg-gradual-red wid30" @tap="adjustbt()" >托盘调整</button>
<button class="cu-btn bg-gradual-orange wid30" @tap="clearbt()">托盘清空</button> <button class="cu-btn bg-gradual-orange wid30" @tap="clearbt()">托盘清空</button>
<button v-if="false" class="cu-btn bg-gradual-orange wid30" @tap="clearbt()">回库</button> <button class="cu-btn bg-gradual-orange wid30" @tap="clearbt()">回库</button>
</view> </view>
<view class="cu-modal" :class="modalName=='DialogModal1'?'show':''"> <view class="cu-modal" :class="modalName=='DialogModal1'?'show':''">
<view class="cu-dialog"> <view class="cu-dialog">
...@@ -247,6 +250,14 @@ ...@@ -247,6 +250,14 @@
}, },
}, },
methods: { methods: {
/* 清除物料信息可this.wlinfo={} */
/* 清除任务信息 */
emptyRwinfo(){
this.rwdh=""
this.rwzt=""
this.agvrwdh=""
this.agvrwzt=""
},
/* 按钮 */ /* 按钮 */
cmbt(){ cmbt(){
uni.showModal({ uni.showModal({
...@@ -528,7 +539,6 @@ ...@@ -528,7 +539,6 @@
gwSelcetdIndex:this.gwSelcetdIndex, gwSelcetdIndex:this.gwSelcetdIndex,
cxinfor:this.cxinfor cxinfor:this.cxinfor
} }
}, },
}) })
...@@ -580,7 +590,6 @@ ...@@ -580,7 +590,6 @@
this.$forceUpdate() this.$forceUpdate()
_self.gwSelcetdIndex=e; _self.gwSelcetdIndex=e;
_self.gwObj=_self.gwinfor[e]; _self.gwObj=_self.gwinfor[e];
console.log(this.gwObj.status)
_self.formData.gwid=_self.gwObj.id; _self.formData.gwid=_self.gwObj.id;
if(this.status!=1){ if(this.status!=1){
this.apigettaskinf() this.apigettaskinf()
...@@ -604,40 +613,20 @@ ...@@ -604,40 +613,20 @@
/* 查询工位 */ /* 查询工位 */
}, },
onLoad(e) { onLoad(e) {
setTimeout(()=>{
this.gwinfor=[{status:1,stationname:"测试站",name:"测试名称"},{status:2,stationname:"测试站",name:"测试名称"},{status:3,stationname:"测试站",name:"测试名称"}]
this.gwObj=this.gwinfor[0]
})
eventBus.$on('addressInfo', function(data){ eventBus.$on('addressInfo', function(data){
console.log(this.cxmc) console.log(data)
console.log(data,"data");
}.bind(this)); }.bind(this));
if(!e.query){ if(!e.query){
return return
} }
let einfor =JSON.parse(e.query) let einfor =JSON.parse(e.query)
if(einfor.xzwl)
{
this.interval()
this.status=einfor.gwjlinfor.status
this.wlinfor=einfor.wlinfor
this.wlinfor.ztsl=einfor.wlinfor.ztsl
this.wlinfor.tpcode=einfor.wlinfor.tpcode
this.wlinfor.tpid=einfor.wlinfor.tpid
console.log(this.wlinfor)
this.cxinfor=einfor.gwjlinfor.cxinfor
this.apiGetgwxx()
this.gwSelcetdIndex=einfor.gwjlinfor.gwSelcetdIndex
// this.gwObj=this.gwList[this.gwSelcetdIndex];
// console.log(this.gwObj)
}else{
this.cxinfor.id=einfor.id
this.cxinfor.name=einfor.name
this.apiGetgwxx()
this.interval()
// this.gwObj=this.gwList[this.gwSelcetdIndex];
// console.log(this.gwObj)
}
}, },
onUnload(){ onUnload(){
eventBus.$off('addressInfo')
clearInterval(this.interval_gwinfor) clearInterval(this.interval_gwinfor)
}, },
onHide(){ onHide(){
......
pages/dl_cmaterial/xzwl.vue
View file @ 89d92328
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
status:"", status:"",
gwjlinfor:{}, gwjlinfor:{},
wlinfor:[ wlinfor:[
{test:"test"}
] ]
} }
...@@ -78,8 +79,10 @@ ...@@ -78,8 +79,10 @@
xzwl:"xzwl", xzwl:"xzwl",
wlinfor:item wlinfor:item
} }
eventBus.$emit('addressInfo',info); eventBus.$emit('addressInfo',"info");
this.$router.go(-1) uni.navigateBack({
delta: 1
});
// this.$Router.replace({ path:'/pages/gwjl/gwjl', query:{ // this.$Router.replace({ path:'/pages/gwjl/gwjl', query:{
// gwjlinfor:this.gwjlinfor, // gwjlinfor:this.gwjlinfor,
// xzwl:"xzwl", // xzwl:"xzwl",
......
pages/dl_putin_storage/index.vue
View file @ 89d92328
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
<view class="padding-xs bg-white"> <view class="padding-xs bg-white">
<view class="cu-form-group "> <view class="cu-form-group ">
<view class="title">配盘单码</view> <view class="title">配盘单码</view>
<input focus="true" placeholder="请扫描配盘单码"></input> <input :focus="ppdmFocus" @confirm="ppdmFocus=false;stpmFocus=true" placeholder="请扫描配盘单码"></input>
</view> </view>
</view> </view>
<view class="padding-xs bg-white"> <view class="padding-xs bg-white">
<view class="cu-form-group "> <view class="cu-form-group ">
<view class="title">扫托盘码</view> <view class="title">扫托盘码</view>
<input @confirm="searchTpm" placeholder="请扫描配盘单码"></input> <input :focus="stpmFocus" @confirm="searchTpm" placeholder="请扫描配盘单码"></input>
</view> </view>
</view> </view>
<view class="padding flex justify-around bg-white "> <view class="padding flex justify-around bg-white ">
...@@ -25,11 +25,12 @@ ...@@ -25,11 +25,12 @@
</template> </template>
<script> <script>
import api from '@/api/api.js'; import {login} from '@/api/dlapi.js';
export default { export default {
data() { data() {
return { return {
ppdmFocus:true,
stpmFocus:false
} }
}, },
filters: { filters: {
...@@ -43,7 +44,12 @@ ...@@ -43,7 +44,12 @@
} }
}, },
methods: { methods: {
comfirmStpm(){
this.ppdmFocus=true
this.stpmFocus=false
},
searchTpm(){ searchTpm(){
let that=this
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '配盘单码：PPM20220426001\n配盘单码：PPM20220426001', content: '配盘单码：PPM20220426001\n配盘单码：PPM20220426001',
...@@ -51,30 +57,25 @@ ...@@ -51,30 +57,25 @@
confirmText: "开始入库", // 确认按钮的文字 confirmText: "开始入库", // 确认按钮的文字
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
console.log('用户点击确定'); that.comfirmStpm()
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); that.comfirmStpm()
} }
} }
}); });
}, },
watchInfo(){ watchInfo(){
this.$router.push({name:"putin_register"}) this.$Router.push({name:"putin_register"})
}, },
// 确认按钮 // 确认按钮
hideModal(e) { hideModal(e) {
this.modalName = null this.modalName = null
}, },
// 生成任务
// 扫描托盘号
// 选择物料
// 任务列表
}, },
onLoad(e) { onLoad(e) {
} }
} }
</script> </script>
......
pages/dl_putin_storage/putin_register.vue
View file @ 89d92328
...@@ -13,7 +13,57 @@ ...@@ -13,7 +13,57 @@
</view> </view>
</view> </view>
<view class="padding-xl"> <view class="padding-xl">
<!-- 库位位置 --> <view class="" style="height: 250px;width: 90vw;display: flex;flex-wrap:wrap">
<view style="height: 20%;width:90%;display: flex;">
<view style="flex: 1;line-height: 40px;"></view>
<view style="flex: 1;line-height: 40px;">G1</view>
<view style="flex: 1;line-height: 40px;">G2</view>
<view style="flex: 1;line-height: 40px;">G3</view>
<view style="flex: 1;line-height: 40px;">G4</view>
<view style="flex: 1;line-height: 40px;">G5</view>
<view style="flex: 1;line-height: 40px;">G6</view>
</view>
<view style="height: 20%;width:90%;display: flex;">
<view style="flex: 1;line-height: 40px;">S1</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位2</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位3</view>
<view style="flex: 1;height: 40px;"></view>
<view style="flex: 1;height: 40px;"></view>
<view style="flex: 1;height: 40px;"></view>
<view style="flex: 1;height: 40px;"></view>
</view>
<view style="height: 20%;width:90%;display: flex;">
<view style="flex: 1;line-height: 40px;">S2</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位2</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位3</view>
<view style="flex: 1;height: 40px;"></view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位5</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位6</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位7</view>
</view>
<view style="height: 20%;width:90%;display: flex;">
<view style="flex: 1;line-height: 40px;">S3</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位2</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位3</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位4</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位5</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位6</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位7</view>
</view>
<view style="height: 20%;width:90%;display: flex;">
<view style="flex: 1;line-height: 40px;">S4</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位2</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位3</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位4</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位5</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位6</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位7</view>
</view>
</view>
<view class="flex justify-around">
<button class="cu-btn bg-gradual-red wid22" @tap="cancelbt" >解除绑定信息</button>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -34,7 +84,7 @@ ...@@ -34,7 +84,7 @@
<view class="padding-xs bg-white" style=""> <view class="padding-xs bg-white" style="">
<view class="cu-form-group "> <view class="cu-form-group ">
<view class="title">库位码</view> <view class="title">库位码</view>
<input focus="true" @confirm="searchKwm()" placeholder="扫描库位码查询"></input> <input :focus="kwmFocus" @confirm="searchKwm()" placeholder="扫描库位码"></input>
</view> </view>
</view> </view>
</view> </view>
...@@ -48,6 +98,7 @@ ...@@ -48,6 +98,7 @@
export default { export default {
data() { data() {
return { return {
kwmFocus:true,
modalName:"", modalName:"",
rkdjlist:[{ rkdjlist:[{
tpm:100010, tpm:100010,
...@@ -92,15 +143,34 @@ ...@@ -92,15 +143,34 @@
} }
}, },
methods: { methods: {
cancelbt(){
uni.showModal({
title: '提示',
content: '是否解除绑定信息',
cancelText: "否", // 取消按钮的文字
confirmText: "是", // 确认按钮的文字
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
},
searchKwm(){ searchKwm(){
let that=this
this.kwmFocus=false
/* 三种状态，1，对应库位入库，2，不对应库位，3，非界面的库位 */ /* 三种状态，1，对应库位入库，2，不对应库位，3，非界面的库位 */
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认入库', content: '确认入库',
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
that.kwmFocus=true
console.log('用户点击确定'); console.log('用户点击确定');
} else if (res.cancel) { } else if (res.cancel) {
that.kwmFocus=true
console.log('用户点击取消'); console.log('用户点击取消');
} }
} }
......
pages/dl_putout_storage/index.vue
View file @ 89d92328
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位6</view> <view style="flex: 1;border: 1px solid #666;height: 40px;">库位6</view>
<view style="flex: 1;border: 1px solid #666;height: 40px;">库位7</view> <view style="flex: 1;border: 1px solid #666;height: 40px;">库位7</view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
......
pages/dl_tray_adjust/index.vue
View file @ 89d92328
<template> <template>
<view class="bg-white"> <view class="bg-white">
<cu-custom bgColor="bg-gradual-blue" :isBack="true"><block slot="content">托盘调整</block> <cu-custom bgColor="bg-gradual-blue" :isBack="true">
<block slot="backText">返回</block></cu-custom> <block slot="content">托盘调整</block>
<block slot="backText">返回</block>
</cu-custom>
<view class="cu-form-group" > <view class="cu-form-group">
<view class="title ">托盘号</view> <view class="title ">托盘号</view>
<input v-model="tpcode" placeholder="请扫描托盘号" focus="true" @confirm="apigetinfor()" ></input> <input v-model="tpcode" placeholder="请扫描托盘号" focus="true" @confirm="apiGetTryinfo()"></input>
</view> </view>
<view class="cu-form-group disable" > <view class="cu-form-group disable">
<view class="title ">已扫托盘号</view> <view class="title ">已扫托盘号</view>
<input v-model="ystpcode" disabled="" focus="true" @confirm="apigetinfor()" ></input> <input v-model="ystpcode" disabled="" focus="true"></input>
</view> </view>
<view v-for="(item,index) in wlinfor" :key="index"> <view v-for="(item,index) in wlinfor" :key="index">
<view class="flex flex-wrap padding bg-grey white radio" style="position: relative;"> <view class="flex flex-wrap padding bg-grey white radio" style="position: relative;">
<button @tap="deldata(item,index)" style="position: absolute;right: 10px;top: 5px;color: red;font-size: 12px;"> <button @tap="deldata(item,index)"
<span style="" >删除</span> style="position: absolute;right: 10px;top: 45px;color: #fff;background-color: red;font-size: 12px;">
<span style="">删除</span>
</button> </button>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">物料<span>{{item.wlcode}}</span></view> <view class="basis-sm margin-top-xs margin-bottom-xs radius">物料<span>{{item.wlcode}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{item.wlname}}</span></view> <view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{item.wlname}}</span></view>
...@@ -24,180 +27,134 @@ ...@@ -24,180 +27,134 @@
<view class="basis-sm margin-top-xs margin-bottom-xs radius">托盘号:<span>{{item.tpcode}}</span></view> <view class="basis-sm margin-top-xs margin-bottom-xs radius">托盘号:<span>{{item.tpcode}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">物料批号:<span>{{item.wlph}}</span></view> <view class="basis-lg margin-top-xs margin-bottom-xs radius">物料批号:<span>{{item.wlph}}</span></view>
</view> </view>
<view class="cu-form-group" > <view class="cu-form-group">
<view class="title ">物料数量维护</view> <view class="title ">物料数量维护</view>
<uni-number-box :min="0" :max="99999" v-model="item.ztsl" ></uni-number-box> <uni-number-box :min="0" :max="99999" v-model="item.ztsl"></uni-number-box>
</view> </view>
</view> </view>
<!-- 假数据 -->
<view class="flex flex-wrap padding bg-grey white radio" style="position: relative;">
<button @tap="deldata(item,index)" style="position: absolute;right: 10px;top: 45px;color: #fff;background-color: red;font-size: 12px;">
<span style="" >删除</span>
</button>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">物料:<span>{{'样式'}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{'样式'}}</span></view>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">规格:<span>{{'样式'}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">数量:<span>{{'样式'}}</span></view>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">托盘号:<span>{{'样式'}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">物料批号:<span>{{'样式'}}</span></view>
</view>
<view class="cu-form-group" >
<view class="title ">物料数量维护</view>
<uni-number-box :min="0" :max="99999" v-model="testys" ></uni-number-box>
</view>
<view class="padding flex align-center bg-white justify-around"> <view class="padding flex align-center bg-white justify-around">
<button class="cu-btn bg-gradual-green lg wid50" @tap="isbctz(2)">调整</button> <button class="cu-btn bg-gradual-green lg wid50" @tap="isbctz(2)">调整</button>
</view> </view>
<view class="cu-modal" :class="modalName=='DialogModal1'?'show':''">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end">
<view class="content">提示</view>
<view class="action" @tap="hideModal">
<text class="cuIcon-close text-red"></text>
</view>
</view>
<view class="padding-xl bg-white">
是否删除该条信息？
</view>
<view class="cu-bar bg-white justify-end">
<view class="action">
<button class="cu-btn line-green text-green" @tap="hideModal">取消</button>
<button class="cu-btn bg-green margin-left" @tap="cdeldata()">确定</button>
</view>
</view>
</view>
</view>
<view class="cu-modal" :class="modalName=='DialogModal2'?'show':''">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end">
<view class="content">提示</view>
<view class="action" @tap="hideModal">
<text class="cuIcon-close text-red"></text>
</view>
</view>
<view class="padding-xl bg-white">
是否保存并调整？
</view>
<view class="cu-bar bg-white justify-end">
<view class="action">
<button class="cu-btn line-green text-green" @tap="hideModal">取消</button>
<button class="cu-btn bg-green margin-left" @tap="apibctz()">确定</button>
</view>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import api from '@/api/api.js'; import api from '@/api/api.js';
import {
getTryinfo,
adjustTry
} from '@/api/dlapi.js'
export default { export default {
data() { data() {
return { return {
testys:10, selected: "",
selected:"", ystpcode: "1",
ystpcode:"", modalName: "",
modalName:"", tpcode: "",
tpcode:"", wlinfor: [{},{}],
wlinfor:[],
} }
}, },
methods:{ methods: {
// api保存调整 // api保存调整
apibctz(){ apiadjustTry(){
this.hideModal() let data={
api.postData("xgwms/tpmx/adjustTpByCode",{ "code": this.ystpcode,
"ckid":this.$ckid, "data": this.wlinfor
"code":this.tpcode, }
"data":this.wlinfor adjustTry(data).then(e=>{
}).then((resp) => { if(e){
if(resp.data.success)
{
this.$tip.alert("调整成功"); this.$tip.alert("调整成功");
this.tpcode = ""
this.ystpcode = ""
this.wlinfor = []
} }
else{
this.$tip.alert(res.data.message || "操作失败");
}
this.tpcode=""
this.ystpcode=""
this.wlinfor=[]
}).catch((err) => {
let msg = err.data.message || "请求出现错误，请稍后再试"
this.$tip.alert(msg);
this.tpcode=""
}).finally(()=>{
}) })
}, },
isbctz(){ isbctz() {
if(this.ystpcode){ let that=this
this.confirm(2) if (this.ystpcode) {
}else{ uni.showModal({
title: '提示',
content: '是否保存并调整',
cancelText: "否", // 取消按钮的文字
confirmText: "是", // 确认按钮的文字
success: function (res) {
if (res.confirm) {
that.apiadjustTry()
} else if (res.cancel) {
}
}
});
} else {
this.$tip.alert("请先扫描有效托盘信息"); this.$tip.alert("请先扫描有效托盘信息");
} }
}, },
hideModal(){ hideModal() {
this.modalName="" this.modalName = ""
}, },
// 弹框 // 弹框
confirm(e){ confirm(e) {
this.modalName="DialogModal"+e this.modalName = "DialogModal" + e
}, },
// 删除确认 // 删除确认
deldata(item,index){ deldata(item, index) {
let that=this
uni.showModal({
title: '提示',
content: '是否删除该条信息',
cancelText: "否", // 取消按钮的文字
confirmText: "是", // 确认按钮的文字
success: function (res) {
if (res.confirm) {
that.wlinfor.splice(that.selected, 1)
} else if (res.cancel) {
this.selected=index }
this.confirm(1) }
}, });
// 确认删除
cdeldata(){
this.hideModal()
this.wlinfor.splice(this.selected,1)
this.selected=""
}, },
// 获取托盘信息 // 获取托盘信息
apigetinfor(){ apiGetTryinfo() {
this.tpcode=this.$trim(this.tpcode) let data={
api.postData("xgwms/tpmx/searchTpmxsByCode",{ "code": this.tpcode
"ckid":this.$ckid, }
"code":this.tpcode getTryinfo(data).then(data => {
}).then((resp) => { if (data && data.records) {
if(resp.data.data.records) this.ystpcode = data.tpcode
{ this.ystpcode=this.tpcode this.wlinfor = data.records
this.wlinfor=resp.data.data.records } else {
} this.tpcode = ""
else{ this.ystpcode = ""
this.$tip.alert("该托盘无数据"); }
}
}).catch((err) => {
let msg = err.data.message || "请求出现错误，请稍后再试"
this.$tip.alert(msg);
this.tpcode=""
}).finally(()=>{
}) })
} }
}, },
onLoad() { onLoad() {
if([]){
console.log(true)
}else{
console.log(false)
}
} }
} }
</script> </script>
<style scoped> <style scoped>
/deep/.uni-numbox-btns{ /deep/.uni-numbox-btns {
width: 27.69px!important; width: 27.69px !important;
} }
.disable{
.disable {
background-color: #F5F5F5 background-color: #F5F5F5
} }
.wid50{
.wid50 {
width: 50%; width: 50%;
} }
</style> </style>
pages/dl_tray_clear/index.vue
View file @ 89d92328
...@@ -2,21 +2,16 @@ ...@@ -2,21 +2,16 @@
<view class="bg-white"> <view class="bg-white">
<cu-custom bgColor="bg-gradual-blue" :isBack="true"><block slot="content">托盘调整</block> <cu-custom bgColor="bg-gradual-blue" :isBack="true"><block slot="content">托盘调整</block>
<block slot="backText">返回</block></cu-custom> <block slot="backText">返回</block></cu-custom>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title ">托盘号</view> <view class="title ">托盘号</view>
<input v-model="tpcode" placeholder="请扫描托盘号" focus="true" @confirm="apigetinfor()" ></input> <input v-model="tpcode" placeholder="请扫描托盘号" focus="true" @confirm="apiGetTryinfo()" ></input>
</view> </view>
<view class="cu-form-group disable" > <view class="cu-form-group disable" >
<view class="title ">已扫托盘号</view> <view class="title ">已扫托盘号</view>
<input v-model="ystpcode" disabled="" focus="true" @confirm="apigetinfor()" ></input> <input v-model="ystpcode" disabled="" focus="true"></input>
</view> </view>
<view v-for="(item,index) in wlinfor" :key="index"> <view v-for="(item,index) in wlinfor" :key="index">
<view class="flex flex-wrap padding bg-grey white radio" style="position: relative;"> <view class="flex flex-wrap padding bg-grey white radio" style="position: relative;">
<button @tap="deldata(item,index)" style="position: absolute;right: 10px;top: 5px;color: red;font-size: 12px;">
<span style="" >删除</span>
</button>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">物料<span>{{item.wlcode}}</span></view> <view class="basis-sm margin-top-xs margin-bottom-xs radius">物料<span>{{item.wlcode}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{item.wlname}}</span></view> <view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{item.wlname}}</span></view>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">规格:<span>{{item.wlgg}}</span></view> <view class="basis-sm margin-top-xs margin-bottom-xs radius">规格:<span>{{item.wlgg}}</span></view>
...@@ -24,76 +19,19 @@ ...@@ -24,76 +19,19 @@
<view class="basis-sm margin-top-xs margin-bottom-xs radius">托盘号:<span>{{item.tpcode}}</span></view> <view class="basis-sm margin-top-xs margin-bottom-xs radius">托盘号:<span>{{item.tpcode}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">物料批号:<span>{{item.wlph}}</span></view> <view class="basis-lg margin-top-xs margin-bottom-xs radius">物料批号:<span>{{item.wlph}}</span></view>
</view> </view>
<!-- <view class="cu-form-group" >
<view class="title ">物料数量维护</view>
<uni-number-box v-model="item.ztsl" ></uni-number-box>
</view> -->
</view>
<!-- 假数据 -->
<view class="flex flex-wrap padding bg-grey white radio" style="position: relative;">
<button @tap="deldata(item,index)" style="position: absolute;right: 10px;top: 45px;color: #fff;background-color: red;font-size: 12px;">
<span style="" >删除</span>
</button>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">物料:<span>{{'样式'}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">名称:<span>{{'样式'}}</span></view>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">规格:<span>{{'样式'}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">数量:<span>{{'样式'}}</span></view>
<view class="basis-sm margin-top-xs margin-bottom-xs radius">托盘号:<span>{{'样式'}}</span></view>
<view class="basis-lg margin-top-xs margin-bottom-xs radius">物料批号:<span>{{'样式'}}</span></view>
</view> </view>
<!-- <view class="cu-form-group" >
<view class="title ">物料数量维护</view>
<uni-number-box min="0" max="99999" v-model="testys" ></uni-number-box>
</view> -->
<view class="padding flex align-center bg-white justify-around"> <view class="padding flex align-center bg-white justify-around">
<button class="cu-btn bg-gradual-green lg wid50" @tap="isbctz(2)">清空</button> <button class="cu-btn bg-gradual-green lg wid50" @tap="isbctz(2)">清空</button>
</view>
<view class="cu-modal" :class="modalName=='DialogModal1'?'show':''">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end">
<view class="content">提示</view>
<view class="action" @tap="hideModal">
<text class="cuIcon-close text-red"></text>
</view>
</view>
<view class="padding-xl bg-white">
是否删除该条信息？
</view>
<view class="cu-bar bg-white justify-end">
<view class="action">
<button class="cu-btn line-green text-green" @tap="hideModal">取消</button>
<button class="cu-btn bg-green margin-left" @tap="cdeldata()">确定</button>
</view>
</view>
</view>
</view>
<view class="cu-modal" :class="modalName=='DialogModal2'?'show':''">
<view class="cu-dialog">
<view class="cu-bar bg-white justify-end">
<view class="content">提示</view>
<view class="action" @tap="hideModal">
<text class="cuIcon-close text-red"></text>
</view>
</view>
<view class="padding-xl bg-white">
是否保存并调整？
</view>
<view class="cu-bar bg-white justify-end">
<view class="action">
<button class="cu-btn line-green text-green" @tap="hideModal">取消</button>
<button class="cu-btn bg-green margin-left" @tap="apibctz()">确定</button>
</view>
</view>
</view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import api from '@/api/api.js'; import api from '@/api/api.js';
import {
getTryinfo,
emptyTry
} from '@/api/dlapi.js'
export default { export default {
data() { data() {
return { return {
...@@ -106,36 +44,36 @@ ...@@ -106,36 +44,36 @@
} }
}, },
methods:{ methods:{
// api保存调整 apiemptyTry(){
apibctz(){ let data={
this.hideModal() "code": this.tpcode
api.postData("xgwms/tpmx/adjustTpByCode",{
"ckid":this.$ckid,
"code":this.tpcode,
"data":this.wlinfor
}).then((resp) => {
if(resp.data.success)
{
this.$tip.alert("调整成功");
} }
else{ emptyTry(data).then(e=>{
this.$tip.alert(res.data.message || "操作失败"); if(e){
this.$tip.alert("清空成功");
this.tpcode = ""
this.ystpcode = ""
this.wlinfor = []
} }
this.tpcode=""
this.ystpcode=""
this.wlinfor=[]
}).catch((err) => {
let msg = err.data.message || "请求出现错误，请稍后再试"
this.$tip.alert(msg);
this.tpcode=""
}).finally(()=>{
}) })
}, },
isbctz(){ isbctz(){
if(this.ystpcode){ if(this.ystpcode){
this.confirm(2) let that=this
uni.showModal({
title: '提示',
content: '是否清空该托盘',
cancelText: "否", // 取消按钮的文字
confirmText: "是", // 确认按钮的文字
success: function (res) {
if (res.confirm) {
that.apiemptyTry()
} else if (res.cancel) {
}
}
});
}else{ }else{
this.$tip.alert("请先扫描有效托盘信息"); this.$tip.alert("请先扫描有效托盘信息");
} }
...@@ -161,25 +99,18 @@ ...@@ -161,25 +99,18 @@
this.selected="" this.selected=""
}, },
// 获取托盘信息 // 获取托盘信息
apigetinfor(){ apiGetTryinfo() {
this.tpcode=this.$trim(this.tpcode) let data={
api.postData("xgwms/tpmx/searchTpmxsByCode",{ "code": this.tpcode
"ckid":this.$ckid,
"code":this.tpcode
}).then((resp) => {
if(resp.data.data.records)
{ this.ystpcode=this.tpcode
this.wlinfor=resp.data.data.records
} }
else{ getTryinfo(data).then(data => {
this.$tip.alert("该托盘无数据"); if (data && data.records) {
this.ystpcode = data.tpcode
this.wlinfor = data.records
} else {
this.tpcode = ""
this.ystpcode = ""
} }
}).catch((err) => {
let msg = err.data.message || "请求出现错误，请稍后再试"
this.$tip.alert(msg);
this.tpcode=""
}).finally(()=>{
}) })
} }
......
pages/index/index.vue
View file @ 89d92328
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
<view class="homepage" style=""> <view class="homepage" style="">
</view> </view>
<!-- 徐工道路功能列表 --> <!-- 徐工道路功能列表 -->
<view class="padding-sm"> <view class="padding-sm" v-if="newckglList.length!=0">
<view class="cu-bar bg-white solid-bottom" > <view class="cu-bar bg-white solid-bottom" >
<view class="action text-bold"> <view class="action text-bold">
<text class='cuIcon-title text-blue'></text>仓库管理 <text class='cuIcon-title text-blue'></text>仓库管理
</view> </view>
</view> </view>
<view class="grid col-2 bg-white"> <view class="grid col-2 bg-white">
<view class="padding-sm" v-for="(item,index) in ckglList" :key="index" @tap="goPage(item.page)"> <view class="padding-sm" v-for="(item,index) in newckglList" :key="index" @tap="goPage(item.page)">
<view class="radius text-center shadow-blur "> <view class="radius text-center shadow-blur ">
<view class="cu-avatar lg " <view class="cu-avatar lg "
:style="{background: 'url('+ item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}"> :style="{background: 'url('+ item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}">
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
</view> </view>
</view> </view>
</view> </view>
<view class="padding-sm"> <view class="padding-sm" v-if="newgwjlList.length!=0">
<view class="cu-bar bg-white solid-bottom" > <view class="cu-bar bg-white solid-bottom" >
<view class="action text-bold"> <view class="action text-bold">
<text class='cuIcon-title text-blue'></text>工位叫料 <text class='cuIcon-title text-blue'></text>工位叫料
</view> </view>
</view> </view>
<view class="grid col-2 bg-white"> <view class="grid col-2 bg-white">
<view class="padding-sm" v-for="(item,index) in gwjlList" :key="index" @tap="goPage(item.page)"> <view class="padding-sm" v-for="(item,index) in newgwjlList" :key="index" @tap="goPage(item.page)">
<view class="radius text-center shadow-blur "> <view class="radius text-center shadow-blur ">
<view class="cu-avatar lg " <view class="cu-avatar lg "
:style="{background: 'url('+ item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}"> :style="{background: 'url('+ item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}">
...@@ -43,14 +43,14 @@ ...@@ -43,14 +43,14 @@
</view> </view>
</view> </view>
</view> </view>
<view class="padding-sm"> <view class="padding-sm" v-if="newtpglList.length!=0">
<view class="cu-bar bg-white solid-bottom" > <view class="cu-bar bg-white solid-bottom" >
<view class="action text-bold"> <view class="action text-bold">
<text class='cuIcon-title text-blue'></text>托盘管理 <text class='cuIcon-title text-blue'></text>托盘管理
</view> </view>
</view> </view>
<view class="grid col-2 bg-white"> <view class="grid col-2 bg-white">
<view class="padding-sm" v-for="(item,index) in tpglList" :key="index" @tap="goPage(item.page)"> <view class="padding-sm" v-for="(item,index) in newtpglList" :key="index" @tap="goPage(item.page)">
<view class="radius text-center shadow-blur "> <view class="radius text-center shadow-blur ">
<view class="cu-avatar lg " <view class="cu-avatar lg "
:style="{background: 'url('+ item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}"> :style="{background: 'url('+ item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}">
...@@ -62,70 +62,6 @@ ...@@ -62,70 +62,6 @@
</view> </view>
</view> </view>
<!-- 常用服务 --> <!-- 常用服务 -->
<view class="padding-sm" v-if="newusList.length!=0">
<view class="cu-bar bg-white solid-bottom" >
<view class="action text-bold">
<text class='cuIcon-title text-blue'></text>入库管理
</view>
</view>
<view class="grid col-2 bg-white">
<view class="padding-sm" v-for="(item,index) in newusList" :key="index" @tap="goPage(item.page)">
<view class="radius text-center shadow-blur ">
<view class="cu-avatar lg "
:style="{background: 'url('+ item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}">
<view class="cu-tag badge" v-if="getTtemDotInfo(item)">{{getTtemDotInfo(item)}}</view>
</view>
<view class="text-lg margin-top">{{item.title}}</view>
</view>
</view>
</view>
</view>
<view class="padding-sm" v-if="newosList.length!=0">
<view class="cu-bar bg-white solid-bottom">
<view class="action text-bold">
<text class='cuIcon-title text-blue'></text>工位叫料
</view>
</view>
<view class="bg-white grid col-2 padding-sm">
<view class="" v-for="(item,index) in newosList" :key="index" @tap="goPage(item.page)">
<view class="padding radius text-center shadow-blur solid-right">
<view class="cu-avatar lg " :style="{background: 'url(' + item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}"><!-- <view class="cu-tag badge">99</view> --></view>
<view class="text-lg margin-top">{{item.title}}</view>
</view>
</view>
</view>
</view>
<view class="padding-sm" v-if="newwsList.length!=0">
<view class="cu-bar bg-white solid-bottom">
<view class="action text-bold">
<text class='cuIcon-title text-blue'></text>出库管理
</view>
</view>
<view class="bg-white grid col-2 padding-sm">
<view class="" v-for="(item,index) in newwsList" :key="index" @tap="goPage(item.page)">
<view class="padding radius text-center shadow-blur solid-right">
<view class="cu-avatar lg " :style="{background: 'url(' + item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}"><!-- <view class="cu-tag badge">99</view> --></view>
<view class="text-lg margin-top">{{item.title}}</view>
</view>
</view>
</view>
</view>
<view class="padding-sm" v-if="newmsList.length!=0">
<view class="cu-bar bg-white solid-bottom">
<view class="action text-bold">
<text class='cuIcon-title text-blue'></text>调整
</view>
</view>
<view class="bg-white grid col-2 padding-sm">
<view class="" v-for="(item,index) in newmsList" :key="index" @tap="goPage(item.page)">
<view class="padding radius text-center shadow-blur solid-right">
<view class="cu-avatar lg " :style="{background: 'url(' + item.icon + ') no-repeat',backgroundSize:'56upx 56upx'}"><!-- <view class="cu-tag badge">99</view> --></view>
<view class="text-lg margin-top">{{item.title}}</view>
</view>
</view>
</view>
</view>
<view class="cu-tabbar-height"> <view class="cu-tabbar-height">
</view> </view>
</scroll-view> </scroll-view>
...@@ -134,8 +70,9 @@ ...@@ -134,8 +70,9 @@
<script> <script>
import api from '@/api/api.js'; import api from '@/api/api.js';
import { us,os } from '@/common/util/work.js' import {us,os} from '@/common/util/work.js'
import tip from '@/common/util/tip.js'; import tip from '@/common/util/tip.js';
import {getPower} from '@/api/dlapi.js'
export default { export default {
name: 'interfacepage', name: 'interfacepage',
props:{ props:{
...@@ -145,7 +82,7 @@ ...@@ -145,7 +82,7 @@
cur: { cur: {
immediate: true, immediate: true,
handler() { handler() {
this.apiqx() this.apiGetpower()
this.initMenu() this.initMenu()
}, },
}, },
...@@ -168,6 +105,7 @@ ...@@ -168,6 +105,7 @@
page:"putout_storage" page:"putout_storage"
}, },
], ],
newckglList:[],
gwjlList:[ gwjlList:[
{ {
title:"工位叫料", title:"工位叫料",
...@@ -176,6 +114,7 @@ ...@@ -176,6 +114,7 @@
page:"cmaterial" page:"cmaterial"
} }
], ],
newgwjlList:[],
tpglList:[ tpglList:[
{ {
title:"托盘调整", title:"托盘调整",
...@@ -190,83 +129,9 @@ ...@@ -190,83 +129,9 @@
page:"trayClear" page:"trayClear"
} }
], ],
newtpglList:[],
// icon:"/wcs/apps/static/icon/work.png",pc端图标路径 // icon:"/wcs/apps/static/icon/work.png",pc端图标路径
//手机端去除/wcs/xgapps //手机端去除/wcs/xgapps
swiperList: [
],
usList:[
// {
// title:"原材入库",
// icon:"/static/icon/work.png",
// useCount:1000,
// page:"putin-storage"
// },
// {
// title:"生产入库",
// icon:"/static/icon/work.png",
// useCount:1000,
// page:"ascrk"
// },
// {
// title:"其它入库",
// icon:"/static/icon/work2.png",
// useCount:1000,
// page:"qtrk"
// },
// {
// title:"托盘检验",
// icon:"/static/icon/tpjy.png",
// useCount:1000,
// page:"tpjy"
// }
],
newusList:[],
osList:[
// {
// title:"工位叫料",
// icon:"/static/icon/wl2.png",
// useCount:1000,
// page:"gwxz"
// },
// {
// title:"清洗送料",
// icon:"/static/icon/wl2.png",
// useCount:1000,
// page:"qxslgwxz"
// }
],
newosList:[],
wsList:[
// {
// title:"产品出库",
// icon:"/static/icon/work3.png",
// useCount:1000,
// page:"ckd"
// },
// {
// title:"其它出库",
// icon:"/static/icon/work4.png",
// useCount:1000,
// page:"qtck"
// }
],
newwsList:[],
msList:[
// {
// title:"托盘调整",
// icon:"/static/icon/work5.png",
// useCount:1000,
// page:"tptz"
// },
// {
// title:"清空托盘",
// icon:"/static/icon/work6.png",
// useCount:1000,
// page:"qktp"
// }
],
newmsList:[],
websock:'', websock:'',
heartCheck:null, heartCheck:null,
lockReconnect:false, lockReconnect:false,
...@@ -278,63 +143,25 @@ ...@@ -278,63 +143,25 @@
}, },
methods: { methods: {
// api获取权限 // api获取权限
apiqx(){ apiGetpower(){
let _self=this; getPower().then(data=>{
api.postData("/frame/init/mobile",{ if(data){
}).then((resp) => { let menu=data.menu
if(resp.data.success){ this.filterMenu(menu,'ckglList','newckglList')
let getqx=resp.data.data.menu this.filterMenu(menu,'gwjlList','newgwjlList')
// 入库管理遍历 this.filterMenu(menu,'tpglList','newtpglList')
let newusList=[]
getqx.forEach(e=>{
this.usList.forEach(a=>{
if(a.title==e.mkmc){
newusList.push(a)
} }
}) })
}) },
this.newusList=newusList filterMenu(menu,oldlist,newlist){
// 工位叫料遍历 this[newlist]=[]
let newosList=[] menu.forEach(e=>{
getqx.forEach(e=>{ this[oldlist].forEach(a=>{
this.osList.forEach(a=>{
if(a.title==e.mkmc){
newosList.push(a)
}
})
})
this.newosList=newosList
// 出库管理
let newwsList=[]
getqx.forEach(e=>{
this.wsList.forEach(a=>{
if(a.title==e.mkmc){
newwsList.push(a)
}
})
})
this.newwsList=newwsList
// 调整
let newmsList=[]
getqx.forEach(e=>{
this.msList.forEach(a=>{
if(a.title==e.mkmc){ if(a.title==e.mkmc){
newmsList.push(a) this[newlist].push(a)
} }
}) })
}) })
this.newmsList=newmsList
}else{
this.$tip.alert(resp.data.message||"请求失败");
}
}).catch((err) => {
let msg = err.data.message || "请求出现错误，请稍后再试"
this.$tip.alert(msg);
}).finally(()=>{
})
}, },
returnPage(){ returnPage(){
this.$Router.replace({name: 'login'}) this.$Router.replace({name: 'login'})
......
pages/login/login.vue
View file @ 89d92328
...@@ -19,15 +19,6 @@ ...@@ -19,15 +19,6 @@
<input type="password" v-model="password" placeholder-class="input-empty" maxlength="20" <input type="password" v-model="password" placeholder-class="input-empty" maxlength="20"
password data-key="password" @input="inputChange" @confirm="toLogin" /> password data-key="password" @input="inputChange" @confirm="toLogin" />
</view> </view>
<!-- <view class="input-item">
<text class="tit">服务器:端口号</text>
<input type="text" v-model="sqlForm.sqlPort"/>
</view> -->
<!-- <view class="input-item">
<text class="tit">端口</text>
<input type="text" v-model="sqlForm.port"/>
</view> -->
<view @click="gofwqsz" class="padding text-right" style="color: #4399FC;"> <view @click="gofwqsz" class="padding text-right" style="color: #4399FC;">
服务器设置 服务器设置
</view> </view>
...@@ -104,25 +95,6 @@ ...@@ -104,25 +95,6 @@
} }
}) })
// uni.getStorage({
// key:'sqlPort',
// success:function(e){
// _self.sqlForm.sqlPort=e.data
// },
// fail() {
// }
// })
// uni.getStorageInfo({
// success: function (res) {
// if(uni.getStorageSync('storage_key')){
// _self.sql=uni.getStorageSync('storage_key');
// }
// }
// })
// #ifdef APP-PLUS // #ifdef APP-PLUS
var that=this var that=this
plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) { plus.runtime.getProperty( plus.runtime.appid, function ( wgtinfo ) {
...@@ -262,7 +234,7 @@ ...@@ -262,7 +234,7 @@
} }
}) })
this.$tip.success('登录成功!') this.$tip.success('登录成功!')
this.$Router.replaceAll({name:'homepage'}) this.$Router.replaceAll({path:'/pages/homepage/homepage'})
}else{ }else{
this.$tip.alert(res.data.message); this.$tip.alert(res.data.message);
} }
......
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