From 8d80e8c9a3feb6c7e4c3d5dd9aa18f74885d1435 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 07 十一月 2024 10:48:27 +0800
Subject: [PATCH] feat:修改逻辑条件
---
pages/driver-page/delivery-my/delivery-my/delivery-my.vue | 120 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 61 insertions(+), 59 deletions(-)
diff --git a/pages/driver-page/delivery-my/delivery-my/delivery-my.vue b/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
index f36d69c..325f4d7 100644
--- a/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
+++ b/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
@@ -36,15 +36,14 @@
labelWidth="20%"
borderBottom
>
- <u--input v-model="registerFormModel.carNo"
- placeholder="璇疯緭鍏ュ唴瀹�"
- clearable></u--input>
+ <xm-cell special label="杞︾墝鍙�" :value="registerFormModel.carNo" @show="showKeyboard('xmKeyboard')"></xm-cell>
+ <xm-keyboard-v2 ref="xmKeyboard" @confirm="(v) => registerFormModel.carNo = v"></xm-keyboard-v2>
</u-form-item>
<u-form-item prop="skin"
label="鐨噸"
labelWidth="20%"
borderBottom
- required v-if="daydata.isWeighing==1">
+ required v-if="(daydata.isWeighing==1&&daydata.productId=='1818237609508347905')||(daydata.isWeighing==1&&daydata.productId=='1818237832536268801')||(daydata.isWeighing==1&&daydata.productId=='1818211942485995521')">
<u--input v-model="skin"
border="surround"
placeholder="璇疯緭鍏ョ毊閲�"
@@ -54,7 +53,7 @@
label="姣涢噸"
labelWidth="20%"
borderBottom
- required v-if="daydata.isWeighing==1">
+ required v-if="(daydata.isWeighing==1&&daydata.productId=='1818237609508347905')||(daydata.isWeighing==1&&daydata.productId=='1818237832536268801')||(daydata.isWeighing==1&&daydata.productId=='1818211942485995521')">
<u--input v-model="hair"
border="surround"
placeholder="璇疯緭鍏ユ瘺閲�"
@@ -64,7 +63,7 @@
label="鍑�閲�"
labelWidth="20%"
borderBottom
- required v-if="daydata.isWeighing==1">
+ required v-if="(daydata.isWeighing==1&&daydata.productId=='1818237609508347905')||(daydata.isWeighing==1&&daydata.productId=='1818237832536268801')||(daydata.isWeighing==1&&daydata.productId=='1818211942485995521')">
<u--input v-model="clean"
border="surround"
disabled
@@ -92,7 +91,7 @@
</view></uni-td>
</uni-tr>
</uni-table>
- <u-form-item prop='contactPicture'>
+ <!-- <u-form-item prop='contactPicture'>
<view class="label-text">
鍘熷彂鍗曟嵁
</view>
@@ -106,7 +105,7 @@
height="150"
:previewFullImage="true"
></u-upload>
- </u-form-item>
+ </u-form-item> -->
<!-- <u-form-item labelWidth="20%"
label="绌鸿溅鍑哄巶"
borderBottom
@@ -225,7 +224,7 @@
if (params.id) {
this.id = params.id
}
- this.fileList1 = []
+ // this.fileList1 = []
this.GetMyDelivery()
uni.getStorage({
key: 'myDelivery',
@@ -256,7 +255,7 @@
range: [{"value": 0,"label": "鍚�" },{"value": 1,"label": "鏄�"}],
carNumShow: false,
yuYueData: [],
- fileList1: [], //鍥剧墖鍒楄〃
+ // fileList1: [], //鍥剧墖鍒楄〃
contactPicture:"",
registerFormModel: {
phone: '',
@@ -369,6 +368,9 @@
},
methods: {
...mapMutations(['changeisUploadimg']),
+ showKeyboard(ref){
+ this.$refs[ref].toShow(this.registerFormModel.carNo)
+ },
// input鑱氱劍
inputFocus(v) {
if (v == 1) {
@@ -388,52 +390,52 @@
this.isInputOrigin = true;
}
},
- deletePic(event) {
- this.changeisUploadimg(true);
- this[`fileList${event.name}`].splice(event.index, 1);
- },
- async afterRead(event) {
- // 褰撹缃� mutiple 涓� true 鏃�, file 涓烘暟缁勬牸寮忥紝鍚﹀垯涓哄璞℃牸寮�
- let lists = [].concat(event.file);
- let fileListLen = this[`fileList${event.name}`].length;
- lists.map(item => {
- this[`fileList${event.name}`].push({
- ...item,
- status: 'uploading',
- message: '涓婁紶涓�'
- });
- });
- for (let i = 0; i < lists.length; i++) {
- const result = await this.uploadFilePromise(lists[i].url, event.name);
- let item = this[`fileList${event.name}`][fileListLen];
- this[`fileList${event.name}`].splice(
- fileListLen,
- 1,
- Object.assign(item, {
- status: 'success',
- message: '涓婁紶鎴愬姛',
- url: result
- })
- );
- fileListLen++;
- }
- },
- uploadFilePromise(url, num) {
- return new Promise((resolve, reject) => {
- let a = uni.uploadFile({
- url: BaseUrl + '/admin/sys-file/uploadUnToken',
- filePath: url,
- name: 'file',
- success: res => {
- if (num == 1) {
- this.contactPicture = JSON.parse(res.data)
- .data.url;
- resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
- }
- }
- });
- });
- },
+ // deletePic(event) {
+ // this.changeisUploadimg(true);
+ // this[`fileList${event.name}`].splice(event.index, 1);
+ // },
+ // async afterRead(event) {
+ // // 褰撹缃� mutiple 涓� true 鏃�, file 涓烘暟缁勬牸寮忥紝鍚﹀垯涓哄璞℃牸寮�
+ // let lists = [].concat(event.file);
+ // let fileListLen = this[`fileList${event.name}`].length;
+ // lists.map(item => {
+ // this[`fileList${event.name}`].push({
+ // ...item,
+ // status: 'uploading',
+ // message: '涓婁紶涓�'
+ // });
+ // });
+ // for (let i = 0; i < lists.length; i++) {
+ // const result = await this.uploadFilePromise(lists[i].url, event.name);
+ // let item = this[`fileList${event.name}`][fileListLen];
+ // this[`fileList${event.name}`].splice(
+ // fileListLen,
+ // 1,
+ // Object.assign(item, {
+ // status: 'success',
+ // message: '涓婁紶鎴愬姛',
+ // url: result
+ // })
+ // );
+ // fileListLen++;
+ // }
+ // },
+ // uploadFilePromise(url, num) {
+ // return new Promise((resolve, reject) => {
+ // let a = uni.uploadFile({
+ // url: BaseUrl + '/admin/sys-file/uploadUnToken',
+ // filePath: url,
+ // name: 'file',
+ // success: res => {
+ // if (num == 1) {
+ // this.contactPicture = JSON.parse(res.data)
+ // .data.url;
+ // resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+ // }
+ // }
+ // });
+ // });
+ // },
lohOutLogin(){
this.$refs.regesterFormRef.validate().then(res => {
if(this.daydata.orderType=='澶栬喘'){
@@ -451,7 +453,7 @@
...this.registerFormModel,
tmTaskCoalContact:{
coalName:this.daydata.productName,
- contactPicture:this.contactPicture,
+ // contactPicture:this.contactPicture,
skin:this.skin,
hair:this.hair,
clean:this.clean
@@ -490,7 +492,7 @@
yyId:this.ids.id,
...this.registerFormModel,
tmTaskCoalContact:{
- contactPicture:this.contactPicture,
+ // contactPicture:this.contactPicture,
numDtoList:numDtoList
}
}, 'json').then(res => {
@@ -547,7 +549,6 @@
})
},
logoutConfirm() {
-
if(this.registerFormModel.carNo==""){
this.lohOutLogin()
}else{
@@ -581,6 +582,7 @@
this.logoutShow = true;
this.ids=item
}else{
+ this.ids=item
this.logoutConfirm();
}
})
--
Gitblit v1.9.1