zhangxin 1 месяц назад
Родитель
Сommit
51a3c37c2e

+ 5 - 1
components/inquiry-verification-list/index.vue

@@ -8,7 +8,11 @@
8
                     <view class="top_left">
8
                     <view class="top_left">
9
                         <view class="name">
9
                         <view class="name">
10
                             <view>{{ item.dictLabel }}</view>
10
                             <view>{{ item.dictLabel }}</view>
11
-                            <view v-if="item.price">¥{{ item.price }}</view>
11
+                            &nbsp;&nbsp;
12
+                            <view v-if="item.price" class="price">
13
+                                <u-icon name="rmb-circle"></u-icon>
14
+                                {{ item.price }}
15
+                            </view>
12
                         </view>
16
                         </view>
13
                         <text class="desc">{{ type == '1' ? '意向' : item.model }}</text>
17
                         <text class="desc">{{ type == '1' ? '意向' : item.model }}</text>
14
                     </view>
18
                     </view>

+ 5 - 0
components/inquiry-verification-list/styles/index.scss

@@ -41,6 +41,11 @@
41
                         display: flex;
41
                         display: flex;
42
                         align-items: center;
42
                         align-items: center;
43
                         gap: 10rpx;
43
                         gap: 10rpx;
44
+                        .price {
45
+                            display: flex;
46
+                            align-items: center;
47
+                            gap: 5rpx;
48
+                        }
44
                     }
49
                     }
45
 
50
 
46
                     .desc {
51
                     .desc {

+ 12 - 1
pages/clue/post/index.vue

@@ -1,7 +1,13 @@
1
 <template>
1
 <template>
2
 	<view class="post_item">
2
 	<view class="post_item">
3
 		<view class="post_top">
3
 		<view class="post_top">
4
-			<view class="top_left">{{ item.name }}  <text v-if="item.price">¥{{ item.price }}</text></view>
4
+			<view class="top_left">{{ item.name }}
5
+				&nbsp;&nbsp;&nbsp;
6
+				<view v-if="item.price" class="price">
7
+					<u-icon name="rmb-circle"></u-icon>
8
+					{{ item.price }}
9
+				</view>
10
+			</view>
5
 			<view class="top_right">{{ item.assignStateCode === '1' ? "已分配" : "未分配" }}</view>
11
 			<view class="top_right">{{ item.assignStateCode === '1' ? "已分配" : "未分配" }}</view>
6
 		</view>
12
 		</view>
7
 		<view class="post_info">
13
 		<view class="post_info">
@@ -210,6 +216,11 @@ export default {
210
 
216
 
211
 		.top_left {
217
 		.top_left {
212
 			font-size: 18px;
218
 			font-size: 18px;
219
+			display: flex;
220
+			.price{
221
+				display: flex;
222
+				align-items: center;
223
+			}
213
 		}
224
 		}
214
 
225
 
215
 		.top_right {
226
 		.top_right {

+ 14 - 13
pages/wareHouse/components/edit.vue

@@ -488,12 +488,15 @@ export default {
488
                     id: options.id,
488
                     id: options.id,
489
                     userId: this.$store.state.user.userInfo.userId,
489
                     userId: this.$store.state.user.userInfo.userId,
490
                 }).then(res => {
490
                 }).then(res => {
491
-                    const key = ['costPrice','dictLabel','dictValue','goodPicFileList','indexntifuCode','origin','stockStatus']
491
+                    const key = ['model','costPrice','dictLabel','dictValue','goodPicFileList','indexntifuCode','origin','stockStatus']
492
                     key.forEach(item => {
492
                     key.forEach(item => {
493
                         this.formData[item] = res.data[item]
493
                         this.formData[item] = res.data[item]
494
                     })
494
                     })
495
                     this.recycleTime = this.$dayjs(res.data.recycleTime).format('YYYY-MM-DD') || ''
495
                     this.recycleTime = this.$dayjs(res.data.recycleTime).format('YYYY-MM-DD') || ''
496
                     this.echoInfoType = res.data.type || '1'
496
                     this.echoInfoType = res.data.type || '1'
497
+                    this.echoInfoProductAttribute = '1'
498
+                    this.echoInfoProductCondition = '1'
499
+                    this.echoInfoStockStatus = res.data.stockStatus || '0'
497
                 });
500
                 });
498
             }
501
             }
499
         })
502
         })
@@ -518,20 +521,18 @@ export default {
518
                         continuousWarehousing: this.continuousWarehousing[0] || '0',//是否连续入库 1:是 0:否
521
                         continuousWarehousing: this.continuousWarehousing[0] || '0',//是否连续入库 1:是 0:否
519
                     }
522
                     }
520
                     uni.$u.api.wareHouseAdd(data).then(res => {
523
                     uni.$u.api.wareHouseAdd(data).then(res => {
521
-                        if (res.code === 200) {
522
-                            uni.$u.toast('新增成功');
523
-                            if (data.continuousWarehousing == '0') {
524
-                                setTimeout(() => {
525
-                                    uni.navigateBack({
526
-                                        delta: 1
527
-                                    });
528
-                                }, 1000);
529
-                            } else {
530
-                                this.clearForm();
531
-                            }
524
+                        uni.$u.toast('操作成功');
525
+                        if (data.continuousWarehousing == '0') {
526
+                            setTimeout(() => {
527
+                                uni.navigateBack({
528
+                                    delta: 1
529
+                                });
530
+                            }, 1000);
532
                         } else {
531
                         } else {
533
-                            uni.$u.toast(res.msg);
532
+                            this.clearForm();
534
                         }
533
                         }
534
+                    }).catch(err => {
535
+                        uni.$u.toast(err.msg);
535
                     })
536
                     })
536
                 } else {
537
                 } else {
537
                     console.log('表单校验不通过');
538
                     console.log('表单校验不通过');