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

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -450,7 +450,9 @@ export default {
             this.form.goodsTypeId = this.form.goodsTypeId.join(',')
           }
           if (!this.form.artsVision) this.$set(this.form, 'artsVisionName', null);
-          this.form.artsVision = this.form.artsVision.join(',')
+          if (this.form.artsVision) {
+            this.form.artsVision = this.form.artsVision.join(',')
+          }
           const params = {
             ...this.form,
             type: 0

src/views/businessManagement/deliveryNotice/configuration/customerContact.json

@@ -38,6 +38,14 @@
     {
       "name": "purchaseTotalAmount",
       "type": "sum"
+    },
+    {
+      "name": "actualWeight",
+      "type": "sum"
+    },
+    {
+      "name": "containerVolume",
+      "type": "sum"
     }
   ],
   "column":[
@@ -250,6 +258,36 @@
           "trigger": "blur"
         }
       ]
+    },
+    {
+      "label": "重量",
+      "prop": "actualWeight",
+      "index": 17,
+      "width":100,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入重量",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "体积",
+      "prop": "containerVolume",
+      "index": 18,
+      "width":100,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入体积",
+          "trigger": "blur"
+        }
+      ]
     }
   ]
 }

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -737,7 +737,31 @@ export default {
                 trigger: 'change'
               }
             ]
+          },
+          {
+            label: '重量合计',
+            prop: 'totalWeight',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
           },{
+            label: '体积合计',
+            prop: 'totalVolumn',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: "备注",
             span: 24,
             type: 'textarea',
@@ -862,6 +886,8 @@ export default {
       this.$set(this.form, 'srcOrderNo', this.form.orgOrderNo)
       this.$set(this.form, 'arrivalContact', this.form.corpAttn)
       this.$set(this.form, 'arrivalTel', this.form.corpTel)
+      this.$set(this.form, 'totalWeight', this.form.cartonWeight)
+      this.$set(this.form, 'totalVolumn', this.form.cntrVolumn)
       this.form.orderItemsList.forEach(item => {
         this.$set(item, 'contractNumber', this.form.orgOrderNo)
       })
@@ -913,6 +939,8 @@ export default {
         delete item.updateUser
       })
       this.contactsData.forEach(item => {
+        this.$set(item, 'containerVolume', item.cntrVolumn)
+        this.$set(item, 'actualWeight', item.cartonWeight)
         this.$set(item, 'specificationAndModel', item.itemType)
         this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
         this.$set(item, 'srcOrderNo', this.form.srcOrderNo)
@@ -947,6 +975,7 @@ export default {
   methods: {
     queryData(id, isCopy = false, type) {
       this.pageLoading = true
+      this.saveLoading = true
       detail(id).then(res => {
         this.form = res.data.data;
         if (this.form.deliveryStatus == '已收货') {
@@ -1088,12 +1117,14 @@ export default {
               this.form.corpsTypeId = this.form.corpsTypeId.join(",")
             }
             this.pageLoading = true
+            this.saveLoading = true
             this.saveActives = ''
             sendOutGoods(this.form).then(res => {
               this.$message.success('收货成功')
               this.queryData(res.data.data.id)
             }).finally(() => {
               this.pageLoading = false
+              this.saveLoading = false
             })
           })
         } else if (type == '到货') {
@@ -1102,6 +1133,7 @@ export default {
           } else {
             this.form.deliveryItemsList = this.goodsShowData.concat(this.giftData)
           }
+          this.saveLoading = true
           this.pageLoading = true
           this.saveActives = ''
           confirmArrival(this.form).then(res => {
@@ -1109,6 +1141,7 @@ export default {
             this.queryData(this.form.id)
           }).catch(() => {
             this.pageLoading = false
+            this.saveLoading = false
           })
         }
       }).finally(() => {
@@ -1722,12 +1755,14 @@ export default {
         this.form.deliveryItemsList = this.goodsShowData.concat(this.giftData)
       }
       this.pageLoading = true
+      this.saveLoading = true
       this.saveActives = ''
       cancelArrival(this.form).then(res => {
         this.$message.success('撤销到货成功')
         this.queryData(this.form.id)
       }).catch(() => {
         this.pageLoading = false
+        this.saveLoading = false
       })
     },
     // 导入销售明细

src/views/businessManagement/purchaseOrder/configuration/customerContact.json

@@ -31,6 +31,14 @@
       "name": "orderQuantity",
       "type": "sum",
       "decimals": 0
+    },
+    {
+      "name": "cartonWeight",
+      "type": "sum"
+    },
+    {
+      "name": "cntrVolumn",
+      "type": "sum"
     }
   ],
   "column":[
@@ -163,6 +171,36 @@
           "trigger": "blur"
         }
       ]
+    },
+    {
+      "label": "重量",
+      "prop": "cartonWeight",
+      "index": 15,
+      "width":100,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入重量",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "体积",
+      "prop": "cntrVolumn",
+      "index": 15,
+      "width":100,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入体积",
+          "trigger": "blur"
+        }
+      ]
     }
   ]
 }

src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -14,7 +14,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
-  "menuWidth": 130,
+  "menuWidth": 180,
   "dialogClickModal": false,
   "searchLabelWidth": 100,
   "searchIcon": true,

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -770,6 +770,28 @@ export default {
               }
             ]
           },{
+            label: '重量合计',
+            prop: 'cartonWeight',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },{
+            label: '体积合计',
+            prop: 'cntrVolumn',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },{
             label: "备注",
             span: 24,
             prop: "orderRemark",
@@ -873,6 +895,7 @@ export default {
     // 明细查询
     queryData(id, isCopy = false) {
       this.pageLoading = true
+      this.saveLoading = true
       detail(id).then(res => {
         this.form = res.data.data;
         this.browse = this.form.status > 0? true: false
@@ -1701,6 +1724,7 @@ export default {
             checkFlag: 1,
           }
           this.pageLoading = true
+          this.saveLoading = true
           pleaseCheck(data).then(res => {
             this.$message.success('请核成功')
             // this.pageLoading = false
@@ -1708,6 +1732,7 @@ export default {
             this.queryData(this.form.id)
           }).finally(() => {
             this.pageLoading = false
+            this.saveLoading = false
           })
         })
       } else {

src/views/businessManagement/receipt/configuration/customerContact.json

@@ -30,6 +30,14 @@
     {
       "name": "deliveryAmount",
       "type": "sum"
+    },
+    {
+      "name": "actualWeight",
+      "type": "sum"
+    },
+    {
+      "name": "containerVolume",
+      "type": "sum"
     }
   ],
   "column":[
@@ -161,6 +169,36 @@
           "trigger": "blur"
         }
       ]
+    },
+    {
+      "label": "重量",
+      "prop": "actualWeight",
+      "index": 7,
+      "width":100,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入重量",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "体积",
+      "prop": "containerVolume",
+      "index": 8,
+      "width":100,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入体积",
+          "trigger": "blur"
+        }
+      ]
     }
   ]
 }

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -654,6 +654,29 @@ export default {
               disabled:true
           },
           {
+            label: '重量合计',
+            prop: 'totalWeight',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },{
+            label: '体积合计',
+            prop: 'totalVolumn',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },
+          {
             label: "入库单备注",
             span: 24,
             type: 'textarea',
@@ -767,12 +790,16 @@ export default {
       delete this.form.corpName
       this.$set(this.form, 'deliveryStatus', '录入')
       this.$set(this.form, 'salesCompany', this.form.belongToCorpId)
+      this.$set(this.form, 'totalWeight', this.form.cartonWeight)
+      this.$set(this.form, 'totalVolumn', this.form.cntrVolumn)
       delete this.form.belongToCorpList
       this.$set(this.form, 'deliveryAmount', 0)
       this.$set(this.form, 'totalQuantity', 0)
       this.$set(this.form, 'purchaseAmount', 0)
       this.returnBack({id: this.form.corpId})
       this.contactsData.forEach(item => {
+        this.$set(item, 'containerVolume', item.cntrVolumn)
+        this.$set(item, 'actualWeight', item.cartonWeight)
         this.$set(item, 'specificationAndModel', item.itemType)
         this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
         this.$set(item, "inventoryNumber", item.storageQuantity)
@@ -801,6 +828,7 @@ export default {
   methods: {
     queryData(id, isCopy = false) {
       this.pageLoading = true
+      this.saveLoading = true
       detail(id).then(res => {
         this.form = res.data.data;
         this.receiveDisabled = this.form.deliveryStatus == '录入'? false: true
@@ -1255,12 +1283,14 @@ export default {
             if (typeof this.form.corpsTypeId == 'object') {
               this.form.corpsTypeId = this.form.corpsTypeId.join(",")
             }
+            this.saveLoading = true
             this.pageLoading = true
             sendInGoods(this.form).then(res => {
               this.$message.success('发货成功')
               this.queryData(res.data.data.id)
             }).finally(() => {
               this.pageLoading = false
+              this.saveLoading = false
             })
           }
         } else {
@@ -1280,11 +1310,13 @@ export default {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")
           }
           this.pageLoading = true
+          this.saveLoading = true
           revokeInGoods(this.form).then(res => {
             this.$message.success('撤销成功')
             this.queryData(res.data.data.id)
           }).finally(() => {
             this.pageLoading = false
+            this.saveLoading = false
           })
         } else {
           return false;
@@ -1334,11 +1366,13 @@ export default {
                   this.form.corpsTypeId = this.form.corpsTypeId.join(",")
                 }
                 this.pageLoading = true
+                this.saveLoading = true
                 sendInGoods(this.form).then(res => {
                   this.$message.success('发货成功')
                   this.queryData(res.data.data.id)
                 }).finally(() => {
                   this.pageLoading = false
+                  this.saveLoading = false
                 })
               })
             }

src/views/businessManagement/salesOrder/configuration/commodity.json

@@ -124,6 +124,18 @@
       "overHidden": true
     },
     {
+      "label": "体积",
+      "prop": "cntrVolumn",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "重量",
+      "prop": "cartonWeight",
+      "slot": true,
+      "overHidden": true
+    },
+    {
       "label": "商品图片",
       "prop": "url",
       "type": "upload",

src/views/businessManagement/salesOrder/configuration/customerContact.json

@@ -37,6 +37,14 @@
       "name": "actualQuantity",
       "type": "sum",
       "decimals": 0
+    },
+    {
+      "name": "cartonWeight",
+      "type": "sum"
+    },
+    {
+      "name": "cntrVolumn",
+      "type": "sum"
     }
   ],
   "column":[{
@@ -281,6 +289,36 @@
           "trigger": "blur"
         }
       ]
+    },
+    {
+      "label": "重量",
+      "prop": "cartonWeight",
+      "index": 15,
+      "width":100,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入重量",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "体积",
+      "prop": "cntrVolumn",
+      "index": 15,
+      "width":100,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入体积",
+          "trigger": "blur"
+        }
+      ]
     }
   ]
 }

src/views/businessManagement/salesOrder/configuration/mainList.json

@@ -416,7 +416,15 @@
       "label": "特批提交时间",
       "prop": "specialCheckTime",
       "search": false,
-      "index": 33,
+      "index": 38,
+      "width": 120,
+      "overHidden": true
+    },
+    {
+      "label": "备注",
+      "prop": "orderRemark",
+      "search": false,
+      "index": 39,
       "width": 120,
       "overHidden": true
     }

src/views/businessManagement/salesOrder/configuration/optionPolicy.json

@@ -81,6 +81,19 @@
         }
       ]
     },{
+      "label": "供应商",
+      "prop": "corpName",
+      "index": 4,
+      "width":100,
+      "cell": true,
+      "rules": [
+        {
+          "required": false,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },{
       "label": "采购价（元）",
       "prop": "purchasePrice",
       "index": 5,

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -567,6 +567,34 @@
                        ref="crud"
                        @selection-change="selectionChangePolicy"
                        :page.sync="pagePolicy">
+              <template slot="menuLeft">
+                <el-button
+                  type="info"
+                  size="mini"
+                  icon="el-icon-download"
+                  @click="downLoadPolicy"
+                >下载模板</el-button>
+                <el-upload
+                  :action="policyUrl+'?policyName=' + uploadPolicy.policyName + '&salesType=1'"
+                  :headers="headers"
+                  :disabled="detailData.seeDisabled || browse"
+                  :on-progress="uploading"
+                  :show-file-list=false
+                  accept=".xls,.xlsx"
+                  multiple
+                  :on-success="successPolicy"
+                  :on-error="uploadError"
+                  style="float: right"
+                >
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    icon="el-icon-upload"
+                    :disabled="uploadPolicy.policyName === ''"
+                    :loading="loadingPolicy"
+                  >导 入</el-button>
+                </el-upload>
+              </template>
               <template slot="orderQuantity" slot-scope="{row}">
                 <el-input-number
                   v-model="row.orderQuantity"
@@ -935,7 +963,6 @@ export default {
           const newTime = new Date().toLocaleString('chinese',{hour12:false})
           policyColumn({newTime: newTime,parentId: parentId,corps: this.form.corpId}).then(res => {
             resolve(res.data.data.map(item => {
-              console.log(item)
               return {
                 ...item,
                 leaf: !item.hasChildren
@@ -1279,6 +1306,28 @@ export default {
                 trigger: 'blur'
               }
             ]
+          },{
+            label: '重量合计',
+            prop: 'cartonWeight',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
+          },{
+            label: '体积合计',
+            prop: 'cntrVolumn',
+            disabled: true,
+            rules: [
+              {
+                required: false,
+                message: ' ',
+                trigger: 'blur'
+              }
+            ]
           }, {
             label: '制单人',
             prop: 'createUserName',
@@ -1561,7 +1610,13 @@ export default {
       switchDialog: false,
       // 商品信息表格loading
       goodsLoading: false,
-      baseURL: '/api/blade-purchase-sales/orderitems/importPrice',
+      // 上传时带的参数
+      uploadPolicy: {
+        policyName: '',
+        salesType: 1
+      },
+      baseURL: '/api/blade-purchase-sales/orderitems/importPrice', // 商品明细上传路径
+      policyUrl: '/api/blade-purchase-sales/orderitems/importPolicy', // 导入政策上传路径
       headers: { "Blade-Auth": 'Bearer ' + getToken()},
       activeName: 'searchList',
       // 商品列表数据合计
@@ -1633,7 +1688,6 @@ export default {
     });
     // 获取角色
     this.roleName = localStorage.getItem('roleName')
-    console.log(this.roleName)
     if (!this.roleName.includes('admin') && !this.roleName.includes('assistant')) {
       this.contactInformation.column.forEach(item => {
         if (item.prop == 'grossProfitRate' || item.prop == 'grossProfit') item.display = false
@@ -1702,6 +1756,7 @@ export default {
     },
     queryData(id, isCopy = false){
       this.pageLoading = true
+      this.saveLoading = true
       detail(id).then(async res => {
         this.form = res.data.data;
         this.browse = this.form.status > 0? true: false;
@@ -1991,6 +2046,7 @@ export default {
     uploading(event, file, fileList) {
       this.openFullScreen(false, '文件正在解析中');
     },
+    // 商品明细上传成功钩子
     importTemplate(res, file) {
       this.openFullScreen(true)
       let goodsData = []
@@ -2028,6 +2084,16 @@ export default {
       this.goodsShowData = this.goodsShowData.concat(res.data)
 
     },
+    // 政策导入成功钩子
+    successPolicy(res, file) {
+      this.openFullScreen(true)
+      if (res.data.message === "" && !res.data.message) {
+        this.dataPolicy = res.data.list? res.data.list: [];
+      } else {
+        this.dataPolicy = res.data.list? res.data.list: [];
+        this.$message.error('导入失败，商品编码有:' + res.data.message);
+      }
+    },
     uploadError(err, file, fileList) {
       this.openFullScreen(true)
       this.$message.error(JSON.parse(err.message).msg)
@@ -2537,6 +2603,7 @@ export default {
     },
     closePolicy() {
       this.treePolicyId = '';
+      this.uploadPolicy.policyName = ''
       this.dataPolicy = [];
       this.contactsDataBuyFree = [];
       this.policyData = []
@@ -2558,6 +2625,7 @@ export default {
     },
     //导入页销售政策查询
     policyNodeClick(data) {
+      this.uploadPolicy.policyName = data.id;
       this.treePolicyId = data.id
       // detailList(data.id).then(res => {
       //   //特价促销
@@ -3274,18 +3342,24 @@ export default {
             item.property == "amount" ||
             item.property == "orderQuantity" ||
             item.property == "actualQuantity" ||
-            item.property == "integral"
+            item.property == "integral" ||
+            item.property == "cartonWeight" ||
+            item.property == "cntrVolumn"
           ) {
             let amountSum = 0;
             let orderQuantitySum = 0;
             let actualQuantitySum = 0;
             let integralSum = 0;
+            let cartonWeight = 0;
+            let cntrVolumn = 0;
             if (this.selection.length > 0) {
               this.selection.forEach(e => {
                 amountSum = _.add(amountSum, Number(e.amount));
                 orderQuantitySum = _.add(orderQuantitySum, Number(e.orderQuantity));
                 actualQuantitySum = _.add(actualQuantitySum, Number(e.actualQuantity));
                 integralSum = _.add(integralSum, Number(e.integral));
+                cartonWeight = _.add(cartonWeight, Number(e.cartonWeight));
+                cntrVolumn = _.add(cntrVolumn, Number(e.cntrVolumn));
               })
             }
             // 订货数量合计
@@ -3304,6 +3378,14 @@ export default {
             if (item.property == "integral") {
               sums[index] = integralSum ? integralSum.toFixed(2) : "0.00";
             }
+            // 重量合计
+            if (item.property == "cartonWeight") {
+              sums[index] = cartonWeight ? cartonWeight.toFixed(2) : "0.00";
+            }
+            // 体积合计
+            if (item.property == "cntrVolumn") {
+              sums[index] = cntrVolumn ? cntrVolumn.toFixed(2) : "0.00";
+            }
           }
         })
       }
@@ -3422,12 +3504,14 @@ export default {
             checkFlag: 2,
           }
           this.pageLoading = true
+          this.saveLoading = true
           pleaseCheck(data).then(res => {
             this.$message.success('请核成功')
             this.saveActives = ''
             this.queryData(this.form.id)
           }).finally(() => {
             this.pageLoading = false
+            this.saveLoading = false
           })
         })
       }
@@ -3445,12 +3529,14 @@ export default {
             checkFlag: 2,
           }
           this.pageLoading = true
+         this.saveLoading = true
           repealCancel(data).then(res => {
             this.$message.success('撤回成功')
             this.saveActives = ''
             this.queryData(this.form.id)
           }).finally(() => {
             this.pageLoading = false
+            this.saveLoading = false
           })
         })
     },
@@ -3466,12 +3552,14 @@ export default {
           checkFlag: 3
         }
         this.pageLoading = true
+        this.saveLoading = true
         pleaseCheck(data).then(res => {
           this.$message.success('请核成功')
           this.saveActives = ''
           this.queryData(this.form.id)
         }).finally(() => {
           this.pageLoading = false
+          this.saveLoading = false
         })
       }
     },
@@ -3601,6 +3689,20 @@ export default {
       })
       this.$message.success('刷新成功')
     },
+    // 导入政策下载模板
+    downLoadPolicy() {
+      this.$confirm('是否下载模板文件？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        window.open(
+          `/api/blade-purchase-sales/orderitems/policy?${
+            this.website.tokenHeader
+          }=${getToken()}`
+        );
+      })
+    },
   },
   computed: {
     ...mapGetters(["userInfo", "permission"])

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -118,7 +118,7 @@
         </el-table-column>
         <el-table-column
             property="corpName"
-            label="发货工厂"
+            label="货运地点"
             align="center"
             show-overflow-tooltip
             width="200">
@@ -918,18 +918,20 @@ export default {
             message: " ",
             trigger: "blur"
           }],
-        }, {
-          label: '货运日期',
-          type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          prop: 'arrivalTime',
-          rules: [{
-            required: true,
-            message: " ",
-            trigger: "blur"
-          }],
-        }, {
+        },
+        //   {
+        //   label: '货运日期',
+        //   type: "datetime",
+        //   format: 'yyyy-MM-dd HH:mm:ss',
+        //   valueFormat: 'yyyy-MM-dd HH:mm:ss',
+        //   prop: 'arrivalTime',
+        //   rules: [{
+        //     required: true,
+        //     message: " ",
+        //     trigger: "blur"
+        //   }],
+        // },
+          {
           label: '备注',
           span: 24,
           minRows: 2,

src/views/landTransportation/driver/index.vue

@@ -270,24 +270,17 @@ export default {
           overHidden: true,
           prop: 'billNo'
         }, {
-          label: '平台号',
-          width: 100,
-          index: 4,
-          search: true,
-          overHidden: true,
-          prop: 'orderNo'
-        }, {
           label: '场站',
           prop: 'station',
           overHidden: true,
-          index: 5,
+          index: 4,
           width: 140,
           search: true,
         },  {
           label: '车队',
           width: 200,
           search: true,
-          index:6,
+          index:5,
           overHidden: true,
           prop: 'fleetId'
         },{
@@ -295,7 +288,7 @@ export default {
           width: 150,
           prop: 'plateNo',
           overHidden: true,
-          index:7,
+          index:6,
           type: 'select',
           search: true,
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
@@ -306,7 +299,7 @@ export default {
         }, {
           label: '司机',
           width: 115,
-          index:8,
+          index:7,
           search: true,
           overHidden: true,
           prop: 'driverId',
@@ -319,11 +312,18 @@ export default {
         }, {
           label: '电话',
           width: 160,
-          index:9,
+          index:8,
           overHidden: true,
           search: true,
           prop: 'tel'
         }, {
+          label: '平台号',
+          width: 100,
+          index: 9,
+          search: true,
+          overHidden: true,
+          prop: 'orderNo'
+        }, {
           label: '箱号',
           cell: true,
           width: 245,

src/views/landTransportation/motorcadeDriver/index.vue

@@ -377,17 +377,10 @@ export default {
           overHidden: true,
           prop: 'billNo'
         }, {
-          label: '平台号',
-          width: 100,
-          index: 4,
-          search: true,
-          overHidden: true,
-          prop: 'orderNo'
-        }, {
           label: '场站',
           prop: 'station',
           overHidden: true,
-          index: 5,
+          index: 4,
           width: 140,
           search: true,
         },
@@ -395,7 +388,7 @@ export default {
             label: '车队',
             width: 200,
             search: true,
-            index: 7,
+            index: 5,
             // hide:true,
             showColumn: false,
             filterable: true,
@@ -436,7 +429,7 @@ export default {
             overHidden: true,
             cell: true,
             filterable: true,
-            index: 8,
+            index: 7,
             prop: 'driverId',
             type: 'select',
             dicUrl: "/api/blade-client/land-driver/driver-list?plateNo={{key}}",
@@ -450,9 +443,16 @@ export default {
             width: 160,
             search: true,
             cell: true,
-            index: 9,
+            index: 8,
             prop: 'tel'
           }, {
+            label: '平台号',
+            width: 100,
+            index: 9,
+            search: true,
+            overHidden: true,
+            prop: 'orderNo'
+          },{
             label: '箱号',
             overHidden: true,
             width: 245,

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -156,7 +156,7 @@
         <template slot="headerSerial" slot-scope="{column}">
           <el-tooltip class="item" effect="dark" content="录入明细" placement="top">
             <el-button type="primary" icon="el-icon-circle-plus-outline" circle size="mini"
-                       @click="$refs.crudBox.rowCellAdd({arrivalTime:new Date((new Date).getTime() + 8 * 60 * 60 * 1000).toJSON().split('T').join(' ').substr(0, 14)+'00:00'})"></el-button>
+                       @click="$refs.crudBox.rowCellAdd({arrivalTime:new Date((new Date).getTime() + 8 * 60 * 60 * 1000).toJSON().split('T').join(' ').substr(0, 14)+'00:00',landAmountD:0})"></el-button>
           </el-tooltip>
         </template>
         <template slot="ctnTypeHeader" slot-scope="{column}">
@@ -168,9 +168,9 @@
         <!--        <template slot="landWeightHeader" slot-scope="{column}">-->
         <!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
         <!--        </template>-->
-        <template slot="landAmountDHeader" slot-scope="{column}">
-          {{ column.label }}<span style="color:#F56C6C">*</span>
-        </template>
+<!--        <template slot="landAmountDHeader" slot-scope="{column}">-->
+<!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
+<!--        </template>-->
         <template slot="arrivalTimeHeader" slot-scope="{column}">
           {{ column.label }}<span style="color:#F56C6C">*</span>
         </template>
@@ -277,7 +277,6 @@
             property="address"
             align="center"
             width="150"
-            :render-header="customTitle"
             label="联系人">
           <template slot-scope="scope">
             <el-input v-model="scope.row.contacts" :disabled="goodsForm.status !== 0" size="small"
@@ -288,7 +287,6 @@
             property="address"
             align="center"
             width="180"
-            :render-header="customTitle"
             label="电话">
           <template slot-scope="scope">
             <el-input v-model="scope.row.tel" :disabled="goodsForm.status !== 0" size="small"
@@ -298,7 +296,6 @@
         <el-table-column
             property="address"
             align="center"
-            :render-header="customTitle"
             label="详细地址">
           <template slot-scope="scope">
             <el-input v-model="scope.row.address" :disabled="goodsForm.status !== 0" size="small"
@@ -327,7 +324,7 @@
           :option="vehicleOption">
       </avue-crud>
     </basic-container>
-    <containerTitle title="费用明细"></containerTitle>
+    <containerTitle title="其他费用"></containerTitle>
     <basic-container>
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
         <el-tab-pane label="应收" name="1"></el-tab-pane>
@@ -1004,9 +1001,8 @@ export default {
             prop: 'etd',
             type: 'date'
           }, {
-            label: '截港日期',
-            prop: 'etc',
-            type: 'date'
+            label: '预配箱量',
+            prop: 'expectCtnQty'
           }, {
             label: '起运港',
             prop: 'polId'
@@ -1014,8 +1010,9 @@ export default {
             label: '目的港',
             prop: 'podId'
           }, {
-            label: '预配箱量',
-            prop: 'expectCtnQty'
+            label: '截港日期',
+            prop: 'etc',
+            type: 'date'
           }, {
             label: '截单日期',
             prop: 'siCutoffDate',
@@ -1679,16 +1676,16 @@ export default {
         for (let item in this.tableData) {
           if (item < Number(this.tableData.length) - 1) {
             if (!this.tableData[item].corpId) return this.$message.error('请选择第' + Number(Number(item) + 1) + '行货运地点');
-            if (!this.tableData[item].address) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行详细地址');
-            if (!this.tableData[item].contacts) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行联系人');
-            if (!this.tableData[item].tel) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行电话');
+            // if (!this.tableData[item].address) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行详细地址');
+            // if (!this.tableData[item].contacts) return this.$message.error('请输入第' + Number(Number(item) + 1) + '行联系人');
+            // 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[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) => {

src/views/maintenance/salesPolicy/configuration/BuyFree.json

@@ -90,7 +90,8 @@
           "trigger": "blur"
         }
       ]
-    },{
+    },
+    {
       "label": "供应商",
       "prop": "corpId",
       "index": 3,

src/views/statisticAnalysis/dataDetail/index.vue

@@ -114,12 +114,18 @@ export default {
             overHidden: true,
           },
           {
-            label: "商品名称",
+            label: "产品名称",
             prop: "goodsName",
             search: false,
             overHidden: true,
           },
           {
+            label: "产品编码",
+            prop: "goodsCode",
+            search: false,
+            overHidden: true,
+          },
+          {
             label: "规格",
             prop: "typeNo",
             search: false,