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

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -24,7 +24,7 @@
         </div>
          <el-form ref="dataList" :model="dataList" label-width="140px">
           <ws-form-item label="标题" span="1" prop="title" >
-            <el-input v-model="dataList.title" maxlength="16" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
               <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="货名" span="1" prop="goodsName" >
@@ -52,7 +52,7 @@
             <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="最小成交量（吨）" span="1" prop="minimumVolume" >
-            <el-input v-model="dataList.minimumVolume" placeholder="请输入最小成交量" />
+            <el-input v-model="dataList.minimumVolume" class="typeselect" placeholder="请输入最小成交量" />
             <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="procurementPlanType" >
@@ -92,7 +92,7 @@
             <el-input
               v-model="dataList.procurementPrice"
               maxlength="120"
-              size="small"
+              class="typeselect"
               placeholder="请输入采购价格"
             />
             <span class="unchangeable">*</span>
@@ -117,8 +117,8 @@
             <el-cascader
               :options="options_"
               v-model="selectedOptions"
+              class="typeselect"
               clearable
-              size="large"
               placeholder="请选择收货库所在地区"
               @change="handleChange"
               style="width:200%"
@@ -160,18 +160,19 @@
             <el-input
             maxlength='30'
               v-model="dataList.baggingNotes"
-              size="small"
+              class="typeselect"
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
           <ws-form-item label="买方" span="1" prop="buyer" >
-            <el-input maxlength='25' v-model="dataList.buyer" size="small" placeholder="请输入买方名称" />
+            <el-input maxlength='25' v-model="dataList.buyer" class="typeselect" placeholder="请输入买方名称" />
             <span class="unchangeable">*</span>
           </ws-form-item>
           <el-form-item label="买方电话" span="1" prop="buyerPhone" >
             <el-input
               v-model="dataList.buyerPhone"
               filterable
+              class="typeselect"
               :filter-method="dataFilter"
               placeholder="请输入买方电话"
             ></el-input>
@@ -181,12 +182,14 @@
             <el-input
               v-model="dataList.invoiceFeePerson"
               placeholder="请输入发票费（个人）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
             <el-input
               v-model="dataList.invoiceFeeCompany"
               placeholder="请输入发票费（企业）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <div class="small-title"></div>
@@ -212,10 +215,10 @@
             <el-input v-model="dataList.impurity" class="typeselect" placeholder="请输入杂质占比" />
           </el-form-item>
           <el-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
-            <el-input v-model="dataList.mildewGrain" placeholder="请输入霉变粒占比" />
+            <el-input v-model="dataList.mildewGrain" class="typeselect" placeholder="请输入霉变粒占比" />
           </el-form-item>
           <el-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
-            <el-input v-model="dataList.imperfectGrain" maxlength="120" placeholder="请输入不完善粒占比" />
+            <el-input v-model="dataList.imperfectGrain" class="typeselect" maxlength="120" placeholder="请输入不完善粒占比" />
           </el-form-item>
           <el-form-item label="蛋白（%）>=" span="1" prop="protein">
             <el-input v-model="dataList.protein" class="typeselect" placeholder="请输入蛋白占比" />
@@ -254,6 +257,7 @@
             <el-cascader
               :options="options1_"
               v-model="selectedOptions1"
+              class="typeselect"
               clearable
               size="large"
               placeholder="请选择产地"
@@ -264,6 +268,7 @@
           <el-form-item label="产出年份" span="1" prop="outputYear">
             <el-date-picker
               v-model="dataList.outputYear"
+              class="typeselect"
               type="year"
               align="right"
               unlink-panels

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -34,6 +34,7 @@
             <el-input
               v-model="dataList.title"
               maxlength="16"
+              class="typeselect"
               placeholder="标题须包含企业简称，不超过16个字"
             />
           </ws-form-item>
@@ -71,6 +72,7 @@
             <el-input
               v-model="dataList.minimumVolume"
               placeholder="请输入最小成交量"
+              class="typeselect"
             />
           </ws-form-item>
           <!--类型-->
@@ -92,7 +94,7 @@
           </ws-form-item>
           <!-- 价格类型 -->
           <ws-form-item label="价格类型" span="1" prop="priceType">
-            <el-input v-model="dataList.priceType" disabled />
+            <el-input v-model="dataList.priceType" class="typeselect" disabled />
           </ws-form-item>
           <!-- 基差 -->
           <ws-form-item
@@ -101,7 +103,7 @@
             span="1"
             prop="basisPrice"
           >
-            <el-input v-model="dataList.basisPrice" placeholder="请输入基差" />
+            <el-input v-model="dataList.basisPrice" class="typeselect" placeholder="请输入基差" />
           </ws-form-item>
           <!--采购价格（元）-->
           <ws-form-item
@@ -114,6 +116,7 @@
               v-model="dataList.procurementPrice"
               maxlength="120"
               size="small"
+              class="typeselect"
               placeholder="请输入采购价格"
             />
           </ws-form-item>
@@ -123,6 +126,7 @@
               disabled
               v-model="dataList.receiveWarehouse"
               maxlength="120"
+              class="typeselect"
               size="small"
             />
             <el-option
@@ -139,6 +143,7 @@
               v-model="selectedOptions"
               clearable
               size="large"
+              class="typeselect"
               placeholder="请选择收货库所在地区"
               @change="handleChange"
               style="width: 200%"
@@ -186,6 +191,7 @@
             <el-input
               v-model="dataList.baggingNotes"
               size="small"
+              class="typeselect"
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
@@ -194,8 +200,8 @@
             <el-input
               v-model="dataList.buyer"
               maxlength="120"
-              size="small"
               placeholder="请输入买方名称"
+              class="typeselect"
             />
           </ws-form-item>
           <!-- 买方电话 -->
@@ -205,18 +211,21 @@
               filterable
               :filter-method="dataFilter"
               placeholder="请输入买方电话"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
             <el-input
               v-model="dataList.invoiceFeePerson"
               placeholder="请输入发票费（个人）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
             <el-input
               v-model="dataList.invoiceFeeCompany"
               placeholder="请输入发票费（企业）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <div class="small-title"></div>
@@ -264,6 +273,7 @@
             <el-input
               v-model="dataList.mildewGrain"
               placeholder="请输入霉变粒占比"
+              class="typeselect"
             />
           </el-form-item>
           <!--不完善粒（%）<=-->
@@ -272,6 +282,7 @@
               v-model="dataList.imperfectGrain"
               maxlength="120"
               placeholder="请输入不完善粒占比"
+              class="typeselect"
             />
           </el-form-item>
           <!-- 蛋白（%）<= -->
@@ -320,7 +331,7 @@
               :options="options1_"
               v-model="selectedOptions1"
               clearable
-              size="large"
+              class="typeselect"
               placeholder="请选择产地"
               @change="handleChange1"
               style="width: 200%"
@@ -333,6 +344,7 @@
               type="year"
               align="right"
               unlink-panels
+              class="typeselect"
               value-format='yyyy'
               range-separator="至"
               placeholder="产出年份"
@@ -1107,7 +1119,7 @@ export default {
   text-align: left;
 }
 /deep/.el-input--small {
-  font-size: 13px;
+  font-size: 14px;
   position: relative;
   display: inline-block;
 }

src/views/salesManagement/salesPlanAdd.vue

@@ -37,6 +37,7 @@
             <el-input
               v-model="dataList.title"
               maxlength="16"
+              class="typeselect"
               placeholder="标题须包含企业简称，不超过16个字"
             />
             <span class="unchangeable">*</span>
@@ -44,6 +45,7 @@
           <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName" >
             <ws-select
+               style="font-size: 14px"
               v-model="dataList.goodsName"
               placeholder
               class="typeselect"
@@ -76,6 +78,7 @@
             <el-input
               v-model="dataList.minimumVolume"
               placeholder="请输入最小成交量"
+              class="typeselect"
             />
             <span class="unchangeable">*</span>
           </el-form-item>
@@ -98,7 +101,7 @@
           </ws-form-item>
           <!-- 价格类型 -->
           <ws-form-item label="价格类型" span="1" prop="priceType">
-            <el-input v-model="dataList.priceType" disabled />
+            <el-input v-model="dataList.priceType" class="typeselect" disabled />
           </ws-form-item>
            <ws-form-item
             v-show="dataList.salePlanType=='期货'"
@@ -106,7 +109,7 @@
             span="1"
             prop="basisPrice"
           >
-            <el-input v-model="dataList.basisPrice" placeholder="请输入基差" />
+            <el-input v-model="dataList.basisPrice" class="typeselect" placeholder="请输入基差" />
             <span class="unchangeable">*</span>
           </ws-form-item>
           <ws-form-item
@@ -119,6 +122,7 @@
               v-model="dataList.salePrice"
               maxlength="120"
               size="small"
+              class="typeselect"
               placeholder="请输入销售价格"
             />
             <span class="unchangeable">*</span>
@@ -145,7 +149,7 @@
               :options="options_"
               v-model="selectedOptions"
               clearable
-              size="large"
+              class="typeselect"
               placeholder="请选择出货库所在地区"
               @change="handleChange"
               style="width: 200%"
@@ -193,6 +197,7 @@
               maxlength="30"
               v-model="dataList.baggingNotes"
               size="small"
+              class="typeselect"
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
@@ -201,6 +206,7 @@
               maxlength="25"
               v-model="dataList.seller"
               size="small"
+              class="typeselect"
               placeholder="请输入卖方名称"
             />
             <span class="unchangeable">*</span>
@@ -209,23 +215,26 @@
             <el-input
               v-model="dataList.sellerPhone"
               filterable
+              class="typeselect"
               :filter-method="dataFilter"
               placeholder="请输入卖方电话"
             ></el-input>
             <span class="unchangeable">*</span>
-            <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
+          </el-form-item>
+             <el-form-item label="发票费（个人）" span="1" prop="invoiceFeePerson" >
             <el-input
               v-model="dataList.invoiceFeePerson"
               placeholder="请输入发票费（个人）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
             <el-input
               v-model="dataList.invoiceFeeCompany"
               placeholder="请输入发票费（企业）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
-          </el-form-item>
           <div class="small-title"></div>
         </el-form>
       </div>
@@ -268,6 +277,7 @@
             <el-input
               v-model="dataList.mildewGrain"
               placeholder="请输入霉变粒占比"
+              class="typeselect"
             />
           </el-form-item>
           <el-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
@@ -275,6 +285,7 @@
               v-model="dataList.imperfectGrain"
               maxlength="120"
               placeholder="请输入不完善粒占比"
+              class="typeselect"
             />
           </el-form-item>
           <el-form-item label="蛋白（%）>=" span="1" prop="protein">
@@ -323,6 +334,7 @@
               placeholder="请选择产地"
               @change="handleChange1"
               style="width: 200%"
+              class="typeselect"
             />
           </ws-form-item>
           <el-form-item label="产出年份" span="1" prop="outputYear">
@@ -334,6 +346,7 @@
               value-format='yyyy'
               range-separator="至"
               placeholder="产出年份"
+              class="typeselect"
             ></el-date-picker>
           </el-form-item>
         </el-form>
@@ -1176,7 +1189,7 @@ export default {
   text-align: left;
 }
 /deep/.el-input--small {
-  font-size: 13px;
+  font-size: 14px;
   position: relative;
   display: inline-block;
 }
@@ -1274,7 +1287,7 @@ export default {
   align-items: center;
   text-align: left;
   overflow: hidden;
-  font-size: 12px;
+  font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #232323;

src/views/salesManagement/salesPlanEdit.vue

@@ -26,7 +26,7 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 标题 -->
           <ws-form-item label="标题" span="1" prop="title">
-            <el-input v-model="dataList.title" maxlength="16" placeholder="标题须包含企业简称，不超过16个字" />
+            <el-input v-model="dataList.title" maxlength="16" class="typeselect" placeholder="标题须包含企业简称，不超过16个字" />
           </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
@@ -55,7 +55,7 @@
           </ws-form-item>
           <!-- 最小成交量 -->
           <ws-form-item label="最小成交量（吨）" span="1" prop="minimumVolume">
-            <el-input v-model="dataList.minimumVolume" placeholder="请输入最小成交量" />
+            <el-input v-model="dataList.minimumVolume" class="typeselect" placeholder="请输入最小成交量" />
           </ws-form-item>
           <!--类型-->
           <ws-form-item label="类型" span="1" prop="salePlanType">
@@ -76,7 +76,7 @@
           </ws-form-item>
           <!-- 价格类型 -->
           <ws-form-item label="价格类型" span="1" prop="priceType">
-            <el-input v-model="dataList.priceType" disabled />
+            <el-input v-model="dataList.priceType" class="typeselect" disabled />
           </ws-form-item>
           <!-- 基差 -->
           <ws-form-item
@@ -85,7 +85,7 @@
             span="1"
             prop="basisPrice"
           >
-            <el-input v-model="dataList.basisPrice" placeholder="请输入基差" />
+            <el-input v-model="dataList.basisPrice" class="typeselect" placeholder="请输入基差" />
           </ws-form-item>
           <!--销售价格（元）-->
           <ws-form-item
@@ -98,6 +98,7 @@
               v-model="dataList.salePrice"
               maxlength="120"
               size="small"
+              class="typeselect"
               placeholder="请输入销售价格"
             />
           </ws-form-item>
@@ -108,7 +109,7 @@
               v-model="dataList.sendWarehouse"
               maxlength="120"
               size="small"
-              
+              class="typeselect"
             />
             <el-option
               v-for="item in warehouseList1"
@@ -124,6 +125,7 @@
               v-model="selectedOptions"
               clearable
               size="large"
+              class="typeselect"
               placeholder="请选择出货库所在地区"
               @change="handleChange"
               style="width:200%"
@@ -166,12 +168,13 @@
             <el-input
               v-model="dataList.baggingNotes"
               size="small"
+              class="typeselect"
               placeholder="请输入装袋要求如：98斤，王中王彩袋"
             />
           </el-form-item>
           <!-- 卖方 -->
           <ws-form-item label="卖方" span="1" prop="seller">
-            <el-input v-model="dataList.seller" maxlength="120" size="small" placeholder="请输入卖方名称" />
+            <el-input v-model="dataList.seller" maxlength="120" size="small" class="typeselect" placeholder="请输入卖方名称" />
           </ws-form-item>
           <!-- 卖方电话 -->
           <el-form-item label="卖方电话" span="1" prop="sellerPhone">
@@ -179,6 +182,7 @@
               v-model="dataList.sellerPhone"
               filterable
               :filter-method="dataFilter"
+              class="typeselect"
               placeholder="请输入卖方电话"
             ></el-input>
           </el-form-item>
@@ -186,12 +190,14 @@
             <el-input
               v-model="dataList.invoiceFeePerson"
               placeholder="请输入发票费（个人）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <el-form-item label="发票费（企业）" span="1" prop="invoiceFeeCompany" >
             <el-input
               v-model="dataList.invoiceFeeCompany"
               placeholder="请输入发票费（企业）"
+              class="typeselect"
             ></el-input>
           </el-form-item>
           <div class="small-title"></div>
@@ -220,11 +226,11 @@
           </el-form-item>
           <!-- 霉变粒 -->
           <el-form-item label="霉变粒（%）<=" span="1" prop="mildewGrain">
-            <el-input v-model="dataList.mildewGrain" placeholder="请输入霉变粒占比" />
+            <el-input v-model="dataList.mildewGrain" class="typeselect" placeholder="请输入霉变粒占比" />
           </el-form-item>
           <!--不完善粒（%）<=-->
           <el-form-item label="不完善粒（%）<=" span="1" prop="imperfectGrain">
-            <el-input v-model="dataList.imperfectGrain" maxlength="120" placeholder="请输入不完善粒占比" />
+            <el-input v-model="dataList.imperfectGrain" class="typeselect" maxlength="120" placeholder="请输入不完善粒占比" />
           </el-form-item>
           <!-- 蛋白（%）<= -->
           <el-form-item label="蛋白（%）>=" span="1" prop="protein">
@@ -269,6 +275,7 @@
               v-model="selectedOptions1"
               clearable
               size="large"
+              class="typeselect"
               placeholder="请选择产地"
               @change="handleChange1"
               style="width:200%"
@@ -285,6 +292,7 @@
               value-format='yyyy'
               range-separator="至"
               placeholder="产出年份"
+              class="typeselect"
             ></el-date-picker>
           </el-form-item>
         </el-form>
@@ -1079,7 +1087,7 @@ export default {
   text-align: left;
 }
 /deep/.el-input--small {
-  font-size: 13px;
+  font-size: 14px;
   position: relative;
   display: inline-block;
 }