收货

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -4,7 +4,7 @@
 			<view class="top-view"> </view>
 			<view class="result-view">
 				<view class="iconfont iconchenggong"></view>
-				<view class="result-title" v-if="info.status == 3">请继续以下完成入库</view>
+				<view class="result-title" v-if="info.status == 3">请确认售价完成入库</view>
 				<view class="result-title" v-else>提交成功</view>
 
 				<view class="pre-save-price" v-if="info.hasSavePrice && info.hasSavePrice == 1">预存价格已导入</view>
@@ -44,11 +44,11 @@
 						<button v-if="info.status == 3" class="admin-button-com big blue" style="width:55vw;margin-top:50upx;" @click="commitChange(1)">改价并入库</button>
 						<button v-if="info.status == 3" class="admin-button-com big blue" style="width:55vw;margin-top:50upx;background-color: red;border:1upx solid red;" @click="confirmIn">仅入库不改价</button>
 						<button v-if="info.status != 3" class="admin-button-com big blue" style="width:55vw;margin-top:50upx;" @click="commitChange(2)">确认改价</button>
-						<button v-if="info.status == 3" class="admin-button-com big default" style="width:55vw;margin-top:30upx;" @click="savePrice">保存价格，稍后处理</button>
+						<button v-if="info.status == 3" class="admin-button-com big default" style="width:55vw;margin-top:30upx;" @click="savePrice">保存价格，稍后入库</button>
 					</template>
 				</template>
 
-				<button class="admin-button-com big default" style="width:55vw;margin-top:30upx;" @click="goBackFn">稍后处理</button>
+				<button class="admin-button-com big default" style="width:55vw;margin-top:30upx;" @click="goBackFn">稍后入库</button>
 
 			</view>
 		</view>

hdApp/src/api/purchase/index.js

@@ -1,5 +1,13 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const saveCgPrice = data => {
+	return https.post("/cg-item/save-cg-price", data);
+};
+
+export const confirmTake = data => {
+	return https.get("/purchase/confirm-take", data);
+};
+
 export const getFullInfo = data => {
 	return https.get("/purchase/get-full-info", data);
 };

hdApp/src/pages.json

@@ -430,7 +430,8 @@
 				{ "path": "bookReadMe","style": {"navigationBarTitleText": "预订须知", "enablePullDownRefresh": true } },
 				{ "path": "addCg","style": {"navigationBarTitleText": "新增采购", "enablePullDownRefresh": false } },
 				{ "path": "addCgConfirm","style": {"navigationBarTitleText": "确认订单", "enablePullDownRefresh": false } },
-				{ "path": "addCgResult","style": {"navigationBarTitleText": "结果", "enablePullDownRefresh": false } }
+				{ "path": "addCgResult","style": {"navigationBarTitleText": "结果", "enablePullDownRefresh": false } },
+				{ "path": "confirmTake","style": {"navigationBarTitleText": "确认收货", "enablePullDownRefresh": false } }
 			]
 		},
 		{