zxz há 2 anos atrás
pai
commit
df33bfcf3c

+ 20 - 5
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -278,7 +278,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='甘南宏旗库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="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>
@@ -583,6 +583,9 @@ export default {
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }],
       companyNameOptions: [{
         value: '黑龙江中天昊元贸易有限公司',
@@ -615,7 +618,10 @@ export default {
       }, {
         value: '黑龙江启兴粮食贸易有限公司',
         label: '黑龙江启兴粮食贸易有限公司'
-      }],
+      }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
+        }],
       companyNameEWOptions: [{
         value: '天津建源供应链管理有限公司',
         label: '天津建源供应链管理有限公司'
@@ -691,6 +697,9 @@ export default {
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }]
         
           this.ewCustomerOptions= [
@@ -724,6 +733,9 @@ export default {
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }]
           this.companyNameEWOptions=[
           {
@@ -756,6 +768,9 @@ export default {
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }]
            if(localStorage.getItem('print_company_name')){
             this.companyName=localStorage.getItem('print_company_name')
@@ -2242,7 +2257,7 @@ export default {
                   this.idPrint = response
                   if (this.weighingList.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' ||
                     this
-                      .warehouseName == '哈尔滨依兰库' || this
+                      .warehouseName == '洮南向阳乡金昊' || this
                         .warehouseName == '白城内陆港' || this
                           .warehouseName == '山东园丰库'|| this
                           .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='甘南宏旗库'||this.warehouseName=='洮南新友谊兴旺库')) {
@@ -2288,7 +2303,7 @@ export default {
                 //       })
                 //       this.idPrint = response
                 //       if (this.weighingList.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
-                //           .warehouseName == '哈尔滨依兰库' || this
+                //           .warehouseName == '洮南向阳乡金昊' || this
                 //           .warehouseName == '白城内陆港')) {
                 //         if (this.weighingList.seller && this.weighingList.buyer) {
                 //           let cang = {}
@@ -2368,7 +2383,7 @@ export default {
                           })
                           this.idPrint = response
                           if (this.weighingList.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this
-                            .warehouseName == '哈尔滨依兰库' || this
+                            .warehouseName == '洮南向阳乡金昊' || this
                               .warehouseName == '白城内陆港' || this
                                 .warehouseName == '山东园丰库' || this
                                   .warehouseName == '杜尔伯特家禾库' || this.warehouseName == '甘南宏旗库' || this.warehouseName == '洮南新友谊兴旺库')) {

+ 3 - 0
src/views/houseSelfCollect/weightCheck.vue

@@ -349,6 +349,9 @@
         }, {
           value: '黑龙江中天昊元贸易有限公司',
           label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }],
         companyNameOptions: [{
           value: '黑龙江利润元粮食贸易有限公司',

+ 15 - 3
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -117,7 +117,7 @@
         warehouseName=='杜尔伯特家禾库'&&printType==2||
         warehouseName=='洮南新友谊兴旺库'&&printType==2||
         warehouseName=='甘南宏旗库'&&printType==2||
-        warehouseName=='哈尔滨依兰库'&&printType==2||
+        warehouseName=='洮南向阳乡金昊'&&printType==2||
         warehouseName=='山东园丰库'&&printType==2">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
@@ -395,6 +395,9 @@
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }],
         companyNameOptions: [{
           value: '黑龙江中天昊元贸易有限公司',
@@ -423,6 +426,9 @@
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }],
         companyNameEWOptions: [{
           value: '天津建源供应链管理有限公司',
@@ -515,6 +521,9 @@
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }]
           this.ewCustomerOptions= [
           {
@@ -547,6 +556,9 @@
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
         }]
           this.companyNameEWOptions=[
           {
@@ -1151,7 +1163,7 @@
             return
           }
           for (let _num = 0; _num < this.modification.length; _num++) {
-            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库')) {
               if (this.modification[_num].seller && this.modification[_num].buyer) {
                 let cang = {}
                 cang.value = this.modification[_num].seller
@@ -1172,7 +1184,7 @@
           this.isShowPrintType = true
           
         } else {
-          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller