更新

src/components/balanceAlert.vue

@@ -133,6 +133,7 @@ export default {
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
+            (this.deptBudgetList.warehouseName == '山东岳沟库' ||
               this.deptBudgetList.warehouseName == '克东千红库' ||
               this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -92,16 +92,16 @@
                     disabled />
                 </ws-form-item>
                 <ws-form-item label="箱号-1" span="1" prop="boxNo">
-                  <ws-input disabled v-model="weighingList.boxNo" placeholder="暂无" maxlength="20" size="small" />
-                </ws-form-item>
-                <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-                  <ws-input disabled v-model="weighingList.boxNoOther" placeholder="暂无" maxlength="20" size="small" />
+                  <ws-input  v-model="weighingList.boxNo" placeholder="暂无" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="封号-1" span="1" prop="titleNo">
-                  <ws-input disabled v-model="weighingList.titleNo" placeholder="暂无" maxlength="20" size="small" />
+                  <ws-input  v-model="weighingList.titleNo" placeholder="暂无" maxlength="20" size="small" />
+                </ws-form-item>
+                <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+                  <ws-input  v-model="weighingList.boxNoOther" placeholder="暂无" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-                  <ws-input disabled v-model="weighingList.titleNoOther" placeholder="暂无" maxlength="20" size="small" />
+                  <ws-input  v-model="weighingList.titleNoOther" placeholder="暂无" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
                   <ws-input type="number" @mousewheel.native.prevent v-if="index == 0"

src/views/houseSelfCollect/paymentManagement.vue

@@ -1201,16 +1201,19 @@
         let _list2 = []
         if (this.printType == 1) {
           localStorage.setItem('cwprint', true)
-          // 财务批量打印数据
-          for (let i = 0; i < this.selectPrintList.length; i++) {
-            if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
-              this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
-              this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
-            } else {
-              this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
-              this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
+          if(localStorage.getItem('ws-pf_staffName') == '全能账号'){
+            // 财务批量打印数据
+            for (let i = 0; i < this.selectPrintList.length; i++) {
+              if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
+                this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
+                this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
+              } else {
+                this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
+                this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
+              }
             }
           }
+          
           localStorage.setItem(
             'selectPrint_selectPrintList',
             JSON.stringify(this.selectPrintList)
@@ -1230,15 +1233,29 @@
           _list1 = JSON.stringify(this.printData)
           _list2 = JSON.stringify(this.customerList)
         }
-        window.open(
-          '../../../../../static/payprint.html?type=2&dataList=' +
-          _list1 +
-          '&customerList=' +
-          _list2 +
-          '&printTypeList=' +
-          this.ruleForm.type,
-          '结算凭证'
-        )
+        if(localStorage.getItem('ws-pf_staffName') == '全能账号'){
+            window.open(
+              '../../../../../static/payprint.html?type=2&dataList=' +
+              _list1 +
+              '&customerList=' +
+              _list2 +
+              '&printTypeList=' +
+              this.ruleForm.type,
+              '结算凭证'
+            )
+          }
+          else{
+            window.open(
+              '../../../../../static/payprint1.html?type=2&dataList=' +
+              _list1 +
+              '&customerList=' +
+              _list2 +
+              '&printTypeList=' +
+              this.ruleForm.type,
+              '结算凭证'
+            )
+          }
+        
       },
       getList() {
         for (let _temp = 0; _temp < this.warehouseList.length; _temp++) {

src/views/warehousenew/warehouseManagementList.vue

@@ -382,10 +382,6 @@
           this.$message.error('请选择打印的截止日期')
           return
         }
-        if (this.parameter.endDate < new Date(this.parameter.startDate).getTime()) {
-          this.$message.error('截止日期输入错误')
-          return
-        }
         if (!this.parameter.warehouseName) {
           this.$message.error('请选择所要打印的仓库')
           return
@@ -394,7 +390,7 @@
           this.parameter.warehouseName = ''
         }
         let enddate = new Date(this.parameter.endDate).toLocaleString()//将截止时间的时间戳转为时间
-        this.parameter.endDate = enddate.split(" ")[0].replace("/" ,"-").replace("/","-")
+        this.parameter.endDate = enddate.split(' ')[0].replace('/' ,'-').replace('/','-')
         this.parameter.warehouseName = this.parameter.warehouseName.replace('（临）','')
          this.isShowPrintType = false
         if (this.headerText == '导出记录') {