Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-supplychain

canteen/pages/delivery/apply.vue

@@ -14,7 +14,12 @@
 		<!-- 物料table -->
 		<view class="lf-p-32 lf-p-t-30 lf-p-b-30 lf-w-100 lf-h-maxcontent lf-border-box">
 			<view class="lf-font-32 lf-color-black lf-font-bold lf-m-b-20">物资明细</view>
-			<wyb-table :headers="headers" :contents="contents" contentBgColor="#ecfaf5" :first-line-fixed="true" @onInputChange="onInputChange" width="max-content" height="800rpx"></wyb-table>
+			<wyb-table :headers="headers" :contents="contents" 
+				contentBgColor="#ecfaf5" 
+				:first-line-fixed="true" 
+				@onInputChange="onInputChange" 
+				width="max-content" height="800rpx"
+				v-if="contents.length"></wyb-table>
 		</view>
 		<!-- 操作按钮 -->
 		<view class="fixed-bottom">

canteen/pages/purchase/detail.vue

@@ -108,12 +108,30 @@
 					},{
 						key: 'spec',
 						label: '规格'
+					},{
+						key: 'brand',
+						label: '品牌'
+					},{
+						key: 'quality_level',
+						label: '品级'
+					},{
+						label: '编号',
+						key: 'm_sn'
+					},{
+						label: '供应商',
+						key: 'supplier_name'
 					},{
 						key: 'pre_tax_price',
 						label: '税前价格'
 					},{
 						key: 'after_tax_price',
 						label: '税后价格'
+					},{
+						key: 'purchase_limit',
+						label: '起购数'
+					},{
+						key: 'purchase_number',
+						label: '采购数量'
 					}],
 				contents: [],
 				order: {},
@@ -219,10 +237,14 @@
 						return {
 							name: item.material.m_name,
 							spec: item.spec.name,
+							brand: item.material.brand,
+							quality_level: item.material.quality_level,
+							m_sn: item.material.m_sn,
+							supplier_name: this.order.supplier.supplier_name,
 							pre_tax_price: item.total_tax_amount,
 							after_tax_price: item.total_non_tax_amount,
-							spec_id: item.spec.id,
-							material_id: item.material.id
+							purchase_limit: item.p_order_item.purchase_limit,
+							purchase_number: item.purchase_number
 						}
 					})
 					this.contents = contents;

supplier/pages/gonghuo/order.vue

@@ -15,7 +15,7 @@
 					<view class="card" v-for="(item, index) in tabItem.list" :key="item.id" @click="$url('/pages/gonghuo/detail?p_sn='+ item.p_sn)">
 						<view class="lf-row-between item">
 							<view class="lf-color-gray">采购方</view>
-							<view class="lf-color-black">{{ item.p_name }}</view>
+							<view class="lf-color-black">{{ item.canteen.canteen_name }}</view>
 						</view>
 						<view class="lf-row-between item">
 							<view class="lf-color-gray">发单时间</view>
@@ -31,7 +31,7 @@
 						</view>
 						<view class="lf-row-between item">
 							<view class="lf-color-gray">订单状态</view>
-							<view class="quoted-price">{{ item.state }}</view>
+							<view :class="stateClass(item.state)">{{ item.state }}</view>
 						</view>
 					</view>
 					<view class="loading-more">
@@ -68,6 +68,10 @@
 					name: '待发货',
 					list: [],
 					..._public
+				},{
+					name: '已发货',
+					list: [],
+					..._public
 				},{
 					name: '已完成',
 					list: [],
@@ -81,6 +85,21 @@
 				windowHeight: 0
 			}
 		},
+		computed: {
+			stateClass(){
+				return function(val){
+					let class_name = {
+						'已发货': 'passed',
+						'已收货': 'passed',
+						'已入库': 'passed',
+						'备货中': 'wait',
+						'待接单': 'quoted-price',
+						'已退单': 'refuse'
+					}
+					return class_name[val];
+				}
+			}
+		},
 		onLoad(){
 			this.windowHeight = uni.getSystemInfoSync().windowHeight;
 			this.getData();