zhangyuewww 9 mesi fa
parent
commit
b7477d0b4f

+ 2 - 1
src/components/balanceAlert.vue

@@ -225,7 +225,8 @@ export default {
               this.deptBudgetList.warehouseName == '佳屹农仓储库'||
               this.deptBudgetList.warehouseName == '洮南金昊库'||
               this.deptBudgetList.warehouseName == '瞻榆瑞祥源'||
-              this.deptBudgetList.warehouseName == '洮南兴旺库2023.10-2024.9')
+              this.deptBudgetList.warehouseName == '洮南兴旺库2023.10-2024.9'||
+              this.deptBudgetList.warehouseName == '榆树民胜库23-24')
           ) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])

+ 1 - 1
src/views/outboundManagement/weighingManagementNew.vue

@@ -347,7 +347,7 @@
             </el-select>
           </div>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'||warehouseName=='甘南林峰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>

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

@@ -126,7 +126,7 @@
             </el-select>
           </div>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'||warehouseName=='甘南林峰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -428,6 +428,7 @@
           &&item!= '黑龙江欣洋粮食贸易有限公司'
           &&item!='黑龙江益储益运粮食贸易有限公司'
           &&item!='黑龙江启兴粮食贸易有限公司'
+          &&item!='吉林昊友城元粮食贸易有限公司'
         })
         if(extra.length>0){
           this.companyNameOptions=[
@@ -464,7 +465,7 @@
         },{
           value: '吉林昊友城元粮食贸易有限公司',
           label: '吉林昊友城元粮食贸易有限公司'
-        },  {
+        }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
         }]

+ 1 - 0
src/views/warehousenew/warehousingOrder.vue

@@ -1687,6 +1687,7 @@ export default {
           for (let i = 0; i < this.multipleSelection1[item.id].length; i++) {
             if (item.warehouseName == this.multipleSelection1[item.id][i].warehouseName) {
               this.multipleSelection1[item.id][i].requestFunds = this.multipleSelection1[item.id][i].amountNotPayable
+              this.multipleSelection1[item.id][i].requestWeight = this.multipleSelection1[item.id][i].surplusWeight
               this.multipleSelection1[item.id][i].select = true
             }
           }