优化

ghsApp/src/admin/home/components/OrderItem.vue

@@ -13,7 +13,7 @@
           <text class="other-book" v-if="item.book == 1" >预订单</text>
           <text class="other-presell" v-if="item.presell == 1" >预售单</text>
           <view :class="['status',currentStatus == 4 ? 'buleColor' : currentStatus == 3 ? 'buleColor' : currentStatus == 1 ? 'defColor' : '']">
-            {{currentStatus==1?'待付款':currentStatus==2?'待发货':currentStatus==3?'待入库':currentStatus==4?'已完成':'已取消'}}
+            {{currentStatus==1?'待付款':currentStatus==2?'待发货':currentStatus==3?'待收货':currentStatus==4?'已完成':'已取消'}}
           </view>
         </view>
         <view class="order-list_info">

ghsApp/src/admin/home/order.vue

@@ -110,7 +110,7 @@ export default {
           id: 2,
         },
         {
-          name: "待入库",
+          name: "待收货",
           value: 0,
           id: 3,
         },

ghsApp/src/filters/constant.js

@@ -64,7 +64,7 @@ const _CONST_MAP = {
 			value: 2
 		},
 		{
-			label: '待入库',
+			label: '待收货',
 			value: 3
 		},
 		{

ghsApp/src/pagesOrder/detail.vue

@@ -134,7 +134,7 @@
 				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
-					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'待入库':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
+					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'待收货':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
 				<view class="order-info_box" v-if="detailInfo.fhType == 1">
 					<view>物流单号：</view>

ghsApp/src/pagesOrder/info.vue

@@ -61,7 +61,7 @@
 				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
-					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'待入库':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
+					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'待收货':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
 				<view v-if="detailInfo.status==1" class="order-info_box">
 					<view>过期时间：</view>

ghsApp/src/pagesPurchase/info.vue

@@ -37,7 +37,7 @@
 				</view>
 				<view class="order-info_box">
 					<view>入库状态：</view>
-					<view>{{ detailInfo.status==1?'待确认' :detailInfo.status==2?'待发货' :detailInfo.status==3?'待入库' :detailInfo.status==4?'已入库' :'已取消' }}</view>
+					<view>{{ detailInfo.status==1?'待确认' :detailInfo.status==2?'待发货' :detailInfo.status==3?'待收货' :detailInfo.status==4?'已入库' :'已取消' }}</view>
 				</view>
 
 				<view v-if="detailInfo.refund == 2" class="order-info_box">

ghsApp/src/pagesPurchase/order.vue

@@ -45,7 +45,7 @@ export default {
 					value: "0"
 				},
 				{
-					name: "待入库",
+					name: "待收货",
 					key: "3",
 					value: "0"
 				},

ghsApp/src/pagesPurchase/orderItem.vue

@@ -8,9 +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" 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>
+				<text v-else>{{ info.status==1?'待确认':info.status==2?'待发货':info.status==3?'待收货':info.status==4?'已入库':'已取消' }}</text>
 			</view>
 		</view>
 		<view class="item-main" >

ghsApp/src/pagesPurchase/wcOrder.vue

@@ -41,7 +41,7 @@ export default {
 					value: "0"
 				},
 				{
-					name: "待入库",
+					name: "待收货",
 					key: "3",
 					value: "0"
 				},

ghsApp/src/pagesStorehouse/allot/allotPut.vue

@@ -56,7 +56,7 @@ export default {
 					key: ""
 				},
 				{
-					name: "待入库",
+					name: "待收货",
 					key: PUT_STATUS.CONFIRM
 				},
 				{
@@ -113,7 +113,7 @@ export default {
 			let name = "";
 			switch (status) {
 				case PUT_STATUS.CONFIRM:
-					name = "待入库";
+					name = "待收货";
 					break;
 				case PUT_STATUS.DONE:
 					name = "已入库";

ghsApp/src/pagesStorehouse/allot/inSelectItem.vue

@@ -13,7 +13,7 @@
 				<view class="orderSn">编号：{{info.orderSn}}</view>
 			</view>
 			<view class="item-row">
-				<view class="mark">状态：{{ info.status == 1 ?'待入库': info.status == 2 ?'已入库':'已取消'}}</view>
+				<view class="mark">状态：{{ info.status == 1 ?'待收货': info.status == 2 ?'已入库':'已取消'}}</view>
 			</view>
 			<view class="item-row">
 				<view class="mark">

ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -149,7 +149,7 @@ export default {
 			let name = "";
 			switch (status) {
 				case PUT_STATUS.CONFIRM:
-					name = "待入库";
+					name = "待收货";
 					break;
 				case PUT_STATUS.DONE:
 					name = "已入库";

ghsApp/src/utils/declare.js

@@ -24,7 +24,7 @@ export const OUT_STATUS = {
 	CANCEL: "3"
 };
 
-//采购订单状态：1待付款，2待发货，3待入库，4已完成
+//采购订单状态：1待付款，2待发货，3待收货，4已完成
 export const PURCHASE_ORDER_STATUS = {
 	CONFIRM: "1",
 	UNDIS: "2",
@@ -38,7 +38,7 @@ export const INVENTORY_STATUS = {
 	DONE: "2"
 };
 
-//订单状态 0全部 1待付款 2待发货 3待入库 4待通知 5已取消 6已完成
+//订单状态 0全部 1待付款 2待发货 3待收货 4待通知 5已取消 6已完成
 export const ORDER_STATUS = {
 	ALL: "0",
 	NOPAY: "1",

hdApp/src/admin/goods/plantCg.vue

@@ -41,7 +41,7 @@ export default {
           key: '2'
         },
         {
-          name: "待入库",
+          name: "待收货",
           value: 0,
           key: '3'
         },

hdApp/src/admin/goods/plantCgDetail.vue

@@ -23,7 +23,7 @@
         </view>
         <view class="order-info_box">
           <view>订单状态：</view>
-          <view>{{ detailInfo.status==0?'待付款' :detailInfo.status==1?'待发货' :detailInfo.status==2?'待入库' :detailInfo.status==3?'已完成' :detailInfo.status==4?'已取消' :'待付款' }}</view>
+          <view>{{ detailInfo.status==0?'待付款' :detailInfo.status==1?'待发货' :detailInfo.status==2?'待收货' :detailInfo.status==3?'已完成' :detailInfo.status==4?'已取消' :'待付款' }}</view>
         </view>
       </view>
       <view v-if="detailInfo.remark !=''" class="content-box price-detail">

hdApp/src/admin/goods/plantCgItem.vue

@@ -50,7 +50,7 @@ export default {
           statusName = "待发货";
           break;
         case '2':
-          statusName = "待入库";
+          statusName = "待收货";
           break;
         case '3':
           statusName = "已完成";

hdApp/src/admin/home/order.vue

@@ -90,7 +90,7 @@ export default {
     return {
       tabIndex: 0,
       classifyModal: false,
-      tabs: [ { name: "全部", value: 0 }, { name: "待付款", value: 0 }, { name: "待发货", value: 0 }, { name: "待入库", value: 0 }, { name: "已完成", value: 0 } ],
+      tabs: [ { name: "全部", value: 0 }, { name: "待付款", value: 0 }, { name: "待发货", value: 0 }, { name: "待收货", value: 0 }, { name: "已完成", value: 0 } ],
       operateIndex: null,
       operateData: {},
       freeShipModal: false,
@@ -160,7 +160,7 @@ export default {
     },
     sendOrderFn(item){
       let that = this
-      that.$util.confirmModal({content:'确认待入库？'},() => {
+      that.$util.confirmModal({content:'确认待收货？'},() => {
         sendOrder({id:item.id}).then(res=>{
           if(res.code == 1){
             that.$msg('操作成功')

hdApp/src/admin/order/detail.vue

@@ -102,7 +102,7 @@
 
             <view class="msg-list">
               <view class="label">状态：</view>
-              <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待发货':orderInfo.status == 3?'待入库':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
+              <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待发货':orderInfo.status == 3?'待收货':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
             </view>
             <view class="msg-list">
               <view class="label">单号：</view>

hdApp/src/filters/constant.js

@@ -64,7 +64,7 @@ const _CONST_MAP = {
 			value: 2
 		},
 		{
-			label: '待入库',
+			label: '待收货',
 			value: 3
 		},
 		{

hdApp/src/pagesOrder/detail.vue

@@ -60,7 +60,7 @@
 				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
-					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'待入库':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
+					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'待收货':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
 				<!-- <view class="order-info_box">
                   <view>销售门店：</view>

hdApp/src/pagesPurchase/info.vue

@@ -55,7 +55,7 @@
 					<view>{{ 
 						detailInfo.status==1?'待付款'
 						:detailInfo.status==2?'待发货'
-						:detailInfo.status==3?'待入库'
+						:detailInfo.status==3?'待收货'
 						:detailInfo.status==4?'已签收'
 						:detailInfo.status==5?'已入库'
 						:detailInfo.status==6?'已取消'

hdApp/src/pagesPurchase/orderItem.vue

@@ -62,7 +62,7 @@ export default {
           statusName = "待发货";
           break;
         case '3':
-          statusName = "待入库";
+          statusName = "待收货";
           break;
         case '4':
           statusName = "已完成";

hdApp/src/pagesPurchase/purDetails.vue

@@ -19,7 +19,7 @@
       <view class="bills-info_box content-box" v-if="detailInfo.fhStatus == 1">
         <view class="order-info_box">
           <view>发货状态：</view>
-          <view style="color:green;font-weight:bold;font-size:30upx;">商家待入库</view>
+          <view style="color:green;font-weight:bold;font-size:30upx;">商家待收货</view>
         </view>
         <view class="order-info_box" v-if="detailInfo.fhType == 1">
           <view>物流单号：</view>
@@ -102,7 +102,7 @@
         </view>
         <view class="order-info_box">
           <view>订单状态：</view>
-          <view>{{ detailInfo.status==1?'待付款' :detailInfo.status==2?'待发货' :detailInfo.status==3?'待入库' :detailInfo.status==4?'已完成' :detailInfo.status==5?'已取消' :'待付款' }}</view>
+          <view>{{ detailInfo.status==1?'待付款' :detailInfo.status==2?'待发货' :detailInfo.status==3?'待收货' :detailInfo.status==4?'已完成' :detailInfo.status==5?'已取消' :'待付款' }}</view>
         </view>
 
         <view v-if="detailInfo.refundLog && detailInfo.refundLog == 1" class="order-info_box">

hdApp/src/pagesPurchase/shopping.vue

@@ -48,7 +48,7 @@ export default {
           key: '2'
         },
         {
-          name: "待入库",
+          name: "待收货",
           value: 0,
           key: '3'
         },
@@ -100,7 +100,7 @@ export default {
         this.tabs[0].value = res.data.shop.totalPurchaseOrder // 全部
         this.tabs[1].value = res.data.shop.cgUnPay // 待付款
         this.tabs[2].value = res.data.shop.cgUnSend // 待发货
-        this.tabs[3].value = res.data.shop.cgSending // 待入库
+        this.tabs[3].value = res.data.shop.cgSending // 待收货
         this.tabs[4].value = res.data.shop.cgFinish // 已完成
       })
     },

hdApp/src/pagesStorehouse/allot/allotPut.vue

@@ -78,7 +78,7 @@ export default {
 					key: ""
 				},
 				{
-					name: "待入库",
+					name: "待收货",
 					key: PUT_STATUS.CONFIRM
 				},
 				{
@@ -126,7 +126,7 @@ export default {
 			let name = "";
 			switch (status) {
 				case PUT_STATUS.CONFIRM:
-					name = "待入库";
+					name = "待收货";
 					break;
 				case PUT_STATUS.DONE:
 					name = "已入库";

hdApp/src/pagesStorehouse/allot/putDetails.vue

@@ -160,7 +160,7 @@ export default {
 			let name = "";
 			switch (status) {
 				case PUT_STATUS.CONFIRM:
-					name = "待入库";
+					name = "待收货";
 					break;
 				case PUT_STATUS.DONE:
 					name = "已入库";

hdApp/src/utils/declare.js

@@ -24,7 +24,7 @@ export const OUT_STATUS = {
 	CANCEL: "3"
 };
 
-//采购订单状态：1待确认，2待发货，3待入库，4已完成
+//采购订单状态：1待确认，2待发货，3待收货，4已完成
 export const PURCHASE_ORDER_STATUS = {
 	CONFIRM: "1",
 	UNDIS: "2",
@@ -38,7 +38,7 @@ export const INVENTORY_STATUS = {
 	DONE: "2"
 };
 
-//订单状态 0全部 1待付款 2待发货 3待入库 4待通知 5已取消 6已完成
+//订单状态 0全部 1待付款 2待发货 3待收货 4待通知 5已取消 6已完成
 export const ORDER_STATUS = {
 	ALL: "0",
 	NOPAY: "1",