前端更新sdy

src/views/houseSelfCollect/inspectInfo.vue

@@ -109,7 +109,7 @@
             <el-button @click="cancel" v-if="this.types == 2" type="primary">关闭</el-button>
           </div>
         </div>
-      </ws-form>
+      </ws-form> 
     </div>
     <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @close="closeDialog">
         <inspectInfoPrint :printData="inspect" ref="saveImg"></inspectInfoPrint>
@@ -268,7 +268,7 @@
       },
       closePrint(){
            this.types = ""
-        this.inspect = [] 
+        // this.inspect = [] 
         this.isShowPrint = false
         this.$router.push({path:'inspectionManagement'})
       },
@@ -584,7 +584,7 @@
       },
       cancel() {
         this.types = ""
-        this.inspect = [] 
+        // this.inspect = [] 
         this.$router.push({
           path: 'inspectionManagement'
         })

src/views/houseSelfCollect/paymentManagement.vue

@@ -241,7 +241,7 @@ export default {
       }
       
     },
-    getWarehouse() {debugger
+    getWarehouse() {
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId')
       })
@@ -291,19 +291,21 @@ export default {
           this.deptBudgetTotal = response.total
         })
         this.isShowAdopt = true
-    //  getpayment({
-    //     warehouseName: this.warehouseName,
-    //     managementType : 1 
-    //   })
-    //     .toPromise()
-    //     .then((response) => {
-    //       for(let i = 0 ; i < response.length ; i++){
-    //         if(response[i].taskId){
-    //           this.isShowAdopt = true
-    //           return
-    //         }
-    //       }
-    //     })
+     getpayment({
+         currentPage: 1,
+        pageSize: 99999,
+        warehouseName: this.warehouseName,
+        managementType : 1 
+      })
+        .toPromise()
+        .then((response) => {
+          for(let i = 0 ; i < response.length ; i++){
+            if(response[i].taskId){
+              this.isShowAdopt = true
+              return
+            }
+          }
+        })
     },
     del(row) {
       this.$confirm(
@@ -511,13 +513,7 @@ export default {
           this.isShowPrint = true
           this.printData = response
           let date = new Date()
-          this.printData.currentTime =
-            date.getFullYear() +
-            '年' +
-            date.getMonth() +
-            '月' +
-            date.getDay() +
-            '日'
+          this.printData.currentTime = date.getFullYear() + '年' + Number(date.getMonth() + 1) + '月' + date.getDate() + '日'
         })
     },
     examine() {

src/views/houseSelfCollect/settlement.vue

@@ -478,8 +478,6 @@ export default {
          this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
          this.paymentList.base = this.paymentList.base.toFixed(2)
           this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
-          console.log(this.paymentList.base,",s;,l;p")
-          console.log(this.paymentList.weighingManagement.netWeight)
            this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
           if(!this.paymentList.solidGrainPrice){
             this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
@@ -714,6 +712,8 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
+          let date = new Date()
+          this.printData.currentTime =  date.getFullYear() +  '年' + '月' +  date.getDate() + '日'
          })
          this.isShowPrint = true
         },