ccj 2 years ago
parent
commit
7c0d9221a2

+ 1 - 0
src/components/balanceAlert.vue

@@ -158,6 +158,7 @@ export default {
               this.deptBudgetList.warehouseName == '肇东金信库' ||
               this.deptBudgetList.warehouseName == '呼兰大金仓'||
               this.deptBudgetList.warehouseName == '克东润津库'||
+              this.deptBudgetList.warehouseName == '洮南新友谊兴旺库'||
               this.deptBudgetList.warehouseName == '克东瑞信达')
           ) {
             for (var i = 0; i < value.length; i++) {

+ 2 - 2
src/views/home/index.vue

@@ -194,7 +194,7 @@ export default {
   methods: {
     //中国地图
     china_map() {
-      debugger
+      
       let mapChart = this.$echarts.init(document.getElementById('china-map')); //图表初始化,china-map是绑定的元素
       window.onresize = mapChart.resize; //如果容器变大小,自适应从新构图
       let series = []; //存放循环配置项
@@ -253,7 +253,7 @@ export default {
         }
       
       }
-      debugger
+      
       for(let k = 0; k < lineData.length; k++) {
         // province.push(lineData[i].bcitysim); //存进去每个省的名字
         // province.push(lineData[i].ecitysim); //存进去每个省的名字

+ 3 - 0
src/views/outboundManagement/weighingManagementNew.vue

@@ -502,6 +502,9 @@
         checked:false,
         dialogDataList:[],
         ewCustomerOptions: [ {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         },{

+ 3 - 0
src/views/outboundManagement/weighingManagementrecord.vue

@@ -247,6 +247,9 @@
         warehouseList1:[],
         
         ewCustomerOptions: [{
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         },{

+ 5 - 5
src/views/profitable/expensemanagementdetails.vue

@@ -191,7 +191,7 @@
     },
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         tableData1:[],
         deptBudgetTotal: 0,
@@ -203,10 +203,10 @@
         compId:localStorage.getItem('ws-pf_compId'),
         dialogVisible1:false,
         deptCircularPage: {},
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
-        endDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
         title:'附件',
         title1:'',
         outtotal:0,

+ 16 - 1
src/views/profitable/payment.vue

@@ -99,9 +99,10 @@
     },
     data() {
       return {
+          timer1: '',
         value: [],
         profitList: [{
-          name: "玉米",
+          name: '玉米',
           count: 2000,
         }],
         size:9,
@@ -125,6 +126,20 @@
     },
     activated() {
       this.getList()
+    },
+     async created() {
+      //获取快捷路口列表
+      this.getRouteList()
+      // this.checkUserInfoDialog()
+      // {
+      this.timer1 = setInterval(this.getList, 120000);
+      // }
+    },
+    beforeDestroy() {
+      clearInterval(this.timer1);
+      if (this.timer1) {
+        clearInterval(this.timer1); // 在Vue实例销毁前,清除定时器
+      }
     },
     methods: {
       getList() {

+ 3 - 3
src/views/taskManagement/tranManagementLook.vue

@@ -96,7 +96,7 @@
           <ws-form-item label="发货地区" span="1" prop="waterContent">
             {{ item.sendPrivate }}/{{ item.sendCity }}/{{ item.sendArea }}
           </ws-form-item>
-           <ws-form-item label="发货地详细地址" span="1" prop="sendDetailedAddress">{{ item.sendDetailedAddress }}</ws-form-item> 
+           <!-- <ws-form-item label="发货地详细地址" span="1" prop="sendDetailedAddress">{{ item.sendDetailedAddress }}</ws-form-item>  -->
           <ws-form-item label="发货人" span="1" prop="sender">
             {{ item.sender }}
           </ws-form-item>
@@ -109,13 +109,13 @@
             {{ item.receivePrivate }}/{{ item.receiveCity
             }}/{{ item.receiveArea }}
           </ws-form-item>
-          <ws-form-item
+          <!-- <ws-form-item
             label="收货地详细地址"
             span="1"
             prop="receiveDetailedAddress"
           >
             {{ item.receiveDetailedAddress }}
-          </ws-form-item>
+          </ws-form-item> -->
           <ws-form-item label="收货人" span="1" prop="receiver">
             {{ item.receiver }}
           </ws-form-item>

+ 0 - 1
src/views/tranManagement/tranManagementShippingLook.vue

@@ -178,7 +178,6 @@
           month: dayjs().format('MM')
         },
         contractList: [],
-        deptBudgetList: {},
       }
     },
     activated() {