table表格增加一些参数

canteen/pages/classification/material.vue

@@ -97,7 +97,7 @@
 						let list = res.data.material.map(item => {
 							if(this.checked_list[item.supplier_id]){
 								item.checked = false;
-								if(this.checked_list[item.supplier_id].material_list[item.material_id]){
+								if(this.checked_list[item.supplier_id].material_list[item.item_id]){
 									item.checked = true;
 								}
 							}else{
@@ -111,7 +111,7 @@
 						let list = res.data.material.map(item => {
 							if(this.checked_list[item.supplier_id]){
 								item.checked = false;
-								if(this.checked_list[item.supplier_id].material_list[item.material_id]){
+								if(this.checked_list[item.supplier_id].material_list[item.item_id]){
 									item.checked = true;
 								}
 							}else{
@@ -143,16 +143,16 @@
 				if(this.is_search_ing){
 					this.tab_list.forEach(t_item => {
 						t_item.list.forEach(l_item => {
-							if(l_item.material_id == item.material_id){
+							if(l_item.item_id == item.item_id){
 								l_item.checked = item.checked;
 							}
 						})
 					})
 				}
 				if(item.checked){
-					this.checked_list[item.supplier_id].material_list[item.material_id] = item;
+					this.checked_list[item.supplier_id].material_list[item.item_id] = item;
 				}else{
-					delete this.checked_list[item.supplier_id].material_list[item.material_id];
+					delete this.checked_list[item.supplier_id].material_list[item.item_id];
 				}
 				uni.$emit('addMaterialList', this.checked_list);
 				console.log("checked_list", this.checked_list)

canteen/pages/purchase/launch.vue

@@ -83,25 +83,34 @@
 				// table 标题处理
 				material_list[i].headers = [{
 					key: 'material_name',
-					label: '菜品名称'
+					label: '物资名称'
 				},{
 					key: 'spec_name',
 					label: '规格'
-				},{
-					key: 'unit',
-					label: '单位'
 				},{
 					key: 'brand',
 					label: '品牌'
+				},{
+					key: 'quality_level',
+					label: '品级'
+				},{
+					label: '编号',
+					key: 'm_sn'
+				},{
+					label: '供应商',
+					key: 'supplier_name'
 				},{
 					key: 'tax_price',
 					label: '含税价'
 				},{
 					key: 'non_tax_price',
 					label: '不含税价'
+				},{
+					key: 'purchase_limit',
+					label: '起购数'
 				},{
 					key: 'purchase_number',
-					label: '数量'
+					label: '采购数量'
 				},{
 					key: 'operation',
 					label: '操作'
@@ -111,6 +120,10 @@
 				for(let j in material_list[i].material_list){
 					material_list[i].material_list[j].purchase_number = {edit: true, value: ''};
 					material_list[i].material_list[j].operation = {button: true, key: 'delete', value: '删除'};
+					material_list[i].material_list[j].supplier_name = material_list[i].supplier_name;
+					material_list[i].material_list[j].tax_price = material_list[i].material_list[j].tax_price;
+					material_list[i].material_list[j].non_tax_price = material_list[i].material_list[j].non_tax_price;
+					// material_list[i].material_list[j].star_num = material_list[i].material_list[j].purchase_limit;
 					list_arr.push(material_list[i].material_list[j]);
 				}
 				material_list[i].material_list = list_arr;
@@ -137,10 +150,10 @@
 				console.log("event", event);
 				if(event.content.key == 'delete'){
 					let supplier_id = event.lineData.supplier_id; // 取出第一层，供应商id
-					let material_id = event.lineData.material_id; // 取出第二层，物资id
+					let item_id = event.lineData.item_id; // 取出第二层，item_id
 					let material_index = event.lineData.contentIndex; // 取出第二层，物资下标
 					this.render_material_list[supplier_id].material_list.splice(material_index, 1);
-					delete this.material_list[supplier_id].material_list[material_id];
+					delete this.material_list[supplier_id].material_list[item_id];
 				}
 			},
 			// 时间选择

supplier/pages/offer/index.vue

@@ -67,6 +67,9 @@
 				},{
 					label: '编号',
 					key: 'number'
+				},{
+					label: '起购数',
+					key: 'purchase_limit'
 				},{
 					label: '含税价',
 					key: 'tax_price'
@@ -139,6 +142,7 @@
 							brand: item?.material?.brand || '',
 							quality_level: item?.material?.quality_level || '',
 							number: item?.material?.m_sn || '',
+							purchase_limit: {edit: true, value: 1},
 							tax_price: {edit: true, value: ''},
 							non_tax_price: {edit: true, value: ''}
 						}
@@ -164,6 +168,7 @@
 							brand: item?.material?.brand || '',
 							quality_level: item?.material?.quality_level || '',
 							number: item?.material?.m_sn || '',
+							purchase_limit: {edit: true, value: item?.quotation?.purchase_limit || ''},
 							tax_price: {edit: true, value: item?.quotation?.tax_price || ''},
 							non_tax_price: {edit: true, value: item?.quotation?.non_tax_price || ''},
 							quotation_id: item?.quotation?.id || 0
@@ -190,6 +195,7 @@
 							brand: item?.material?.brand || '',
 							quality_level: item?.material?.quality_level || '',
 							number: item?.material?.m_sn || '',
+							purchase_limit: {edit: true, value: item?.quotation?.purchase_limit || ''},
 							tax_price: {edit: true, value: item?.quotation?.tax_price || ''},
 							non_tax_price: {edit: true, value: item?.quotation?.non_tax_price || ''}
 						}
@@ -234,7 +240,8 @@
 					list.push({
 						id: item.quotation_id,
 						tax_price: item.tax_price.value,
-						non_tax_price: item.non_tax_price.value
+						non_tax_price: item.non_tax_price.value,
+						purchase_limit: item.purchase_limit.value || 1
 					})
 				});
 				// 操作状态，是保存还是直接发起
@@ -263,7 +270,8 @@
 							m_id: item.material_id,
 							m_spec_id: item.spec_id,
 							tax_price: item.tax_price.value,
-							non_tax_price: item.non_tax_price.value
+							non_tax_price: item.non_tax_price.value,
+							purchase_limit: item.purchase_limit.value || 1
 						})
 					}
 				});

supplier/pages/order/detail.vue

@@ -62,6 +62,9 @@
 				},{
 					label: '编号',
 					key: 'number'
+				},{
+					label: '起购数',
+					key: 'purchase_limit'
 				},{
 					label: '含税价',
 					key: 'tax_price'
@@ -119,7 +122,8 @@
 							quality_level: item?.material?.quality_level || '',
 							number: item?.material?.m_sn || '',
 							tax_price: item.tax_price,
-							non_tax_price: item.non_tax_price
+							non_tax_price: item.non_tax_price,
+							purchase_limit: item.purchase_limit
 						}
 						return obj;
 					});