shish %!s(int64=3) %!d(string=hai) anos
pai
achega
0c62188271

+ 4 - 0
ghsApp/src/api/storehouse/stock.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const clearOutOrder = data => {
+	return https.get("/stock-out/clear", data);
+};
+
 /** *
  * 库存明细
  */

+ 1 - 0
ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -17,6 +17,7 @@
 					<view :class="[ 'status', item.status == OUT_STATUS.DONE ? 'primary' : item.status == OUT_STATUS.CONFIRM ? 'warn' : 'gray' ]" >
 						<view :class="[ 'iconfont', item.status == OUT_STATUS.CANCEL ? 'iconcaozuojihuo' : 'icondairuku' ]" ></view>
 						<view :class="['status-name']">{{ item.statusName }}</view>
+						<text style="color:red;margin-top:20upx;" v-if="item.debt == 1">欠款</text>
 					</view>
 				</view>
 			</block>

+ 2 - 6
ghsApp/src/pagesStorehouse/allot/allotPut.vue

@@ -11,12 +11,7 @@
 		</view>
 		<scroll-view scroll-y class="allot-list">
 			<block v-if="!$util.isEmpty(list.data)">
-				<view
-					class="allot-item"
-					v-for="(item, index) in list.data"
-					:key="index"
-					@click="gotoDetails(item)"
-				>
+				<view class="allot-item" v-for="(item, index) in list.data" :key="index" @click="gotoDetails(item)" >
 					<view class="info">
 						<view class="info-order">{{ item.orderSn }}</view>
 						<view class="info-name">门店:{{ item.outShopName }}</view>
@@ -27,6 +22,7 @@
 					<view :class="[ 'status', item.status == PUT_STATUS.DONE ? 'primary' : item.status == PUT_STATUS.CONFIRM ? 'warn' : 'gray' ]" >
 						<view :class="[ 'iconfont', item.status == PUT_STATUS.CANCEL ? 'iconcaozuojihuo' : 'icondairuku' ]" ></view>
 						<view :class="['status-name']">{{ item.statusName }}</view>
+						<text style="color:red;margin-top:20upx;" v-if="item.debt == 1">欠款</text>
 					</view>
 				</view>
 			</block>

+ 18 - 1
ghsApp/src/pagesStorehouse/allot/exDetails.vue

@@ -15,6 +15,10 @@
 					<view class="cell-label"> 操作</view>
 					<view class="cell-value"> {{ outData.adminName || "" }}</view>
 				</view>
+				<view class="info-cell" v-if="outData.debt == 1">
+					<view class="cell-label"> 结算</view>
+					<view class="cell-value"> <text style="color:red;">欠款</text></view>
+				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 状态</view>
 					<view class="cell-value">{{getItemStatusName(outData.status)}}</view>
@@ -69,13 +73,16 @@
 			<view class="btn-view" v-if="outData.status">
 				<button v-if="outData.status != OUT_STATUS.CANCEL && outData.statusName != '已出库'" class="admin-button-com middle" @click="cancelEvent" > 取消 </button>
 				<button v-if="outData.status == OUT_STATUS.CONFIRM" class="admin-button-com middle" @click="confirmEventPop" > 确认 </button>
+
+				<button v-if="outData.status == 2 && outData.debt == 1" class="admin-button-com middle" @click="clearOrder()" > 结清 </button>
+
 			</view>
 		</view>
 	</view>
 </template>
 <script>
 import { OUT_STATUS } from "@/utils/declare";
-import { getStockOutDetailApi, confirmStockOutOrderApi, cancelStockOutOrderApi } from "@/api/storehouse/stock";
+import { getStockOutDetailApi, confirmStockOutOrderApi, cancelStockOutOrderApi,clearOutOrder } from "@/api/storehouse/stock";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 export default {
 	components: { AppWrapperEmpty },
@@ -151,6 +158,16 @@ export default {
 			await this.initData();
 			uni.showToast({ title: "取消成功" })
 		},
+		clearOrder(){
+			let that = this
+			that.$util.confirmModal({content:'确定结清?'},() => {
+				clearOutOrder({orderSn:this.orderSn}).then(res=>{
+					if(res.code == 1){
+						that.initData()
+					}
+				})
+			})
+		},
 		confirmEventPop(){
 			let that = this;
 			that.$util.confirmModal({content:'确定出库?'},() => {

+ 4 - 0
ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -15,6 +15,10 @@
 					<view class="cell-label"> 制单人</view>
 					<view class="cell-value"> {{ putData.adminName || "" }}</view>
 				</view>
+				<view class="info-cell" v-if="putData.debt == 1">
+					<view class="cell-label"> 结算</view>
+					<view class="cell-value"> <text style="color:red;">欠款</text></view>
+				</view>
 				<view class="info-cell">
 					<view class="cell-label"> 状态</view>
 					<view :class="[ 'cell-value', { warning: putData.status == PUT_STATUS.CONFIRM }, { success: putData.status == PUT_STATUS.DONE } ]" >