陆运修改

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -542,10 +542,11 @@ import {
   fleetDriverSave,
   recordingDetails,
   changeFleet,
-  incidentalSubmit, saveFile, getFee
+  incidentalSubmit, saveFile, getFee, fleetList
 } from "@/api/landTransportation";
 import website from "@/config/website";
 import {getDeptTree} from "@/api/system/dept";
+import {customerList} from "@/api/basicData/basicFeesDesc";
 
 export default {
   props: {
@@ -556,11 +557,11 @@ export default {
   data() {
     return {
       formData: {},
-      enclosure:false,
+      enclosure: false,
       formAnnex: {},
-      key:0,
+      key: 0,
       formDataList: {},
-      orderList:[],
+      orderList: [],
       dialogChange: false,
       optionData: {
         span: 12,
@@ -1068,7 +1069,7 @@ export default {
           label: '委托日期',
           prop: 'bsDate',
           type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
         }, {
           label: '票据号',
@@ -1240,7 +1241,7 @@ export default {
         ]
       },
       collectionList: [],
-      collectionOption:{},
+      collectionOption: {},
       collectionOptionBackup: {
         align: 'center',
         menuAlign: 'center',
@@ -1270,10 +1271,21 @@ export default {
         column: [{
           label: '客户名称',
           slot: true,
+          width: 300,
           prop: 'corpId'
         }, {
+          label: '车号',
+          cell: true,
+          prop: 'plateNo',
+          type: "select",
+          props: {
+            label: "label",
+            value: "label"
+          },
+        }, {
           label: '费用名称',
           slot: true,
+          width: 200,
           prop: 'feeId'
         }, {
           label: '计价单位',
@@ -1286,16 +1298,22 @@ export default {
             value: "dictKey"
           }
         }, {
-          label: '数量',
-          cell: true,
-          prop: 'quantity'
-        }, {
           label: '单价',
           cell: true,
+          type: 'number',
+          controls:false,
           prop: 'price'
         }, {
+          label: '数量',
+          cell: true,
+          controls:false,
+          type: 'number',
+          prop: 'quantity'
+        }, {
           label: '金额',
           cell: true,
+          type: 'number',
+          controls:false,
           prop: 'amount'
         }, {
           label: '税率',
@@ -1311,21 +1329,12 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
-        }, {
-          label: '车号',
-          cell: true,
-          prop: 'plateNo',
-          type: "select",
-          props: {
-            label: "label",
-            value: "label"
-          },
         }
         ]
       },
       paymentList: [],
-      paymentOption:{},
-      paymentOptionBackup:{
+      paymentOption: {},
+      paymentOptionBackup: {
         align: 'center',
         menuAlign: 'center',
         index: true,
@@ -1354,10 +1363,21 @@ export default {
         column: [{
           label: '客户名称',
           slot: true,
+          width: 300,
           prop: 'corpId'
         }, {
+          label: '车号',
+          cell: true,
+          prop: 'plateNo',
+          type: "select",
+          props: {
+            label: "label",
+            value: "label"
+          },
+        }, {
           label: '费用名称',
           slot: true,
+          width: 200,
           prop: 'feeId'
         }, {
           label: '计价单位',
@@ -1370,23 +1390,29 @@ export default {
             value: "dictKey"
           }
         }, {
-          label: '数量',
+          label: '单价',
           cell: true,
-          prop: 'quantity'
+          controls:false,
+          type: 'number',
+          prop: 'price',
         }, {
-          label: '单价',
+          label: '数量',
           cell: true,
-          prop: 'price'
+          controls:false,
+          type: 'number',
+          prop: 'quantity'
         }, {
           label: '金额',
           cell: true,
+          controls:false,
+          type: 'number',
           prop: 'amount'
         }, {
-          label: '税率(默认6)',
+          label: '税率',
           cell: true,
           prop: 'taxRate'
         }, {
-          label: '币别(默认RMB)',
+          label: '币别',
           cell: true,
           prop: 'currency',
           type: "select",
@@ -1395,16 +1421,7 @@ export default {
             label: "dictValue",
             value: "dictKey"
           },
-        }, {
-          label: '车号',
-          cell: true,
-          prop: 'plateNo',
-          type: "select",
-          props: {
-            label: "label",
-            value: "label"
-          },
-        }
+        },
         ]
       }
     };
@@ -1413,6 +1430,28 @@ export default {
     this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(86.1), this.entrustOptionTwoTBackup);
     this.collectionOption = await this.getColumnData(this.getColumnName(86.4), this.collectionOptionBackup);
     this.paymentOption = await this.getColumnData(this.getColumnName(86.5), this.paymentOptionBackup);
+    // price
+    // quantity
+    this.findObject(this.collectionOption.column, "price").change = (data) => {
+      if (data.row.price && data.row.quantity){
+        data.row.amount = Number(data.row.price) * Number(data.row.quantity)
+      }
+    }
+    this.findObject(this.collectionOption.column, "quantity").change = (data) => {
+      if (data.row.price && data.row.quantity){
+        data.row.amount = Number(data.row.price) * Number(data.row.quantity)
+      }
+    }
+    this.findObject(this.paymentOption.column, "price").change = (data) => {
+      if (data.row.price && data.row.quantity){
+        data.row.amount = Number(data.row.price) * Number(data.row.quantity)
+      }
+    }
+    this.findObject(this.paymentOption.column, "quantity").change = (data) => {
+      if (data.row.price && data.row.quantity){
+        data.row.amount = Number(data.row.price) * Number(data.row.quantity)
+      }
+    }
     this.KeyBoxTwo++
     if (this.id) {
       detailDelegationList({id: this.id, kind: '2'}).then(res => {
@@ -1488,7 +1527,7 @@ export default {
        * 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
        * 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
        */
-      const inSave = await this.saveColumnData(this.getColumnName(85.4), this.collectionOption);
+      const inSave = await this.saveColumnData(this.getColumnName(86.4), this.collectionOption);
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -1498,7 +1537,7 @@ export default {
     //自定义列重置
     async resetColumnCollection() {
       this.collectionOption = this.collectionOptionBackup;
-      const inSave = await this.delColumnData(this.getColumnName(85.4), this.collectionOptionBackup);
+      const inSave = await this.delColumnData(this.getColumnName(86.4), this.collectionOptionBackup);
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.collection.$refs.dialogColumn.columnBox = false;
@@ -1528,19 +1567,19 @@ export default {
       }
     },
     //打开附件
-    annexOpen(row, index){
+    annexOpen(row, index) {
       this.enclosure = true
       this.formAnnex = row
-      getFee({id:row.id}).then(res=>{
+      getFee({id: row.id}).then(res => {
         this.orderList = res.data.data
       })
     },
     //保存
-    saveAnnex(){
+    saveAnnex() {
       saveFile({
-        id:this.formAnnex.id,
-        fileList:this.orderList
-      }).then(res=>{
+        id: this.formAnnex.id,
+        fileList: this.orderList
+      }).then(res => {
         this.$message.success("保存成功");
         this.annexOpen(this.formAnnex)
       })
@@ -1725,22 +1764,22 @@ export default {
     },
     rowCell(row, index) {
       if (row.$cellEdit) {
-        if (row.plateNo){
-          incidentalSubmit(row).then(res=>{
+        if (row.plateNo) {
+          incidentalSubmit(row).then(res => {
             this.$refs.collection.rowCell(row, index)
             row = res.data.data
             this.$message.success("保存成功");
           })
-        }else {
+        } else {
           this.$message.error("请选择车号");
         }
-      }else {
+      } else {
         this.$refs.collection.rowCell(row, index)
       }
     },
     paymentRowCell(row, index) {
       if (row.$cellEdit) {
-        incidentalSubmit(row).then(res=>{
+        incidentalSubmit(row).then(res => {
           row = res.data.data
           this.$message.success("保存成功");
         })
@@ -1780,23 +1819,33 @@ export default {
     },
     //收费新增
     addRowCollection() {
-      this.$refs.collection.rowCellAdd({
-        currency: '1',
-        type: '1',
-        corpId:'1526835847238901762',
-        orderId:this.id,
-        $cellEdit: true
-      });
+      customerList({size: 10, current: 1}).then(res => {
+        this.$refs.collection.rowCellAdd({
+          currency: '1',
+          type: '1',
+          feeId: res.data.data.records.length > 0 ? res.data.data.records[0] : '',
+          unit: '件数',
+          corpId: '1526835847238901762',
+          quantity:1,
+          orderId: this.id,
+          $cellEdit: true
+        });
+      })
     },
     //付费新增
     addRowPayment() {
-      this.$refs.payment.rowCellAdd({
-        currency: '1',
-        type: '2',
-        corpId:'1526835847238901762',
-        orderId:this.id,
-        $cellEdit: true
-      });
+      customerList({size: 10, current: 1}).then(res => {
+        this.$refs.payment.rowCellAdd({
+          currency: '1',
+          type: '2',
+          feeId: res.data.data.records.length > 0 ? res.data.data.records[0] : '',
+          unit: '件数',
+          quantity:1,
+          corpId: '1526835847238901762',
+          orderId: this.id,
+          $cellEdit: true
+        });
+      })
     },
     //选择费用
     selectValue(value, row) {

src/views/landTransportation/dispatchingCars/index.vue

@@ -150,7 +150,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: 150,

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -41,7 +41,7 @@
         <div class="el-button&#45;&#45;small-yh add-customer-btn">
           <el-button
               type="primary"
-              :disabled="goodsForm.status > 1"
+              :disabled="goodsForm.status >= 1"
               size="small"
               :loading="type"
               v-if="!typeTwo"
@@ -977,7 +977,7 @@ export default {
           label: '委托日期',
           prop: 'bsDate',
           type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
+          format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
         }, {
           label: '票据号',
@@ -1258,13 +1258,22 @@ export default {
         column: [{
           label: '公司名称',
           slot: true,
-          width: 200,
+          width: 300,
           overHidden: true,
           prop: 'corpId'
         }, {
+          label: '车号',
+          cell: true,
+          prop: 'plateNo',
+          type: "select",
+          props: {
+            label: "label",
+            value: "label"
+          },
+        }, {
           label: '费用名称',
           slot: true,
-          width: 160,
+          width: 200,
           prop: 'feeId'
         }, {
           label: '计价单位',
@@ -1277,14 +1286,14 @@ export default {
             value: "dictKey"
           }
         }, {
-          label: '数量',
-          cell: true,
-          prop: 'quantity'
-        }, {
           label: '单价',
           cell: true,
           prop: 'price'
         }, {
+          label: '数量',
+          cell: true,
+          prop: 'quantity'
+        }, {
           label: '金额',
           cell: true,
           prop: 'amount'

src/views/landTransportation/placeAnOrder/index.vue

@@ -215,7 +215,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: 150,

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

@@ -46,6 +46,10 @@ export default {
     this.getSysType();
   },
   methods: {
+    //点击获取图表数据
+    handleMousedown(params){
+      this.$emit('handleMousedown',params.data)
+    },
     //箱分布图表
     rankingTwo(id, name, data) {
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
@@ -79,6 +83,7 @@ export default {
             ]
           }
       );
+      myChart.on("click", this.handleMousedown);
     },
     init() {
       this.getSysType();

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

@@ -101,13 +101,13 @@
               show-overflow-tooltip
               prop="landAmountD"
             ></el-table-column>
-            <el-table-column
-              align="center"
-              label="其他费用(总)"
-              width="100"
-              show-overflow-tooltip
-              prop="allFeeD"
-            ></el-table-column>
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="其他费用(总)"-->
+<!--              width="100"-->
+<!--              show-overflow-tooltip-->
+<!--              prop="allFeeD"-->
+<!--            ></el-table-column>-->
             <el-table-column
               align="center"
               label="应付杂费"
@@ -209,6 +209,7 @@
 <script>
 import {active} from "@/api/wel";
 import {gaude,location} from "@/api/gaude";
+import data from "@/views/util/data";
 export default {
   name: "basicContainer",
   props: {
@@ -312,9 +313,12 @@ export default {
     init() {
       this.getsalesTrend();
     },
-    getsalesTrend() {
+    query(data){
+      this.getsalesTrend(data)
+    },
+    getsalesTrend(data={status:0,mold:0}) {
       this.loading = true;
-      active({status:0,mold:0}).then(res => {
+      active(data).then(res => {
         this.tableData = res.data.data
         this.loading = false;
       })

src/views/wel/home/landTransportation/landTransportation.vue

@@ -2,8 +2,8 @@
   <div class="container">
     <quick-launch class="item1" :sysType="sysType" />
 <!--    <audit-data class="item2" :sysType="sysType"/>-->
-    <sales-reached class="item2" :sysType="sysType"/>
-    <sales-trend class="item3" :sysType="sysType"/>
+    <sales-reached @handleMousedown="handleMousedown" class="item2" :sysType="sysType"/>
+    <sales-trend ref="trend" class="item3" :sysType="sysType"/>
   </div>
 </template>
 
@@ -34,7 +34,14 @@ export default {
     payToday
   },
   computed: {},
-  methods: {}
+  methods: {
+    handleMousedown(params){
+      this.$refs.trend.query({
+        status:params.name === '未运行'?1:params.name === '运行中'?2:3,
+        mold:params.mold
+      })
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>