shish 3 лет назад
Родитель
Сommit
4d534059a8

+ 2 - 1
ghsApp/src/admin/home/apply.vue

@@ -62,7 +62,8 @@ export default {
                     title:'订单与销售',
                     list:[
                         {name: "预售",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/admin/order/statBook"},
-                        {name: "运费设置",img: `${this.$constant.imgUrl}/ghs/home/shop.png`,url: "/admin/order/freight"}
+                        {name: "运费设置",img: `${this.$constant.imgUrl}/ghs/home/shop.png`,url: "/admin/order/freight"},
+                        {name: "物流",img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,url: "/admin/shop/wl"}
                     ]
                 },
                 {

+ 4 - 0
ghsApp/src/api/purchase/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const printBill = data => {
+	return https.get("/purchase-order/print-bill", data);
+};
+
 export const getCgItemList = data => {
 	return https.get("/purchase-order-item/get-item-list", data);
 };

+ 15 - 4
ghsApp/src/pagesPurchase/info.vue

@@ -115,7 +115,7 @@
 				</view>
 			</view>
 
-			<view class="content-box price-detail">
+			<view class="content-box price-detail" v-if="detailInfo.location == 0">
 				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">运费支付</div>
@@ -166,7 +166,7 @@
 				</div>
 			</view>
 
-			<view class="content-box price-detail">
+			<view class="content-box price-detail" v-if="detailInfo.location == 0">
 				<div class="module-com input-line-wrap">
 					<tui-list-cell v-if="detailInfo.yfPayWay==2" class="line-cell" :hover="false">
 						<div class="tui-title">短途运费</div>
@@ -206,12 +206,16 @@
 
 		</view>
 
-		<view class="app-footer open_btn">
+		<view class="app-footer open_btn" v-if="detailInfo.location == 0">
 			<view v-if="detailInfo.status != 3" @click="changePrice()" class="admin-button-com big blue">修改价格</view>
 			<view v-if="detailInfo.status == 3" @click="cancelIn()" class="admin-button-com big blue">取消入库</view>
 			<view v-if="detailInfo.status == 3" @click="changePrice()" class="admin-button-com big blue" style="margin-right:45upx;margin-left:55upx;">入库和改价</view>
 		</view>
 
+		<view class="app-footer open_btn" v-else>
+			<view v-if="detailInfo.status == 2 || detailInfo.status == 3 || detailInfo.status == 4" @click="printBillFn(detailInfo)" class="admin-button-com big blue">打印({{detailInfo.printNum}})</view>
+		</view>
+
 		<modal-module :show="printLabelShow" @click="dialogInputConfirm" :maskClosable="true" title="数量" padding="30rpx 30rpx" >
 		<template v-slot:content>
 			<div class="app-modal-input-wrap">
@@ -227,7 +231,7 @@
 	</view>
 </template>
 <script>
-import { getPurchaseDetailApi,updateRemark,printAll,printItem,confirmPutIn,cancelPutIn } from "@/api/purchase";
+import { getPurchaseDetailApi,updateRemark,printAll,printItem,confirmPutIn,cancelPutIn,printBill } from "@/api/purchase";
 import productMins from "@/mixins/product";
 import TuiListCell from "@/components/plugin/list-cell";
 import ModalModule from "@/components/plugin/modal"
@@ -261,6 +265,13 @@ export default {
 		})
 	},
 	methods: {
+		printBillFn(info){
+			uni.showLoading({mask:true})
+			printBill({id:info.id}).then((res) => {
+				info.printNum++
+				uni.hideLoading()
+			})
+		},
 		dialogInputConfirm(val) {
 			let that=this;
 			if (val.index == 0) {