提交陆运

src/components/upload/index.vue

@@ -37,7 +37,6 @@
           :size="scope.size"
           :type="scope.type"
           @click="download(scope)"
-          :disabled="disabled"
           >查看
         </el-button>
         <el-button

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -244,6 +244,8 @@
     <c-upload
         typeUpload="CD"
         :data="orderFilesList"
+        disabled
+        deleteUrl="/api/blade-client/common-file/remove"
         :enumerationValue="76"
     ></c-upload>
   </div>
@@ -319,7 +321,7 @@ export default {
           {
             name: 'landWeight',
             type: 'sum',
-            decimals: 6
+            decimals: 2
           }, {
             name: 'landAmountC',
             type: 'sum',
@@ -336,7 +338,7 @@ export default {
         column: [
           {
             label: '状态',
-            width: 200,
+            width: 100,
             type: 'select',
             dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
             props: {
@@ -358,6 +360,10 @@ export default {
             cell: true,
             prop: 'fleetId'
           }, {
+            label: '应付陆运费',
+            cell: true,
+            prop: 'landAmountC'
+          }, {
             label: '尺寸箱型',
             width: 100,
             slot: true,
@@ -371,7 +377,7 @@ export default {
             width: 160,
             prop: 'landWeight',
             controls: false,
-            precision: 6,
+            precision: 2,
             type: 'number'
           }, {
             label: '车号',
@@ -386,20 +392,19 @@ export default {
             width: 160,
             prop: 'tel'
           }, {
-            label: '应收陆运费',
+            label: '单柜运费',
             prop: 'landAmountD'
           }, {
-            label: '应付陆运费',
-            cell: true,
-            prop: 'landAmountC'
-          }, {
             label: '委托备注',
+            width: 245,
             prop: 'remarks'
           }, {
             label: '车队备注',
+            width: 245,
             prop: 'fleetRemarks'
           }, {
             label: '司机备注',
+            width: 245,
             prop: 'driverRemarks'
           }
         ]
@@ -485,7 +490,7 @@ export default {
           {
             name: 'landWeight',
             type: 'sum',
-            decimals: 6
+            decimals: 2
           }, {
             name: 'landAmountD',
             type: 'sum',
@@ -520,10 +525,10 @@ export default {
           prop: 'landWeight',
           controls: false,
           width: 200,
-          precision: 6,
+          precision: 2,
           type: 'number'
         }, {
-          label: '应收陆运费',
+          label: '单柜运费',
           cell: true,
           prop: 'landAmountD',
           controls: false,
@@ -694,6 +699,7 @@ export default {
         this.tableData = res.data.data.orderAddressList
         this.entrustList = res.data.data.orderItemList
         this.goodsList = res.data.data.orderItemList
+        this.orderFilesList = res.data.data.fileList
         if (res.data.data.orderFeeList.length > 0) {
           res.data.data.orderFeeList.forEach(item => {
             if (item.type == 1) {
@@ -720,6 +726,7 @@ export default {
         this.tableData = res.data.data.orderAddressList
         this.entrustList = res.data.data.orderItemList
         this.goodsList = res.data.data.orderItemList
+        this.orderFilesList = res.data.data.fileList
         if (res.data.data.orderFeeList.length > 0) {
           res.data.data.orderFeeList.forEach(item => {
             if (item.type == 1) {

src/views/landTransportation/driver/index.vue

@@ -166,7 +166,7 @@ export default {
           {
             name: 'landWeight',
             type: 'sum',
-            decimals: 6
+            decimals: 2
           }, {
             name: 'landAmountC',
             type: 'sum',
@@ -177,8 +177,9 @@ export default {
           }],
         column: [{
           label: '状态',
-          width: 200,
+          width: 100,
           type: 'select',
+          index:1,
           overHidden: true,
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
           props: {
@@ -188,77 +189,43 @@ export default {
           dataType: "string",
           prop: 'status'
         }, {
-          label: '车队',
-          width: 200,
-          search: true,
+          label: '车号',
+          width: 150,
+          prop: 'vehicleId',
           overHidden: true,
+          index:4,
           type: 'select',
-          cascader: ['plateNo'],
-          dicUrl: "/api/blade-client/corpsdesc/fleet-list",
+          search: true,
+          dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
           props: {
-            label: "cname",
+            label: "plateNo",
             value: "id"
-          },
-          prop: 'fleetId'
+          }
         },{
           label: '提单号',
           width: 100,
-          index: 3,
+          index:2,
           search: true,
           overHidden: true,
           prop: 'billNo'
-        },{
-          label: '货物名称',
-          overHidden: true,
-          width: 160,
-          search: true,
-          index: 9,
-          prop: 'goods'
-        },{
-          label: '路线',
-          index: 14,
-          width: 160,
-          search: true,
-          prop: 'addressDetail'
         }, {
-          label: '尺寸箱型',
-          width: 100,
+          label: '车队',
+          width: 200,
           search: true,
-          overHidden: true,
-          prop: 'ctnType',
-          type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
-          props: {
-            label: "dictValue",
-            value: "dictValue"
-          },
-        }, {
-          label: '箱量',
-          width: 50,
-          prop: 'ctnQuantity'
-        }, {
-          label: '重量',
-          width: 160,
-          prop: 'landWeight',
-          controls: false,
-          overHidden: true,
-          precision: 6,
-          type: 'number'
-        }, {
-          label: '车号',
-          width: 150,
-          prop: 'vehicleId',
+          index:3,
           overHidden: true,
           type: 'select',
-          search: true,
-          dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
+          cascader: ['plateNo'],
+          dicUrl: "/api/blade-client/corpsdesc/fleet-list",
           props: {
-            label: "plateNo",
+            label: "cname",
             value: "id"
-          }
+          },
+          prop: 'fleetId'
         }, {
           label: '司机',
           width: 115,
+          index:5,
           search: true,
           overHidden: true,
           prop: 'driverId',
@@ -271,29 +238,16 @@ export default {
         }, {
           label: '电话',
           width: 160,
+          index:6,
           overHidden: true,
           search: true,
           prop: 'tel'
-        }, {
-          label: '箱号',
-          cell: true,
-          overHidden: true,
-          search: true,
-          prop: 'ctnNo'
-        }, {
-          label: '场站',
-          prop: 'station',
-          overHidden: true,
-          index: 10,
-          width: 140,
-          search: true,
         },{
-          label: '船名航次',
-          prop: 'factory',
-          overHidden: true,
-          index: 13,
-          width: 140,
+          label: '路线',
+          index: 7,
+          width: 160,
           search: true,
+          prop: 'addressDetail'
         },{
           label: '到厂时间',
           prop: 'arrivalTime',
@@ -303,6 +257,28 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index: 8,
+          width: 140,
+          search: true,
+        },{
+          label: '货物名称',
+          overHidden: true,
+          width: 160,
+          search: true,
+          index: 9,
+          prop: 'goods'
+        }, {
+          label: '箱号',
+          cell: true,
+          width: 245,
+          index: 10,
+          overHidden: true,
+          search: true,
+          prop: 'ctnNo'
+        }, {
+          label: '场站',
+          prop: 'station',
+          overHidden: true,
           index: 11,
           width: 140,
           search: true,
@@ -318,22 +294,63 @@ export default {
           index: 12,
           width: 140,
           search: true,
+        },{
+          label: '船名航次',
+          prop: 'factory',
+          overHidden: true,
+          index: 13,
+          width: 140,
+          search: true,
+        }, {
+          label: '尺寸箱型',
+          width: 100,
+          search: true,
+          index: 14,
+          overHidden: true,
+          prop: 'ctnType',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          },
+        }, {
+          label: '箱量',
+          width: 50,
+          index: 15,
+          prop: 'ctnQuantity'
+        }, {
+          label: '重量(吨)',
+          width: 160,
+          prop: 'landWeight',
+          controls: false,
+          overHidden: true,
+          index: 16,
+          precision: 2,
+          type: 'number'
         }, {
-          label: '陆运费(C)',
+          label: '应付陆运费',
           overHidden: true,
+          index: 17,
           prop: 'landAmountC'
         }, {
           label: '委托备注',
           overHidden: true,
+          width: 245,
+          index: 18,
           prop: 'remarks'
         }, {
           label: '车队备注',
           overHidden: true,
+          width: 245,
+          index: 19,
           prop: 'fleetRemarks'
         }, {
           label: '司机备注',
           overHidden: true,
           cell: true,
+          width: 245,
+          index: 20,
           prop: 'driverRemarks'
         }
         ],
@@ -344,10 +361,6 @@ export default {
   async created() {
     this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88), this.optionList);
     this.key++
-    this.getWorkDicts("order_status").then(res => {
-      this.findObject(this.goodsOptionCrud.column, "status").dicData =
-          res.data.data;
-    });
     let i = 0;
     this.goodsOptionCrud.column.forEach(item => {
       if (item.search) i++

src/views/landTransportation/motorcadeDriver/index.vue

@@ -172,7 +172,7 @@ export default {
           {
             name: 'landWeight',
             type: 'sum',
-            decimals: 6
+            decimals: 2
           }, {
             name: 'landAmountC',
             type: 'sum',
@@ -188,7 +188,7 @@ export default {
         column: [{
           label: '状态',
           overHidden: true,
-          width: 200,
+          width: 100,
           type: 'select',
           index: 1,
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
@@ -199,60 +199,12 @@ export default {
           dataType: "string",
           prop: 'status'
         }, {
-          label: '车队',
-          width: 200,
-          search: true,
-          index: 2,
-          type: 'select',
-          cascader: ['plateNo'],
-          overHidden: true,
-          dicUrl: "/api/blade-client/corpsdesc/fleet-list",
-          props: {
-            label: "cname",
-            value: "id"
-          },
-          prop: 'fleetId'
-        }, {
-          label: '尺寸箱型',
-          width: 100,
-          index: 3,
-          search: true,
-          overHidden: true,
-          prop: 'ctnType',
-          type: 'select',
-          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
-          props: {
-            label: "dictValue",
-            value: "dictValue"
-          },
-        }, {
-          label: '提单号',
-          width: 100,
-          index: 3,
-          search: true,
-          overHidden: true,
-          prop: 'billNo'
-        }, {
-          label: '箱量',
-          width: 50,
-          index: 4,
-          overHidden: true,
-          prop: 'ctnQuantity'
-        }, {
-          label: '重量',
-          width: 160,
-          prop: 'landWeight',
-          controls: false,
-          overHidden: true,
-          index: 5,
-          precision: 6,
-          type: 'number'
-        }, {
           label: '车号',
           width: 150,
           cell: true,
           search: true,
-          index: 6,
+          index: 4,
+          allowCreate:true,
           prop: 'vehicleId',
           overHidden: true,
           filterable: true,
@@ -275,14 +227,34 @@ export default {
             })
           },
         }, {
+          label: '提单号',
+          width: 100,
+          index: 2,
+          search: true,
+          overHidden: true,
+          prop: 'billNo'
+        }, {
+          label: '车队',
+          width: 200,
+          search: true,
+          index: 3,
+          type: 'select',
+          cascader: ['plateNo'],
+          overHidden: true,
+          dicUrl: "/api/blade-client/corpsdesc/fleet-list",
+          props: {
+            label: "cname",
+            value: "id"
+          },
+          prop: 'fleetId'
+        }, {
           label: '司机',
           width: 115,
           search: true,
-          // prop: 'driverId'
           overHidden: true,
           cell: true,
           filterable: true,
-          index: 7,
+          index: 5,
           prop: 'driverId',
           type: 'select',
           dicUrl: "/api/blade-client/land-driver/driver-list?vehicleId={{key}}",
@@ -305,9 +277,27 @@ export default {
           width: 160,
           search: true,
           cell: true,
-          index: 8,
+          index: 6,
           prop: 'tel'
         }, {
+          label: '路线',
+          index: 7,
+          width: 160,
+          search: true,
+          prop: 'addressDetail'
+        },{
+          label: '到厂时间',
+          prop: 'arrivalTime',
+          overHidden: true,
+          type: "date",
+          searchRange: true,
+          defaultTime: ['00:00:00', '23:59:59'],
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
+          index: 8,
+          width: 145,
+          search: true,
+        }, {
           label: '货物名称',
           overHidden: true,
           width: 160,
@@ -317,29 +307,18 @@ export default {
         }, {
           label: '箱号',
           overHidden: true,
-          width: 160,
+          width: 245,
+          index: 10,
           search: true,
           prop: 'ctnNo'
         }, {
           label: '场站',
           prop: 'station',
           overHidden: true,
-          index: 10,
-          width: 140,
-          search: true,
-        }, {
-          label: '到厂时间',
-          prop: 'arrivalTime',
-          overHidden: true,
-          type: "date",
-          searchRange: true,
-          defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
-          valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 11,
           width: 140,
           search: true,
-        }, {
+        },  {
           label: '制单日期',
           overHidden: true,
           prop: 'createTime',
@@ -349,7 +328,7 @@ export default {
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 12,
-          width: 140,
+          width: 145,
           search: true,
         }, {
           label: '船名航次',
@@ -359,11 +338,33 @@ export default {
           width: 140,
           search: true,
         }, {
-          label: '路线',
+          label: '尺寸箱型',
+          width: 100,
           index: 14,
-          width: 160,
           search: true,
-          prop: 'addressDetail'
+          overHidden: true,
+          prop: 'ctnType',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxType",
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          }
+        }, {
+          label: '箱量',
+          width: 50,
+          index: 15,
+          overHidden: true,
+          prop: 'ctnQuantity'
+        }, {
+          label: '重量(吨)',
+          width: 160,
+          prop: 'landWeight',
+          controls: false,
+          overHidden: true,
+          index: 16,
+          precision: 2,
+          type: 'number'
         },
           // {
           //   label: '陆运费(D)',
@@ -371,32 +372,36 @@ export default {
           //   prop: 'landAmountD'
           // },
           {
-            label: '陆运费(C)',
+            label: '应付陆运费',
             overHidden: true,
-            index: 15,
+            index: 17,
+            width: 100,
             cell: true,
             prop: 'landAmountC'
           }, {
             label: '委托备注',
             overHidden: true,
-            index: 16,
+            index: 18,
+            width: 245,
             prop: 'remarks'
           }, {
             label: '车队备注',
             cell: true,
-            index: 17,
+            index: 19,
+            width: 245,
             overHidden: true,
             prop: 'fleetRemarks'
           }, {
             label: '司机备注',
             overHidden: true,
-            index: 8,
+            width: 245,
+            index: 20,
             prop: 'driverRemarks'
           }
         ]
       },
       totalData: {},
-      activeName: ''
+      activeName: '1'
     }
   },
   async created() {

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -297,7 +297,9 @@
     <containerTitle title="上传附件"></containerTitle>
     <c-upload
         typeUpload="CD"
+        deleteUrl="/api/blade-client/common-file/remove"
         :data="orderFilesList"
+        :disabled="goodsForm.status === 1"
         :enumerationValue="76"
     ></c-upload>
   </div>
@@ -402,7 +404,7 @@ export default {
           precision: 6,
           type: 'number'
         }, {
-          label: '应收陆运费',
+          label: '单柜运费',
           prop: 'landAmountD'
         }, {
           label: '备注',
@@ -510,6 +512,7 @@ export default {
       entrustOptionTwo: {
         align: 'center',
         menuAlign: 'center',
+        refreshBtn:false,
         addBtnText: '录入箱信息',
         index: true,
         cellBtn: true,
@@ -521,7 +524,7 @@ export default {
           {
             name: 'landWeight',
             type: 'sum',
-            decimals: 6
+            decimals: 2
           }, {
             name: 'landAmountD',
             type: 'sum',
@@ -559,10 +562,10 @@ export default {
           prop: 'landWeight',
           controls: false,
           width: 200,
-          precision: 6,
+          precision: 2,
           type: 'number'
         }, {
-          label: '应收陆运费',
+          label: '单柜运费',
           cell: true,
           prop: 'landAmountD',
           controls: false,
@@ -572,6 +575,7 @@ export default {
         }, {
           label: '备注',
           cell: true,
+          width: 245,
           prop: 'remarks'
         }]
       },
@@ -579,6 +583,7 @@ export default {
       collectionOption: {
         align: 'center',
         menuAlign: 'center',
+        refreshBtn:false,
         index: true,
         cancelBtn: false,
         editBtn: false,
@@ -600,11 +605,13 @@ export default {
         }, {
           name: 'quantity',
           type: 'sum',
-          decimals: 1
+          decimals: 0
         }],
         column: [{
           label: '客户名称',
           slot: true,
+          width: 200,
+          overHidden: true,
           prop: 'corpId'
         }, {
           label: '费用名称',
@@ -633,7 +640,8 @@ export default {
           cell: true,
           prop: 'amount'
         }, {
-          label: '税率(默认6)',
+          // label: '税率(默认6)',
+          label: '税率',
           cell: true,
           prop: 'taxRate'
         }, {
@@ -655,6 +663,7 @@ export default {
         menuAlign: 'center',
         index: true,
         cancelBtn: false,
+        refreshBtn: false,
         editBtn: false,
         delBtn: false,
         cellBtn: false,
@@ -674,11 +683,13 @@ export default {
         }, {
           name: 'quantity',
           type: 'sum',
-          decimals: 1
+          decimals: 0
         }],
         column: [{
           label: '客户名称',
+          width: 200,
           slot: true,
+          overHidden: true,
           prop: 'corpId'
         }, {
           label: '费用名称',
@@ -707,7 +718,8 @@ export default {
           cell: true,
           prop: 'amount'
         }, {
-          label: '税率(默认6)',
+          // label: '税率(默认6)',
+          label: '税率',
           cell: true,
           prop: 'taxRate'
         }, {
@@ -732,6 +744,7 @@ export default {
         this.tableData = res.data.data.orderAddressList
         this.entrustList = res.data.data.orderItemList
         this.goodsList = res.data.data.orderItemList
+        this.orderFilesList = res.data.data.fileList
         if (res.data.data.orderFeeList.length > 0) {
           res.data.data.orderFeeList.forEach(item => {
             if (item.type == 1) {
@@ -768,6 +781,7 @@ export default {
         this.tableData = res.data.data.orderAddressList
         this.entrustList = res.data.data.orderItemList
         this.goodsList = res.data.data.orderItemList
+        this.orderFilesList = res.data.data.fileList
         if (res.data.data.orderFeeList.length > 0) {
           this.collectionList = []
           this.paymentList = []
@@ -822,7 +836,7 @@ export default {
     },
     //地址新增
     addAddress() {
-      this.tableData.splice(this.tableData.length - 1, 0, {leas: 1111})
+      this.tableData.splice(this.tableData.length - 1, 0, {})
     },
     //返回主列表
     backToList() {
@@ -888,6 +902,7 @@ export default {
             ...this.goodsForm,
             kind: '1',
             orderAddressList: data,
+            fileList:this.orderFilesList,
             orderItemList: this.entrustList,
             orderFeeList: this.collectionList.concat(this.paymentList)
           }).then(res => {