shish 5 лет назад
Родитель
Сommit
adb4008a40
2 измененных файлов с 15 добавлено и 20 удалено
  1. 13 15
      ghsApp/src/admin/billing/affirm.vue
  2. 2 5
      ghsApp/src/mixins/product.js

+ 13 - 15
ghsApp/src/admin/billing/affirm.vue

@@ -39,9 +39,7 @@
                 重选花材
               </view>
               <view class="describe-view">
-                共{{ selectList.length }}种,
-                <!-- 共16扎9支, -->
-                合计 ¥<text class="price">{{ allPrice }}</text>
+                共{{ selectList.length }}种,合计 ¥<text class="price">{{ allPrice }}</text>
               </view>
             </view>
           </view>
@@ -99,8 +97,12 @@
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
-            <view v-if="form.debt == 1" class="tui-title">应收金额</view>
-            <view v-else class="tui-title">实收金额</view>
+            <view class="tui-title">
+              <text v-if="form.sendType == 1">待收金额</text>
+              <text v-else>
+                <text v-if="form.debt == 1">应收金额</text><text v-else>已收金额</text>
+              </text>  
+            </view>
             <input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);height:70rpx;" type="digit" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
@@ -120,17 +122,14 @@
     </view>
     <view class="under-bar">
       <view class="price-view">
-        <text class="price-title" v-if="isBilling">{{form.debt == 1 ? "欠款" : "已收款"}}</text>
-        <text class="price-title" v-else>金额</text>
-        <text class="price-number">
-          ¥
-									<text class="large" v-if="isBilling">{{ modifyPrice?modifyPrice:0 }}</text>
-									<text class="large" v-else>{{ allPrice.toFixed(2) }}</text>
+        <text class="price-title" v-if="isBilling">
+          <text v-if="form.sendType == 1">待收款</text>
+          <text v-else>{{form.debt == 1 ? "欠款" : "已收款"}}</text>
         </text>
+        <text class="price-title" v-else>金额</text>
+        <text class="price-number">¥<text class="large" v-if="isBilling">{{ modifyPrice }}</text><text class="large" v-else>{{ allPrice.toFixed(2) }}</text></text>
       </view>
-      <button class="admin-button-com blue middle" @click="affirmFormSubmit">
-        开单
-      </button>
+      <button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
     </view>
 
   </view>
@@ -215,7 +214,6 @@ export default {
     if(option.customName){
       this.form.customName = option.customName
     }
-
   },
 	onShow(){
 		if(!this.$util.isEmpty(uni.getStorageSync("newClient"))){

+ 2 - 5
ghsApp/src/mixins/product.js

@@ -80,11 +80,8 @@ export default {
 			if (this.selectList) {
 				for (const item of this.selectList) {
 					const itemInfo = this.getSelectItemById(item.id, item.classId);
-					if (
-						itemInfo &&
-						!this.$util.isEmpty(itemInfo.bigPrice) &&
-						!this.$util.isEmpty(itemInfo.smallPrice)
-					) {
+					console.log('算价格的:itemInfo',itemInfo)
+					if (itemInfo && !this.$util.isEmpty(itemInfo.bigPrice) && !this.$util.isEmpty(itemInfo.smallPrice)) {
 						if(item.userPrice>0){
 							price += Number(item.userPrice);
 						}else{