shish hace 2 años
padre
commit
e9a3ff9eb3
Se han modificado 2 ficheros con 3 adiciones y 3 borrados
  1. 1 1
      ghsApp/src/pagesPurchase/order.vue
  2. 2 2
      ghsApp/src/pagesPurchase/orderItem.vue

+ 1 - 1
ghsApp/src/pagesPurchase/order.vue

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

+ 2 - 2
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.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 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">
 			<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-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>
 		</view>
 		<view class="item-main" >
 		<view class="item-main" >