提前录采购单

ghsApp/src/api/purchase/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const cancelPutIn = data => {
+	return https.get("/purchase-order/cancel", data);
+};
+
 export const confirmPutIn = data => {
 	return https.get("/purchase-order/confirm-put-in", data);
 };

ghsApp/src/pagesPurchase/info.vue

@@ -194,13 +194,14 @@
 		</view>
 
 		<view class="app-footer open_btn">
+			<view v-if="detailInfo.status == 3" @click="cancelIn()" class="admin-button-com big default">取消入库</view>
 			<view v-if="detailInfo.status == 3" @click="confirmIn()" class="admin-button-com big blue">确认入库</view>
 		</view>
 
 	</view>
 </template>
 <script>
-import { getPurchaseDetailApi,updateRemark,printAll,printItem,confirmPutIn } from "@/api/purchase";
+import { getPurchaseDetailApi,updateRemark,printAll,printItem,confirmPutIn,cancelPutIn } from "@/api/purchase";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
 export default {
@@ -222,6 +223,18 @@ export default {
 		};
 	},
 	methods: {
+		cancelIn(){
+			let that = this
+			that.$util.confirmModal({content:'确认取消此单？'},() => {
+				uni.showLoading({mask:true})
+				cancelPutIn({id:that.detailInfo.id}).then(res=>{
+					uni.hideLoading()
+					if(res.code == 1){
+						that.init()
+					}
+				})
+			})
+		},
 		confirmIn(){
 			let that = this
 			that.$util.confirmModal({content:'确认现在入库？'},() => {

ghsApp/src/pagesPurchase/orderItem.vue

@@ -8,8 +8,9 @@
 			<view v-if="info.refund == 2" class="status" style="color:red;border:1upx solid red;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:50upx;">有退款 </view>
 			<view v-if="info.debt == 1" class="status" style="color:red;border:1upx solid red;border-radius:20upx;font-size:20upx;padding:5upx 12upx;margin-right:50upx;">欠款 </view>
 			<view class="status">
-				<text v-if="info.status != 3">{{ info.status==1?'待确认':info.status==2?'待发货':info.status==3?'待入库':info.status==4?'已入库':'已取消' }}</text>
-				<text v-else style="font-weight:bold;color:green;">待入库</text>
+				<text v-if="info.status == 3" style="font-weight:bold;color:green;">待入库</text>
+				<text v-else-if="info.status == 5" style="font-weight:bold;color:#CCCCCC;">已取消</text>
+				<text v-else>{{ info.status==1?'待确认':info.status==2?'待发货':info.status==3?'待入库':info.status==4?'已入库':'已取消' }}</text>
 			</view>
 		</view>
 		<view class="item-main" >