modify

Elements-SY
Commit 7ea9f4639bdecad8f514d8cd362ffb8d0afe4a36 7ea9f463 1 parent 212490d5
Showing 4 changed files with 58 additions and 58 deletions
src/views/allocationConfig/cargoAllocation/index.vue
src/views/basicInformation/queryCargo/index.vue
src/views/preMdeConfig/reportForm/index.vue
src/views/systemConfig/superAllocation/index.vue
--- a/src/views/allocationConfig/cargoAllocation/index.vue
View file @7ea9f46
+++ b/src/views/allocationConfig/cargoAllocation/index.vue
View file @7ea9f46
@@ -3,20 +3,20 @@
     <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small"
       @submit.native.prevent>
       <el-row type="flex" style="flexWrap: wrap !important">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="ACCS原航班日期">
             <el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期"
               end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable>
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="ACCS原航班号">
             <el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable @change="fltNoChange">
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="海关回执状态">
             <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
               <el-option v-for="item in selectData.findConditionData
@@ -26,7 +26,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="货物状态">
             <el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable>
               <el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName"
@@ -35,7 +35,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="ACCSpool">
             <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
               <el-option value="Pre-MDE" key="Pre-MDE">
@@ -47,7 +47,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="申报类别">
             <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
               <el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName"
@@ -56,7 +56,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="服务类型">
             <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable>
               <el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName"
@@ -66,7 +66,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="重量区间">
             <el-row>
               <el-col :span="10">
@@ -82,7 +82,7 @@
             </el-row>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="件数区间">
             <el-row>
               <el-col :span="10">
@@ -98,26 +98,26 @@
             </el-row>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="取件日期">
             <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
               :value-format="valueFormat" clearable>
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="URSA">
             <el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable>
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="始发站">
             <el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable>
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item>
             <template slot="label">
               <div style="display:inline-block">ACCS航线
@@ -134,9 +134,9 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="运单号">
-            <el-input class="formItem" type="textarea" :rows="1" placeholder="例: xxx;xxx;" :maxlength="12000"
+            <el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号（回车分割）" :maxlength="12000"
               v-model="formData.waybillNo" clearable></el-input>
           </el-form-item>
         </el-col>
--- a/src/views/basicInformation/queryCargo/index.vue
View file @7ea9f46
+++ b/src/views/basicInformation/queryCargo/index.vue
View file @7ea9f46
@@ -2,38 +2,14 @@
   <div class="cargoPage">
     <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData">
       <el-row type="flex" style="flexWrap: wrap !important">
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="配舱航班日期">
             <el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至"
               start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
-          <el-form-item label="运单号">
-            <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
-              placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="配载航班号">
-            <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
-              clearable @change="planeNoChange"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="URSA">
-            <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" clearable>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="始发站">
-            <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="海关回执状态">
             <el-select v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple clearable
               placeholder="不限">
@@ -44,7 +20,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="申报类别">
             <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
               <el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id"
@@ -53,7 +29,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="服务类型">
             <el-select v-model="formData.serviceTypeId" class="formItem" filterable multiple clearable placeholder="不限">
               <el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
@@ -63,35 +39,59 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="运单号">
+            <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
+              placeholder="请输入运单号（回车间隔）" :rows="4" :maxlength="12000" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="配载航班号">
+            <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="4"
+              clearable @change="planeNoChange"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="URSA">
+            <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="4" clearable>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="始发站">
+            <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="4" clearable>
+            </el-input>
+          </el-form-item>
+        </el-col>
         <el-col v-show="formShow">
           <el-row type="flex" style="flexWrap: wrap !important">
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="ACCS原航班日期">
                 <el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至"
                   start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="ACCS原航班号">
                 <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="取件日期">
                 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
                   :value-format="valueFormat" clearable>
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="创建日期">
                 <el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至"
                   start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="ACCSpool">
                 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
                   <el-option value="Pre-MDE" key="Pre-MDE">
@@ -103,7 +103,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="货物状态">
                 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable>
                   <el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id"
@@ -112,7 +112,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="是否自动">
                 <el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
                   <el-option label="手动" value="1"> </el-option>
@@ -120,7 +120,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="配舱状态">
                 <el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable>
                   <el-option label="已配" value="1"> </el-option>
@@ -128,7 +128,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item>
                 <template slot="label">
                   <div style="display:inline-block">配载航线
@@ -145,7 +145,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="预审状态">
                 <el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple>
                   <el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item"
@@ -153,10 +153,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="发件人账号">
                 <el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem"
-                  placeholder="请输入发件人账号（;间隔）" :rows="1" :maxlength="12000" clearable></el-input>
+                  placeholder="请输入发件人账号（;间隔）" :rows="4" :maxlength="12000" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-row>
--- a/src/views/preMdeConfig/reportForm/index.vue
View file @7ea9f46
+++ b/src/views/preMdeConfig/reportForm/index.vue
View file @7ea9f46
@@ -3,7 +3,7 @@
         <el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto"
             size="small">
             <el-row>
-                <el-col :span="6">
+                <el-col :span="5">
                     <el-form-item label="取件日期">
                         <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
                             value-format="yyyy-MM-dd" clearable>
--- a/src/views/systemConfig/superAllocation/index.vue
View file @7ea9f46
+++ b/src/views/systemConfig/superAllocation/index.vue
View file @7ea9f46
@@ -3,10 +3,10 @@
         <el-form class="form-header" ref="dictForm" label-width="auto" label-position="left" style="margin-bottom:10px"
             @submit.native.prevent size="small">
             <el-row>
-                <el-col :span="8">
+                <el-col :span="6">
                     <el-form-item label="发件人账号">
                         <el-input type="textarea" v-model="selectionData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割"
-                            maxlength="3000" rows="1" />
+                            maxlength="3000" rows="4" />
                     </el-form-item>
                 </el-col>
             </el-row>