Browse Source

修改bug

chenrui 2 years ago
parent
commit
23546d3bbb

+ 2 - 1
components/customPicker/checkBoxPicker.vue

@@ -57,7 +57,8 @@ export default {
 			}).then(result => {
 				if (result && result.status == 200) {
 					if(this.filtrate){//筛选业务状态
-						var selfArr=['WAIT_SUBMIT','WAIT_AUDIT','WAIT_OUT_WAREHOUSE','FINISH']
+					// 'WAIT_SUBMIT','WAIT_AUDIT'
+						var selfArr=['WAIT_OUT_WAREHOUSE','FINISH']
 						result.data.list=result.data.list.filter((item,i)=>{
 							if(selfArr.includes(item.code)){
 								return item

+ 14 - 2
hybrid/html/index.html

@@ -217,8 +217,9 @@
             <div class="amount_list flex align_center flex-between">
               <span class="amountName">折后金额</span>
               <span class="amount" style="color: #f0ad4e"
-                v-if="info.settleAmount">¥{{toThousands(info.settleAmount,2)}}</span>
-              <span class="amount" style="color: #f0ad4e" v-else>¥0.00</span>
+                v-if="info.billStatus == 'UNSETTLE'">¥{{info.settleAmount?toThousands(info.settleAmount,2):'0.00'}}</span>
+				<span class="amount" style="color: #f0ad4e"
+				  v-else>¥{{foldPrice}}</span>
             </div>
           </div>
           <div class="downLoadCon">
@@ -293,6 +294,17 @@
         this.ajaxUrl = window.location.origin + '/qpls-md/'
         this.loadData()
       },
+	  computed:{
+		  // 折后金额
+		  foldPrice(){
+		  	let totalAmount = this.info.totalAmount?this.info.totalAmount:0
+		  	let discountPrice=this.info.discountAmount?this.info.discountAmount:0
+		  	let foldAmount = totalAmount - discountPrice 
+		  	foldAmount=Number(foldAmount)>0 ? foldAmount : 0
+		  	const newFoldPrice = foldAmount.toFixed(2)
+		  	return newFoldPrice
+		  }
+	  },
       methods: {
         loadData () {
           const ajaxData = {

+ 2 - 1
pages/sales/billHistory.vue

@@ -12,7 +12,8 @@
 				<view class="list" @click="jumpPage('/pages/sales/billHistoryDetail?billId=' + item.verifySn)" v-for="(item, i) in billList" :key="i">
 					<view class="list_t u-flex u-row-between">
 						<view class="u-line-1">{{ item.customer.customerName }}</view>
-						<view>¥{{ toThousands(item.settleAmount || 0, 2) }}</view>
+						<view v-if="item.billStatus == 'UNSETTLE'">¥{{ toThousands(item.settleAmount || 0, 2) }}</view>
+						<view v-else>¥{{ toThousands(item.settleRealAmount || 0, 2) }}</view>
 					</view>
 					<view class="list_b u-flex u-row-between">
 						<view>{{ item.createDate }}</view>

+ 1 - 1
pages/sales/billHistoryDetail.vue

@@ -321,7 +321,7 @@ export default {
 						})
 						_this.getPayType();
 						_this.showPayment = true
-						_this.form.discountAmount=_this.billInfo.discountAmount
+						_this.form.discountAmount=_this.billInfo.discountAmount?toThousands(_this.billInfo.discountAmount):'0.00'
 						_this.$nextTick(()=>{
 							_this.isShowEditBtn();
 							_this.$refs.uForm.setRules(_this.rules);

+ 0 - 12
pages/userCenter/setData.vue

@@ -27,18 +27,6 @@
 						"
 					></u-switch>
 				</u-cell-item>
-				<!-- <u-cell-item title="参与对账的销售单业务状态">
-					<u-input slot="right-icon" v-model="billStatus" @click="showCheckBoxModal=true" disabled placeholder="请选择参与对账的销售单业务状态" placeholder-style="text-align:right" :custom-style="inputStyle"/>
-				</u-cell-item>
-				<u-cell-item title="参与对账的销售单来源">
-					<u-input slot="right-icon" v-model="billCycle" @click="showModal=true" disabled placeholder="请选择参与对账的销售单来源" placeholder-style="text-align:right" :custom-style="inputStyle"/>
-				</u-cell-item>
-				<u-cell-item  title="铺货销售单是否参与对账">
-					<u-switch :size="40" :active-color="activeColor" slot="right-icon" v-model="checked"></u-switch>
-				</u-cell-item>
-				<u-cell-item title="对账单选择客户默认页签" :border-bottom="false">
-					<u-input slot="right-icon" v-model="billCycle" @click="showModal=true" disabled placeholder="请选择对账单客户" placeholder-style="text-align:right" :custom-style="inputStyle"/>
-				</u-cell-item> -->
 			</u-cell-group>
 		</view>
 		<!-- 类似于picker单选 -->