Browse Source

陆运修改

caojunjie 3 years ago
parent
commit
e332fa0286

+ 1 - 1
src/views/landTransportation/dispatchingCars/index.vue

@@ -226,7 +226,7 @@ export default {
             width: 140
           }, {
             label: '公司名称',
-            prop: 'corpName',
+            prop: 'corpShortName',
             overHidden: true,
             index: 12,
             width: 140,

+ 1 - 1
src/views/landTransportation/driver/index.vue

@@ -255,7 +255,7 @@ export default {
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 1,
           width: 140,

+ 1 - 1
src/views/landTransportation/motorcadeDriver/index.vue

@@ -362,7 +362,7 @@ export default {
           type: "date",
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
-          format: "yyyy-MM-dd HH:mm:ss",
+          format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 1,
           width: 145,

+ 4 - 3
src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -1748,7 +1748,6 @@ export default {
     //确认变更
     confirmChange() {
       validChange().then(res => {
-        console.log(res)
         this.goodsForm.status = 0
         this.goodsOptionFormC.disabled = false
         this.goodsOptionForm.disabled = false
@@ -1769,14 +1768,16 @@ export default {
                 item.sort = index + 1
               })
               this.type = true
+              let form = this.goodsForm
               delete this.goodsForm.status
+              delete form.orderItemList
               changeSubmission({
-                ...this.goodsForm,
+                ...form,
                 kind: '1',
                 orderAddressList: data,
                 fileList: this.orderFilesList,
                 itemList: this.entrustList,
-                orderItemList: this.vehicleList,
+                orderItemList:[],
                 orderFeeList: this.collectionList.concat(this.paymentList)
               }).then(res => {
                 this.$message.success('保存成功');

+ 1 - 1
src/views/landTransportation/placeAnOrder/index.vue

@@ -291,7 +291,7 @@ export default {
             width: 140
           }, {
             label: '公司名称',
-            prop: 'corpName',
+            prop: 'shortName',
             overHidden: true,
             index: 12,
             width: 140,

+ 1 - 1
src/views/landTransportation/reportAnalysis/index.vue

@@ -291,7 +291,7 @@ export default {
           }],
         column: [{
           label: '客户名称',
-          prop: 'corpName',
+          prop: 'corpShortName',
           overHidden: true,
           index: 1,
           width: 140,

+ 1 - 1
src/views/wel/home/landTransportation/components/sales-reached.vue

@@ -99,7 +99,7 @@ export default {
         // this.rankingTwo('totalBulkCargoTwo', '散货总量:'+res.data.data.dept.all, res.data.data.dept.list)
       })
       bizCount({mold:3}).then(res=>{
-        this.rankingTwo('specialTotal', '特种车辆:'+res.data.data.flow.all,res.data.data.flow.list)
+        this.rankingTwo('specialTotal', '特种运输:'+res.data.data.flow.all,res.data.data.flow.list)
         // this.rankingTwo('specialTotalTwo', '特种车辆总量:'+res.data.data.dept.all,res.data.data.dept.list)
       })
       this.loading = false

+ 12 - 2
src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -23,12 +23,22 @@
               header-row-style="color: #000"
               style="width: 100%;">
             <el-table-column
+                type="index"
+                label="序号"
+                align="center"
+                width="50">
+            </el-table-column>
+            <el-table-column
               align="center"
               label="货运日期"
               width="150"
               show-overflow-tooltip
               prop="arrivalTime"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                {{scope.row.arrivalTime?scope.row.arrivalTime.slice(0,16):''}}
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="业务员"
@@ -141,7 +151,7 @@
                 label="客户名称"
                 width="190"
                 show-overflow-tooltip
-                prop="corpName"
+                prop="corpShortName"
             ></el-table-column>
             <el-table-column
                 align="center"