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

src/views/fleet/plans/index.vue

@@ -316,6 +316,18 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
+        label="提单号"
+        width="100"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        fixed="left"
+      >
+        <template slot-scope="scope">
+          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
         :label="item.name"
@@ -485,14 +497,6 @@ export default {
           width: 100,
         },
         {
-          surface: "7",
-          label: "mblno",
-          name: "提单号",
-          checked: 0,
-          width: 100,
-          fixed: "left",
-        },
-        {
           surface: "8",
           label: "qtyPlan",
           name: "计划件数",

src/views/fleet/scheduling/index.vue

@@ -299,6 +299,18 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
+        label="提单号"
+        width="100"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        fixed="left"
+      >
+        <template slot-scope="scope">
+          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
         :label="item.name"
@@ -420,7 +432,7 @@ export default {
       showSetting: false,
       drag: false,
       setRowList: [],
-      getRowList:[],
+      getRowList: [],
       tableDate: [
         {
           surface: "1",
@@ -465,14 +477,6 @@ export default {
           width: 100,
         },
         {
-          surface: "7",
-          label: "mblno",
-          name: "提单号",
-          checked: 0,
-          width: 100,
-          fixed: "left",
-        },
-        {
           surface: "8",
           label: "qtyPlan",
           name: "计划件数",

src/views/fleet/sendcar/index.vue

@@ -309,6 +309,18 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
+        label="提单号"
+        width="100"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        fixed="left"
+      >
+        <template slot-scope="scope">
+          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
         :label="item.name"
@@ -435,9 +447,9 @@ export default {
       transPropList: [],
       showSetting: false,
       drag: false,
-      setRowList:[],
-      getRowList:[],
-      tableDate:[
+      setRowList: [],
+      getRowList: [],
+      tableDate: [
         {
           surface: "1",
           label: "corpId",
@@ -481,14 +493,6 @@ export default {
           width: 100,
         },
         {
-          surface: "7",
-          label: "mblno",
-          name: "提单号",
-          checked: 0,
-          width: 100,
-          fixed: "left",
-        },
-        {
           surface: "8",
           label: "qtyPlan",
           name: "计划件数",

src/views/index.vue

@@ -439,6 +439,7 @@
               :style="{
                 backgroundColor: index % 2 == 0 ? '#fafbfd' : '#FFFFFF',
               }"
+              @click="jump('/track/cabinet')"
             >
               <div style="width: 30%">{{ item.mblno }}</div>
               <div style="width: 20%">{{ item.carregNo }}</div>

src/views/track/cabinet/AddOrUpdate.vue

@@ -341,9 +341,32 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="箱号" prop="cntrName">
+              <el-input
+                v-model="form.cntrName"
+                placeholder="请输入箱号"
+                :disabled="true"
+                size="mini"
+                style="width: 180px"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
+            <el-form-item label="运单号" prop="orderNo">
+              <el-input
+                v-model="form.orderNo"
+                placeholder="请输入运单号"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="起始里程" prop="odometerFrom">
               <el-input
                 v-model="form.odometerFrom"
@@ -382,6 +405,9 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="6">
             <el-form-item label="提箱时间" prop="loadDate">
               <el-date-picker
@@ -397,9 +423,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="6">
             <el-form-item label="装卸货时间" prop="mdLoadDate">
               <el-date-picker
@@ -445,17 +468,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="备注" prop="acceptRemarks">
-              <el-input
-                v-model="form.acceptRemarks"
-                placeholder="请输入备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
         </el-row>
 
         <el-row>
@@ -605,6 +617,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col>
+            <el-form-item label="备注" prop="acceptRemarks">
+              <el-input
+                v-model="form.acceptRemarks"
+                placeholder="请输入备注"
+                size="mini"
+                :disabled="disabled"
+                type="textarea"
+                :rows="2"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <el-collapse v-model="collapses">
         <!-- <el-collapse-item v-if="userType == '00'">

src/views/track/cabinet/index.vue

@@ -162,7 +162,7 @@
                   style="max-width: 187px"
                 /> </el-form-item
             ></el-col>
-            <el-col :span="6">
+            <!-- <el-col :span="6">
               <el-form-item
                 label-width="100px"
                 label="提箱时间"
@@ -181,7 +181,7 @@
                 >
                 </el-date-picker>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </div>
       </el-collapse-transition>
@@ -382,6 +382,18 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
+        label="提单号"
+        width="100"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        fixed="left"
+      >
+        <template slot-scope="scope">
+          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
         :label="item.name"
@@ -530,7 +542,7 @@ export default {
         loadAddr: null,
         mdLoadAddr: null,
         unLoadAddr: null,
-        pickerDate:null,
+        pickerDate: null,
       },
       showSetting: false,
       drag: false,
@@ -580,14 +592,6 @@ export default {
           width: 100,
         },
         {
-          surface: "7",
-          label: "mblno",
-          name: "提单号",
-          checked: 0,
-          width: 100,
-          fixed: "left",
-        },
-        {
           surface: "8",
           label: "cntrQty",
           name: "柜量",

src/views/track/singleCost/AddOrUpdate.vue

@@ -502,7 +502,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fFeeid" label="费用名称">
+        <el-table-column prop="fFeeid" label="费用名称" align="center" width="120">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fFeeid"
@@ -520,7 +520,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fDc" label="收付">
+        <el-table-column prop="fDc" label="收付" align="center"  width="100">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fDc"
@@ -532,7 +532,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fFeeunitid" label="计费单位">
+        <el-table-column prop="fFeeunitid" label="计费单位" align="center" width="100">
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fFeeunitid"
@@ -549,7 +549,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="fBillingQty" label="计费数量">
+        <el-table-column prop="fBillingQty" label="计费数量" align="center" width="100">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fBillingQty"
@@ -560,7 +560,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="fUnitprice" label="单价">
+        <el-table-column prop="fUnitprice" label="单价" align="center" width="100">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fUnitprice"
@@ -571,7 +571,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="fCurrency" label="币种">
+        <el-table-column prop="fCurrency" label="币种" align="center" width="100">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fCurrency"
@@ -580,7 +580,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="fExrate" label="汇率">
+        <el-table-column prop="fExrate" label="汇率" align="center" width="100">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fExrate"
@@ -589,7 +589,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="fAmount" label="金额">
+        <el-table-column prop="fAmount" label="金额" align="center" width="100">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fAmount"
@@ -598,7 +598,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="fTaxrate" label="税率">
+        <el-table-column prop="fTaxrate" label="税率" align="center" width="100">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.fTaxrate"
@@ -607,7 +607,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="remarks" label="备注">
+        <el-table-column prop="remarks" label="备注" align="center" width="180">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.remarks"
@@ -616,7 +616,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="remarks" label="费用来源">
+        <el-table-column prop="remarks" label="费用来源" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.actId == 1030">接单</span>
             <span v-if="scope.row.actId == 1040">提箱</span>

src/views/track/singleCost/index.vue

@@ -309,6 +309,18 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
+        label="提单号"
+        width="100"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        fixed="left"
+      >
+        <template slot-scope="scope">
+          <div @click="handleUpdate(scope.row)">{{ scope.row.mblno }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
         :label="item.name"
@@ -422,7 +434,7 @@ export default {
       showSetting: false,
       drag: false,
       setRowList: [],
-      getRowList:[],
+      getRowList: [],
       tableDate: [
         {
           surface: "1",
@@ -467,14 +479,6 @@ export default {
           width: 100,
         },
         {
-          surface: "7",
-          label: "mblno",
-          name: "提单号",
-          checked: 0,
-          width: 100,
-          fixed: "left",
-        },
-        {
           surface: "8",
           label: "cntrQty",
           name: "柜量",