فهرست منبع

大件的参数名称修改

caojunjie 2 سال پیش
والد
کامیت
f17e29dc43

+ 9 - 6
src/views/SpecialTrade/driver/index.vue

@@ -301,7 +301,7 @@ export default {
           width: 68,
           search: true,
         },{
-          label: '型',
+          label: '型',
           width: 68,
           search: true,
           index: 5,
@@ -314,7 +314,7 @@ export default {
             value: "dictValue"
           },
         }, {
-          label: '量',
+          label: '量',
           width: 58,
           index: 6,
           prop: 'ctnQuantity'
@@ -428,7 +428,7 @@ export default {
           overHidden: true,
           width: 100,
           search: true,
-          index: 17,
+          index: 10,
           prop: 'goods'
         }, {
           label: '件数',
@@ -576,7 +576,8 @@ export default {
     }
   },
   async created() {
-    this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88), this.optionList);
+    // this.goodsOptionCrud = await this.getColumnData(this.getColumnName(88), this.optionList);
+      this.goodsOptionCrud = this.optionList
     this.key++
     let i = 0;
     this.goodsOptionCrud.column.forEach(item => {
@@ -611,7 +612,8 @@ export default {
        * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
        * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
        */
-      const inSave = await this.saveColumnData(this.getColumnName(88), this.goodsOptionCrud);
+      // const inSave = await this.saveColumnData(this.getColumnName(88), this.goodsOptionCrud);
+      const inSave = this.goodsOptionCrud
       if (inSave) {
         this.$message.success("保存成功");
         //关闭窗口
@@ -621,7 +623,8 @@ export default {
     //自定义列重置
     async resetColumn() {
       this.goodsOptionCrud = this.optionList;
-      const inSave = await this.delColumnData(this.getColumnName(88), this.optionList);
+      // const inSave = await this.delColumnData(this.getColumnName(88), this.optionList);
+        const inSave = this.optionList
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;

+ 9 - 7
src/views/SpecialTrade/motorcadeDriver/index.vue

@@ -432,7 +432,7 @@ export default {
           search: true,
           prop: 'addressDetail'
         }, {
-          label: '提单号',
+          label: '业务号',
           width: 140,
           index: 3,
           search: true,
@@ -446,7 +446,7 @@ export default {
           width: 68,
           search: true,
         }, {
-          label: '型',
+          label: '型',
           width: 68,
           index: 5,
           search: true,
@@ -459,7 +459,7 @@ export default {
             value: "dictValue"
           }
         }, {
-          label: '量',
+          label: '量',
           width: 58,
           index: 6,
           overHidden: true,
@@ -527,7 +527,7 @@ export default {
             cell: true,
             index: 10,
             prop: 'tel'
-          }, {
+          },{
             label: '平台号',
             width: 100,
             index: 11,
@@ -576,7 +576,7 @@ export default {
             overHidden: true,
             width: 100,
             search: true,
-            index: 16,
+            index: 10,
             prop: 'goods'
           }, {
             label: '件数',
@@ -735,7 +735,8 @@ export default {
     }
   },
   async created() {
-    this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(87), this.optionList);
+    // this.entrustOptionTwoT = await this.getColumnData(this.getColumnName(87), this.optionList);
+      this.entrustOptionTwoT = this.optionList
     this.query = {
       arrivalTime: [defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
     }
@@ -847,7 +848,8 @@ export default {
     //自定义列重置
     async resetColumn() {
       this.entrustOptionTwoT = this.optionList;
-      const inSave = await this.delColumnData(this.getColumnName(87), this.optionList);
+      // const inSave = await this.delColumnData(this.getColumnName(87), this.optionList);
+        const inSave = this.optionList
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;

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

@@ -37,11 +37,26 @@ export default {
       loading: false,
       tradeType: null,
       entrustTimer: null,
-      tableData: []
+      tableData: [],
+        menuAll:[] //所有路由菜单id
     };
   },
   created() {
-    this.getSysType();
+      //从缓存中获取所有路由信息
+      let menu = JSON.parse(localStorage.getItem("saber-menuAll")).content
+      for (let item of menu){
+          this.menuAll.push(item.id)
+          if (item.children.length > 0){
+              this.getMenuId(item.children)
+          }
+      }
+      // 删除今日业务的缓存
+      localStorage.removeItem('首页-今日业务')
+      console.log(menu,'获取的菜单id')
+
+      this.$nextTick(res=>{
+          this.getSysType();
+      });
   },
   mounted() {
       // 延迟获取数据
@@ -58,9 +73,22 @@ export default {
     clearInterval(this.entrustTimer); //关闭
   },
   methods: {
+      //获取所有路由信息id
+      getMenuId(array){
+          for (let item of array){
+              this.menuAll.push(item.id)
+          }
+      },
     //点击获取图表数据
     handleMousedown(params){
-      this.$emit('handleMousedown',params.data)
+        console.log(this.menuAll,90)
+        if (params.data.mold == 1 && this.menuAll.includes('1499196328461225986')) {
+            this.$emit('handleMousedown',params.data)
+        }else if (params.data.mold == 2 && this.menuAll.includes('1499196328461225986')) {
+            this.$emit('handleMousedown',params.data)
+        }else if (params.data.mold == 3 && this.menuAll.includes('1673857442015977474')) {
+            this.$emit('handleMousedown',params.data)
+        }
     },
     //箱分布图表
     rankingTwo(id, name, data) {
@@ -95,7 +123,7 @@ export default {
             ]
           }
       );
-      myChart.on("click", this.handleMousedown);
+        myChart.on("click", this.handleMousedown);
     },
     init() {
       this.getSysType();
@@ -105,11 +133,17 @@ export default {
       this.loading = true
         // 集装箱的数据
       bizCount({mold:1}).then(res=>{
+          if (!this.menuAll.includes('1499196328461225986')) {
+              res.data.data.flow.all = 0
+          }
         this.rankingTwo('totalContainer', '集装箱:'+res.data.data.flow.all, res.data.data.flow.list)
         // this.rankingTwo('totalContainerTwo', '集装箱总量:'+res.data.data.dept.all, res.data.data.dept.list)
       })
         // 散货的echarts的数据
       bizCount({mold:2}).then(res=>{
+          if (!this.menuAll.includes('1499196328461225986')) {
+              res.data.data.flow.all = 0
+          }
         this.rankingTwo('totalBulkCargo', '散货:'+res.data.data.flow.all,  res.data.data.flow.list)
         // this.rankingTwo('totalBulkCargoTwo', '散货总量:'+res.data.data.dept.all, res.data.data.dept.list)
       })