Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/kaihe/basicdata/container/index.vue

@@ -2,18 +2,15 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
-        <el-col :span="8">
           <el-form-item label="编号" prop="fNo">
-            <el-input style="width: 250px" v-model="queryParams.fNo" placeholder="请输入编号" clearable size="small">
+            <el-input style="width: 200px" v-model="queryParams.fNo" placeholder="请输入编号" clearable size="small">
             </el-input>
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="名称" prop="fName">
             <el-input
               v-model="queryParams.fName"
-              style="width: 250px"
+              style="width: 200px"
               placeholder="请输入名称"
               clearable
               size="small"
@@ -21,12 +18,10 @@
             />
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="状态" prop="fStatus">
             <el-select
               v-model="queryParams.fStatus"
-              style="width: 250px"
+              style="width: 200px"
               placeholder="请选择状态"
               clearable
               size="small"
@@ -36,32 +31,29 @@
               <el-option label="停用" value="F"/>
             </el-select>
           </el-form-item>
-        </el-col>
+        <el-form-item label="箱种类" prop="fType">
+          <el-select
+            v-model="queryParams.fType"
+            style="width: 200px"
+            placeholder="请选择箱种类"
+            clearable
+            size="small"
+            filterable
+            @keyup.enter.native="handleQuery"
+          >
+            <el-option
+              v-for="dict in containerOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
       </el-row>
       <div v-show="queryParamsHidden">
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="箱种类" prop="fType">
-              <el-select
-                v-model="queryParams.fType"
-                style="width: 250px"
-                placeholder="请选择箱种类"
-                clearable
-                size="small"
-                filterable
-                @keyup.enter.native="handleQuery"
-              >
-                <el-option
-                  v-for="dict in containerOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
 
-            </el-form-item>
 
-          </el-col>
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="中文名" prop="fName">-->
 <!--              <el-input-->
@@ -75,25 +67,21 @@
 <!--            </el-form-item>-->
 
 <!--          </el-col>-->
-          <el-col :span="8">
+
             <el-form-item label="UNCODE">
               <el-input
                 v-model="queryParams.fUncode"
-                style="width: 250px"
+                style="width: 200px"
                 clearable
                 size="small"
                 placeholder="请输入UNCODE"
               />
             </el-form-item>
 
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
             <el-form-item label="录入人" prop="createBy">
               <el-input
                 v-model="queryParams.createBy"
-                style="width: 250px"
+                style="width: 200px"
                 placeholder="请输入录入人"
                 clearable
                 size="small"
@@ -101,8 +89,15 @@
               />
             </el-form-item>
 
-          </el-col>
-          <el-col :span="8">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              style="width: 200px"
+              type="textarea"
+              clearable
+              size="small"
+              v-model="queryParams.remark"
+            />
+          </el-form-item>
             <el-form-item label="录入区间" prop="cLoadDate">
               <el-date-picker
                 v-model="queryParams.cLoadDate"
@@ -116,18 +111,7 @@
               </el-date-picker>
             </el-form-item>
 
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="备注" prop="remark">
-              <el-input
-                style="width: 250px"
-                clearable
-                size="small"
-                v-model="queryParams.remark"
-              />
-            </el-form-item>
 
-          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -199,15 +183,15 @@
 
     <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" width="55" label="行号" align="center" />
-      <el-table-column :show-overflow-tooltip="true" label="编号" align="center" prop="fNo" width="100px"/>
-      <el-table-column label="名称" align="center" prop="fName" width="100px"/>
+      <el-table-column type="index" width="55" label="行号" align="center" fixed/>
+      <el-table-column :show-overflow-tooltip="true" label="编号" align="center" prop="fNo" width="100px" fixed/>
+      <el-table-column label="名称" align="center" prop="fName" width="100px" fixed/>
 
-      <el-table-column :show-overflow-tooltip="true" label="箱类型" align="center" prop="typeName" width="100px"/>
+      <el-table-column :show-overflow-tooltip="true" label="箱类型" align="center" prop="typeName" width="100px" fixed/>
 
 
-      <el-table-column :show-overflow-tooltip="true" label="英文名" align="center" width="100px" prop="fEname" />
-      <el-table-column :show-overflow-tooltip="true" label="UNCODE" align="center" prop="fUncode" />
+      <el-table-column :show-overflow-tooltip="true" label="英文名" align="center" width="100px" prop="fEname" fixed/>
+      <el-table-column :show-overflow-tooltip="true" label="UNCODE" align="center" prop="fUncode" fixed/>
       <el-table-column :show-overflow-tooltip="true" label="TEU" align="center" prop="fTeu" />
 
       <el-table-column label="箱容量（立方）" align="center" prop="fCbm" />
@@ -226,7 +210,7 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/kaihe/basicdata/portinformation/index.vue

@@ -4,7 +4,7 @@
       <el-row>
           <el-form-item label="港口名称" prop="fName">
             <el-select
-              style="width: 240px"
+              style="width: 200px"
               v-model="queryParams.fName"
               placeholder="请选择港口名称"
               clearable size="small"
@@ -21,7 +21,7 @@
           <el-form-item label="航线" prop="portName">
             <el-select
               v-model="queryParams.portName"
-              style="width: 240px"
+              style="width: 200px"
               placeholder="请选择航线"
               clearable
               filterable
@@ -40,7 +40,7 @@
           <el-form-item label="UNCODE" prop="fUncode">
             <el-input
               v-model="queryParams.fUncode"
-              style="width: 240px"
+              style="width: 200px"
               placeholder="请输入UNCODE"
               clearable
               size="small"
@@ -48,13 +48,25 @@
             >
             </el-input>
           </el-form-item>
+        <el-form-item label="状态" prop="fStatus">
+          <el-select
+            v-model="queryParams.fStatus"
+            placeholder="请选择状态"
+            clearable
+            size="small"
+            style="width: 200px"
+          >
+            <el-option label="正常" value="T"/>
+            <el-option label="停用" value="F"/>
+          </el-select>
+        </el-form-item>
       </el-row>
       <div v-show="queryParamsHidden">
         <el-row>
           <el-form-item label="国家" prop="fCountry">
             <el-input
               v-model="queryParams.fCountry"
-              style="width: 240px"
+              style="width: 200px"
               placeholder="请输入国家"
               clearable
               size="small"
@@ -68,7 +80,7 @@
               placeholder="请输入省"
               clearable
               size="small"
-              style="width: 240px"
+              style="width: 200px"
             >
             </el-input>
           </el-form-item>
@@ -78,34 +90,24 @@
               placeholder="请输入市"
               clearable
               size="small"
-              style="width: 240px"
+              style="width: 200px"
             >
             </el-input>
           </el-form-item>
-          <el-form-item label="状态" prop="fStatus">
-            <el-select
-              v-model="queryParams.fStatus"
-              placeholder="请选择状态"
-              clearable
-              size="small"
-              style="width: 240px"
-            >
-              <el-option label="正常" value="T"/>
-              <el-option label="停用" value="F"/>
-            </el-select>
-          </el-form-item>
-        </el-row>
-        <el-row>
+
           <el-form-item label="录入人" prop="createBy">
             <el-input
               v-model="queryParams.createBy"
               placeholder="请输入录入人"
               clearable
               size="small"
-              style="width: 240px"
+              style="width: 200px"
             >
             </el-input>
           </el-form-item>
+        </el-row>
+        <el-row>
+
           <el-form-item label="录入区间" prop="cLoadDate">
             <el-date-picker
               v-model="queryParams.cLoadDate"
@@ -199,14 +201,14 @@
 
     <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" width="55" label="行号" align="center" />
-      <el-table-column :show-overflow-tooltip="true" label="港口类型" align="center" prop="havenName" width="200px"/>
-      <el-table-column label="港口编号" align="center" prop="fNo" width="100px"/>
+      <el-table-column type="index" width="55" label="行号" align="center" fixed/>
+      <el-table-column :show-overflow-tooltip="true" label="港口类型" align="center" prop="havenName" width="200px" fixed/>
+      <el-table-column label="港口编号" align="center" prop="fNo" width="100px" fixed/>
 <!--      <el-table-column :show-overflow-tooltip="true" label="港口简称" align="center" prop="fName" width="100px"-->
 <!--      />-->
-      <el-table-column :show-overflow-tooltip="true" label="中文全称" align="center" width="100px" prop="fName" />
-      <el-table-column :show-overflow-tooltip="true" label="英文全称" align="center" prop="fEname" />
-      <el-table-column :show-overflow-tooltip="true" label="航线" align="center" prop="fLaneid" />
+      <el-table-column :show-overflow-tooltip="true" label="中文全称" align="center" width="100px" prop="fName" fixed/>
+      <el-table-column :show-overflow-tooltip="true" label="英文全称" align="center" prop="fEname" fixed/>
+      <el-table-column :show-overflow-tooltip="true" label="航线" align="center" prop="fLaneid" fixed/>
 
       <el-table-column label="UNCODE" align="center" prop="fUncode" />
       <el-table-column label="国家" align="center" prop="fCountry" />
@@ -226,7 +228,7 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/kaihe/basicdata/route/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
-        <el-col :span="8">
+
           <el-form-item label="航线名称" prop="fName">
             <el-select
-              style="width: 250px"
+              style="width: 200px"
               v-model="queryParams.fName"
               placeholder="请选择航线名称"
               clearable size="small"
@@ -21,12 +21,10 @@
             </el-select>
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="管理员" prop="fManagerid">
             <el-input
               v-model="queryParams.fManagerid"
-              style="width: 250px"
+              style="width: 200px"
               placeholder="请输入管理员"
               clearable
               size="small"
@@ -34,12 +32,10 @@
             />
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="状态" prop="fStatus">
             <el-select
               v-model="queryParams.fStatus"
-              style="width: 250px"
+              style="width: 200px"
               placeholder="请选择状态"
               clearable
               size="small"
@@ -49,15 +45,26 @@
               <el-option label="停用" value="F"/>
             </el-select>
           </el-form-item>
-        </el-col>
+        <el-form-item label="录入区间" prop="cLoadDate">
+          <el-date-picker
+            v-model="queryParams.cLoadDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: 250px"
+          >
+          </el-date-picker>
+        </el-form-item>
       </el-row>
       <div  v-show="queryParamsHidden">
         <el-row>
-          <el-col :span="8">
+
             <el-form-item label="录入人" prop="createBy">
               <el-input
                 v-model="queryParams.createBy"
-                style="width: 250px"
+                style="width: 200px"
                 placeholder="请输入电话"
                 clearable
                 size="small"
@@ -65,21 +72,6 @@
               />
             </el-form-item>
 
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="录入区间" prop="cLoadDate">
-              <el-date-picker
-                v-model="queryParams.cLoadDate"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 250px"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -173,7 +165,7 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="120px">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/kaihe/basicdata/wharf/index.vue

@@ -2,10 +2,9 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
-        <el-col :span="8">
           <el-form-item label="港口名称" prop="fPort">
             <el-select
-              style="width: 250px"
+              style="width: 200px"
               v-model="queryParams.fPort"
               placeholder="请选择港口名称"
               clearable
@@ -22,12 +21,10 @@
             </el-select>
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="码头" prop="fName">
             <el-select
               v-model="queryParams.fName"
-              style="width: 250px"
+              style="width: 200px"
               placeholder="请选择码头"
               clearable
               size="small"
@@ -42,12 +39,10 @@
             </el-select>
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="状态" prop="fStatus">
             <el-select
               v-model="queryParams.fStatus"
-              style="width: 250px"
+              style="width: 200px"
               placeholder="请选择状态"
               clearable
               size="small"
@@ -57,16 +52,25 @@
               <el-option label="停用" value="F"/>
             </el-select>
           </el-form-item>
-        </el-col>
-
+        <el-form-item label="录入区间" prop="fBsdate">
+          <el-date-picker
+            v-model="queryParams.cLoadDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: 250px"
+          >
+          </el-date-picker>
+        </el-form-item>
       </el-row>
       <div v-show="queryParamsHidden">
         <el-row>
-          <el-col :span="8">
             <el-form-item label="录入人" prop="createBy">
               <el-input
                 v-model="queryParams.createBy"
-                style="width: 250px"
+                style="width: 200px"
                 placeholder="请输入录入人"
                 clearable
                 size="small"
@@ -74,33 +78,16 @@
               />
             </el-form-item>
 
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="录入区间" prop="fBsdate">
-              <el-date-picker
-                v-model="queryParams.cLoadDate"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 250px"
-              >
-              </el-date-picker>
-            </el-form-item>
-
-          </el-col>
-          <el-col :span="8">
             <el-form-item label="备注">
               <el-input
                 v-model="queryParams.remark"
-                style="width: 250px"
+                style="width: 200px"
                 clearable
+                type="textarea"
                 size="small"
               />
             </el-form-item>
 
-          </el-col>
         </el-row>
 
       </div>
@@ -194,7 +181,7 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" align="center" width="120px" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/kaihe/basicdata/yard/index.vue

@@ -2,10 +2,9 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
-        <el-col :span="8">
           <el-form-item label="港口名称" prop="portName">
             <el-select
-              style="width: 250px"
+              style="width: 200px"
               v-model="queryParams.portName"
               placeholder="请选择港口名称"
               clearable size="small"
@@ -21,12 +20,10 @@
             </el-select>
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="堆场" prop="fName">
             <el-select
               v-model="queryParams.fName"
-              style="width: 250px"
+              style="width: 200px"
               placeholder="请选择堆场"
               clearable
               size="small"
@@ -41,12 +38,10 @@
             </el-select>
           </el-form-item>
 
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="状态" prop="fStatus">
             <el-select
               v-model="queryParams.fStatus"
-              style="width: 250px"
+              style="width: 200px"
               placeholder="请选择状态"
               clearable
               size="small"
@@ -57,15 +52,25 @@
             </el-select>
           </el-form-item>
 
-        </el-col>
+        <el-form-item label="录入区间" prop="cLoadDate">
+          <el-date-picker
+            v-model="queryParams.cLoadDate"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: 250px"
+          >
+          </el-date-picker>
+        </el-form-item>
       </el-row>
       <div v-show="queryParamsHidden">
         <el-row>
-          <el-col :span="8">
             <el-form-item label="录入人" prop="createBy">
               <el-input
                 v-model="queryParams.createBy"
-                style="width: 250px"
+                style="width: 200px"
                 placeholder="请输入录入人"
                 clearable
                 size="small"
@@ -73,33 +78,16 @@
               />
             </el-form-item>
 
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="录入区间" prop="cLoadDate">
-              <el-date-picker
-                v-model="queryParams.cLoadDate"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 250px"
-              >
-              </el-date-picker>
-            </el-form-item>
-
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="备注">
-              <el-input
-                v-model="queryParams.remark"
-                style="width: 250px"
-                clearable
-                size="small"
-              />
-            </el-form-item>
+          <el-form-item label="备注">
+            <el-input
+              v-model="queryParams.remark"
+              type="textarea"
+              style="width: 200px"
+              clearable
+              size="small"
+            />
+          </el-form-item>
 
-          </el-col>
         </el-row>
       </div>
     </el-form>
@@ -192,7 +180,7 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="120px">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/kaihe/containerNews/boxDistribution/index.vue

@@ -7,7 +7,7 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="箱号" prop="fNo">
+          <el-form-item label="箱型" prop="fNo">
             <el-input
               v-model="queryParams.fNo"
               style="width: 240px"

src/views/kaihe/containerNews/boxInformation/index.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
           <el-form-item label="箱号" prop="fNo">
-            <el-input style="width: 240px" v-model="queryParams.fNo" placeholder="请选择客户类别" clearable size="small">
+            <el-input style="width: 200px" v-model="queryParams.fNo" placeholder="请选择客户类别" clearable size="small">
 
             </el-input>
           </el-form-item>
@@ -11,7 +11,7 @@
           <el-form-item label="箱类型" prop="fTypeid">
             <el-select
               v-model="queryParams.fTypeid"
-              style="width: 240px"
+              style="width: 200px"
               placeholder="请输入名称"
               clearable
               size="small"
@@ -30,7 +30,7 @@
           <el-form-item label="箱状态" prop="fCntrstatus">
             <el-select
               v-model="queryParams.fCntrstatus"
-              style="width: 240px"
+              style="width: 200px"
               placeholder="请输入或选择"
               clearable
               size="small"
@@ -48,7 +48,7 @@
           <el-form-item label="箱主" prop="fOwner">
             <el-select
               v-model="queryParams.fOwner"
-              style="width: 240px"
+              style="width: 200px"
               placeholder="请输入或选择"
               clearable
               size="small"
@@ -69,7 +69,7 @@
             <el-form-item label="录入人" prop="createBy">
               <el-input
                 v-model="queryParams.createBy"
-                style="width: 240px"
+                style="width: 200px"
                 placeholder="请输入电话"
                 clearable
                 size="small"
@@ -77,30 +77,28 @@
               />
             </el-form-item>
 
-
-            <el-form-item label="录入区间" prop="cLoadDate">
-              <el-date-picker
-                v-model="queryParams.cLoadDate"
-                type="daterange"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="width: 250px"
-              >
-              </el-date-picker>
-            </el-form-item>
-
-
           <el-form-item label="备注" prop="remark">
             <el-input
-              style="width: 250px"
+              style="width: 200px"
+              type="textarea"
               clearable
               size="small"
               v-model="queryParams.remark"
             />
           </el-form-item>
 
+          <el-form-item label="录入区间" prop="cLoadDate">
+            <el-date-picker
+              v-model="queryParams.cLoadDate"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 250px"
+            >
+            </el-date-picker>
+          </el-form-item>
         </el-row>
       </div>
     </el-form>
@@ -165,30 +163,30 @@
     </el-row>
 
     <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" width="55" label="行号" align="center" />
-      <el-table-column :show-overflow-tooltip="true" label="箱号" align="center" prop="fNo" width="100px"/>
-      <el-table-column label="地点" align="center" prop="fUpdateaddress" width="100px"/>
-      <el-table-column label="箱类型" align="center" prop="typeidName" width="100px"/>
-      <el-table-column label="箱状态" align="center" prop="cntrstatusName" width="100px"/>
-      <el-table-column label="空重" align="center" prop="updateEFName" width="100px"/>
-      <el-table-column :show-overflow-tooltip="true" label="箱主" align="center" prop="ownerName" width="100px"/>
-      <el-table-column :show-overflow-tooltip="true" label="箱来源" align="center" width="100px" prop="sourceName" />
+      <el-table-column type="selection"  align="center" />
+      <el-table-column type="index"  label="行号" align="center" fixed/>
+      <el-table-column label="箱号" sortable fixed align="center" prop="fNo" fixed width="100px"/>
+      <el-table-column label="地点" align="center"  sortable  prop="fUpdateaddress" fixed/>
+      <el-table-column label="箱类型" align="center" sortable  prop="typeidName" fixed width="100px"/>
+      <el-table-column label="箱状态" align="center" sortable  prop="cntrstatusName" fixed width="100px"/>
+      <el-table-column label="空重" align="center" sortable  prop="updateEFName" fixed/>
+      <el-table-column :show-overflow-tooltip="true" label="箱主" align="center" prop="ownerName" />
+      <el-table-column :show-overflow-tooltip="true" label="箱来源" align="center"  prop="sourceName" />
       <el-table-column :show-overflow-tooltip="true" label="租赁方式" align="center" prop="rentName" />
       <el-table-column :show-overflow-tooltip="true" label="备注" align="center" prop="remark" />
       <el-table-column label="录入人" align="center" prop="createBy" />
-      <el-table-column label="录入时间" align="center" prop="createTime" width="100">
+      <el-table-column label="录入时间" align="center" prop="createTime" width="100px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="最新修改人" align="center" prop="updateBy" width="100px"/>
-      <el-table-column label="最新修改时间" align="center" prop="updateTime" width="100">
+      <el-table-column label="最新修改时间" align="center" prop="updateTime" width="120px">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+      <el-table-column label="操作" align="center" min-width="120px" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -728,4 +726,5 @@
 .el-icon-full-screen:before {
   content: "\e719";
 }
+
 </style>

src/views/kaihe/containerNews/modifyPage/index.vue

@@ -142,6 +142,7 @@
           this.loading = false;
         })
       }
+
     },
     created() {
       this.getDicts("f_updateEF").then(response => {
@@ -196,6 +197,7 @@
           this.$router.push({
             path: "/containerNews/boxDistribution",
           });
+
         })
       },
       //地点带入