Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/components/balanceAlert.vue

@@ -57,6 +57,7 @@ export default {
           if (
             this.deptBudgetList.warehouseName == '白城内陆港' ||
             this.deptBudgetList.warehouseName == '肇东金信库'||
+            this.deptBudgetList.warehouseName == '白城鹏羽库'||
             this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库'||
             this.deptBudgetList.warehouseName == '洮南向阳乡金昊'
           ) {
@@ -158,6 +159,7 @@ export default {
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
               this.deptBudgetList.warehouseName == '龙江金信库' ||
               this.deptBudgetList.warehouseName == '白城内陆港' ||
+              this.deptBudgetList.warehouseName == '白城鹏羽库' ||
               this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
               this.deptBudgetList.warehouseName == '洮南向阳乡金昊' ||
               this.deptBudgetList.warehouseName == '甘南林峰库' ||

src/main.js

@@ -39,29 +39,30 @@ Vue.prototype.$axios = axios;
 import global from './global.js'
 Vue.prototype.global = global
 import ItemWrap from './components/item-wrap/item-wrap.vue'
-Vue.component('ItemWrap',ItemWrap)
+Vue.component('ItemWrap', ItemWrap)
 import Echart from './components/echart/index.vue'
-Vue.component('Echart',Echart)
-    // 初始化vue-amap
-    // AMap.initAMapApiLoader({
-    //   // 高德key
-    //   key: 'd5486742b76ab0969e4c3ce26f46dfc6',
-    //   // 插件集合 （插件按需引入）
-    //   plugin: ['AMap.Geolocation', 'Geolocation', 'AMap.DistrictSearch', "AMap.PlaceSearch",'AMap.Autocomplete', 'AMap.Geocoder', 'AMap.DistrictSearch'],
-    //   v: '1.4.4'
-    // });
-    // ------------ 通过域名判断起始的登陆页面 开始 --------------------
-    //使用login的Url
-    // const urls = [
-    //   'www.winsea.com',
-    //   'product-test.winsea.com',
-    //   'test.winsea.com',
-    //   'saas.winsea.com',
-    //   'saas-test.winsea.com'
-    // ]
-    // urls.includes(window.location.host)
-    //   ? localStorage.setItem('ws_login_type', 2)
-    //   : localStorage.removeItem('ws_login_type')
+Vue.component('Echart', Echart)
+import '@/utils/jsmpeg.min'
+// 初始化vue-amap
+// AMap.initAMapApiLoader({
+//   // 高德key
+//   key: 'd5486742b76ab0969e4c3ce26f46dfc6',
+//   // 插件集合 （插件按需引入）
+//   plugin: ['AMap.Geolocation', 'Geolocation', 'AMap.DistrictSearch', "AMap.PlaceSearch",'AMap.Autocomplete', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+//   v: '1.4.4'
+// });
+// ------------ 通过域名判断起始的登陆页面 开始 --------------------
+//使用login的Url
+// const urls = [
+//   'www.winsea.com',
+//   'product-test.winsea.com',
+//   'test.winsea.com',
+//   'saas.winsea.com',
+//   'saas-test.winsea.com'
+// ]
+// urls.includes(window.location.host)
+//   ? localStorage.setItem('ws_login_type', 2)
+//   : localStorage.removeItem('ws_login_type')
 
 // ------------ 通过域名判断起始的登陆页面 结束 --------------------
 

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -231,6 +231,10 @@ export default {
   watch: {},
   data() {
     return {
+      leftFJPrice:{},
+      leftFJIndex:0,
+      rightFJPrice:{},
+      rightFJIndex:0,
       isSolidFood: false,
       isShowTip: false,
       price: 0,
@@ -674,13 +678,13 @@ export default {
     },
     // 增加分界
     add(item, item1, index) {
-      // let _data = this.detailList;
-      // if (item.index > 2) {
-      //   this.$message({
-      //     message: '最多插入3个分界值',
-      //     type: 'warning',
-      //   })
-      // } else {
+      let _data = this.detailList;
+      if (item.index > 2) {
+        this.$message({
+          message: '最多插入3个分界值',
+          type: 'warning',
+        })
+      } else {
         item.index++
         item.detailList.splice(index + 1, 0, {
           name: '分界',
@@ -694,7 +698,7 @@ export default {
           type: 4,
         })
         this.makeSpliceIndex(item, item1, index)
-      // }
+      }
     },
     // 减少分界
     reduce(item, item1, index) {
@@ -1522,9 +1526,8 @@ export default {
                 _obj.priceOther = this.keepTwoDecimal(priceList[i].val)
               }
             }
-
             _list.push(_obj)
-            // console.log('_list', _list)
+            console.log('_list', _list)
           }
         } else {
           _obj = {}
@@ -1576,9 +1579,12 @@ export default {
       let that = this
       this.left = []
       this.right = []
+      
       let _priceList = this.priceList
       for (let i = 0; i < _priceList.length; i++) {
         for (let k = 0; k < _priceList[i].checkList.length; k++) {
+          this.rightFJIndex=0
+          this.leftFJIndex=0
           let _leftObj = {}
           _leftObj.level = _priceList[i].checkList[k]
           _leftObj.basicUnitPrice = parseFloat(_priceList[i].basicUnitPrice)
@@ -1662,13 +1668,38 @@ export default {
                   if (j == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
-                    baseprice = parseFloat(
+                      if(_priceList[i].detailList[j].type==5){
+                        this.leftFJIndex++
+                        if(this.leftFJIndex==1){
+                          baseprice = parseFloat(
                       parseFloat(_priceList[i].basicUnitPrice) +
                         ((parseFloat(_priceList[i].detailList[j + 2].water) -
                           parseFloat(_priceList[i].detailList[j].water)) /
                           0.1) *
                           parseFloat(_priceList[i].detailList[j + 1].jfprice)
                     )
+                    this.leftFJPrice = baseprice
+                        }else if(this.leftFJIndex>1){
+                          baseprice = parseFloat(
+                      parseFloat(this.leftFJPrice) +
+                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                          parseFloat(_priceList[i].detailList[j].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
+                    )
+                    this.leftFJPrice = baseprice
+                        }
+                      }else{
+                        baseprice = parseFloat(
+                      parseFloat(_priceList[i].basicUnitPrice) +
+                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                          parseFloat(_priceList[i].detailList[j].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
+                    )
+                      }
+
+                  
                   }
                   _leftObj.priceList.push({
                     index: j,
@@ -1729,6 +1760,29 @@ export default {
                   if (k == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
+                    if(_priceList[i].detailList[k].type==5){
+                      this.rightFJIndex++
+                      if(this.rightFJIndex==1){
+                        baseprice = parseFloat(
+                      parseFloat(_priceList[i].basicUnitPrice) -
+                        ((parseFloat(_priceList[i].detailList[k].water) -
+                          parseFloat(_priceList[i].detailList[k - 2].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[k - 1].jfprice)
+                    )
+                    this.rightFJPrice = baseprice
+                      }else if(this.rightFJIndex>1){
+                        baseprice = parseFloat(
+                      parseFloat(this.rightFJPrice) -
+                        ((parseFloat(_priceList[i].detailList[k].water) -
+                          parseFloat(_priceList[i].detailList[k - 2].water)) /
+                          0.1) *
+                          parseFloat(_priceList[i].detailList[k - 1].jfprice)
+                    )
+                    this.rightFJPrice = baseprice
+                      }
+                    }else{
+                      
                     baseprice = parseFloat(
                       parseFloat(_priceList[i].basicUnitPrice) -
                         ((parseFloat(_priceList[i].detailList[k].water) -
@@ -1736,6 +1790,8 @@ export default {
                           0.1) *
                           parseFloat(_priceList[i].detailList[k - 1].jfprice)
                     )
+                    }
+
                   }
                   _rightObj.priceList.push({
                     index: k,
@@ -1844,6 +1900,7 @@ export default {
     calculatePriceRight(_waterMax) {
       //获取每个分界值
       let _listResult = []
+      debugger
       for (let i = 0; i < this.right.length; i++) {
         let _list = this.right[i].priceList
         let tmp = {}

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -24,6 +24,9 @@
 
         <div class="bottom">
           <div class="bg-left titleup"><span class="word_css">实时监控</span></div>
+          <!-- <div>
+            <canvas id="video" class="canvas"></canvas>
+          </div> -->
           <div v-if="!monitorUrl1" class="video1">
             <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
             <div>监控视频未连接</div>
@@ -301,7 +304,6 @@
     getsettleaccout,
     newSubmit
   } from '@/model/houseSelfCollect/index'
-
   import {
     addstorageputList
   } from '@/model/warehouse/index'
@@ -477,7 +479,11 @@
         id: '',
         inOutData: {},
         idPrint: '',
-        ewCustomerOptions: [{
+        ewCustomerOptions: [
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -487,13 +493,13 @@
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
         }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         }],
         companyNameOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -503,9 +509,6 @@
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
         }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        },{
           value: '榆树市保寿镇保寿村民胜粮食加工有限公司',
           label: '榆树市保寿镇保寿村民胜粮食加工有限公司'
         }, ],
@@ -532,6 +535,8 @@
       }
     },
     mounted() {
+      
+      // this.getVideos()
       this.isShowBalance = true
       var _saomaData = JSON.parse(localStorage.getItem('saoma_data')) //判断是否扫码进来的
       // }
@@ -616,6 +621,12 @@
 
     },
     methods: {
+      getVideos(){debugger
+          let canvas = document.getElementById('video')
+          let url = 'ws://127.0.0.1:8082'
+          var player = new JSMpeg.Player(url, {canvas: canvas})
+          console.log(player)
+    },
       refreshClick(type) {
         let that = this
         if (type == 1) {
@@ -2438,4 +2449,8 @@
     border-right: 4px solid #2aff7c;
     // border-bottom: 1px solid #2aff7c ;
   }
+  .canvas{
+    width: 300px;
+    height:300px
+  }
 </style>

src/views/houseSelfCollect/weighingManagement.vue

@@ -202,6 +202,9 @@
     data() {
       return {
         ewCustomerOptions: [{
+            value: '黑龙江中天昊元贸易有限公司',
+            label: '黑龙江中天昊元贸易有限公司'
+          },{
             value: '黑龙江利润元粮食贸易有限公司',
             label: '黑龙江利润元粮食贸易有限公司'
           }, {
@@ -210,11 +213,11 @@
           }, {
             value: '黑龙江鑫满仓粮食贸易有限公司',
             label: '黑龙江鑫满仓粮食贸易有限公司'
-          }, {
-            value: '黑龙江中天昊元贸易有限公司',
-            label: '黑龙江中天昊元贸易有限公司'
           }],
         companyNameOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -223,10 +226,7 @@
         }, {
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
-        }, {
-          value: '黑龙江中天昊元贸易有限公司',
-          label: '黑龙江中天昊元贸易有限公司'
-        }, ],
+        },  ],
          companyNameOptions1: [
             {
           value: '黑龙江中天昊元贸易有限公司',

src/views/universalityAudit/component/routers/route.js

@@ -1,4 +1,4 @@
-import Layout from '@/layout/index';
+// import Layout from '@/layout/index';
 
 // const profitableRouter = {
 //   path: '/aduitmanagement',

src/views/warehousenew/warehousingOrder.vue

@@ -1454,11 +1454,18 @@ export default {
             this.form.distributionIng = ''
             this.fieldrationsshow = false
             this.getList()
-          }).catch(() => {
-            this.$message({
-              message: '折干失败',
-              type: 'warning'
-            });
+          }).catch((response) => {
+            if (response.code == null) {
+              this.$message({
+                message: response.data.message,
+                type: 'warning'
+              });
+            } else {
+              this.$message({
+                message: '折干失败',
+                type: 'warning'
+              });
+            }
           })
       }).catch(() => {
         // this.$message({