Quellcode durchsuchen

供货商新增采购计算总价(自己输入的金额)

jf vor 5 Jahren
Ursprung
Commit
0f39bbcae7
41 geänderte Dateien mit 81 neuen und 70 gelöschten Zeilen
  1. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json
  2. 2 2
      ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json
  3. 0 0
      ghsApp/dist/build/mp-weixin/common/vendor.js
  4. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  5. 2 2
      ghsApp/dist/build/mp-weixin/components/app-uploader.json
  6. 2 2
      ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json
  7. 2 2
      ghsApp/dist/build/mp-weixin/components/kd_entrance.json
  8. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json
  9. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-vip.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/alert.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/list-cell.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/modal.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/selectList.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json
  20. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/tabs.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/date-picker.json
  22. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json
  23. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json
  24. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json
  25. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json
  26. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json
  27. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json
  28. 2 2
      ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json
  29. 2 2
      ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json
  30. 2 2
      ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json
  31. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  32. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json
  33. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/add.js
  34. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/add.wxml
  35. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/add.wxss
  36. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/details.js
  37. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/details.wxml
  38. 0 0
      ghsApp/dist/build/mp-weixin/pagesPurchase/details.wxss
  39. 14 1
      ghsApp/src/mixins/product.js
  40. 2 2
      ghsApp/src/pagesPurchase/add.vue
  41. 3 5
      ghsApp/src/pagesPurchase/details.vue

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/module/operate-line.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/home/components/plugin/timeaxis-item.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ghsApp/dist/build/mp-weixin/common/vendor.js


+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-uploader.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-wrapper-empty.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/kd_entrance.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/allMoreSelectInput.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-vip.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/alert.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/fab.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/list-cell.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/modal.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/selectList.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/t-table/t-th.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/tabs.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/date-picker.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/half-picker.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/linkage-picker.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/range-picker.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/region-picker.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/selector-picker.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/shortterm-picker.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/w-picker/time-picker.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesArrears/detailsItem.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesInvite/inviteItem.json

@@ -1,4 +1,4 @@
 {
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepStatus.json

@@ -1,4 +1,4 @@
 {
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }
 }

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/add.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/add.wxml


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/add.wxss


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/details.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/details.wxml


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ghsApp/dist/build/mp-weixin/pagesPurchase/details.wxss


+ 14 - 1
ghsApp/src/mixins/product.js

@@ -102,9 +102,22 @@ export default {
 			return "";
 			return "";
 		},
 		},
 		//选择商品总价
 		//选择商品总价
-		allPrice() {
+		allPriceFun(){
 			let price = 0;
 			let price = 0;
+			if (this.selectList) {
+				for (const item of this.selectList) {
+					const itemInfo = this.getSelectItemById(item.id, item.classId);
+					if (itemInfo &&!this.$util.isEmpty(itemInfo.itemPrice)) {
+						price += Number(itemInfo.itemPrice);
+					}
+				}
+			}
 
 
+			return Math.round(price * 100) / 100;
+		},
+		allPrice() {
+			let price = 0;
+			console.log('this.selectList',this.selectList)
 			if (this.selectList) {
 			if (this.selectList) {
 				for (const item of this.selectList) {
 				for (const item of this.selectList) {
 					const itemInfo = this.getSelectItemById(item.id, item.classId);
 					const itemInfo = this.getSelectItemById(item.id, item.classId);

+ 2 - 2
ghsApp/src/pagesPurchase/add.vue

@@ -111,7 +111,7 @@
 							<allSelectInput :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="customData.itemPrice" :placeholder="'请填写采购总价'"
 							<allSelectInput :isActive="isAloneAllActive" :isFocus="isAloneAllFocus" :value="customData.itemPrice" :placeholder="'请填写采购总价'"
 																							:width="400" :height="60"
 																							:width="400" :height="60"
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">
 																							@deleteInputVal="deleteAloneInputVal" @initAllInput="initAloneAllInput" @moveAllInput="moveAloneAllInput">
-							</allSelectInput>元
+							</allSelectInput> <text style="margin-left: 20rpx"></text>
 						</view>
 						</view>
 					</view>
 					</view>
 					<view class="select-cmd_bx">
 					<view class="select-cmd_bx">
@@ -142,7 +142,7 @@
 			padding="30rpx 30rpx"
 			padding="30rpx 30rpx"
 		>
 		>
 		</modal-module> -->
 		</modal-module> -->
-		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent"></FooterCart>
+		<FooterCart :price="allPriceFun" :count="allCount" @confirm="confirmSelectEvent"></FooterCart>
     <kd-entrance></kd-entrance>
     <kd-entrance></kd-entrance>
 	</view>
 	</view>
 </template>
 </template>

+ 3 - 5
ghsApp/src/pagesPurchase/details.vue

@@ -31,11 +31,9 @@
 									<view class="info-line">
 									<view class="info-line">
 										<text class="item-type">b级</text>
 										<text class="item-type">b级</text>
 										<text class="item-count">
 										<text class="item-count">
-											<text v-if="item.bigCount > 0 || item.smallCount > 0">{{
-												`${item.bigCount}`
-											}}</text>
-											<text v-if="item.smallCount > 0">/</text>
-											<text v-if="item.smallCount > 0">{{ `${item.smallCount}` }}</text>
+											<text >{{`${item.bigCount}`}}</text>
+											<text >/</text>
+											<text >{{ `${item.smallCount}` }}</text>
 										</text>
 										</text>
 									</view>
 									</view>
 								</view>
 								</view>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.