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

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -1113,7 +1113,7 @@ export default {
           label: '调度公司',
           prop: 'dispatchDept',
           cascader: ['dispatcher'],
-          dicUrl: "/api/blade-system/dept/top-list",
+          dicUrl: "/api/blade-system/dept/top-list?deptCategory=2",
           type: "select",
           props: {
             label: "deptName",

src/views/landTransportation/dispatchingCars/index.vue

@@ -75,11 +75,11 @@
         <template slot="addressDetail" slot-scope="{ row,index}">
           <el-tooltip class="item" effect="dark" placement="top">
             <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
-            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.addressDetail}}</div>
+            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.addressDetail }}</div>
           </el-tooltip>
         </template>
         <template slot="billNo" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{row.billNo}}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.billNo }}</span>
         </template>
         <template slot-scope="{row,index}" slot="menu">
           <el-button type="text"
@@ -93,10 +93,14 @@
           <!--                     @click.stop="$refs.crud.rowDel(row,index)">删除</el-button>-->
         </template>
         <template slot="corpName" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.corpName }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{
+              row.corpName
+            }}</span>
         </template>
         <template slot="orderNo" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.orderNo }}</span>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{
+              row.orderNo
+            }}</span>
         </template>
       </avue-crud>
     </basic-container>
@@ -118,8 +122,8 @@ export default {
       id: '',
       show: true,
       loading: false,
-      query:{},
-      key:0,
+      query: {},
+      key: 0,
       dataList: [],
       totalData: {},
       page: {
@@ -142,14 +146,14 @@ export default {
         height: "auto",
         searchSpan: 8,
         searchIcon: true,
-        column:[
+        column: [
           {
             label: '货运日期',
             prop: 'arrivalTime',
             overHidden: true,
             type: "date",
             searchRange: true,
-            defaultTime:['00:00:00', '23:59:59'],
+            defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 1,
@@ -188,30 +192,30 @@ export default {
             index: 5,
             width: 140,
             search: true,
-          },{
+          }, {
             label: '计划箱量',
             prop: 'ctnDetail',
             overHidden: true,
             index: 6,
             width: 140
-          },{
+          }, {
             label: '已派箱量',
             prop: 'dispatchCtnDetail',
             overHidden: true,
             index: 7,
             width: 140
-          },{
+          }, {
             label: '受理箱量',
             prop: 'sendCtnDetail',
             overHidden: true,
             index: 8,
             width: 140
-          },{
+          }, {
             label: '运费',
             index: 9,
             width: 140,
             prop: 'freight'
-          },{
+          }, {
             label: '订单号',
             prop: 'orderNo',
             index: 10,
@@ -248,7 +252,7 @@ export default {
           //   width: 140,
           //   search: true,
           // }
-          ,{
+          , {
             label: '船名航次',
             prop: 'factory',
             overHidden: true,
@@ -261,7 +265,7 @@ export default {
             prop: 'createTime',
             type: "date",
             searchRange: true,
-            defaultTime:['00:00:00', '23:59:59'],
+            defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 15,
@@ -269,13 +273,13 @@ export default {
             search: true,
           }]
       },
-      home:false,
-      dispatchTimer:null
+      home: false,
+      dispatchTimer: null
     }
   },
   activated() {
-    if (this.$route.query.orderId){
-      this.rowCell({id:this.$route.query.orderId},0)
+    if (this.$route.query.orderId) {
+      this.rowCell({id: this.$route.query.orderId}, 0)
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
       this.home = true
     }
@@ -298,11 +302,13 @@ export default {
   },
   mounted() {
     let this_ = this;
-    this_.dispatchTimer = setInterval(function(){
-      totalList(2).then(res=>{
-        this_.totalData = res.data.data
-      })
-    },5000)
+    this_.dispatchTimer = setInterval(function () {
+      if (JSON.parse(localStorage.getItem("saber-token")).content) {
+        totalList(2).then(res => {
+          this_.totalData = res.data.data
+        })
+      }
+    }, 5000)
   },
   beforeDestroy() {
     clearInterval(this.dispatchTimer); //关闭
@@ -340,7 +346,7 @@ export default {
       }
       this.$refs.crud.getTableHeight()
     },
-    onLoad(page, params={}) {
+    onLoad(page, params = {}) {
       totalList(2).then(res => {
         this.totalData = res.data.data
       })
@@ -406,7 +412,7 @@ export default {
       this.show = false
     },
     backToList(type) {
-      if (type){
+      if (type) {
         this.$router.push({
           path: '/landTransportation/dispatchingCars/index'
         });
@@ -419,8 +425,8 @@ export default {
       this.activeName = tab
       this.onLoad(this.page)
     },
-    ToBreak (val) {
-      if (val)return val.replace(/\n/g, '<br/>')
+    ToBreak(val) {
+      if (val) return val.replace(/\n/g, '<br/>')
     }
   }
 }

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -1009,7 +1009,7 @@ export default {
         }, {
           label: '调度公司',
           prop: 'dispatchDept',
-          dicUrl: "/api/blade-system/dept/top-list",
+          dicUrl: "/api/blade-system/dept/top-list?deptCategory=2",
           cascader: ['dispatcher'],
           type: "select",
           props: {

src/views/landTransportation/placeAnOrder/index.vue

@@ -12,7 +12,7 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{totalData.all}}</span>
+                  <span class="card-content-num">{{ totalData.all }}</span>
                   <span class="card-content-text">全部</span>
                 </div>
               </div>
@@ -123,7 +123,8 @@
           @search-change="searchChange">
         <template slot="menuLeft" slot-scope="{size}">
           <el-button type="primary" icon="el-icon-plus" :size="size" @click="rowSave">创建单据</el-button>
-          <el-button type="success" :size="size" :disabled="selectionList.length !== 1" @click="copyDocument">复制单据</el-button>
+          <el-button type="success" :size="size" :disabled="selectionList.length !== 1" @click="copyDocument">复制单据
+          </el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
         </template>
         <template slot="corpNameSearch" slot-scope="{ row,index}">
@@ -134,15 +135,15 @@
         <template slot="addressDetail" slot-scope="{ row,index}">
           <el-tooltip class="item" effect="dark" placement="top">
             <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
-            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.addressDetail}}</div>
+            <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.addressDetail }}</div>
           </el-tooltip>
         </template>
         <template slot-scope="{row,index}" slot="menu">
-<!--          <el-button type="text"-->
-<!--                     icon="el-icon-edit"-->
-<!--                     size="small"-->
-<!--                     @click.stop="rowCell(row,index)">编辑-->
-<!--          </el-button>-->
+          <!--          <el-button type="text"-->
+          <!--                     icon="el-icon-edit"-->
+          <!--                     size="small"-->
+          <!--                     @click.stop="rowCell(row,index)">编辑-->
+          <!--          </el-button>-->
           <el-button type="text"
                      icon="el-icon-delete"
                      size="small"
@@ -151,13 +152,15 @@
           </el-button>
         </template>
         <template slot="corpName" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{row.corpName}}</span>
+          <span class="el-button--text" style="cursor: pointer"
+                @click.stop="rowCell(row,index)">{{ row.corpName }}</span>
         </template>
         <template slot="orderNo" slot-scope="{row,index}">
-          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{row.orderNo}}</span>
+          <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>
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.billNo }}</span>
         </template>
       </avue-crud>
     </basic-container>
@@ -180,8 +183,8 @@ export default {
       id: '',
       activeName: '999',
       show: true,
-      query:{},
-      selectionList:[],
+      query: {},
+      selectionList: [],
       dataList: [],
       loading: false,
       page: {
@@ -190,15 +193,15 @@ export default {
         total: 0,
         pageSizes: [10, 50, 100, 200, 300]
       },
-      key:0,
-      totalData:{},
+      key: 0,
+      totalData: {},
       option: {},
       optionList: {
         align: 'center',
-        stripe:true,
+        stripe: true,
         index: true,
-        menu:true,
-        menuWidth:80,
+        menu: true,
+        menuWidth: 80,
         addBtn: false,
         editBtn: false,
         delBtn: false,
@@ -207,15 +210,15 @@ export default {
         searchIcon: true,
         searchIndex: 2,
         selection: true,
-        highlightCurrentRow:true,
-        column:[
+        highlightCurrentRow: true,
+        column: [
           {
             label: '货运日期',
             prop: 'arrivalTime',
             overHidden: true,
             type: "date",
             searchRange: true,
-            defaultTime:['00:00:00', '23:59:59'],
+            defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 1,
@@ -254,30 +257,30 @@ export default {
             index: 5,
             width: 140,
             search: true,
-          },{
+          }, {
             label: '计划箱量',
             prop: 'ctnDetail',
             overHidden: true,
             index: 6,
             width: 140
-          },{
+          }, {
             label: '已派箱量',
             prop: 'dispatchCtnDetail',
             overHidden: true,
             index: 7,
             width: 140
-          },{
+          }, {
             label: '受理箱量',
             prop: 'sendCtnDetail',
             overHidden: true,
             index: 8,
             width: 140
-          },{
+          }, {
             label: '运费',
             index: 9,
             width: 140,
             prop: 'freight'
-          },{
+          }, {
             label: '订单号',
             prop: 'orderNo',
             index: 10,
@@ -314,7 +317,7 @@ export default {
           //   width: 140,
           //   search: true,
           // }
-            ,{
+          , {
             label: '船名航次',
             prop: 'factory',
             overHidden: true,
@@ -327,7 +330,7 @@ export default {
             prop: 'createTime',
             type: "date",
             searchRange: true,
-            defaultTime:['00:00:00', '23:59:59'],
+            defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index: 15,
@@ -335,14 +338,14 @@ export default {
             search: true,
           }]
       },
-      home:false,
-      entrustTimer:null,
+      home: false,
+      entrustTimer: null,
       roleName: localStorage.getItem("roleName").split(','),
     }
   },
   activated() {
-    if (this.$route.query.id){
-      this.rowCell({id:this.$route.query.id},0)
+    if (this.$route.query.id) {
+      this.rowCell({id: this.$route.query.id}, 0)
       this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
       this.home = true
       // this.$router.push({ query: {} });
@@ -355,7 +358,7 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1){
+    if (this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1) {
       this.option.menu = false
       this.option.header = false
     }
@@ -367,17 +370,19 @@ export default {
   },
   mounted() {
     let this_ = this
-    this_.entrustTimer = setInterval(function(){
-      totalList(1).then(res=>{
-        this_.totalData = res.data.data
-      })
-    },5000)
+    this_.entrustTimer = setInterval(function () {
+      if (JSON.parse(localStorage.getItem("saber-token")).content) {
+        totalList(1).then(res => {
+          this_.totalData = res.data.data
+        })
+      }
+    }, 5000)
   },
   beforeDestroy() {
     clearInterval(this.entrustTimer); //关闭
   },
   methods: {
-    selectionChange(list){
+    selectionChange(list) {
       this.selectionList = list
       // this.$message.success('选中的数据'+ JSON.stringify(list));
     },
@@ -402,7 +407,7 @@ export default {
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        if (this.roleName.indexOf('经理') !== -1||this.roleName.indexOf('部门经理') !== -1||this.roleName.indexOf('总经理') !== -1){
+        if (this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1) {
           this.option.menu = false
           this.option.header = false
         }
@@ -422,8 +427,8 @@ export default {
       this.activeName = tab
       this.onLoad(this.page)
     },
-    onLoad(page, params={}) {
-      totalList(1).then(res=>{
+    onLoad(page, params = {}) {
+      totalList(1).then(res => {
         this.totalData = res.data.data
       })
       let queryParams = {
@@ -488,12 +493,12 @@ export default {
       this.show = false
     },
     //复制单据
-    copyDocument(){
+    copyDocument() {
       this.id = 'copy' + this.selectionList[0].id
       this.show = false
     },
     backToList(type) {
-      if(type){
+      if (type) {
         this.home = false
         this.$router.push({
           path: '/landTransportation/placeAnOrder/index'
@@ -503,8 +508,8 @@ export default {
       this.show = true
       this.onLoad(this.page)
     },
-    ToBreak (val) {
-      if (val)return val.replace(/\n/g, '<br/>')
+    ToBreak(val) {
+      if (val) return val.replace(/\n/g, '<br/>')
     }
   }
 }
@@ -631,6 +636,7 @@ export default {
         color: rgba(4, 66, 31, 0.63);
         background-color: rgba(66, 188, 111, 0.15);
       }
+
       &-title7 {
         color: rgba(255, 98, 14, 0.63);
         background-color: rgba(220, 150, 42, 0.15);