From aff94579d33c07675ab160652b6d8ce49ed2e154 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 24 一月 2025 15:56:46 +0800
Subject: [PATCH] fix:更改请求地址
---
pages/public-page/selectSpecifications/selectSpecifications.vue | 164 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 128 insertions(+), 36 deletions(-)
diff --git a/pages/public-page/selectSpecifications/selectSpecifications.vue b/pages/public-page/selectSpecifications/selectSpecifications.vue
index f211140..cefbd16 100644
--- a/pages/public-page/selectSpecifications/selectSpecifications.vue
+++ b/pages/public-page/selectSpecifications/selectSpecifications.vue
@@ -3,13 +3,14 @@
<u--form labelPosition="top"
labelWidth="30%"
:borderBottom="false"
- :rules="rules"
+ :rules="pageFlag ? rules : rulesGe"
:errorType="'border-bottom'"
:model="dataForm"
ref="uForm">
- <u-form-item
+ <!-- <u-form-item
borderBottom=true
label="涓�绾у搧绫�"
+ v-if="!pageFlag"
prop="firstClass"
:borderBottom="false">
<u-cell-group>
@@ -20,19 +21,27 @@
slot="right-icon"
size="30"></u-icon></u-cell>
</u-cell-group>
- </u-form-item>
+ </u-form-item> -->
<u-form-item
borderBottom=true
label="浜岀骇鍝佸悕"
prop="secondClass"
:borderBottom="false">
<u-cell-group>
- <u-cell :title="dataForm.secondClass"
+ <!-- <u-cell :title="dataForm.secondClass"
value="璇烽�夋嫨"
@click="secondClassSelect">
<u-icon name="arrow-right"
slot="right-icon"
- size="30"></u-icon></u-cell>
+ size="30"></u-icon></u-cell> -->
+ <!-- <niceui-data-select-input
+ v-model="dataForm.secondClass"
+ :localdata="secondClassActionsList"
+ @change="change"
+ :value="dataForm.secondClass"
+ class="uni-px-5 uni-pb-5"
+ ></niceui-data-select-input> -->
+ <uni-combox :candidates="secondClassActionsList" placeholder="璇烽�夋嫨浜岀骇鍝佸悕" v-model="dataForm.secondClass"></uni-combox>
</u-cell-group>
</u-form-item>
<u-form-item
@@ -46,6 +55,7 @@
</u-form-item>
<!-- 鏂板涓嶅悎鏍肩О閲� -->
<u-form-item label="涓嶅悎鏍奸噸閲�"
+ v-if="pageFlag"
prop="unqualifiedWeight"
borderBottom>
<u-input v-model="dataForm.unqualifiedWeight"
@@ -64,6 +74,7 @@
</u-form-item> -->
<u-form-item label="鍗曚环"
prop="penaltyUnitPrice"
+ v-if="pageFlag"
borderBottom>
<u-input v-model="dataForm.penaltyUnitPrice"
placeholder="璇疯緭鍏ヤ笉鍚堟牸鍗曚环"
@@ -114,6 +125,8 @@
export default {
data() {
return {
+ pageFlag:false, // false:'涓嶅悎鏍�' true :'鍚堟牸鐨�'
+
dataForm: {
firstClass: "",
secondClass: "",
@@ -152,7 +165,7 @@
},
'specifications': {
type: 'string',
- required: true,
+ required: false,
message: '璇烽�夋嫨鍊�',
trigger: ['blur', 'change']
},
@@ -167,11 +180,46 @@
// trigger: ['blur', 'change']
// },
'penaltyUnitPrice':{
- required: true,
+ required: false,
message: '璇烽�夋嫨鍊�',
trigger: ['blur', 'change']
}
},
+ rulesGe:{
+ 'firstClass': {
+ type: 'string',
+ required: true,
+ message: '璇烽�夋嫨鍊�',
+ trigger: ['blur', 'change']
+ },
+ 'secondClass': {
+ type: 'string',
+ required: true,
+ message: '璇烽�夋嫨鍊�',
+ trigger: ['blur', 'change']
+ },
+ 'specifications': {
+ type: 'string',
+ required: false,
+ message: '璇烽�夋嫨鍊�',
+ trigger: ['blur', 'change']
+ },
+ 'unqualifiedWeight': {
+ required: false,
+ message: '璇烽�夋嫨鍊�',
+ trigger: ['blur', 'change']
+ },
+ // 'unqualifiedType':{
+ // required: true,
+ // message: '璇烽�夋嫨鍊�',
+ // trigger: ['blur', 'change']
+ // },
+ 'penaltyUnitPrice':{
+ required: false,
+ message: '璇烽�夋嫨鍊�',
+ trigger: ['blur', 'change']
+ }
+ },
//
showWeighCopyStorge: []
}
@@ -190,8 +238,10 @@
this.params = params;
this.productName = params.productName === "true" || false
this.unqualified = params.unqualified === "true" || false
+ params.pageFlag ? this.pageFlag = false : this.pageFlag = true;
this.showWeighCopyStorge = JSON.parse(JSON.stringify(uni.getStorageSync('showWeighCopyStorgeOther')))
- console.log(params,'paramsparamsparams');
+ console.log(params, 'paramsparamsparams');
+
if(params.type == 'edit'){
this.init(params)
}
@@ -202,21 +252,52 @@
uni.showLoading({
title: "鍔犺浇涓�"
})
- this.$reqGet("getFirstCategoryName").then(res => {
- if (res.code === 0) {
- uni.hideLoading()
- this.firstClassActionsList = res.data.filter(Boolean).map(v => {
- return {
- ...v,
- name: v && v.firstCategoryName
+ // this.$reqGet("getFirstCategoryName").then(res => {
+ // if (res.code === 0) {
+ // uni.hideLoading()
+ // this.firstClassActionsList = res.data.filter(Boolean).map(v => {
+ // return {
+ // ...v,
+ // name: v && v.firstCategoryName
+ // }
+ // })
+ // if(params.type !== 'edit') this.dataForm.firstClass = this.firstClassActionsList[0].firstCategoryName
+ // //濡傛灉鏄悎鏍肩殑闇�瑕佸洖鏄惧搧鍚嶈鏍�
+ //
+
+ // } else {
+ // uni.hideLoading()
+ // this.$u.toast('鍔犺浇澶辫触')
+ // }
+ // // 鍥炴樉浜岀骇鍝佸悕
+ this.$reqGet('getSecondCategoryName').then(
+ res => {
+ if (res.code === 0) {
+ uni.hideLoading();
+ console.log(res.data,'result')
+ this.secondClassActionsList = res.data.map(v => {
+ return v.secondCategoryName
+ })
+ // if(this.secondClassActionsList .length){
+ // this.dataForm.secondClass = this.secondClassActionsList[0].value;
+ // }
+ //
+ // }
+ if(params.actionObj){
+ let {breed,spec} = JSON.parse(params.actionObj);
+ this.secondClassActionsList.unshift(breed)
+ this.dataForm.specifications= spec;;
+ this.dataForm.secondClass= breed;
+ this.dataForm.firstClass= JSON.parse(params.actionObj).firstClass || '';
+ console.log(this.secondClassActionsList,'secondClass')
}
- })
- if(params.type !== 'edit') this.dataForm.firstClass = this.firstClassActionsList[0].firstCategoryName
- } else {
- uni.hideLoading()
- this.$u.toast('鍔犺浇澶辫触')
- }
- })
+
+ } else {
+ uni.hideLoading()
+ this.$u.toast('鍔犺浇澶辫触')
+ }
+ })
+ // })
},
init(params){
let arr = this.showWeighCopyStorge[params.index];
@@ -238,6 +319,7 @@
},
firstClassSelectClick(val) {
this.dataForm.firstClass = val.name
+ this.secondClassSelect();
},
// 浜岀骇鍝佺被閫夋嫨
getSecondCategoryName() {
@@ -251,9 +333,11 @@
this.secondClassActionsList = res.data.map(v => {
return {
...v,
- name: v.secondCategoryName
+ value: v.secondCategoryName,
+ text:v.secondCategoryName
}
})
+ this.dataForm.secondClass = this.secondClassActionsList[0].value;
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -263,7 +347,7 @@
//浜岀骇鍝佺被鑿滃崟
async secondClassSelect() {
await this.getSecondCategoryName()
- this.secondClassShow = true
+ // this.secondClassShow = true
},
secondClassClose() {
this.secondClassShow = false
@@ -311,18 +395,18 @@
.specifications;
let tempArr = this.showWeighCopyStorge[this.index].unqualifiedBreed.split(",")
let tempWeightArr = this.showWeighCopyStorge[this.index].unqualifiedWeights.split(",")
- let noPinArr =this.showWeighCopyStorge[this.index].unqualifiedType.split(",")
+ // let noPinArr =this.showWeighCopyStorge[this.index].unqualifiedType.split(",")
let noPriceArr = this.showWeighCopyStorge[this.index].penaltyUnitPrice.split(",");
tempArr[this.params.indexTo] = str;
tempWeightArr[this.params.indexTo] = this.dataForm.unqualifiedWeight;
// noPinArr[this.params.indexTo] = this.dataForm.unqualifiedType;
- noPriceArr[this.params.indexTo] = this.dataForm.penaltyUnitPrice;
+ noPriceArr[this.params.indexTo] = this.dataForm.penaltyUnitPrice || '0';
this.showWeighCopyStorge[this.index].unqualifiedBreed = tempArr.join(',');
this.showWeighCopyStorge[this.index].unqualifiedWeights = tempWeightArr.join(',');
- this.showWeighCopyStorge[this.index].unqualifiedType = noPinArr.join(',');
+ // this.showWeighCopyStorge[this.index].unqualifiedType = noPinArr.join(',');
this.showWeighCopyStorge[this.index].penaltyUnitPrice = noPriceArr.join(',');
- this.showWeighCopyStorge[this.index].breed = this.dataForm.secondClass
- this.showWeighCopyStorge[this.index].spec = this.dataForm.specifications
+ // this.showWeighCopyStorge[this.index].breed = this.dataForm.secondClass
+ // this.showWeighCopyStorge[this.index].spec = this.dataForm.specifications
//濡傛灉杩欎釜 tempArr涓嶄负 绌�
if(this.showWeighCopyStorge[this.index].tempArr){
this.showWeighCopyStorge[this.index].tempArr[this.params.indexTo].firstClass = this.dataForm.firstClass;
@@ -367,7 +451,7 @@
//娣诲姞涓嶅悎鏍煎崟浠�
let noPrice;
if(this.showWeighCopyStorge[this.index].penaltyUnitPrice){
- noPrice = this.showWeighCopyStorge[this.index].penaltyUnitPrice.split(",").filter(Boolean)
+ noPrice = this.showWeighCopyStorge[this.index].penaltyUnitPrice.split(",");
}else{
noPrice = []
}
@@ -375,14 +459,14 @@
tempWeightArr.push(this.dataForm.unqualifiedWeight);
tempArr.push(str);
// noPin.push(this.dataForm.unqualifiedType)
- noPrice.push(this.dataForm.penaltyUnitPrice)
+ noPrice.push(this.dataForm.penaltyUnitPrice ? this.dataForm.penaltyUnitPrice : '0')
this.showWeighCopyStorge[this.index].unqualifiedBreed = tempArr.join(',')
this.showWeighCopyStorge[this.index].unqualifiedWeights = tempWeightArr.join(',')
// this.showWeighCopyStorge[this.index].unqualifiedType = noPin.join(',')
this.showWeighCopyStorge[this.index].penaltyUnitPrice = noPrice.join(',')
- this.showWeighCopyStorge[this.index].breed = this.dataForm.secondClass
- this.showWeighCopyStorge[this.index].spec = this.dataForm.specifications
+ // this.showWeighCopyStorge[this.index].breed = this.dataForm.secondClass
+ // this.showWeighCopyStorge[this.index].spec = this.dataForm.specifications
this.showWeighCopyStorge[this.index].firstClass = this.dataForm.firstClass;
@@ -410,7 +494,7 @@
uni.navigateBack({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?dataForm=${JSON.stringify(this.dataForm)}&orderPlanId=${this.takeCoalId}&index=${this.index}&havedSubmit=${true}`
})
- uni.$emit("handClick",{data:this.dataForm,tempArr:this.showWeighCopyStorge[this.index].tempArr,index:this.index});
+ uni.$emit("handClick",{data:this.dataForm,tempArr:this.showWeighCopyStorge[this.index].tempArr,index:this.index,pageFlag:this.pageFlag});
}).catch(errors => {
console.log(errors,'errors')
uni.$u.toast('鏍￠獙澶辫触')
@@ -426,14 +510,17 @@
value = parseFloat(value);
value = value + ""; // 鍙樺洖涓哄瓧绗︿覆
}else{
- value = value.replace(/^(-)*(\d+)\.(\d\d).*$/,"$1$2.$3");
+ value = value.replace(/^(-)*(\d+)\.(\d\d\d\d).*$/,"$1$2.$3");
} // 濡傛灉娌℃湁灏忔暟鐐癸紝棣栦綅涓嶈兘涓虹被浼间簬 01銆�02鐨勫��
this.$nextTick(()=>{
this.dataForm[name] = value.replace(/[^\d.]/g, "");
});
- }
+ },
+ change(e) {
+ this.dataForm.secondClass =e;
+ },
}
}
</script>
@@ -445,6 +532,10 @@
margin: 10px;
position: relative;
}
+ /deep/ .uni-combox {
+ z-index: 99999!important
+ }
+
.slide-fade-enter-active {
transition: all 0.3s ease-out;
@@ -474,4 +565,5 @@
}
}
}
+
</style>
\ No newline at end of file
--
Gitblit v1.9.1