InOutPut
/
Put_Android
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改点检校验

master
lijuncheng 8 months ago
parent
d3190511cc
commit
31fc4ad6c9
11 changed files with 266 additions and 354 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      password.txt
  2. 4
      src/manifest.json
  3. 222
      src/mycomponents/form/customerFrom.vue
  4. 2
      src/pages.json
  5. 25
      src/pages/foam/check.vue
  6. 42
      src/pages/foam/input.vue
  7. 21
      src/pages/index/index.vue
  8. 14
      src/pages/setter/index.vue
  9. 4
      src/store/modules/user.js
  10. 8
      src/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue
  11. BIN
      test.keystore

2
password.txt
View File

@ -1,2 +1,2 @@
别名：testalias
密码： wms3.0
密码： putandin

4
src/manifest.json
View File

@ -1,6 +1,6 @@
{
"name" : "wms",
"appid" : "__UNI__43932FE",
"name" : "投入产出",
"appid" : "__UNI__37328FF",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : 1,

222
src/mycomponents/form/customerFrom.vue
View File

@ -69,7 +69,7 @@
<text style="font-size: 32rpx; font-weight:550">点检状态</text>
<text style="font-size: 30rpx; color: #9e9e9e;">(单选)</text>
</view>
<u-radio-group v-if="isRefresh" v-model="item.SelectName" @change="radioGroupChange(item)">
<u-radio-group v-if="isRefresh&&isRefreshType2" v-model="item.SelectName" @change="radioGroupChange(item)">
<view class="uni-flex" style="width: 50%; margin-left: 0rpx;"
v-for="(radio, index) in dataInputList" :key="index">
<view class="uni-flex " style="margin-top: 10rpx; justify-content: flex-start;">
@ -81,7 +81,7 @@
</u-radio-group>
</view>
<input class="input" v-if="item.putMachine.length==1" style="margin-left: 50rpx;"
:placeholder="item.putMachine[0].Name" v-model="item.SelectName" />
type="digit" placeholder="" v-model="item.SelectName" @input="inputType2" />
</view>
</view>
@ -109,7 +109,7 @@
</view>
<view class="">
<view class="" style="margin-left: 50rpx;">
<view class="" style="margin-left: 50rpx;" v-if="item.Methond!='压力表示数范围2.5bar~4.5bar'">
<view class="">
<text style="font-size: 32rpx; font-weight:550">点检状态</text>
<text style="font-size: 30rpx; color: #9e9e9e;">(单选)</text>
@ -130,20 +130,23 @@
<!-- <input class="input" style="margin-left: 50rpx;" :placeholder="item.placeholder"
v-model="item.SelectName" /> -->
<view class="" style="margin-left: 50rpx;">
<text style="font-size: 32rpx; margin: 10rpx;">{{item.putMachine[0].Name}}</text>
<text style="font-size: 32rpx; margin: 10rpx;">{{item.putMachine[0].Name}}({{item.putMachine[0].Limit}}~{{item.putMachine[0].Floor}})</text>
<input class="input" @input="inputMain(item)" type="number"
:placeholder="item.putMachine[0].Name" v-model="item.putMachine[0].SelectName" />
placeholder="" v-model="item.putMachine[0].SelectName" />
</view>
<view class="" style="margin-left: 50rpx;">
<text style="font-size: 32rpx; margin: 10rpx;">{{item.putMachine[1].Name}}</text>
<text style="font-size: 32rpx; margin: 10rpx;">{{item.putMachine[1].Name}}({{item.putMachine[1].Limit}}~{{item.putMachine[1].Floor}})</text>
<input class="input" @input="inputMinor(item)" type="number"
:placeholder="item.putMachine[1].Name" v-model="item.putMachine[1].SelectName" />
placeholder="" v-model="item.putMachine[1].SelectName" />
</view>
</view>
<view class=""
style="width: 100%;background-color: gray;height: 2rpx; margin-top: 15rpx;margin-bottom: 15rpx;" />
</view>
</view>
<view class="" v-else-if="item.Type=='5'">
<view class="" v-else-if="item.Type=='4'">
<view class="flex uni-row" style="padding-left: 10rpx; border-bottom: #9e9e9e;">
<view class="" style="margin-top: 3rpx;">
<text class="colorRed">*</text>
@ -240,6 +243,7 @@
current: 0,
isRefresh: true,
isRefreshType3: true,
isRefreshType2: true,
};
@ -274,6 +278,13 @@
this.reload3()
},
inputType2(item){
// if(item.length==0){
// }
this.reload2()
},
submit(callBack) {
try {
@ -303,35 +314,39 @@
}
} else if (item.Type == 3) {
if (item.SelectName == "") {
if(item.putMachine[0].SelectName==""){
if (item.putMachine[0].SelectName == "") {
var hint = hintIndex + ".点检内容 : " + item.Content;
throw new Error(hint)
}else {
if (!this.isWithinInterval(item.putMachine[0].SelectName, item.putMachine[0].Limit, item
} else {
if (!this.isWithinInterval(item.putMachine[0].SelectName, item.putMachine[0].Limit,
item
.putMachine[0]
.Floor)) {
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.SelectName +
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.putMachine[0].SelectName +
"】不在【" + item.putMachine[0].Limit + "】和【" + item.putMachine[0].Floor + "】之间"
throw new Error(hint)
}
}
if(item.putMachine[1].SelectName==""){
if (item.putMachine[1].SelectName == "") {
var hint = hintIndex + ".点检内容 : " + item.Content;
throw new Error(hint)
}else {
if (!this.isWithinInterval(item.putMachine[1].SelectName, item.putMachine[1].Limit, item
} else {
if (!this.isWithinInterval(item.putMachine[1].SelectName, item.putMachine[1].Limit,
item
.putMachine[1]
.Floor)) {
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.SelectName +
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.putMachine[1].SelectName +
"】不在【" + item.putMachine[1].Limit + "】和【" + item.putMachine[1].Floor + "】之间"
throw new Error(hint)
}
}
}else {if (!this.isExitList(item.SelectName)) {
if (!this.isWithinInterval(item.putMachine[0].SelectName, item.putMachine[0].Limit, item
} else {
if (!this.isExitList(item.SelectName)) {
if (!this.isWithinInterval(item.putMachine[0].SelectName, item.putMachine[0].Limit,
item
.putMachine[0]
.Floor)) {
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.SelectName +
@ -339,16 +354,21 @@
throw new Error(hint)
}
if (!this.isWithinInterval(item.putMachine[1].SelectName, item.putMachine[1].Limit, item
if (!this.isWithinInterval(item.putMachine[1].SelectName, item.putMachine[1].Limit,
item
.putMachine[1]
.Floor)) {
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.SelectName +
"】不在【" + item.putMachine[1].Limit + "】和【" + item.putMachine[1].Floor + "】之间"
throw new Error(hint)
}
}}
}
}
}else if(item.Type == 4){
if (item.SelectName == "") {
var hint = hintIndex + ".点检内容 : " + item.Content;
throw new Error(hint)
}
}
}
@ -379,129 +399,11 @@
submitss(callBack) {
var isCheckPass = true
for (var i = 0; i < this.formData.length; i++) {
var item = this.formData[i];
var hintIndex = i + 1
if (item.Type == 1) {
if (item.SelectName == "") {
this.showHint(hintIndex + ".点检内容 : " + item.Content, item.placeholder)
isCheckPass = false;
break
}
} else if (item.Type == 2) {
} else
if (item.Type == 3) {
if (item.SelectName == "") {
this.showHint(hintIndex + ".点检内容 : " + item.Content, item.inputLow.placeholder)
isCheckPass = false;
break
} else {
if (!this.isWithinInterval(item.inputLow.name, item.inputLow.lower, item.inputLow
.upper)) {
this.showHint(hintIndex + ".点检内容 : " + item.Content, "最低压 : 输入数量【" + item.inputLow
.name +
"】不在【" + item.inputLow.lower + "】和【" + item.inputLow.upper + "】之间")
isCheckPass = false;
break
}
}
if (item.inputHigh.name == "") {
this.showHint(hintIndex + ".点检内容 : " + item.Content, item.inputHigh.placeholder)
isCheckPass = false;
break
} else {
if (!this.isWithinInterval(item.inputHigh.name, item.inputHigh.lower, item.inputHigh
.upper)) {
this.showHint(hintIndex + ".点检内容 : " + item.Content, "最高压 : 输入数量【" + item.inputHigh
.name +
"】不在【" + item.inputHigh.lower + "】和【" + item.inputHigh.upper + "】之间")
isCheckPass = false;
break
}
}
} else if (item.Type == 2) {
if (item.SelectName == "") {
this.showHint(hintIndex + ".点检内容 : " + item.Content, item.placeholder)
isCheckPass = false;
break
} else {
if (!this.isExitList(item.SelectName)) {
if (item.putMachine.length > 0) {
for (var i = 0; i < item.putMachine.length; i++) {
var temp = item.putMachine[i]
if (item.SelectName == "") {
this.showHint(hintIndex + ".点检内容 : " + item.Content, temp.Name)
isCheckPass = false;
break
}
if (!this.isWithinInterval(item.SelectName, temp.Limit, temp.Floor)) {
this.showHint(hintIndex + ".点检内容 : " + item.Content, "输入数量【" + item
.SelectName +
"】不在【" + temp.Limit + "】和【" + temp.Floor + "】之间")
isCheckPass = false;
break
}
}
} else {
if (!this.isWithinInterval(item.SelectName, item.Limit, item.Floor)) {
this.showHint(hintIndex + ".点检内容 : " + item.Content, "输入数量【" + item
.SelectName +
"】不在【" + item.Limit + "】和【" + item.Floor + "】之间")
isCheckPass = false;
break
}
}
}
}
} else if (item.type == "groupSelect") {
if (item.SelectName == "") {
this.showHint(hintIndex + ".点检内容 : " + item.Content, item.placeholder)
isCheckPass = false;
break
}
}
}
if (isCheckPass) {
this.formData.forEach(res => {
if (res.SelectName.includes("班")) {
var value = this.dataClassList.filter(item => item.name == res.SelectName)
if (value.length > 0) {
res.SelectValue = value[0].value
} else {
res.SelectValue = ""
}
} else {
var value = this.dataList.filter(item => item.name == res.SelectName)
if (value.length > 0) {
res.SelectValue = value[0].value
} else {
res.SelectValue = ""
}
}
})
callBack(this.formData)
// this.$emit("submit",this.formData)
console.log("通过", this.formData)
} else {
console.log("失败")
}
},
isWithinInterval(num, lower, upper) {
var num =Number(num);
var lower =Number(lower);
var upper =Number(upper);
var num = Number(num);
var lower = Number(lower);
var upper = Number(upper);
if (!this.isNumber(num)) {
return true;
}
@ -528,23 +430,20 @@
reset() {
for (var i = 0; i < this.formData.length; i++) {
var item = this.formData[i];
if (item.type == "inputRange") {
item.inputLow.name = "";
item.inputHigh.name = ""
} else if (item.type == "inputAndSelect") {
if (item.putMachine) {
item.putMachine.name = ""
item.putMachine.value = ""
}
if (item.minor) {
item.minor.name = ""
item.minor.value = ""
}
if(item.Type == "1"){
item.SelectName = ""
item.value = ""
} else {
item.SelectValue= ""
}else if(item.Type == "2"){
item.SelectName = ""
item.value = ""
item.SelectValue= ""
}else if(item.Type == "3"){
item.putMachine.forEach(res=>{
res.SelectName=""
res.SelectValue=""
})
}else if(item.Type == "4"){
item.SelectName = ""
item.SelectValue= ""
}
}
// var testList =deepCopyData(this.dataList)
@ -563,12 +462,19 @@
this.isRefresh = true
this.isRefreshType3 = true
})
this.$forceUpdate()
},
reload3() {
this.isRefreshType3 = false
this.$nextTick(() => {
this.isRefreshType3 = true
})
},
reload2() {
this.isRefreshType2 = false
this.$nextTick(() => {
this.isRefreshType2 = true
})
}

2
src/pages.json
View File

@ -3,7 +3,7 @@
"pages": [{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "WMS仓库管理系统-移动端",
"navigationBarTitleText": "投入产出管理系统-移动端",
"titleNView": {
// "autoBackButton": "true",
"buttons": [{}]

25
src/pages/foam/check.vue
View File

@ -4,10 +4,10 @@
style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
<view class="flex u-col-center space-between">
<view class="">
<view class="" style="margin: 5rpx;">
<view class="" style="margin: 5rpx; font-weight: bold;">
设备编号 : {{deviceCode}}
</view>
<view class="" style="margin: 5rpx;" v-if="deviceName!=''">
<view class="" style="margin: 5rpx; font-weight: bold;" v-if="deviceName!=''">
设备名称 : {{deviceName}}
</view>
@ -77,7 +77,7 @@
dateTime: "",
deviceCode: "",
deviceName: "",
worker: "admin",
worker: this.$store.state.user.id,
dataList: [],
formData: [{
type: "stateSelect",
@ -219,20 +219,24 @@
this.reset();
this.closeScanPopup();
var groupSelect = {
Type: "5",
Type: "4",
Content: "选择班组",
placeholder: "请选择班组",
name: '',
value: "",
SelectName: "",
SelectValue: "",
}
// this.dataList = this.formData
this.dataList = res.Result;
this.dataList.push(groupSelect)
this.dataList.forEach(res=>{
res.SelectName=""
res.SelectValue=""
if(res.putMachine){
res.putMachine.forEach(item=>{
item.SelectName=""
item.SelectValue=""
})
}
})
this.deviceName=this.dataList[0].Name;
this.dateTime = getCurrDateTime()
@ -256,9 +260,9 @@
return
}
this.$refs.customerFrom.submit(data => {
data.worker ="admin";
var commitData={
worker:"admin",
LoginUserID:this.$store.state.user.id,
UserName:this.$store.state.user.name,
createTime:getCurrDateTime(),
dataList:data
}
@ -293,6 +297,9 @@
closeScanPopup() {
this.$refs.scanPopup.closeScanPopup();
},
showMessage(hint){
this.$refs.comMessage.showMessage("提示", hint)
},
}
}

42
src/pages/foam/input.vue
View File

@ -26,11 +26,11 @@
</uni-section>
<view class="uni-flex space-between">
<view class="" style="width: 75%; ">
<view class="" style="width: 80%; ">
<input class="input" disabled v-model="planNumber" />
</view>
<view class="uni-flex" style="width: 25%; align-items: center;">
<button type="primary" size="mini" @click="showPlanSelect">选择单号</button>
<view class="uni-flex" style="width: 20%; align-items: center;">
<button type="primary" size="mini" @click="showPlanSelect">单号</button>
</view>
</view>
@ -40,11 +40,11 @@
<uni-section title="原料名称" subTitle="输入或者选择原料名称" subTitleFontSize="26rpx" titleFontSize="35rpx" type="line">
</uni-section>
<view class="uni-flex space-between">
<view class="" style="width: 75%;">
<view class="" style="width: 80%;">
<input class="input" v-model="materialName" />
</view>
<view class="uni-flex" style="width: 25%; align-items: center;">
<button type="primary" size="mini" @click="showMaterialSelect">选择原料</button>
<view class="uni-flex" style="width: 20%; align-items: center;">
<button type="primary" size="mini" @click="showMaterialSelect">原料</button>
</view>
</view>
</view>
@ -206,22 +206,22 @@
uni.hideLoading()
this.showMessage(error)
})
this.$refs.selectPopup.open({
mode: 'radio', //radio checkbox 单选、多选
dataList: getDataList(), //如果dataList传入了数组则直接使用传入的数组渲染，无需再配置proxyConfig
// selected: this.userForm.values, //已选中的数据
// proxyConfig: { //组件内部代理请求数据配置
// reqFun: this.reqGetList, //请求方法
// localPaging: false //前端本地分页
// this.$refs.selectPopup.open({
// mode: 'radio', //radio checkbox 单选、多选
// dataList: getDataList(), //如果dataList传入了数组则直接使用传入的数组渲染，无需再配置proxyConfig
// // selected: this.userForm.values, //已选中的数据
// // proxyConfig: { //组件内部代理请求数据配置
// // reqFun: this.reqGetList, //请求方法
// // localPaging: false //前端本地分页
// // },
// search: {
// type: 'local', //local本地数据搜索 | remote请求接口
// },
search: {
type: 'local', //local本地数据搜索 | remote请求接口
},
fields: {
label: 'name',
value: 'code'
}
})
// fields: {
// label: 'name',
// value: 'code'
// }
// })
},

21
src/pages/index/index.vue
View File

@ -91,7 +91,8 @@
position: [-10, -10],
menusCount: {},
filterList: [],
serchval: ""
serchval: "",
backButtonPress: 0
}
},
onLoad() {
@ -108,8 +109,7 @@
},
onHide() {
},
onHide() {},
onShow() {
if (uni.getStorageSync("hasLogin") == null || uni.getStorageSync("hasLogin") == false) {
uni.showModal({
@ -133,9 +133,20 @@
})
}
},
onUnload() {
onUnload() {},
onBackPress(e) {
// 此处一定要return为true，否则页面不会返回到指定路径
this.backButtonPress++;
if (this.backButtonPress > 1) {
plus.runtime.quit();
} else {
plus.nativeUI.toast('再滑一次退出应用11');
}
setTimeout(function() {
this.backButtonPress = 0;
}, 1000);
return true;
},
mounted() {},
methods: {
findList(tab) {

14
src/pages/setter/index.vue
View File

@ -57,7 +57,7 @@
const app = createApp({});
// app.component({
// });
const userName = ref(store.state.user.name);
const userName = ref(store.state.user.id);
let test = ref("123");
let version = ref();
let userInfo = ref(null);
@ -79,7 +79,6 @@
function handlerlogout() {
store.dispatch('LogOut', {}).then(() => {
clearStorage();
// #ifdef H5
uni.reLaunch({
@ -91,18 +90,7 @@
plus.runtime.quit()
// #endif
}).catch(error=>{
clearStorage();
// #ifdef H5
uni.reLaunch({
url: '../login/index'
})
// #endif
// #ifdef APP
plus.runtime.quit()
// #endif
})
};
function clearStorage() {

4
src/store/modules/user.js
View File

@ -52,8 +52,8 @@ const user = {
return new Promise((resolve, reject) => {
login(username, password).then(res => {
if(res){
// 设置 token
commit('SET_ID',res.Result.LoginUserID)
commit('SET_NAME',res.Result.UserName)
resolve(res)
}else {
uni.showToast({

8
src/uni_modules/wz-select-popup/components/wz-select-popup/wz-list.vue
View File

@ -4,8 +4,9 @@
@click="$emit('checkList',item)">
<!-- <uni-icons v-if="item.check" type="checkbox-filled" color="#007aff" size="24"></uni-icons>
<uni-icons v-else type="circle" color="#999" size="24"></uni-icons> -->
{{index+1}}.
<view class="list-item-text">{{item[fields.label]}}</view>
<text style="color: #000 ;font-size: 35rpx; font-weight: bold;">{{index+1}}.</text>
<view class="list-item-text" style="color: #000;font-size: 35rpx;">{{item[fields.label]}}</view>
</view>
<view class="loadmore" @click="$emit('loadmore')">
<view v-if="page.loading == 'loading'" class="icon">
@ -76,10 +77,9 @@
.list-item {
display: flex;
align-items: center;
color: $uni-text-color-grey;
color: gray;
padding: $uni-spacing-col-base;
margin-bottom: $uni-spacing-col-sm;
background-color: #fff;
.list-item-text {
@include wz-line(2);

BIN
test.keystore
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save