Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/home/index.vue

@@ -360,21 +360,21 @@
     async mounted() {
       var staffId=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
       // getAdminId().toPromise().then(response => {console.log(11111)})
-                this.loading = false
-                // WebSocket
-                // this.$store.dispatch('setAdminId', response.data.data)
-                if ('WebSocket' in window) {
-                  if (process.env.NODE_ENV === 'production') {
-                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/'+staffId )
-                  }
-                  else {
-                    //  this.websocket = new WebSocket('ws://192.168.1.115:8090/commonUser/api/onOpen?adminId=84f62127b7384dcdbaeaddfe460329fc' )
-                    this.websocket = new WebSocket('ws://192.168.1.115:8090/websocket/'+staffId )
-                  }
-                  this.initWebSocket()
-                } else {
-                  alert('当前浏览器不支持websocket')
-                }
+      this.loading = false
+      // WebSocket
+      // this.$store.dispatch('setAdminId', response.data.data)
+      if ('WebSocket' in window) {
+        if (process.env.NODE_ENV === 'production') {
+          this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/'+staffId )
+        }
+        else {
+          //  this.websocket = new WebSocket('ws://192.168.1.115:8090/commonUser/api/onOpen?adminId=84f62127b7384dcdbaeaddfe460329fc' )
+          this.websocket = new WebSocket('ws://192.168.1.119:9100/websocket/'+staffId )
+        }
+        this.initWebSocket()
+      } else {
+        alert('当前浏览器不支持websocket')
+      }
               
       let that = this
       this.getChartsData()
@@ -500,15 +500,15 @@
       contract(index){
          if(index == 0){
             this.$router.push({
-              name:"buyContract"
+              name:'buyContract'
             })
           }else if(index == 1){
             this.$router.push({
-              name:"salesContract"
+              name:'salesContract'
             })
           }else if(index == 3){
             this.$router.push({
-              name:"warehouseManagementList"
+              name:'warehouseManagementList'
             })
           }
       },
@@ -551,11 +551,11 @@
               data = [{
                 name: '已完成量',
                 value: this.chartsData[i].biViewInfoList[0].count,
-                type:"采购合同"
+                type:'采购合同'
               }, {
                 name: '待完成量',
                 value: this.chartsData[i].biViewInfoList[1].count,
-                type:"采购合同"
+                type:'采购合同'
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
@@ -569,11 +569,11 @@
               data = [{
                 name: '已开票',
                 value: this.chartsData[i].biViewInfoList[0].count,
-                type:"采购合同"
+                type:'采购合同'
               }, {
                 name: '待开票',
                 value: this.chartsData[i].biViewInfoList[1].count,
-                type:"采购合同"
+                type:'采购合同'
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
@@ -586,11 +586,11 @@
               data = [{
                 name: '已付款',
                 value: this.chartsData[i].biViewInfoList[0].count,
-                type: "采购合同"
+                type: '采购合同'
               }, {
                 name: '待付款',
                 value: this.chartsData[i].biViewInfoList[1].count,
-                   type: "采购合同"
+                   type: '采购合同'
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
@@ -603,7 +603,7 @@
               data = [{
                 name: '已完成量',
                 value: this.chartsData[i].biViewInfoList[0].count,
-                  type: "销售合同"
+                  type: '销售合同'
               }, {
                 name: '待完成量',
                 value: this.chartsData[i].biViewInfoList[1].count

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -83,8 +83,8 @@
               :value="item.contractNo"
             />
             <el-option
-              v-if="!item.reportStatus"
               v-for="item in option"
+              v-if="!item.reportStatus"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -21,10 +21,10 @@
         <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
             maxlength="500" type="input" class="findValue">
-            <el-option v-if="item.reportStatus" v-for="item in options" :key="item.constKey"
+            <el-option  v-for="item in options" v-if="item.reportStatus" :key="item.constKey"
               :label="item.contractNo + '(' + item.reportStatus + ')'" :value="item.contractNo" />
-            <!-- <el-option v-if="!item.reportStatus" v-for="item in options" :key="item.constKey"
-							:label="item.contractNo" :value="item.contractNo" /> -->
+            <el-option  v-for="item in options" v-if="!item.reportStatus" :key="item.constKey"
+							:label="item.contractNo" :value="item.contractNo" />
           </el-select>
         </el-col>
       </el-row>
@@ -651,7 +651,8 @@
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             this.orderList = this.contractNoList[i]
-            for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
+            if(this.orderList.tranTaskInfoList){
+              for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
               if (this.orderList.tranTaskInfoList[i].tranProcessInfo) {
                 this.tranProcessInfo.push({
                   label: this.orderList.tranTaskInfoList[i].taskNo + '(' + this.orderList.tranTaskInfoList[i]
@@ -661,8 +662,11 @@
                 })
               }
             }
-            this.activeName = this.tranProcessInfo.name
-            this.tranType = this.tranProcessInfo.tranType
+            this.activeName = this.tranProcessInfo[0].name
+            this.tranType = this.tranProcessInfo[0].tranType
+            }
+            
+            
             if (this.contractNoList[i].depositUrl) {
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
             } else {

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -314,7 +314,7 @@
         for (var i = 0; i < this.freightspace.length; i++) {
           maxStorage += Number(this.freightspace[i].maxStorage)
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       },
       total: function() {
         if (this.deptBudgetList.tranCarInfoList != null) {
@@ -324,7 +324,7 @@
               this.deptBudgetList.tranCarInfoList[i].loadNetWeight
             )
           }
-          return maxStorage
+          return maxStorage.toFixed(2)
         } else {
           return 0
         }

src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -335,7 +335,7 @@ export default {
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     total: function () {
       if (this.deptBudgetList.tranCarInfoList != null) {
@@ -345,7 +345,7 @@ export default {
             this.deptBudgetList.tranCarInfoList[i].loadNetWeight
           )
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       } else {
         return 0
       }

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -444,7 +444,7 @@ export default {
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     total: function () {
       if (this.deptBudgetList.tranCarInfoList != null) {
@@ -454,7 +454,7 @@ export default {
             this.deptBudgetList.tranCarInfoList[i].loadNetWeight
           )
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       } else {
         return 0
       }

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -351,7 +351,7 @@ export default {
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     total: function () {
       var maxStorage = 0
@@ -360,7 +360,7 @@ export default {
           this.deptBudgetList.tranCarInfoList[i].loadNetWeight
         )
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     label1: function () {
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -457,7 +457,7 @@ export default {
           this.deptBudgetList.tranCarInfoList[i].unloadNetWeight
         )
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
   },
   mounted() {

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -333,7 +333,7 @@ activated(){
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     total: function () {
       var maxStorage = 0
@@ -342,7 +342,7 @@ activated(){
           this.deptBudgetList.tranCarInfoList[i].loadNetWeight
         )
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     label1: function () {
        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -344,7 +344,7 @@
         for (var i = 0; i < this.freightspace.length; i++) {
           maxStorage += Number(this.freightspace[i].maxStorage)
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       },
       total: function() {
         if (this.deptBudgetList.tranCarInfoList.length > 0) {
@@ -354,7 +354,7 @@
               this.deptBudgetList.tranCarInfoList[i].positionWeight
             )
           }
-          return maxStorage
+          return maxStorage.toFixed(2)
         }
       },
     },

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -517,7 +517,7 @@ export default {
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     total: function () {
       if (this.deptBudgetList.tranCarInfoList != null) {
@@ -527,7 +527,7 @@ export default {
             this.deptBudgetList.tranCarInfoList[i].loadNetWeight
           )
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       } else {
         return 0
       }

src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -262,7 +262,7 @@
         for (var i = 0; i < this.freightspace.length; i++) {
           maxStorage += Number(this.freightspace[i].maxStorage)
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       },
       total: function() {
         if (this.deptBudgetList.tranCarInfoList != null) {
@@ -272,7 +272,7 @@
               this.deptBudgetList.tranCarInfoList[i].loadNetWeight
             )
           }
-          return maxStorage
+          return maxStorage.toFixed(2)
         } else {
           return 0
         }

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -320,7 +320,7 @@
         for (var i = 0; i < this.freightspace.length; i++) {
           maxStorage += Number(this.freightspace[i].maxStorage)
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       },
       total: function() {
         if (this.deptBudgetList.tranCarInfoList != null) {
@@ -330,7 +330,7 @@
               this.deptBudgetList.tranCarInfoList[i].loadNetWeight
             )
           }
-          return maxStorage
+          return maxStorage.toFixed(2)
         } else {
           return 0
         }

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -337,7 +337,7 @@ export default {
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     total: function () {
       if (this.deptBudgetList.tranCarInfoList != null) {
@@ -347,7 +347,7 @@ export default {
             this.deptBudgetList.tranCarInfoList[i].loadNetWeight
           )
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       } else {
         return 0
       }

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -471,7 +471,7 @@ export default {
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     total: function () {
       if (this.deptBudgetList.tranCarInfoList != null) {
@@ -481,7 +481,7 @@ export default {
             this.deptBudgetList.tranCarInfoList[i].unloadNetWeight
           )
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       } else {
         return 0
       }

src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -371,7 +371,7 @@ export default {
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
-      return maxStorage
+      return maxStorage.toFixed(2)
     },
     total: function () {
       if (this.deptBudgetList.tranCarInfoList != null) {
@@ -381,7 +381,7 @@ export default {
             this.deptBudgetList.tranCarInfoList[i].loadNetWeight
           )
         }
-        return maxStorage
+        return maxStorage.toFixed(2)
       } else {
         return 0
       }