Merge branch 'dev' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc into dev

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -235,7 +235,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'">
+        <div v-if="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>
@@ -987,7 +987,8 @@
       },
       handleCurrentChange(val) {
         this.submitAllow = false
-        if (this.tpyeNo == 2 && this.status == 1 && val && val.qualityInspectionManagement.confirm == 0) {
+        if (this.tpyeNo == 2 && this.status == 1 && val && val.qualityInspectionManagement.confirm == 0
+        ) {
           this.submitAllow = true
           this.$message({
             message: '该条质检信息未确认',

src/views/houseSelfCollect/weighingManagement.vue

@@ -141,7 +141,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'">
+        <div v-if="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>
@@ -229,8 +229,8 @@
           label: '厦门建发物产有限公司'
         }],
         companyName: '黑龙江利润元粮食贸易有限公司',
-        companyNameEW: "厦门建发物产有限公司",
-        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+        companyNameEW: '厦门建发物产有限公司',
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
         ewradio: '',
         ddchecked: false,
         checked: false,
@@ -271,7 +271,7 @@
         selectEW: false,
         printSeparately: false,
         onePrint:false,//单个打印标识
-        idPrint:"",
+        idPrint:'',
       }
     },
     computed: {
@@ -530,7 +530,7 @@
               this.dialogData.compName = this.companyName
                 this.dialogDataList.push( this.dialogData)
              }
-              this.printBig("", this.radio)
+              this.printBig('', this.radio)
             })
             .catch((response) => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -94,7 +94,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'">
+        <div v-if="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>
@@ -163,12 +163,12 @@
         deptCircularPage: {},
         deptBudgetTotal: 0,
         warehouseList: [], //仓库
-        searchKeyWord: "",
+        searchKeyWord: '',
         choice: '',
         warehousingType: 1,
         isShowPrint:false,
         dialogData:{},
-        title:"",
+        title:'',
         modification:[],
         ewCustomerOptions: [{
             value: '黑龙江利润元粮食贸易有限公司',
@@ -201,8 +201,8 @@
           label: '厦门建发物产有限公司'
         }],
         companyName: '黑龙江利润元粮食贸易有限公司',
-        companyNameEW: "厦门建发物产有限公司",
-        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+        companyNameEW: '厦门建发物产有限公司',
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
          ewradio: '',
         ddchecked: false,
         checked: false,
@@ -301,7 +301,7 @@
                 this.dialogData.companyName = this.companyName
                 this.dialogDataList.push( this.dialogData)
              }
-              this.printBig("", this.radio)
+              this.printBig('', this.radio)
             })
             .catch((response) => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -347,7 +347,7 @@
       //打印
         if (type == 1) {
             if(this.modification.length == 0){
-              this.$message.error("请选择批量打印的条目！")
+              this.$message.error('请选择批量打印的条目！')
               return
             }
           this.isShowPrintType = true

src/views/warehouse/warehouseManagementRecord.vue

@@ -302,7 +302,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'">
+        <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'||deptBudgetList.warehouseName=='哈尔滨依兰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -456,8 +456,8 @@
           label: '厦门建发物产有限公司'
         }],
         companyName: '黑龙江利润元粮食贸易有限公司',
-        companyNameEW: "厦门建发物产有限公司",
-        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+        companyNameEW: '厦门建发物产有限公司',
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
         ddchecked: false,
         checked: false,
         isShowPrintType: false,
@@ -494,7 +494,7 @@
         modification: [],
         printList: [], //批量打印数据
         onePrint: false, //单个打印开关
-        idPrint:"",
+        idPrint:'',
       }
     },
 
@@ -583,7 +583,7 @@
                     this.makeEWjjSelectPrintList()
                     //  this.selectEW = true;
                   }
-                  localStorage.setItem("warehouseBatchPrint", JSON.stringify(this.printList))
+                  localStorage.setItem('warehouseBatchPrint', JSON.stringify(this.printList))
                   window.open('../../../../static/warehouseBatchPrint.html?selectEW=' + this.checked +
                     '&selectEWDD=' + this.ddchecked)
                 }
@@ -679,7 +679,7 @@
       batchPrint() {
         this.printList = []
         if (this.modification.length == 0) {
-          this.$message.error("请勾选要打印的条目！")
+          this.$message.error('请勾选要打印的条目！')
         } else {
 
           this.isShowPrintType = true
@@ -707,7 +707,7 @@
       },
       handleSelectionChange(val) {
         this.modification = val
-        console.log("sfasa", this.modification)
+        console.log('sfasa', this.modification)
       },
       selectInit(row){
 				 //在这里一定要记得类型匹配的上。