结账

ghsApp/src/admin/clear/customInfo.vue

@@ -59,7 +59,7 @@
 									<text class="item-type">
 										<text v-if="Number(s.bigNum)>0">{{s.bigNum}}扎</text>
 										<text v-if="Number(s.smallNum)>0">{{s.smallNum}}支</text>
-										<text style="margin-left:10upx;color:black;" v-if="Number(s.tkPrice)>0">退款¥{{parseFloat(s.tkPrice)}} 实付¥{{parseFloat(s.actPrice)}}</text>
+										<text style="margin-left:20upx;color:red;font-weight:bold;" v-if="Number(s.tkPrice)>0">退款¥{{parseFloat(s.tkPrice)}} 实付¥{{parseFloat(s.actPrice)}}</text>
 									</text>
 									<text class="item-count" style="color: #3385ff;">查看明细</text>
 								</view>

ghsApp/src/pagesArrears/clearResult.vue

@@ -43,6 +43,9 @@ export default {
 							confirmClear({id:that.option.id,payWay:payWay}).then(res=>{
 								if(res.code == 1){
 									that.$msg('操作成功')
+									setTimeout(function(){
+										uni.navigateBack()
+									},1500)
 								}
 							})							
 						}else{

ghsApp/src/pagesArrears/details.vue

@@ -31,7 +31,7 @@
 				</view>
 			</template>
 			<view class="btn-view">
-				<button :class="['admin-button-com', 'blue']" @click="isModelFun" >提交</button>
+				<button :class="['admin-button-com', 'blue']" @click="isModelFun">结清</button>
 			</view>
 		</view>
 		<modal-module :show="isModel" @click="confirmData" :title="'确认金额'" color="#333" :size="32" padding="30upx 30upx" >

ghsApp/src/pagesOrder/detail.vue

@@ -87,8 +87,7 @@
 				<view>结算状态：</view>
 					<view style="color:red;font-weight:bold;">欠款</view>
 					<view class="price">
-						<text v-if="detailInfo.debtAmount > 0" @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' style="margin-right:60upx;color:#3385FF;font-size:26upx;">全部欠款单</text>
-						<button @click="settleOrder(detailInfo)" class="admin-button-com">结清本单</button>
+						<button @click='pageTo({url:"/pagesArrears/details",query: {id: detailInfo.customId}})' class="admin-button-com">全部欠款单</button>
 					</view>
 				</view>
 				<view class="order-info_box" v-else>
@@ -298,49 +297,6 @@ export default {
 			}
 			this.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
 		},
-		//结账
-		settleOrder(item) {
-			let id = item.id
-			let customId = item.customId
-			let remainDebtPrice = item.remainDebtPrice
-			let that = this
-			let payWay = 0
-			uni.showActionSheet({
-				itemList: ['请选择收款方式：', '微信', '支付宝','现金','银行卡'],
-				success: function (respond) {
-					let currentIndex = respond.tapIndex
-					let inWay = [{name:"未选择",id:-1},{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}]
-					if(currentIndex > 0){
-
-						payWay = inWay[currentIndex].id
-						let params = {
-							id:JSON.stringify([{id:id}]),
-							customId:customId,
-							payWay:payWay,
-							modifyPrice:remainDebtPrice,
-							complete:1
-						}
-
-						that.$util.confirmModal({content:'确认结清欠款？'},() => {
-							clearOrderApi(params).then(res => {
-								if(res.code == 1) {
-									if(res.data.hasUnComplete && res.data.hasUnComplete == 1){
-										that.$util.confirmModal({content:'此客户还有待完成的账单',okText:'查看'},() => {
-											that.pageTo({url:'/admin/clear/customList',type:2})
-										})
-									}else{
-										that.pageTo({url:'/common/success', type: 2,query:{titleType:1}})
-									}
-								}
-							})
-						})
-
-					}else{
-						this.$msg("请选择收款方式");
-					}
-				}
-			})
-		},
 		navigateTo(latitude, longitude, address) {
 			// #ifdef APP-PLUS
 			let that = this

hdApp/src/admin/clear/info.vue

@@ -52,7 +52,7 @@
 									<text class="item-type">
 										<text v-if="Number(s.bigNum)>0">{{s.bigNum}}扎</text>
 										<text v-if="Number(s.smallNum)>0">{{s.smallNum}}支</text>
-										<text style="margin-left:10upx;color:black;" v-if="Number(s.tkPrice)>0">退款¥{{parseFloat(s.tkPrice)}} 实付¥{{parseFloat(s.actPrice)}}</text>
+										<text style="margin-left:20upx;color:red;font-weight:bold;" v-if="Number(s.tkPrice)>0">退款¥{{parseFloat(s.tkPrice)}} 实付¥{{parseFloat(s.actPrice)}}</text>
 									</text>
 									<text class="item-count" style="color: #3385ff;">查看明细</text>
 								</view>

hdApp/src/pagesPurchase/gathering.vue

@@ -38,7 +38,7 @@
         </view>
       </template>
       <view class="btn-view" >
-        <button :class="['admin-button-com', 'blue', 'global']" @click="batchConfirm" >确认</button>
+        <button :class="['admin-button-com', 'blue', 'global']" @click="batchConfirm">结清</button>
       </view>
     </view>
   </view>

hdApp/src/pagesPurchase/purDetails.vue

@@ -80,8 +80,7 @@
           <view>欠款状态：</view>
             <view>是</view>
             <view class="price">
-              <text v-if="detailInfo.debtAmount > 0" @click="goToSettle(detailInfo)" style="margin-right:38upx;color:#3385FF;font-size:26upx;">全部欠款单</text>
-              <button @click="settleOrder(detailInfo.id,detailInfo.supplierId)" class="admin-button-com">结帐</button>
+              <button v-if="detailInfo.debtAmount > 0" @click="goToSettle(detailInfo)" class="admin-button-com">全部欠款单</button>
             </view>
         </view>
         <view class="order-info_box" v-else>
@@ -268,19 +267,6 @@ export default {
 				}
 			});
 		},
-    //结帐
-    settleOrder(id,ghsId) {
-        let that = this
-        purchaseClearCreateOrder({ purchaseIds:id,ghsId:ghsId }).then(res => {
-          if(res.code == 1) {
-            if(res.data.hasUnComplete && res.data.hasUnComplete == 1){
-              that.$util.confirmModal({content:'还有待完成的账单',okText:'查看'},() => { that.pageTo({ url: '/admin/clear/list', type: 2}) })
-            }else{
-              that.pageTo({ url: '/pagesPurchase/gatherPay?orderSn=' + res.data.orderSn + '&actPrice=' + res.data.actPrice+'&remainSecond='+res.data.remainSecond, type: 2 })
-            }
-          }
-        })
-    },
     //跳转到结账页
     goToSettle (item) {
       this.pageTo({