Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pageD/myRelease/buyEdit.vue

@@ -201,10 +201,10 @@
 					freightPayerKey:-1,
 					priceType: "定价采购",
 					procurementPlanType:"现货",
-					grain:"不限",
-					grade:"不限",
+					grain:"塔粮",
+					grade:"一等品",
 					outputYear:"2020",
-					packingType:"不限",
+					packingType:"散装",
 					freightPayer:"",
 				},
 				params:{

pageD/myRelease/sellDetails.vue

@@ -179,9 +179,9 @@
 					priceType: "定价采购",
 					procurementPlanType: "现货",
 					grain: "塔粮",
-					grade: "不限（默认）",
+					grade: "一等品",
 					outputYear: "2020",
-					packingType: "不限（默认）",
+					packingType: "散装",
 					freightPayer: "",
 				},
 				params: {
@@ -198,7 +198,7 @@
 				liIndex: 0,
 				liType: ['塔粮', '筛粮', '中粒', '大粒'],
 				pinIndex: 0,
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				pinType: ['一等品', '二等品', '三等品', '等外'],
 				nianIndex: 3,
 				nianType: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014', '2013', '2012',
 					'2011'
@@ -208,7 +208,7 @@
 				region: '请选择收货地区',
 				region1: '请选择产地',
 				baoIndex: 0,
-				baoType: ['不限（默认）', '散装', '大袋', '小袋'],
+				baoType: ['散装', '大袋', '小袋'],
 				chengIndex: -1,
 				chengType: ['可议', '买方承担', '卖方承担']
 			}

pageD/myRelease/sellEdit.vue

@@ -205,9 +205,9 @@
 					priceType: "定价采购",
 					procurementPlanType: "现货",
 					grain: "塔粮",
-					grade: "不限（默认）",
+					grade: "一等品",
 					outputYear: "2020",
-					packingType: "不限（默认）",
+					packingType: "可议",
 					freightPayer: "",
 				},
 				params: {

pageD/myRelease/sellGrain.vue

@@ -209,8 +209,8 @@
 					freightPayerKey: -1,
 					priceType: "定价销售",
 					grain: "塔粮",
-					grade: "不限（默认）",
-					packingType: "不限（默认）",
+					grade: "一等品",
+					packingType: "散装",
 					freightPayer: "",
 				},
 				params: {

pageD/warehousings/ex_warehouse.vue

@@ -227,7 +227,7 @@
 				},
 				pinIndex: 0,
 				pinTypes: '',
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				pinType: ['一等品', '二等品', '三等品', '等外'],
 				ruIndex: 0,
 				rutypes: '',
 				ruType: ['销售出库', '移库出库', '暂存出库', '贸易服务出库', '采购出库'],

pageD/warehousings/warehousings.vue

@@ -215,9 +215,9 @@ import upload from '@/components/upload.vue';
 					contractNo: {},
 					carNo: {},
 				},
-				pinIndex: '不限（默认）',
+				//pinIndex: '不限（默认）',
 				pinTypes: '',
-				pinType: ['不限（默认）', '一等品', '二等品', '三等品', '等外'],
+				pinType: ['一等品', '二等品', '三等品', '等外'],
 				ruIndex: '采购入库',
 				rutypes: '',
 				warehouse:[],