前端

public/static/payprint1.html

@@ -1258,6 +1258,7 @@
             if (this.printData.compName == undefined) this.printData.compName = ''
             document.title = this.printData.compName + '结算凭证'
             window.print()
+            console.log(11111111111111)
                 // sessionStorage.removeItem('selectPrint_selectPrintList');
                 // sessionStorage.removeItem('selectPrint_selectCustomerList');
             window.onafterprint = function(event) {

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -66,14 +66,14 @@
               </el-input>
             </el-form-item>
           </div>
-          <div class="grid-content" v-if="!isSolidFood">
+          <!-- <div class="grid-content" v-if="!isSolidFood">
             <el-form-item label="参数类型">
               <el-radio-group @change="paramTypeChange" v-model="baseInfoForm.paramType" :disabled="!isEdit">
                 <el-radio label="1">升水扣重</el-radio>
                 <el-radio label="2">升水扣钱</el-radio>
               </el-radio-group>
             </el-form-item>
-          </div>
+          </div> -->
 
         </div>
       </el-form>
@@ -442,7 +442,7 @@ export default {
           dryGrainPrice: '',
           details: [],
           detailPrints: [],
-          paramType: '1',
+          paramType: '2',
         }
         this.baseInfoForm.warehouseId = this.$route.query.warehouseId
         this.baseInfoForm.warehouseName = this.$route.query.warehouseName
@@ -611,8 +611,11 @@ export default {
           dryGrainPrice: '',
           details: [],
           detailPrints: [],
-          paramType: '1',
+          paramType: '2',
         }
+        this.baseInfoForm.warehouseId = this.$route.query.warehouseId
+        this.baseInfoForm.warehouseName = this.$route.query.warehouseName
+        this.baseInfoForm.compId = this.$route.query.compId
       if (e == '玉米淀粉' ||
         e == '玉米（机收）' ||
         e == '玉米（酒精）' ||
@@ -621,9 +624,7 @@ export default {
         e == '玉米（棒）' ||
         e == '玉米'
       ) {
-        this.baseInfoForm.warehouseId = this.$route.query.warehouseId
-        this.baseInfoForm.warehouseName = this.$route.query.warehouseName
-        this.baseInfoForm.compId = this.$route.query.compId
+       
         this.baseInfoForm.bulkDensityStandard = 1
       }else{
         this.baseInfoForm.bulkDensityStandard = ''

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -238,7 +238,7 @@
                 <ws-form-item v-if='statusTypetext != "初检" && serviceManagementType == 1' label="经办人" span="1"
                   prop="agent">
                   <ws-input v-model="deptBudgetList.agent" placeholder="自动获取，不可编辑" maxlength="100" disabled
-                    size="small" />
+                    size="small" />   
                 </ws-form-item>
                 <!-- <ws-form-item v-if='statusTypetext == "初检" && serviceManagementType == 1' label="运费(元/吨)" span="1"
                   prop="freight">
@@ -1106,16 +1106,16 @@ export default {
       if (this.deptBudgetList.goodsName && type != 'water') {
         if (this.deptBudgetList.goodsName.indexOf('潮粮') != -1) {
           this.deptBudgetList.type = '潮粮'
-          this.deptBudgetList.grade = this.gradeList[1].value
-				  this.deptBudgetList.gradeKey = this.gradeList[1].key
+          this.deptBudgetList.grade = this.gradeList[1].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
           this.deptBudgetList.imperfectGrain=8
 					this.deptBudgetList.impurity=1
 					this.deptBudgetList.mildewGrain=2
 					this.deptBudgetList.jiaorenli=0
         } else {
           this.deptBudgetList.type = '干粮'
-          this.deptBudgetList.grade = this.gradeList[1].value
-				  this.deptBudgetList.gradeKey = this.gradeList[1].key
+          this.deptBudgetList.grade = this.gradeList[1].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
           this.deptBudgetList.imperfectGrain=8
 					this.deptBudgetList.impurity=1
 					this.deptBudgetList.mildewGrain=2
@@ -1867,7 +1867,7 @@ export default {
           type: 'warning',
         })
         return
-      }waterContent
+      }
       if (
         this.deptBudgetList.titleNoOther &&
         this.deptBudgetList.titleNoOther.length > 20
@@ -2274,6 +2274,7 @@ export default {
       this.getList()
     },
     submit() {
+      console.log(this.deptBudgetList)
       if (this.reader) {
         this.reader.cancel()
       }
@@ -2499,7 +2500,7 @@ export default {
           this.deptBudgetList.warehouseInOutDetail.jiaorenli =
             this.deptBudgetList.jiaorenli
           //热损伤
-          if (!this.deptBudgetList.jiaorenli) {
+          if (!this.deptBudgetList.jiaorenli&&this.deptBudgetList.jiaorenli!=0) {
             this.$message({
               message: '请输入热损伤!',
               type: 'warning',
@@ -3635,16 +3636,16 @@ export default {
             this.deptBudgetList.goodsName = this.taskNolist[i].goodsName
             if(this.taskNolist[i].goodsName.indexOf("潮粮") != -1){  //收购从合同中带出货名  单价等信息  用货名是否带有潮粮字符来判断干潮类型
               this.deptBudgetList.type = "潮粮"
-              this.deptBudgetList.grade = this.gradeList[1].value
-				      this.deptBudgetList.gradeKey = this.gradeList[1].key
+              this.deptBudgetList.grade = this.gradeList[1].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
               this.deptBudgetList.imperfectGrain=8
 							this.deptBudgetList.impurity=1
 							this.deptBudgetList.mildewGrain=2
 							this.deptBudgetList.jiaorenli=0
             }else{
               this.deptBudgetList.type = "干粮"
-              this.deptBudgetList.grade = this.gradeList[1].value
-				      this.deptBudgetList.gradeKey = this.gradeList[1].key
+              this.deptBudgetList.grade = this.gradeList[1].constValue
+				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
               this.deptBudgetList.imperfectGrain=8
 							this.deptBudgetList.impurity=1
 							this.deptBudgetList.mildewGrain=2
@@ -3697,7 +3698,7 @@ export default {
             this.deptBudgetList.goodsNameKey = this.outContractNo.goodsNameKey
           }
           this.goodsNameChange(this.deptBudgetList.goodsName)
-          this.deptBudgetList.grade = this.outContractNo.grade
+          // this.deptBudgetList.grade = this.outContractNo.grade
           if (this.outContractNo.inOutType == '采购入库') {
             if(this.outContractNo.deliverType==1){
                 gettask({contractNo:this.outContractNo.contractNo,compId:localStorage.getItem('ws-pf_compId')}).toPromise().then((response) => {

src/views/houseSelfCollect/settlement.vue

@@ -386,7 +386,7 @@
       },
       printBig() {
         localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
-        window.open('../../../../../static/payprint.html?type=2&dataList=' + JSON.stringify(this.printData))
+        window.open('../../../../../static/payprint.html?type=2')
       },
       getList() {
         getpaymentexamine({

src/views/warehousenew/warehousingOrder.vue

@@ -676,7 +676,7 @@ export default {
       warehouseList: [],
       currectfocusdata: {},
       customershow: false,
-      interestratevalue: '',
+      interestratevalue: {},
       accessoryTFs: false,
       remarkList: false,
       dialogTitle: '',