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

canteen/common/api.js

@@ -1,9 +1,8 @@
 // appId: 正式 null | 测试 null
 export const DEV = "dev"; // dev 测试 | prod 正式
 export const VERSION = '1.0.0'; // 版本号
-export const DEVURL = 'http://192.168.3.5'; // 测试服请求地址
 // export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
-// export const DEVURL = 'http://192.168.43.78'; // 测试服请求地址
+export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址
 export const PRODURL = ''; // 正式服请求地址
 
 export const API_CANTEEN_LOGIN = '/api/canteen/login'; // 登录

canteen/pages/delivery/apply.vue

@@ -72,6 +72,9 @@
 				},{
 					label: '批次',
 					key: 'batch_sn'
+				},{
+					key: 'stock_number',
+					label: '库存数量'
 				},{
 					key: 'delivery_number',
 					label: '出库数量'
@@ -112,6 +115,7 @@
 					warehouse_list[i].operation = {button: true, key: 'delete', value: '删除'};
 					warehouse_list[i].unit = warehouse_list[i].unit.unit_name;
 					warehouse_list[i].category = warehouse_list[i].category.m_cate_name;
+					warehouse_list[i].stock_number = warehouse_list[i].stock;
 					contents.push(warehouse_list[i]);
 				}
 				this.contents = contents;
@@ -129,10 +133,13 @@
 					let list = res.data.sheet || [];
 					let warehouse_list = {};
 					list.map(item => {
+						console.log('======',item)
+						console.log('===库存===',item.warehouse.stock)
 						warehouse_list[item.id] = {
 							batch_sn: item?.purchase?.batch_sn || '',
 							brand: item?.material?.brand || '',
 							checked: true,
+							stock: item.warehouse.stock,
 							m_sn: item?.material?.m_sn || '',
 							material_id: item?.material?.id || 0,
 							material_name: item?.material?.m_name || '',

canteen/pages/purchase/launch.vue

@@ -23,7 +23,7 @@
 		<self-line></self-line>
 		<!-- 收货时间 -->
 		<view class="lf-row-between lf-p-30 lf-p-l-32 lf-p-r-32 lf-font-28">
-			<view class="lf-color-black">收货时间</view>
+			<view class="lf-color-black">预计收货时间</view>
 			<picker mode="date" :value="date" @change="pickerChange">
 				<!-- <view class="lf-color-555 lf-text-right" style="width: 400rpx;">{{ '请选择收货时间...' }}</view> -->
 				<view class="lf-color-555 lf-text-right" style="width: 400rpx;">{{ date }}</view>

supplier/common/api.js

@@ -1,7 +1,7 @@
 // appId: 正式 null | 测试 null
 export const DEV = "dev"; // dev 测试 | prod 正式
 export const VERSION = '1.0.0'; // 版本号
-export const DEVURL = 'http://192.168.3.5'; // 测试服请求地址
+export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址
 // export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
 export const PRODURL = ''; // 正式服请求地址
 

supplier/pages/offer/index.vue

@@ -70,10 +70,6 @@
 			wybTable
 		},
 		data(){
-			// PS 获取30天后日期
-			var date1 = new Date();
-			var date2 = new Date(date1);
-			date2.setDate(date1.getDate() + 30);
 			return {
 				headers: [{
 					label: '物资名称',
@@ -167,6 +163,22 @@
 			}
 		},
 		methods: {
+			// 日期选择器值被改变
+			pickerChange(event, current_name){
+				console.log(current_name)
+				if(current_name == 'deadline_start') {
+					// PS 获取30天后日期
+					var date1 = new Date(event.detail.value);
+					var date2 = new Date(date1);
+					date2.setDate(date1.getDate() + 30);
+					console.log(this.$shared.recordTime(date2, '-', 'date'))
+					this[current_name] = event.detail.value;
+					this.deadline_end = this.$shared.recordTime(date2, '-', 'date')
+				}else {
+					this[current_name] = event.detail.value;
+				}
+				
+			},
 			// 获取物资列表
 			getMaterialList(){
 				this.$http(this.API.API_SUPPLIER_MATERIALLIST).then(res => {
@@ -318,10 +330,6 @@
 					})
 				}
 			},
-			// 日期选择器值被改变
-			pickerChange(event, current_name){
-				this[current_name] = event.detail.value;
-			},
 			// 切换显示关联食堂modal
 			switchRelation(){
 				if(this.type == 1) return this.$msg('编辑不可更换关联食堂哦');