ccj 2 anos atrás
pai
commit
d80eed1a43

+ 3 - 0
public/static/payprint1.html

@@ -1192,6 +1192,9 @@
             }
             //公司id
             this.compId = localStorage.getItem('ws-pf_compId')
+            if(this.compId == '5d164edcef03476dba6630f86dc96496'){
+                this.compId = '6a713699e08c4cbc97a87f7648a95e3d'
+            }
             this.date = new Date().toLocaleString()
                 // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
             let _data = {}

+ 3 - 0
public/static/payprint3.html

@@ -1191,6 +1191,9 @@
             }
             //公司id
             this.compId = localStorage.getItem('ws-pf_compId')
+            if(this.compId == '5d164edcef03476dba6630f86dc96496'){
+                this.compId = '6a713699e08c4cbc97a87f7648a95e3d'
+            }
             this.date = new Date().toLocaleString()
                 // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
             let _data = {}

+ 5 - 2
src/components/balanceAlert.vue

@@ -64,7 +64,9 @@ export default {
             this.param = 1200
           } else if (this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
             this.param = 2400
-          }  else {
+          } else if(this.deptBudgetList.warehouseName == '大庆朝阳沟库' ){
+            this.param = 4800
+          } else {
             this.param = 9600
           }
           console.log(this.param)
@@ -196,7 +198,8 @@ export default {
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '顺诚粮库' ||
-              this.deptBudgetList.warehouseName == '鲅鱼圈金信库')
+              this.deptBudgetList.warehouseName == '鲅鱼圈金信库'|
+              this.deptBudgetList.warehouseName == '大庆朝阳沟库')
           ) {
             for (var i = value.length - 1; i >= 0; i--) {
               var tmp = String.fromCharCode(value[i])

+ 1 - 1
src/views/houseSelfCollect/paymentManagement.vue

@@ -183,7 +183,7 @@
             " @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">打印</el-button>
           <el-button v-show="
               (scope.row.approveStatus ||
-              (scope.row.status != '待结算' && !scope.row.approveStatus))&&compId=='6a713699e08c4cbc97a87f7648a95e3d'
+              (scope.row.status != '待结算' && !scope.row.approveStatus))&&(compId=='6a713699e08c4cbc97a87f7648a95e3d'||compId=='5d164edcef03476dba6630f86dc96496')
             " @click="printPY(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">三方打印</el-button>
           <el-button v-show="
               scope.row.approveStatus ||

+ 1 - 1
src/views/houseSelfCollect/settlement.vue

@@ -402,7 +402,7 @@
           }
           let compIdTmp  = localStorage.getItem('ws-pf_compId')
           //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分15
-          if(compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d'){
+          if(compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d' || compIdTmp == '5d164edcef03476dba6630f86dc96496'){
             // this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
             this.paymentList.buckleWeightRatio = 1.25
             this.ganwater = 14.5