Browse Source

修改泡沫点检

master
lijuncheng 8 months ago
parent
commit
d3190511cc
  1. 328
      src/mycomponents/form/customerFrom.vue
  2. 50
      src/pages/foam/check.vue

328
src/mycomponents/form/customerFrom.vue

@ -40,7 +40,8 @@
<!-- <input class="input" disabled style="margin-left: 50rpx;" :placeholder="item.placeholder"
v-model="item.SelectName" /> -->
</view>
<view class="" style="width: 100%;background-color: gray;height: 2rpx; margin-top: 15rpx;margin-bottom: 15rpx;" />
<view class=""
style="width: 100%;background-color: gray;height: 2rpx; margin-top: 15rpx;margin-bottom: 15rpx;" />
</view>
<view class="" v-else-if="item.Type=='2'">
@ -62,7 +63,7 @@
</view>
</view>
<view class="" >
<view class="">
<view class="" style="margin-left: 50rpx;">
<view class="">
<text style="font-size: 32rpx; font-weight:550">点检状态</text>
@ -79,42 +80,44 @@
</view>
</u-radio-group>
</view>
<!-- <input class="input" style="margin-left: 50rpx;" :placeholder="item.placeholder"
v-model="item.SelectName" /> -->
</view>
<view class="" v-if="item.putMachine.length>0" >
<view class="" v-if="item.putMachine.length==1" style="margin-left: 50rpx;">
<text style="font-size: 32rpx; margin: 10rpx;">{{item.putMachine[0].Name}}</text>
<input class="input" @input="inputMinor(item)" type="number"
:placeholder="item.putMachine[0].Name" v-model="item.SelectName" />
</view>
<view class="" v-if="item.putMachine.length==2" style="margin-left: 50rpx;">
<text style="font-size: 32rpx; margin: 10rpx;">{{item.putMachine[1].Name}}</text>
<input class="input" @input="inputMain(item)" type="number" :placeholder="item.putMachine[1].Name"
v-model="item.putMachine[1].name" />
</view>
<input class="input" v-if="item.putMachine.length==1" style="margin-left: 50rpx;"
:placeholder="item.putMachine[0].Name" v-model="item.SelectName" />
</view>
</view>
<view class="" v-else-if="item.Type=='groupSelect'">
<view class="flex uni-row" style="padding-left: 10rpx; border-bottom: #9e9e9e;">
<view class="" v-else-if="item.Type=='3'">
<view class="flex uni-row " style="padding-left: 10rpx; border-bottom: #9e9e9e;">
<view class="" style="margin-top: 3rpx;">
<text class="colorRed">*</text>
<text class="num" style="font-size: 32rpx;">{{ index + 1 }}.</text>
</view>
<view class="" style="display: flex;flex-direction: column;">
<view class="uni-flex uni-column">
<view class="position">
{{ item.Content }}
点检部位 : {{ item.Position }}
</view>
<view class="content">
点检内容 : {{ item.Content }}
</view>
<view class="methond" style="margin-bottom: 10rpx;">
点检方法 : {{item.Methond}}
</view>
</view>
</view>
</view>
<view class="">
<view class="" style="margin-left: 50rpx;">
<view style="font-size: 30rpx; color: #9e9e9e;">(单选)</view>
<u-radio-group v-if="isRefresh" v-model="item.SelectName" @change="radioGroupChange(item)">
<view class="">
<text style="font-size: 32rpx; font-weight:550">点检状态</text>
<text style="font-size: 30rpx; color: #9e9e9e;">(单选)</text>
</view>
<u-radio-group v-if="isRefresh&&isRefreshType3" v-model="item.SelectName"
@change="radioGroupChange(item)">
<view class="uni-flex" style="width: 50%; margin-left: 0rpx;"
v-for="(radio, index) in dataClassList" :key="index">
v-for="(radio, index) in dataInputList" :key="index">
<view class="uni-flex " style="margin-top: 10rpx; justify-content: flex-start;">
<u-radio :name="radio.name" @change="radioChange(radio)">
{{radio.name}}
@ -123,43 +126,54 @@
</view>
</u-radio-group>
</view>
<!-- <input class="input" disabled style="margin-left: 50rpx;" :placeholder="item.placeholder"
v-model="item.SelectName" /> -->
</view>
<view class="" v-if="item.putMachine.length>1">
<!-- <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>
<input class="input" @input="inputMain(item)" type="number"
:placeholder="item.putMachine[0].Name" 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>
<input class="input" @input="inputMinor(item)" type="number"
:placeholder="item.putMachine[1].Name" v-model="item.putMachine[1].SelectName" />
</view>
</view>
</view>
</view>
<view class="" v-else-if="item.type=='inputRange'">
<view class="flex uni-row " style="padding-left: 10rpx; border-bottom: #9e9e9e;">
<view class="" v-else-if="item.Type=='5'">
<view class="flex uni-row" style="padding-left: 10rpx; border-bottom: #9e9e9e;">
<view class="" style="margin-top: 3rpx;">
<text class="colorRed">*</text>
<text class="num" style="font-size: 32rpx;">{{ index + 1 }}.</text>
</view>
<view class="uni-flex uni-column">
<view class="" style="display: flex;flex-direction: column;">
<view class="position">
点检部位 : {{ item.Position }}
</view>
<view class="content">
点检内容 : {{ item.Content }}
</view>
<view class="methond" style="margin-bottom: 10rpx;">
点检方法 : {{item.Methond}}
{{ item.Content }}
</view>
</view>
</view>
<view class="">
<view class="" style="margin-left: 50rpx;">
<text style="font-size: 32rpx; margin: 10rpx;">{{item.inputLow.placeholder}}</text>
<input class="input" type="number" :placeholder="item.inputLow.placeholder"
v-model="item.inputLow.name" />
</view>
<view class="" style="margin-left: 50rpx;">
<text style="font-size: 32rpx; margin: 10rpx;">{{item.inputHigh.placeholder}}</text>
<input class="input" type="number" :placeholder="item.inputHigh.placeholder"
v-model="item.inputHigh.name" />
<view style="font-size: 30rpx; color: #9e9e9e;">(单选)</view>
<u-radio-group v-if="isRefresh" v-model="item.SelectName" @change="radioGroupChange(item)">
<view class="uni-flex" style="width: 50%; margin-left: 0rpx;"
v-for="(radio, index) in dataClassList" :key="index">
<view class="uni-flex " style="margin-top: 10rpx; justify-content: flex-start;">
<u-radio :name="radio.name" @change="radioChange(radio)">
{{radio.name}}
</u-radio>
</view>
</view>
</u-radio-group>
</view>
<!-- <input class="input" disabled style="margin-left: 50rpx;" :placeholder="item.placeholder"
v-model="item.SelectName" /> -->
</view>
</view>
</view>
<showModal ref="comMessage"></showModal>
@ -224,7 +238,8 @@
],
testName: null,
current: 0,
isRefresh: true
isRefresh: true,
isRefreshType3: true,
};
@ -232,44 +247,164 @@
},
methods: {
radioChange(radio) {
console.log("radioChange")
console.log("radioChange", radio)
},
radioGroupChange(item) {
console.log("radioGroupChange", item)
// for (let i = 0; i < this.dataList.length; i++) {
// if (this.dataList[i].name === item.SelectName) {
// this.current = i;
// break;
// if(item.SelectName=!""){
// if(item.putMachine.length==2){
// item.putMachine[0].SelectName=""
// item.putMachine[1].SelectName=""
// // this.reload3()
// }
// }
console.log("radioGroupChange", item)
},
inputMain(item) {
item.SelectName = item.minor.name + "~" + item.putMachine.name;
if (item.minor.name == "" && item.putMachine.name == "") {
if (item.putMachine[0].SelectName.length > 0) {
item.SelectName = ""
}
this.reload3()
},
inputMinor(item) {
item.SelectName = item.minor.name + "~" + item.putMachine.name;
if (item.minor.name == "" && item.putMachine.name == "") {
if (item.putMachine[1].SelectName.length > 0) {
item.SelectName = ""
}
this.reload3()
},
submit(callBack) {
try {
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 == "") {
var hint = hintIndex + ".点检内容 : " + item.Content;
throw new Error(hint)
}
} else if (item.Type == 2) {
//
if (item.SelectName == "") {
var hint = hintIndex + ".点检内容 : " + item.Content;
throw new Error(hint)
}
//
if (!this.isExitList(item.SelectName)) {
if (!this.isWithinInterval(item.SelectName, item.putMachine[0].Limit, item
.putMachine[0]
.Floor)) {
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.SelectName +
"】不在【" + item.putMachine[0].Limit + "】和【" + item.putMachine[0].Floor + "】之间"
throw new Error(hint)
}
}
} else if (item.Type == 3) {
if (item.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
.putMachine[0]
.Floor)) {
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.SelectName +
"】不在【" + item.putMachine[0].Limit + "】和【" + item.putMachine[0].Floor + "】之间"
throw new Error(hint)
}
}
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
.putMachine[1]
.Floor)) {
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.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
.putMachine[0]
.Floor)) {
var hint = hintIndex + ".点检内容 : " + item.Content + "输入数量【" + item.SelectName +
"】不在【" + item.putMachine[0].Limit + "】和【" + item.putMachine[0].Floor + "】之间"
throw new Error(hint)
}
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)
}
}}
}
}
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 = res.SelectName
}
}
})
callBack(this.formData)
} catch (error) {
this.showHint("", error.message)
}
},
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 == "inputRange") {
if (item.inputLow.name == "") {
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 +
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
@ -281,20 +416,16 @@
isCheckPass = false;
break
} else {
if (!this.isWithinInterval(item.inputHigh.name, item.inputHigh.lower, item.inputHigh.upper)) {
this.showHint(hintIndex + ".点检内容 : " + item.Content, "最高压 : 输入数量【" + item.inputHigh.name +
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 == 1) {
if (item.SelectName == "") {
this.showHint(hintIndex + ".点检内容 : " + item.Content, item.placeholder)
isCheckPass = false;
break
}
} else if (item.Type == 2) {
if (item.SelectName == "") {
this.showHint(hintIndex + ".点检内容 : " + item.Content, item.placeholder)
@ -302,27 +433,29 @@
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==""){
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 +
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 +
this.showHint(hintIndex + ".点检内容 : " + item.Content, "输入数量【" + item
.SelectName +
"】不在【" + item.Limit + "】和【" + item.Floor + "】之间")
isCheckPass = false;
break
@ -340,20 +473,20 @@
}
}
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=""
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=""
} else {
var value = this.dataList.filter(item => item.name == res.SelectName)
if (value.length > 0) {
res.SelectValue = value[0].value
} else {
res.SelectValue = ""
}
}
})
@ -366,6 +499,9 @@
}
},
isWithinInterval(num, lower, upper) {
var num =Number(num);
var lower =Number(lower);
var upper =Number(upper);
if (!this.isNumber(num)) {
return true;
}
@ -383,7 +519,7 @@
// title: title,
// Content: hint
// })
this.$refs.comMessage.showMessage(title, hint)
this.$refs.comMessage.showMessage("提示", hint)
},
isNumber(val) {
@ -420,10 +556,18 @@
console.log("重置", this.formData)
},
reload(){
reload() {
this.isRefresh = false
this.isRefreshType3 = false
this.$nextTick(() => {
this.isRefresh = true
this.isRefreshType3 = true
})
},
reload3() {
this.isRefreshType3 = false
this.$nextTick(() => {
this.isRefreshType3 = true
})
}

50
src/pages/foam/check.vue

@ -209,31 +209,34 @@
methods: {
getScanResult(result) {
uni.showLoading({
title:"加载中",
mask:true
title: "加载中",
mask: true
})
getDeviceInfo(result).then(res=>{
getDeviceInfo(result).then(res => {
uni.hideLoading()
this.deviceCode = result;
console.log(result)
this.reset();
this.closeScanPopup();
var groupSelect ={
Type: "groupSelect",
var groupSelect = {
Type: "5",
Content: "选择班组",
placeholder: "请选择班组",
name: '',
value: "",
}
this.dataList = this.formData
// res.Result;
// this.dataList.push(groupSelect)
// this.dataList.forEach(res=>{
// res.SelectName=""
// })
// this.deviceName=this.dataList[0].Name;
// this.dataList = this.formData
this.dataList = res.Result;
this.dataList.push(groupSelect)
this.dataList.forEach(res=>{
res.SelectName=""
res.putMachine.forEach(item=>{
item.SelectName=""
})
})
this.deviceName=this.dataList[0].Name;
this.dateTime = getCurrDateTime()
}).catch(error=>{
}).catch(error => {
uni.hideLoading()
this.showMessage(error)
})
@ -253,8 +256,15 @@
return
}
this.$refs.customerFrom.submit(data => {
var param =data
console.log("提交", JSON.stringify(data))
data.worker ="admin";
var commitData={
worker:"admin",
createTime:getCurrDateTime(),
dataList:data
}
var param = commitData
console.log("提交", JSON.stringify(param))
// foamCheckSubmit(param).then(res=>{
// uni.hideLoading()
// this.showMessage("")
@ -266,12 +276,12 @@
})
},
clearData(){
this.deviceCode=""
clearData() {
this.deviceCode = ""
this.dateTime = "",
this.deviceCode= "",
this.deviceName="",
this.reset();
this.deviceCode = "",
this.deviceName = "",
this.reset();
},
reset() {
this.$refs.customerFrom.reset()

Loading…
Cancel
Save