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

src/components/balanceAlert.vue

@@ -217,6 +217,7 @@ export default {
               this.deptBudgetList.warehouseName == '榆树民胜库'||
               this.deptBudgetList.warehouseName == '榆树库'||
               this.deptBudgetList.warehouseName == '洮南蛟流河烘干塔'||
+              this.deptBudgetList.warehouseName == '万马库'||
               this.deptBudgetList.warehouseName == '克东瑞信达'||
               this.deptBudgetList.warehouseName == '佳屹农仓储库')
           ) {

src/layout/index/top/index.vue

@@ -107,6 +107,9 @@
           <el-dropdown-item icon="el-icon-s-custom" @click.native="personalFlag = true">
             {{ $t('navbar.personalInformation') }}
           </el-dropdown-item>
+          <el-dropdown-item icon="el-icon-s-custom" @click="rizhi()">
+           日志
+          </el-dropdown-item>
           <el-dropdown-item icon="el-icon-s-promotion" @click.native="passwordFlag = true">
             {{ $t('navbar.uploadPsw') }}
           </el-dropdown-item>
@@ -397,7 +400,10 @@
     methods: {
       ...mapActions('common', ['setLocalVessels']),
       ...mapActions('user', ['getUserInfo','toSetShow']),
-      
+      rizhi(){
+         window.location.href = 'www.shenrongwuliu.com'
+      },
+
       payCode() {
 		  console.log('input', this.barCode)
         this.btnStatus = {

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1765,7 +1765,7 @@ export default {
           this.weighingList.titleNo = val.qualityInspectionManagement.titleNo
           this.weighingList.titleNoOther = val.qualityInspectionManagement.titleNoOther
           if (this.tpyeNo == 2 && this.status == 1 && val && val.qualityInspectionManagement.confirm == 0 && this
-            .warehouseName != '克东千丰库') {
+            .warehouseName != '克东千丰库'&&localStorage.getItem('ws-pf_compName')!='黑龙江省申融物流管理有限公司') {
             this.submitAllow = true
             this.$message({
               message: '该条质检信息未确认',

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -102,7 +102,7 @@
         <el-table-column key="16" class="table_td" prop="tare" label="皮重（吨）"></el-table-column>
         <el-table-column key="17" class="table_td" prop="netWeight" label="净重（吨）" >
           <template slot-scope="scope">
-            <span>-{{scope.row.netWeight }}</span>
+            <span>{{scope.row.netWeight }}</span>
           </template>
         </el-table-column>
         <el-table-column key="18" width='120' class="table_td" prop="feedbackWeight" label="卸车净重（吨）"