提交散货

src/api/landTransportation/bulkCargo.js

@@ -74,3 +74,27 @@ export function tRemove(data) {
         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/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>
@@ -345,12 +344,11 @@
             align="center"
             fixed
             v-if="goodsForm.status === 0"
-            width="40">
+            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>
           </template>
           <template slot-scope="scope">
@@ -499,7 +497,8 @@
                       @click="moveUp(scope.row,scope.$index)"></el-button>
                 </div>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="向下移动" placement="right" v-if="scope.$index < tableDataTwo.length-1">
+              <el-tooltip class="item" effect="dark" content="向下移动" placement="right"
+                          v-if="scope.$index < tableDataTwo.length-1">
                 <div class="single" style="margin-top: -5px">
                   <el-button
                       type="text"
@@ -512,6 +511,15 @@
             </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>
@@ -527,7 +535,7 @@
             align="center"
             fixed
             v-if="goodsForm.status === 0"
-            width="40">
+            width="50">
           <template slot-scope="scope" slot="header">
             <el-tooltip
                 className="item"
@@ -539,8 +547,7 @@
                   icon="el-icon-plus"
                   size="mini"
                   circle
-                  @click="addAddressTwo"
-                  style="margin-right: 1.25rem;">
+                  @click="addAddressTwo">
               </el-button>
             </el-tooltip>
           </template>
@@ -729,6 +736,15 @@
             </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>
@@ -804,6 +820,7 @@
           v-if="activeIndex === '1'"
           :data="collectionList"
           :option="collectionOption"
+          :key="key"
           ref="collection"
           @resetColumn="resetColumnCollection"
           @saveColumn="saveColumnCollection"
@@ -867,6 +884,7 @@
           v-if="activeIndex === '2'"
           :data="paymentList"
           :option="paymentOption"
+          :key="key"
           ref="payment"
           @resetColumn="resetColumnPayment"
           @saveColumn="saveColumnPayment"
@@ -966,7 +984,7 @@ import {
   detailDelegationList,
   removeCollection,
   saveSaveList,
-  addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove,saveFile
+  addressList, cancelSubmission, getCorp, getSalesman, getFee, changeSubmission, validChange, tRemove, saveFile
 } from "@/api/landTransportation/bulkCargo";
 import {getDeptTree} from "@/api/system/dept";
 import website from "@/config/website";
@@ -1005,7 +1023,7 @@ export default {
       orderFilesList: [],
       salesmanList: [],
       vehicleList: [],
-      packageType:[],
+      packageType: [],
       breakConfiguration: {
         multipleChoices: false,
         multiple: false,
@@ -1600,7 +1618,7 @@ export default {
           prop: 'fleetId',
           type: 'select',
           cascader: ['plateNo'],
-          dicUrl: "/api/blade-client/corpsdesc/list?size=1000&current=1&&corpType=CD",
+          dicUrl: "/api/blade-client/corpsdesc/list?size=500&current=1&&corpType=CD",
           props: {
             label: "cname",
             value: "id",
@@ -1815,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,
@@ -1841,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,
@@ -1869,9 +1887,11 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
+          index:9
         }]
       },
       paymentList: [],
+      key: 0,
       collectionOption: {},
       paymentOption: {},
       paymentOptionBackup: {
@@ -1906,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,
@@ -1922,45 +1948,46 @@ 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() {
-    getDictionary({code:'package_type'}).then(res=>{
+    getDictionary({code: 'package_type'}).then(res => {
       this.packageType = res.data.data
     })
     this.findObject(this.goodsOptionFormTwo.column, "plateNo").change = (data) => {
@@ -1991,7 +2018,7 @@ 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);
-    console.log(this.id)
+    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 => {
@@ -2001,7 +2028,7 @@ export default {
           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 => {
@@ -2110,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 : '',
@@ -2297,7 +2324,7 @@ export default {
         this.goodsList = res.data.data.itemList
         this.vehicleList = res.data.data.orderItemList
         this.orderFilesList = res.data.data.fileList
-        if (res.data.data.orderFeeList){
+        if (res.data.data.orderFeeList) {
           if (res.data.data.orderFeeList.length > 0) {
             this.collectionList = []
             this.paymentList = []
@@ -2426,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)
@@ -2503,7 +2530,6 @@ export default {
     },
     //提交委托
     submit(type) {
-      this.goodsForm.salesman = '11111111'
       if (type) {
         this.$refs['goodsFormE'].validate((valid, done) => {
           done()
@@ -2534,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)
@@ -2569,18 +2595,41 @@ export default {
     },
     //收费新增
     addRowCollection() {
-      this.$refs.collection.rowCellAdd({
-        currency: '1',
-        type: '1',
-        $cellEdit: true
-      });
+      if (this.goodsForm.plateNo){
+        this.$refs.collection.rowCellAdd({
+          currency: '1',
+          type: '1',
+          $cellEdit: true,
+          plateNo:this.goodsForm.plateNo
+        });
+      }else {
+        this.$message.error('请选择车号')
+      }
+    },
+    //付费新增
+    addRowPayment() {
+      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) {
-      this.enclosure = true
-      getFee({id: row.id}).then(res => {
-        this.orderList = res.data.data
-      })
+    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() {
@@ -2592,14 +2641,6 @@ export default {
         this.annexOpen(this.formAnnex)
       })
     },
-    //付费新增
-    addRowPayment() {
-      this.$refs.payment.rowCellAdd({
-        currency: '1',
-        type: '2',
-        $cellEdit: true
-      });
-    },
     //选择费用
     selectValue(value, row) {
       this.$set(row, 'feeName', value.cname)

src/views/landTransportation/bulkCargo/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basic-container v-if="false" v-show="show">
+    <basic-container v-show="show">
       <div class="home-container">
         <div style="display: flex;justify-content: center;">
           <div class="content">
@@ -172,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>
@@ -281,7 +281,7 @@ export default {
             search: true,
           }, {
             label: '合同号',
-            prop: 'billNo',
+            prop: 'contractNo',
             index: 4,
             overHidden: true,
             width: 140,