Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/landTransportation/bulkCargo.js

@@ -16,3 +16,85 @@ export function saveDelegationList(data) {
         data: data
     })
 }
+// 列表查询
+export function selectInvoiceList(data) {
+    return request({
+        url: '/api/blade-land/order/pageBulkLoad',
+        method: 'get',
+        params: data
+    })
+}
+
+// 单据查询
+export function detailDelegationList(data) {
+    return request({
+        url: '/api/blade-land/order/detailBulkLoad',
+        method: 'get',
+        params:data
+    })
+}
+// 列表单条删除
+export function removeDelegationList(data) {
+    return request({
+        url: '/api/blade-land/order/remove',
+        method: 'post',
+        params: data
+    })
+}
+//获取省市区
+export function addressList(name) {
+    return request({
+        url: '/api/blade-system/region/match?address='+name,
+        method: 'get'
+    })
+}
+//查询业务员
+export function getSalesman(data) {
+    return request({
+        url: '/api/blade-user/userList',
+        method: 'get',
+        params:{
+            roleAlias:'业务员',
+            ...data
+        }
+    })
+}
+//获取默认公司名称
+export function getCorp() {
+    return request({
+        url: '/api/blade-client/corpsattn/get-corp',
+        method: 'get'
+    })
+}
+//删除途径地
+export function tRemove(data) {
+    return request({
+        url: '/api/blade-land/order-address/removeBulkAddress',
+        method: 'post',
+        params:data
+    })
+}
+// 删除杂费明细
+export function removeCollection(data) {
+    return request({
+        url: '/api/blade-land/order-fee/remove?ids='+data,
+        method: 'post'
+    })
+}
+//获取附件
+export function getFee(data) {
+    return request({
+        url: '/api/blade-land/order-fee/file-list',
+        method: 'get',
+        params:data
+    })
+}
+
+//保存附件
+export function saveFile(data) {
+    return request({
+        url: '/api/blade-land/order-fee/file',
+        method: 'post',
+        data:data
+    })
+}

src/enums/column-name.js

@@ -312,6 +312,9 @@ const columnName = [{
   code: 85.6,
   name: '委托-附件'
 }, {
+  code: 85.7,
+  name: '散货-列表'
+}, {
   code: 86,
   name: '调度'
 }, {

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -208,8 +208,7 @@
           <template slot-scope="scope">
             <el-tooltip className="item" v-if="scope.$index === tableData.length-1" effect="dark" content="增加途径地址"
                         placement="top">
-              <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addAddress"
-                         style="margin-right: 1.25rem;"></el-button>
+              <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addAddress"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -336,6 +335,7 @@
     <basic-container>
       <el-table
           ref="singleTable"
+          border="1"
           :data="tableData"
           size="mini"
           :header-cell-style="{color:'#000',background:'#fafafa'}"
@@ -344,14 +344,15 @@
             align="center"
             fixed
             v-if="goodsForm.status === 0"
-            width="40">
-          <template slot-scope="scope">
-            <el-tooltip className="item" v-if="scope.$index === tableData.length-1" effect="dark" content="增加途径地址"
+            width="50">
+          <template slot-scope="scope" slot="header">
+            <el-tooltip className="item" effect="dark" content="增加途径地址"
                         placement="top">
-              <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addAddress"
-                         style="margin-right: 1.25rem;"></el-button>
+              <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addAddress"></el-button>
             </el-tooltip>
-            <el-tooltip v-else class="item" effect="dark" content="删除" placement="right">
+          </template>
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="删除" placement="right">
               <el-button type="danger" icon="el-icon-delete" size="mini" circle
                          @click="deleteAddress(scope)"></el-button>
             </el-tooltip>
@@ -381,7 +382,7 @@
           </template>
         </el-table-column>
         <el-table-column
-            property="freightPlaceId"
+            property="corpId"
             label="货运地点"
             align="center"
             :render-header="customTitle"
@@ -390,7 +391,7 @@
             <crop-select
                 :corpType="'GC'"
                 :disabled="goodsForm.status !== 0"
-                v-model="scope.row.freightPlaceId"
+                v-model="scope.row.corpId"
                 @clear="clear(scope.row)"
                 @getCorpData="(row)=>{withAddress(row,scope)}"/>
           </template>
@@ -441,8 +442,14 @@
             width="180"
             label="包装类型">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-select v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" placeholder="请选择">
+              <el-option
+                  v-for="item in packageType"
+                  :key="item.id"
+                  :label="item.dictValue"
+                  :value="item.dictKey">
+              </el-option>
+            </el-select>
           </template>
         </el-table-column>
         <el-table-column
@@ -468,6 +475,7 @@
         <el-table-column
             property="remarks"
             align="center"
+            width="200"
             label="备注">
           <template slot-scope="scope">
             <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
@@ -478,28 +486,46 @@
             align="center"
             width="40">
           <template slot-scope="scope">
-            <div v-if="scope.$index !== tableData.length-1" style="margin: -5px auto">
-              <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 1">
+            <div style="margin: -5px auto">
+              <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 0">
                 <div class="single" style="margin-bottom: -5px">
-                  <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-up" size="mini"
-                             @click="moveUp(scope.row,scope.$index)"></el-button>
+                  <el-button
+                      type="text"
+                      style="margin-right: -0.5rem"
+                      icon="el-icon-arrow-up"
+                      size="mini"
+                      @click="moveUp(scope.row,scope.$index)"></el-button>
                 </div>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="向下移动" placement="right"
-                          v-if="scope.$index > 0 && scope.$index < tableData.length-2">
+                          v-if="scope.$index < tableDataTwo.length-1">
                 <div class="single" style="margin-top: -5px">
-                  <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-down" size="mini"
-                             @click="moveDown(scope.row,scope.$index)"></el-button>
+                  <el-button
+                      type="text"
+                      style="margin-right: -0.5rem"
+                      icon="el-icon-arrow-down"
+                      size="mini"
+                      @click="moveDown(scope.row,scope.$index)"></el-button>
                 </div>
               </el-tooltip>
             </div>
           </template>
         </el-table-column>
+        <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="80">
+          <template slot-scope="{row, index}">
+            <el-button type="text" size="small" icon="el-icon-s-order" @click="annexOpen(row, index,true)">附 件</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </basic-container>
     <containerTitle title="卸货地址"></containerTitle>
     <basic-container>
       <el-table
+          border="1"
           ref="singleTable"
           :data="tableDataTwo"
           size="mini"
@@ -509,16 +535,30 @@
             align="center"
             fixed
             v-if="goodsForm.status === 0"
-            width="40">
-          <template slot-scope="scope">
-            <el-tooltip className="item" v-if="scope.$index === tableDataTwo.length-1" effect="dark" content="增加途径地址"
-                        placement="top">
-              <el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addAddressTwo"
-                         style="margin-right: 1.25rem;"></el-button>
+            width="50">
+          <template slot-scope="scope" slot="header">
+            <el-tooltip
+                className="item"
+                effect="dark"
+                content="增加途径地址"
+                placement="top">
+              <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  circle
+                  @click="addAddressTwo">
+              </el-button>
             </el-tooltip>
-            <el-tooltip v-else class="item" effect="dark" content="删除" placement="right">
-              <el-button type="danger" icon="el-icon-delete" size="mini" circle
-                         @click="deleteAddress(scope)"></el-button>
+          </template>
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" content="删除" placement="right">
+              <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  size="mini"
+                  circle
+                  @click="deleteAddressTwo(scope)"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -546,7 +586,7 @@
           </template>
         </el-table-column>
         <el-table-column
-            property="freightPlaceId"
+            property="corpId"
             label="货运地点"
             align="center"
             :render-header="customTitle"
@@ -555,7 +595,7 @@
             <crop-select
                 :corpType="'GC'"
                 :disabled="goodsForm.status !== 0"
-                v-model="scope.row.freightPlaceId"
+                v-model="scope.row.corpId"
                 @clear="clear(scope.row)"
                 @getCorpData="(row)=>{withAddressTwo(row,scope)}"/>
           </template>
@@ -566,8 +606,11 @@
             width="150"
             label="联系人">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.contacts" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-input
+                v-model="scope.row.contacts"
+                :disabled="goodsForm.status !== 0"
+                size="small"
+                placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -576,8 +619,11 @@
             width="180"
             label="电话">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tel" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-input
+                v-model="scope.row.tel"
+                :disabled="goodsForm.status !== 0"
+                size="small"
+                placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -586,8 +632,11 @@
             width="280"
             label="详细地址">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.address" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-input
+                v-model="scope.row.address"
+                :disabled="goodsForm.status !== 0"
+                size="small"
+                placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -596,8 +645,11 @@
             width="180"
             label="货物体积">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.volume" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-input
+                v-model="scope.row.volume"
+                :disabled="goodsForm.status !== 0"
+                size="small"
+                placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -606,8 +658,14 @@
             width="180"
             label="包装类型">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-select v-model="scope.row.packingType" :disabled="goodsForm.status !== 0" placeholder="请选择">
+              <el-option
+                  v-for="item in packageType"
+                  :key="item.id"
+                  :label="item.dictValue"
+                  :value="item.dictKey">
+              </el-option>
+            </el-select>
           </template>
         </el-table-column>
         <el-table-column
@@ -616,8 +674,11 @@
             width="180"
             label="重量">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.weight" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-input
+                v-model="scope.row.weight"
+                :disabled="goodsForm.status !== 0"
+                size="small"
+                placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -626,40 +687,64 @@
             width="180"
             label="件数">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.quantity" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-input
+                v-model="scope.row.quantity"
+                :disabled="goodsForm.status !== 0"
+                size="small"
+                placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
         <el-table-column
             property="remarks"
             align="center"
+            width="200"
             label="备注">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.remarks" :disabled="goodsForm.status !== 0" size="small"
-                      placeholder="请输入内容"></el-input>
+            <el-input
+                v-model="scope.row.remarks"
+                :disabled="goodsForm.status !== 0"
+                size="small"
+                placeholder="请输入内容"></el-input>
           </template>
         </el-table-column>
         <el-table-column
             align="center"
             width="40">
           <template slot-scope="scope">
-            <div v-if="scope.$index !== tableDataTwo.length-1" style="margin: -5px auto">
-              <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 1">
+            <div style="margin: -5px auto">
+              <el-tooltip class="item" effect="dark" content="向上移动" placement="right" v-if="scope.$index > 0">
                 <div class="single" style="margin-bottom: -5px">
-                  <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-up" size="mini"
-                             @click="moveUpTwo(scope.row,scope.$index)"></el-button>
+                  <el-button
+                      type="text"
+                      style="margin-right: -0.5rem"
+                      icon="el-icon-arrow-up"
+                      size="mini"
+                      @click="moveUpTwo(scope.row,scope.$index)"></el-button>
                 </div>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" content="向下移动" placement="right"
-                          v-if="scope.$index > 0 && scope.$index < tableDataTwo.length-2">
+                          v-if="scope.$index < tableDataTwo.length-1">
                 <div class="single" style="margin-top: -5px">
-                  <el-button type="text" style="margin-right: -0.5rem" icon="el-icon-arrow-down" size="mini"
-                             @click="moveDownTwo(scope.row,scope.$index)"></el-button>
+                  <el-button
+                      type="text"
+                      style="margin-right: -0.5rem"
+                      icon="el-icon-arrow-down"
+                      size="mini"
+                      @click="moveDownTwo(scope.row,scope.$index)"></el-button>
                 </div>
               </el-tooltip>
             </div>
           </template>
         </el-table-column>
+        <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="80">
+          <template slot-scope="{row, index}">
+            <el-button type="text" size="small" icon="el-icon-s-order" @click="annexOpen(row, index,true)">附 件</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </basic-container>
     <containerTitle title="车辆信息"></containerTitle>
@@ -735,6 +820,7 @@
           v-if="activeIndex === '1'"
           :data="collectionList"
           :option="collectionOption"
+          :key="key"
           ref="collection"
           @resetColumn="resetColumnCollection"
           @saveColumn="saveColumnCollection"
@@ -798,6 +884,7 @@
           v-if="activeIndex === '2'"
           :data="paymentList"
           :option="paymentOption"
+          :key="key"
           ref="payment"
           @resetColumn="resetColumnPayment"
           @saveColumn="saveColumnPayment"
@@ -841,6 +928,13 @@
                      @click="$refs.payment.rowDel(row,index)"
           >删除
           </el-button>
+          <el-button
+              size="small"
+              type="text"
+              icon="el-icon-s-order"
+              @click="annexOpen(row, index)"
+          >附 件
+          </el-button>
         </template>
         <template slot="menuLeft">
           <el-button
@@ -872,11 +966,11 @@
           :basic="true"
           deleteUrl="/api/blade-client/common-file/remove"
           :data="orderList"
-          disabled
           :enumerationValue="76"
       ></c-upload>
       <span slot="footer" class="dialog-footer">
           <el-button @click="enclosure = false" size="small">取 消</el-button>
+          <el-button type="primary" @click="saveAnnex" size="small">保 存</el-button>
         </span>
     </el-dialog>
     <track-playback :dialogVisible="dialogVisible" :lineArr="lineArr" ref="playback"></track-playback>
@@ -890,7 +984,7 @@ import {
   detailDelegationList,
   removeCollection,
   saveSaveList,
-  addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove
+  addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove, saveFile
 } from "@/api/landTransportation/bulkCargo";
 import {getDeptTree} from "@/api/system/dept";
 import website from "@/config/website";
@@ -898,6 +992,7 @@ import {gaude, location} from "@/api/gaude";
 //地图回放
 import trackPlayback from "@/components/trackPlayback"
 import {fleetList, telephone} from "@/api/landTransportation";
+import {getDictionary} from "@/api/system/dictbiz";
 
 export default {
   comments: {
@@ -928,6 +1023,7 @@ export default {
       orderFilesList: [],
       salesmanList: [],
       vehicleList: [],
+      packageType: [],
       breakConfiguration: {
         multipleChoices: false,
         multiple: false,
@@ -1519,10 +1615,10 @@ export default {
         span: 8,
         column: [{
           label: '车队',
-          prop: 'fleet',
+          prop: 'fleetId',
           type: 'select',
-          cascader: ['licenseNumber'],
-          dicUrl: "/api/blade-client/corpsdesc/list?size=1000&current=1&&corpType=CD",
+          cascader: ['plateNo'],
+          dicUrl: "/api/blade-client/corpsdesc/list?size=500&current=1&&corpType=CD",
           props: {
             label: "cname",
             value: "id",
@@ -1530,11 +1626,8 @@ export default {
           }
         }, {
           label: '车号',
-          prop: 'licenseNumber',
-          allowCreate: true,
-          overHidden: true,
-          filterable: true,
-          cascader: ['driver'],
+          prop: 'plateNo',
+          cascader: ['driverId'],
           type: "select",
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
           props: {
@@ -1543,7 +1636,7 @@ export default {
           },
         }, {
           label: '司机',
-          prop: 'driver',
+          prop: 'driverId',
           type: "select",
           dicUrl: "/api/blade-client/land-driver/driver-list?plateNo={{key}}",
           props: {
@@ -1740,23 +1833,18 @@ export default {
           slot: true,
           width: 200,
           overHidden: true,
-          prop: 'corpId'
-        }
-          /*, {
-            label: '车号',
-            cell: true,
-            prop: 'plateNo',
-            type: "select",
-            props: {
-              label: "label",
-              value: "label"
-            },
-          }*/
-        , {
+          prop: 'corpId',
+          index:1
+        }, {
+          label: '车号',
+          prop: 'plateNo',
+          index:2
+        }, {
           label: '费用名称',
           slot: true,
           width: 200,
-          prop: 'feeId'
+          prop: 'feeId',
+          index:3
         }, {
           label: '计价单位',
           cell: true,
@@ -1766,24 +1854,29 @@ export default {
           props: {
             label: "dictValue",
             value: "dictKey"
-          }
+          },
+          index:4
         }, {
           label: '单价',
           cell: true,
-          prop: 'price'
+          prop: 'price',
+          index:5
         }, {
           label: '数量',
           cell: true,
-          prop: 'quantity'
+          prop: 'quantity',
+          index:6
         }, {
           label: '金额',
           cell: true,
-          prop: 'amount'
+          prop: 'amount',
+          index:7
         }, {
           // label: '税率(默认6)',
           label: '税率',
           cell: true,
-          prop: 'taxRate'
+          prop: 'taxRate',
+          index:8
         }, {
           label: '币别',
           cell: true,
@@ -1794,9 +1887,11 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
+          index:9
         }]
       },
       paymentList: [],
+      key: 0,
       collectionOption: {},
       paymentOption: {},
       paymentOptionBackup: {
@@ -1831,12 +1926,18 @@ export default {
           width: 200,
           slot: true,
           overHidden: true,
-          prop: 'corpId'
+          prop: 'corpId',
+          index:1
+        }, {
+          label: '车号',
+          prop: 'plateNo',
+          index:2
         }, {
           label: '费用名称',
           slot: true,
           width: 200,
-          prop: 'feeId'
+          prop: 'feeId',
+          index:3
         }, {
           label: '计价单位',
           width: 100,
@@ -1847,46 +1948,50 @@ export default {
           props: {
             label: "dictValue",
             value: "dictKey"
-          }
+          },
+          index:4
         }, {
           label: '数量',
           cell: true,
-          width: 100,
-          prop: 'quantity'
+          prop: 'quantity',
+          index:5
         }, {
           label: '单价',
           cell: true,
-          width: 100,
-          prop: 'price'
+          prop: 'price',
+          index:6
         }, {
           label: '金额',
           cell: true,
-          width: 100,
-          prop: 'amount'
+          prop: 'amount',
+          index:7
         }, {
           // label: '税率(默认6)',
           label: '税率',
           cell: true,
-          width: 100,
-          prop: 'taxRate'
+          prop: 'taxRate',
+          index:8
         }, {
           label: '币别',
           cell: true,
-          width: 100,
           prop: 'currency',
           type: "select",
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
           props: {
             label: "dictValue",
             value: "dictKey"
-          }
+          },
+          index:9
         }]
       }
     };
   },
   async created() {
-    this.findObject(this.goodsOptionFormTwo.column, "licenseNumber").change = (data) => {
-      fleetList({fleetId: data.row.fleetId}).then(res => {
+    getDictionary({code: 'package_type'}).then(res => {
+      this.packageType = res.data.data
+    })
+    this.findObject(this.goodsOptionFormTwo.column, "plateNo").change = (data) => {
+      fleetList({fleetId: this.goodsForm.fleetId}).then(res => {
         for (let item in res.data.data) {
           if (data.value === res.data.data[item].plateNo) {
             this.goodsForm.driver = res.data.data[item].driverId
@@ -1896,7 +2001,7 @@ export default {
         }
       })
     }
-    this.findObject(this.goodsOptionFormTwo.column, "driver").change = (data) => {
+    this.findObject(this.goodsOptionFormTwo.column, "driverId").change = (data) => {
       telephone().then(res => {
         for (let item in res.data.data) {
           if (data.value === res.data.data[item].id) {
@@ -1913,15 +2018,17 @@ export default {
     this.keyContact++
     this.collectionOption = await this.getColumnData(this.getColumnName(85.4), this.collectionOptionBackup);
     this.paymentOption = await this.getColumnData(this.getColumnName(85.5), this.paymentOptionBackup);
+    this.key++
     if (this.id) {
       if (this.id.slice(0, 4) === 'copy') {
         detailDelegationList({id: this.id.slice(4, this.id.length), kind: '1'}).then(res => {
           this.goodsForm = res.data.data
-          this.tableData = res.data.data.orderAddressList
+          this.tableData = res.data.data.loadingAddressList || []
+          this.tableDataTwo = res.data.data.unloadedAddressList || []
           this.entrustList = res.data.data.itemList
           this.goodsList = res.data.data.itemList
           this.vehicleList = res.data.data.orderItemList
-          this.orderFilesList = res.data.data.fileList
+          this.orderFilesList = res.data.data.fileList || []
           this.goodsForm.status = 0
           if (res.data.data.orderFeeList.length > 0) {
             res.data.data.orderFeeList.forEach(item => {
@@ -1958,7 +2065,8 @@ export default {
         }
         detailDelegationList({id: this.id.slice(2, this.id.length), kind: '1'}).then(res => {
           this.goodsForm = res.data.data
-          this.tableData = res.data.data.orderAddressList
+          this.tableData = res.data.data.loadingAddressList || []
+          this.tableDataTwo = res.data.data.unloadedAddressList || []
           this.entrustList = res.data.data.itemList
           this.goodsList = res.data.data.itemList
           this.vehicleList = res.data.data.orderItemList
@@ -1990,7 +2098,8 @@ export default {
       } else {
         detailDelegationList({id: this.id, kind: '1'}).then(res => {
           this.goodsForm = res.data.data
-          this.tableData = res.data.data.orderAddressList
+          this.tableData = res.data.data.loadingAddressList || []
+          this.tableDataTwo = res.data.data.unloadedAddressList || []
           this.entrustList = res.data.data.itemList
           this.goodsList = res.data.data.itemList
           this.vehicleList = res.data.data.orderItemList
@@ -2028,7 +2137,7 @@ export default {
         this.goodsForm = {
           corpId: res.data.data ? res.data.data.id : '',
           businessType: "出口",
-          shippingMode: "集装箱",
+          shippingMode: "散货",
           status: 0,
           salesman: JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id,
           belongCompany: res.data.data ? res.data.data.belongCompany : '',
@@ -2070,6 +2179,7 @@ export default {
     },
     initData(tenantId) {
       getDeptTree(tenantId).then(res => {
+        console.log(res)
         const column = this.findObject(this.goodsOptionForm.column, "salesmanDept");
         column.dicData = res.data.data;
       });
@@ -2208,28 +2318,29 @@ export default {
       }
       detailDelegationList({id: ids, kind: '1'}).then(res => {
         this.goodsForm = res.data.data
-        this.tableData = res.data.data.orderAddressList
+        this.tableData = res.data.data.loadingAddressList
+        this.tableDataTwo = res.data.data.unloadedAddressList
         this.entrustList = res.data.data.itemList
         this.goodsList = res.data.data.itemList
         this.vehicleList = res.data.data.orderItemList
         this.orderFilesList = res.data.data.fileList
-        if (res.data.data.orderFeeList.length > 0) {
-          this.collectionList = []
-          this.paymentList = []
-          res.data.data.orderFeeList.forEach(item => {
-            if (item.type == 1) {
-              this.collectionList.push(item)
-            } else {
-              this.paymentList.push(item)
-            }
-          })
+        if (res.data.data.orderFeeList) {
+          if (res.data.data.orderFeeList.length > 0) {
+            this.collectionList = []
+            this.paymentList = []
+            res.data.data.orderFeeList.forEach(item => {
+              if (item.type == 1) {
+                this.collectionList.push(item)
+              } else {
+                this.paymentList.push(item)
+              }
+            })
+          }
         }
-
-
         this.goodsOptionFormC.disabled = true
         this.goodsOptionForm.disabled = true
         this.goodsOptionFormTwo.disabled = true
-        this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status >= 1
+        this.goodsOptionFormTwo.disabled = this.goodsOptionForm.disabled = this.goodsOptionFormC.disabled = this.collectionOption.disabled = this.paymentOption.disabled = this.goodsForm.status >= 1
         delete this.goodsForm.orderAddressList
         delete this.goodsForm.itemList
         delete this.goodsForm.orderFeeList
@@ -2300,6 +2411,16 @@ export default {
         this.tableData.splice(scope.$index, 1);
       }
     },
+    //删除途径地址
+    deleteAddressTwo(scope) {
+      if (scope.row.id) {
+        tRemove({ids: scope.row.id}).then(res => {
+          this.tableDataTwo.splice(scope.$index, 1);
+        })
+      } else {
+        this.tableDataTwo.splice(scope.$index, 1);
+      }
+    },
     //箱信息保存
     rowSave(row, index, done, loading) {
       row.$cellEdit = false
@@ -2332,8 +2453,8 @@ export default {
       saveSaveList({
         ...this.goodsForm,
         kind: '1',
-        loadingAddressList:this.tableData,
-        unloadedAddressList:this.tableDataTwo,
+        loadingAddressList: this.tableData,
+        unloadedAddressList: this.tableDataTwo,
         fileList: this.orderFilesList,
         itemList: this.entrustList,
         orderFeeList: this.collectionList.concat(this.paymentList)
@@ -2377,13 +2498,6 @@ export default {
                   // if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
                 }
               }
-              for (let item in this.entrustList) {
-                if (!this.entrustList[item].ctnType) return this.$message.error('请选择第' + Number(Number(item) + 1) + '行箱型');
-                if (!this.entrustList[item].ctnQuantity) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行箱量');
-                if (!this.entrustList[item].arrivalTime) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行货运日期');
-                // if (!this.entrustList[item].landAmountD) return this.$message.error('请输入第' + Number(Number(item) + 1) + '运费');
-              }
-              if (this.entrustList.length === 0) return this.$message.error('箱信息不能为空')
               let data = JSON.parse(JSON.stringify(this.tableData))
               data.forEach((item, index) => {
                 item.sort = index + 1
@@ -2431,13 +2545,6 @@ export default {
             // if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
           }
         }
-        for (let item in this.entrustList) {
-          if (!this.entrustList[item].ctnType) return this.$message.error('请选择第' + Number(Number(item) + 1) + '行箱型');
-          if (!this.entrustList[item].ctnQuantity) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行箱量');
-          if (!this.entrustList[item].arrivalTime) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行货运日期');
-          // if (!this.entrustList[item].landAmountD) return this.$message.error('请输入第' + Number(Number(item) + 1) + '运费');
-        }
-        if (this.entrustList.length === 0) return this.$message.error('箱信息不能为空')
         this.$refs['goodsFormE'].validate((valid, doneE) => {
           doneE()
           if (valid) {
@@ -2453,8 +2560,8 @@ export default {
                 saveSaveList({
                   ...this.goodsForm,
                   kind: '1',
-                  loadingAddressList:this.tableData,
-                  unloadedAddressList:this.tableDataTwo,
+                  loadingAddressList: this.tableData,
+                  unloadedAddressList: this.tableDataTwo,
                   fileList: this.orderFilesList,
                   itemList: this.entrustList,
                   orderFeeList: this.collectionList.concat(this.paymentList)
@@ -2488,26 +2595,51 @@ export default {
     },
     //收费新增
     addRowCollection() {
-      this.$refs.collection.rowCellAdd({
-        currency: '1',
-        type: '1',
-        $cellEdit: true
-      });
-    },
-    //打开附件
-    annexOpen(row, index) {
-      this.enclosure = true
-      getFee({id: row.id}).then(res => {
-        this.orderList = res.data.data
-      })
+      if (this.goodsForm.plateNo){
+        this.$refs.collection.rowCellAdd({
+          currency: '1',
+          type: '1',
+          $cellEdit: true,
+          plateNo:this.goodsForm.plateNo
+        });
+      }else {
+        this.$message.error('请选择车号')
+      }
     },
     //付费新增
     addRowPayment() {
-      this.$refs.payment.rowCellAdd({
-        currency: '1',
-        type: '2',
-        $cellEdit: true
-      });
+      if (this.goodsForm.plateNo){
+        this.$refs.payment.rowCellAdd({
+          currency: '1',
+          type: '2',
+          $cellEdit: true,
+          plateNo:this.goodsForm.plateNo
+        });
+      }else {
+        this.$message.error('请选择车号')
+      }
+    },
+    //打开附件
+    annexOpen(row, index,type) {
+      if (row.id){
+        this.formAnnex = row
+        getFee({id: row.id}).then(res => {
+          this.orderList = res.data.data
+          this.enclosure = true
+        })
+      }else {
+        this.$message.error('请点击顶部【保存】后再操作')
+      }
+    },
+    //保存
+    saveAnnex() {
+      saveFile({
+        id: this.formAnnex.id,
+        fileList: this.orderList
+      }).then(res => {
+        this.$message.success("保存成功");
+        this.annexOpen(this.formAnnex)
+      })
     },
     //选择费用
     selectValue(value, row) {
@@ -2551,6 +2683,7 @@ export default {
     },
     //选择公司名称带出所属公司
     getCorpData(row) {
+      console.log(row.belongCompany)
       this.goodsForm.belongCompany = row.belongCompany
       this.goodsForm.salesman = ''
       //查询业务员
@@ -2561,6 +2694,7 @@ export default {
     },
     //选择地址客户带出地址
     withAddress(row, scope) {
+      console.log(row)
       this.$set(this.tableData[scope.$index], 'contacts', row.attn)
       this.$set(this.tableData[scope.$index], 'tel', row.tel)
       this.$set(this.tableData[scope.$index], 'address', row.storageAddr)
@@ -2568,7 +2702,7 @@ export default {
       // this.tableData[scope.$index].tel = row.tel
       // this.tableData[scope.$index].address = row.storageAddr
       if (!scope.row.key) scope.row.key = 0
-      this.$set(this.tableData[scope.$index], 'freightPlaceName', row.cname)
+      this.$set(this.tableData[scope.$index], 'corpName', row.cname)
       // this.tableData[scope.$index].corpName = row.cname
       if (row.belongtoarea) {
         addressList(row.belongtoarea.split(',')[0]).then(res => {
@@ -2586,7 +2720,7 @@ export default {
       // this.tableData[scope.$index].tel = row.tel
       // this.tableData[scope.$index].address = row.storageAddr
       if (!scope.row.key) scope.row.key = 0
-      this.$set(this.tableDataTwo[scope.$index], 'freightPlaceName', row.cname)
+      this.$set(this.tableDataTwo[scope.$index], 'corpName', row.cname)
       // this.tableData[scope.$index].corpName = row.cname
       if (row.belongtoarea) {
         addressList(row.belongtoarea.split(',')[0]).then(res => {

src/views/landTransportation/bulkCargo/index.vue

@@ -127,24 +127,30 @@
           </el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
         </template>
-        <template slot="corpShortNameSearch" slot-scope="{ row,index}">
+        <template slot="corpNameSearch" slot-scope="{ row,index}">
           <crop-select
               v-model="row.corpId"
               :corpType="'KH'"
               :label="'shortName'"
           ></crop-select>
         </template>
-        <template slot="corpNameSearch" slot-scope="{ row,index}">
-          <crop-select
-              v-model="row.corpId"
-          ></crop-select>
-        </template>
+<!--        <template slot="corpNameSearch" slot-scope="{ row,index}">-->
+<!--          <crop-select-->
+<!--              v-model="row.corpId"-->
+<!--          ></crop-select>-->
+<!--        </template>-->
         <template slot="addressDetail" slot-scope="{ row,index}">
           <el-tooltip class="item" effect="dark" placement="top">
             <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
             <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.addressDetail }}</div>
           </el-tooltip>
         </template>
+        <template slot="unloadingPlace" slot-scope="{ row,index}">
+          <el-tooltip class="item" effect="dark" placement="top">
+            <div v-html="ToBreak(row.unloadingPlace)" slot="content"></div>
+            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.unloadingPlace }}</div>
+          </el-tooltip>
+        </template>
         <template slot-scope="{row,index}" slot="menu">
           <!--          <el-button type="text"-->
           <!--                     icon="el-icon-edit"-->
@@ -166,8 +172,8 @@
           <span class="el-button--text" style="cursor: pointer"
                 @click.stop="rowCell(row,index)">{{ row.orderNo }}</span>
         </template>
-        <template slot="billNo" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.billNo }}</span>
+        <template slot="contractNo" slot-scope="{row,index}">
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.contractNo }}</span>
         </template>
         <template slot="fleetNameDetail" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.fleetNameDetail }}</span>
@@ -180,7 +186,7 @@
 
 <script>
 import detailPage from './detailPage'
-import {removeDelegationList, selectInvoiceList, totalList} from "@/api/landTransportation";
+import {removeDelegationList, selectInvoiceList, totalList} from "@/api/landTransportation/bulkCargo";
 import {getQueryString} from "@/util/util";
 import {businessStatisticsFrequency} from "@/api/wel";
 
@@ -262,48 +268,67 @@ export default {
             index: 2,
             width: 94
           }, {
-            label: '货运地点',
+            label: '装货地址',
             prop: 'addressDetail',
             index: 3,
             width: 132,
             search: true,
           }, {
-            label: '提单号',
-            prop: 'billNo',
+            label: '卸货地址',
+            prop: 'unloadingPlace',
+            index: 3,
+            width: 132,
+            search: true,
+          }, {
+            label: '合同号',
+            prop: 'contractNo',
             index: 4,
             overHidden: true,
             width: 140,
             search: true,
           }, {
-            label: '场站',
-            prop: 'station',
-            overHidden: true,
-            index: 5,
-            width: 70,
+            label: '派车单号',
+            width: 140,
+            prop: 'dispatchNumber',
             search: true,
           }, {
-            label: '计划箱量',
-            prop: 'ctnDetail',
-            overHidden: true,
-            index: 6,
-            width: 78
-          }, {
-            label: '已派箱量',
-            prop: 'dispatchCtnDetail',
-            overHidden: true,
-            index: 7,
-            width: 82
+            label: '车队',
+            width: 100,
+            index: 8,
+            prop: 'fleetId',
+            type: 'select',
+            cascader: ['plateNo'],
+            dicUrl: "/api/blade-client/corpsdesc/list?size=1000&current=1&&corpType=CD",
+            props: {
+              label: "cname",
+              value: "id",
+              res: "data.records"
+            },
+            search: true,
           }, {
-            label: '受理箱量',
-            prop: 'sendCtnDetail',
-            overHidden: true,
+            label: '车号',
+            width: 100,
             index: 8,
-            width: 80
+            prop: 'plateNo',
+            type: "select",
+            dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
+            props: {
+              label: "plateNo",
+              value: "plateNo"
+            },
+            search: true,
           }, {
-            label: '车队',
-            width: 78,
+            label: '司机',
+            width: 100,
             index: 8,
-            prop: 'fleetNameDetail'
+            prop: 'driverId',
+            type: "select",
+            dicUrl: "/api/blade-client/land-driver/driver-list?plateNo={{key}}",
+            props: {
+              label: "name",
+              value: "id"
+            },
+            search: true,
           }, {
             label: '运费',
             index: 9,
@@ -317,7 +342,7 @@ export default {
             width: 140
           }, {
             label: '公司名称',
-            prop: 'corpShortName',
+            prop: 'corpName',
             overHidden: true,
             index: 12,
             width: 112,
@@ -329,31 +354,7 @@ export default {
             overHidden: true,
             width: 100,
             search: true,
-          }
-          // , {
-          //   label: '所属公司',
-          //   prop: 'belongCompany',
-          //   overHidden: true,
-          //   index: 4,
-          //   width: 140,
-          //   search: true,
-          // }
-          // , {
-          //   label: '货物名称',
-          //   prop: 'goods',
-          //   overHidden: true,
-          //   index: 13,
-          //   width: 140,
-          //   search: true,
-          // }, {
-          //   label: '船名航次',
-          //   prop: 'factory',
-          //   overHidden: true,
-          //   index: 14,
-          //   width: 140,
-          //   search: true,
-          // }
-          , {
+          }, {
             label: '制单人',
             prop: 'createUserName',
             overHidden: true,
@@ -387,7 +388,7 @@ export default {
     }
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(85), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(85.7), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -414,14 +415,14 @@ export default {
   },
   mounted() {
     businessStatisticsFrequency().then(res=>{
-      let this_ = this
-      this_.entrustTimer = setInterval(function () {
-        if (JSON.parse(localStorage.getItem("saber-token")).content) {
-          totalList(1).then(res => {
-            this_.totalData = res.data.data
-          })
-        }
-      },  Number(res.data.data[0].dictKey)*1000)
+      // let this_ = this
+      // this_.entrustTimer = setInterval(function () {
+      //   if (JSON.parse(localStorage.getItem("saber-token")).content) {
+      //     totalList(1).then(res => {
+      //       this_.totalData = res.data.data
+      //     })
+      //   }
+      // },  Number(res.data.data[0].dictKey)*1000)
     })
   },
   beforeDestroy() {
@@ -439,7 +440,7 @@ export default {
        * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
        * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
        */
-      const inSave = await this.saveColumnData(this.getColumnName(85), this.option);
+      const inSave = await this.saveColumnData(this.getColumnName(85.7), this.option);
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -449,7 +450,7 @@ export default {
     //自定义列重置
     async resetColumn() {
       this.option = this.optionList;
-      const inSave = await this.delColumnData(this.getColumnName(85), this.optionList);
+      const inSave = await this.delColumnData(this.getColumnName(85.7), this.optionList);
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
@@ -474,15 +475,14 @@ export default {
       this.onLoad(this.page)
     },
     onLoad(page, params = {}) {
-      totalList(1).then(res => {
-        this.totalData = res.data.data
-      })
+      // totalList(1).then(res => {
+      //   this.totalData = res.data.data
+      // })
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
         itemStatus: this.activeName,
         status: this.activeName,
-        kind: '1',
         ...Object.assign(params, this.query)
       }
       this.loading = true;

src/views/warehousing/cargoClearance/AddOrUpdate.vue

@@ -43,7 +43,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="客户" prop="fCorpid">
-              <el-select v-model="form.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 80%"
+              <el-select size="small" v-model="form.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 100%"
                          @change="changefStltype" :disabled="detailList.length > 0">
                 <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName" :value="item.fId">
                 </el-option>
@@ -52,14 +52,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="结算方式" prop="fStltypeid" v-if="dataShowcar == '1'">
-              <el-select v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
-                         style="width: 80%">
+              <el-select size="small" v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
+                         style="width: 100%">
                 <el-option v-for="(item, index) in fStltypeOptions" :key="index.dictValue" :label="item.dictLabel"
                            :value="item.dictValue" />
               </el-select>
             </el-form-item>
             <el-form-item label="作业类型" prop="fBusinessType" v-if="dataShowcar == '0'">
-              <el-select style="width: 80%" v-model="form.fBusinessType" filterable @change="educationChange" :disabled="
+              <el-select size="small" style="width: 100%" v-model="form.fBusinessType" filterable @change="educationChange" :disabled="
               contrOl ||
               browseStatus ||
               warehouseDrList.length > 0 ||
@@ -72,7 +72,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="提单号" prop="fMblno">
-              <el-input v-model="form.fMblno" style="width: 80%" placeholder="请输入提单号"
+              <el-input size="small" v-model="form.fMblno" style="width: 100%" placeholder="请输入提单号"
                         :disabled="detailList.length != 0" />
             </el-form-item>
           </el-col>
@@ -80,14 +80,14 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="业务日期" prop="fBsdate">
-              <el-date-picker v-model="form.fBsdate" style="width: 80%" type="date" :disabled="browseStatus"
+              <el-date-picker size="small" v-model="form.fBsdate" style="width: 100%" type="date" :disabled="browseStatus"
                               value-format="timestamp" placeholder="业务日期" @change="changeDate" format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="业务时间" prop="fBstime">
-              <el-time-picker style="width: 80%" :disabled="browseStatus" v-model="form.fBstime" :picker-options="{
+              <el-time-picker size="small" style="width: 100%" :disabled="browseStatus" v-model="form.fBstime" :picker-options="{
               selectableRange: '00:00:00 - 23:59:59',
             }" value-format="timestamp" placeholder="任意时间点">
               </el-time-picker>
@@ -95,7 +95,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓管员" prop="fStorekeeper">
-              <el-select v-model="form.fStorekeeper" filterable clearable :disabled="browseStatus" style="width: 80%"
+              <el-select size="small" v-model="form.fStorekeeper" filterable clearable :disabled="browseStatus" style="width: 100%"
                          placeholder="请输入模糊查找">
                 <el-option v-for="(item, index) in userOptions" :key="index.userName" :label="item.nickName"
                            :value="item.userName"></el-option>
@@ -106,8 +106,8 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="原仓库" prop="fInwarehouseid">
-              <el-select v-model="form.fInwarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
-                         style="width: 80%" placeholder="请选择" @change="fInwarehouseChange">
+              <el-select size="small" v-model="form.fInwarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
+                         style="width: 100%" placeholder="请选择" @change="fInwarehouseChange">
                 <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
                            :value="item.fId"></el-option>
               </el-select>
@@ -115,8 +115,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="新仓库" prop="fWarehouseid">
-              <el-select v-model="form.fWarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
-                         style="width: 80%" placeholder="请选择">
+              <el-select size="small" v-model="form.fWarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
+                         style="width: 100%" placeholder="请选择">
                 <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
                            :value="item.fId"></el-option>
               </el-select>
@@ -124,20 +124,20 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="单据编号" prop="fBillno">
-              <el-input v-model="form.fBillno" style="width: 80%" disabled placeholder="单据编号" />
+              <el-input size="small" v-model="form.fBillno" style="width: 100%" disabled placeholder="单据编号" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="计划通关件数" prop="fPlanqty">
-              <el-input v-model.number="form.fPlanqty" style="width: 80%" maxlength="9" laceholder="计划件数"
+              <el-input size="small" v-model.number="form.fPlanqty" style="width: 100%" maxlength="9" laceholder="计划件数"
                         :disabled="browseStatus || current !== before" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="计划通关净重(kg)" prop="fPlannetweight">
-              <el-input v-model="form.fPlannetweight" style="width: 80%" maxlength="16" v-input-limit="2"
+              <el-input size="small" v-model="form.fPlannetweight" style="width: 100%" maxlength="16" v-input-limit="2"
                         laceholder="计划净重" :disabled="browseStatus || current !== before" @change="tfNetweight">
                 <template slot="append">{{ tfNetweightnum }}吨</template>
               </el-input>
@@ -145,7 +145,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="计划通关毛重(kg)" prop="fPlangrossweight">
-              <el-input v-model="form.fPlangrossweight" v-input-limit="2" style="width: 80%" laceholder="计划毛重"
+              <el-input size="small" v-model="form.fPlangrossweight" v-input-limit="2" style="width: 100%" laceholder="计划毛重"
                         maxlength="16" :disabled="browseStatus || current !== before" @change="tfGrossweight">
                 <template slot="append">{{ tfGrossweightnum }}吨</template>
               </el-input>
@@ -155,7 +155,7 @@
         <el-row v-if="detailsHidden2">
           <el-col :span="8">
             <el-form-item label="作业类型" prop="fBusinessType" v-if="dataShowcar == '1'">
-              <el-select style="width: 80%" v-model="form.fBusinessType" filterable @change="educationChange" :disabled="
+              <el-select size="small" style="width: 100%" v-model="form.fBusinessType" filterable @change="educationChange" :disabled="
               contrOl ||
               browseStatus ||
               warehouseDrList.length > 0 ||
@@ -166,8 +166,8 @@
               </el-select>
             </el-form-item>
             <el-form-item label="结算方式" prop="fStltypeid" v-if="dataShowcar == '0'">
-              <el-select v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
-                         style="width: 80%">
+              <el-select size="small" v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
+                         style="width: 100%">
                 <el-option v-for="(item, index) in fStltypeOptions" :key="index.dictValue" :label="item.dictLabel"
                            :value="item.dictValue" />
               </el-select>
@@ -175,7 +175,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="劳务公司" prop="fLabour">
-              <el-select style="width: 80%" v-model="form.fLabour" clearable filterable placeholder="请输入关键词"
+              <el-select size="small" style="width: 100%" v-model="form.fLabour" clearable filterable placeholder="请输入关键词"
                          :disabled="contrOl || browseStatus">
                 <el-option v-for="(item, index) in fCompanyOptIons" :key="index.fId" :label="item.fName"
                            :value="item.fId"></el-option>
@@ -188,7 +188,7 @@
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-              <el-select style="width: 80%" v-model="form.fFleet" clearable filterable placeholder="请输入关键词"
+              <el-select size="small" style="width: 100%" v-model="form.fFleet" clearable filterable placeholder="请输入关键词"
                          :disabled="contrOl || browseStatus">
                 <el-option v-for="(item, index) in fleetOptions" :key="index.fId" :label="item.fName" :value="item.fId">
                 </el-option>
@@ -203,7 +203,7 @@
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-              <el-input v-model="form.fTruckno" style="width: 80%" :disabled="browseStatus" placeholder="车号" />
+              <el-input size="small" v-model="form.fTruckno" style="width: 100%" :disabled="browseStatus" placeholder="车号" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -212,7 +212,7 @@
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-              <el-input v-model="form.fDriverName" style="width: 80%" :disabled="browseStatus" placeholder="司机姓名" />
+              <el-input size="small" v-model="form.fDriverName" style="width: 100%" :disabled="browseStatus" placeholder="司机姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -221,7 +221,7 @@
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-              <el-input v-model="form.fDriverTel" style="width: 80%" :disabled="browseStatus" placeholder="司机电话" />
+              <el-input size="small" v-model="form.fDriverTel" style="width: 100%" :disabled="browseStatus" placeholder="司机电话" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -232,13 +232,13 @@
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-              <el-input v-model="form.fDriverIdCar" style="width: 80%" :disabled="browseStatus" placeholder="司机身份证" />
+              <el-input size="small" v-model="form.fDriverIdCar" style="width: 100%" :disabled="browseStatus" placeholder="司机身份证" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="原贸易方式" prop="fTrademodeid">
-              <el-select v-model="form.fTrademodeid" placeholder="请选择原贸易方式"
-                         :disabled="browseStatus || detailList.length > 0" clearable style="width: 80%">
+              <el-select size="small" v-model="form.fTrademodeid" placeholder="请选择原贸易方式"
+                         :disabled="browseStatus || detailList.length > 0" clearable style="width: 100%">
                 <el-option v-for="dict in fTrademodeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
                            :value="dict.dictValue" />
               </el-select>
@@ -246,8 +246,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="新贸易方式" prop="fNewTrademodeid">
-              <el-select v-model="form.fNewTrademodeid" placeholder="请选择新贸易方式"
-                         :disabled="browseStatus || clearanceDisabled" clearable style="width: 80%">
+              <el-select size="small" v-model="form.fNewTrademodeid" placeholder="请选择新贸易方式"
+                         :disabled="browseStatus || clearanceDisabled" clearable style="width: 100%">
                 <el-option v-for="dict in fTrademodeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
                            :value="dict.dictValue" />
               </el-select>
@@ -257,14 +257,29 @@
         <el-row>
           <el-col :span="16">
             <el-form-item label="备注" prop="remark">
-              <el-input style="width: 100%" v-model="form.remark" type="textarea" :disabled="browseStatus"
+              <el-input size="small" style="width: 100%" v-model="form.remark" type="textarea" :disabled="browseStatus"
                         placeholder="请输入内容" />
             </el-form-item>
+            <el-row>
+              <el-col :offset="8" :span="6" style="margin-top: 20px">
+                <el-form-item style="width: 300px;">
+                  <el-button
+                      @click="detailsHidden2 ? (detailsHidden2 = false) : (detailsHidden2 = true)"
+                      v-if="dataShowcar == '0'">
+                    {{ detailsHidden2 ? "隐藏" : "更多" }}
+                  </el-button>
+                  <el-button
+                      @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">
+                    {{ detailsHidden ? "隐藏" : "展开" }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-col>
           <el-col :span="8">
             <el-form-item>
               <div style="display: flex; align-items: center">
-                <el-table :data="CntrTable" style="width: 80%" :header-cell-style="{ lineHeight: '16px' }">
+                <el-table :data="CntrTable" style="width: 100%" :header-cell-style="{ lineHeight: '16px' }">
                   <el-table-column prop="fCntrid " label="箱型" header-align="center" align="center">
                     <template slot-scope="scope">
                       <el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
@@ -291,42 +306,29 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item>
-              <el-button
-                  @click="detailsHidden2 ? (detailsHidden2 = false) : (detailsHidden2 = true)"
-                  v-if="dataShowcar == '0'">
-                {{ detailsHidden2 ? "隐藏" : "更多" }}
-              </el-button>
-              <el-button
-                  @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">
-                {{ detailsHidden ? "隐藏" : "展开" }}
-              </el-button>
-            </el-form-item>
-          </el-col>
         </el-row>
         <div v-if="detailsHidden">
           <el-row style="margin-top: 30px">
             <el-col :span="8">
               <el-form-item label="仓库联系人" prop="fContacts">
-                <el-input v-model="form.fContacts" style="width: 80%" :disabled="browseStatus" placeholder="仓库联系人" />
+                <el-input size="small" v-model="form.fContacts" style="width: 100%" :disabled="browseStatus" placeholder="仓库联系人" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="仓库电话" prop="fTel">
-                <el-input v-model="form.fTel" :disabled="browseStatus" style="width: 80%" placeholder="请输仓库入电话" />
+                <el-input size="small" v-model="form.fTel" :disabled="browseStatus" style="width: 100%" placeholder="请输仓库入电话" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item label="制单人" prop="createBy">
-                <el-input disabled v-model="form.createBy" style="width: 80%" placeholder="制单人" />
+                <el-input size="small" disabled v-model="form.createBy" style="width: 100%" placeholder="制单人" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="制单部门" prop="fDeptid">
-                <el-select v-model="form.fDeptid" filterable disabled style="width: 80%" remote>
+                <el-select size="small" v-model="form.fDeptid" filterable disabled style="width: 100%" remote>
                   <el-option v-for="(item, index) in deptOptions" :key="index.deptId" :label="item.deptName"
                              :value="item.deptId"></el-option>
                 </el-select>
@@ -334,7 +336,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item disabled label="制单日期" prop="createTime">
-                <el-date-picker v-model="form.createTime" size="large" type="date" disabled style="width: 80%"
+                <el-date-picker size="small" v-model="form.createTime" type="date" disabled style="width: 100%"
                                 value-format="timestamp" placeholder="制单日期">
                 </el-date-picker>
               </el-form-item>
@@ -343,12 +345,12 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="品名" prop="fProductName">
-                <el-input v-model="form.fProductName" style="width: 80%" disabled placeholder="品名" />
+                <el-input size="small" v-model="form.fProductName" style="width: 100%" disabled placeholder="品名"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="品牌">
-                <el-input v-model="form.fMarks" style="width: 80%" disabled placeholder="品牌" />
+                <el-input size="small" v-model="form.fMarks" style="width: 100%" disabled placeholder="品牌"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -766,8 +768,12 @@ Navigation = false;
         ">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="选择库位" :data="treeselectList" :visible.sync="choiceWarehouse" width="30%"
-               :before-close="hanDleclose">
+    <el-dialog
+        title="选择库位"
+        :data="treeselectList"
+        :visible.sync="choiceWarehouse"
+        width="30%"
+        :before-close="hanDleclose">
       <treeselect v-model="treeselectList.fWarehouselocid" @select="getAlltree" :options="fWarehouseidOptions"
                   :show-count="true" :disable-branch-nodes="true" placeholder="请选择归属库区" />
       <span slot="footer" class="dialog-footer">