ccjgmwz 3 سال پیش
والد
کامیت
4258ade18b
2فایلهای تغییر یافته به همراه24 افزوده شده و 19 حذف شده
  1. 2 1
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  2. 22 18
      src/views/houseSelfCollect/inspectInfo.vue

+ 2 - 1
src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -994,7 +994,6 @@
                 }
               }
             }
-
             // for (let j = (_priceList[i].detailList.length + 1) / 2 - 1; j > 0; j--) {
             //   if (_priceList[i].detailList[j] && _priceList[i].detailList[j].type != 4) {
             //     if (_priceList[i].detailList[j].type != 1) {
@@ -1077,6 +1076,8 @@
             this.right.push(_rightObj)
             console.log('this.right', this.right)
           }
+            debugger
+
         }
       },
       // 获取当前价格左右价格区间数据

+ 22 - 18
src/views/houseSelfCollect/inspectInfo.vue

@@ -138,8 +138,8 @@
     packList
   } from '@/model/contarct/index'
   import inspectInfoPrint from './component/inspectInfoPrint.vue'
-  import html2canvas from "html2canvas"
-  import axios from "axios"
+  import html2canvas from 'html2canvas'
+  import axios from 'axios'
   export default {
     components: {
       inspectInfoPrint,
@@ -152,8 +152,8 @@
         inspect: {
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
-          natureOfGrainPurchase:"贸易粮",
-          type:"潮粮"
+          natureOfGrainPurchase:'贸易粮',
+          type:'潮粮'
         },
         disabled: false,
         disabled1: false,
@@ -171,7 +171,7 @@
         typeList: ['干粮', '潮粮'],
         purchasePriceList: [],
         id: '',
-        imgUrl:"",
+        imgUrl:'',
         printData:{},
         num:0,
         tipFlag:true
@@ -186,8 +186,8 @@
            this.inspect = {
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
-          natureOfGrainPurchase:"贸易粮",
-          type:"潮粮"
+          natureOfGrainPurchase:'贸易粮',
+          type:'潮粮'
         }
       }
       this.cangid = this.$route.query.cangid
@@ -205,6 +205,10 @@
         this.disabled1 = true
         this.information = '编辑'
       }
+      else{
+        this.disabled1 = false
+        this.disabled = false
+      }
       this.calculation()
       this.getList(this.id)
     },
@@ -236,12 +240,12 @@
       },
       closeDialog() {
         html2canvas(this.$refs.saveImg.$el).then(canvas => {
-          let dataURL = canvas.toDataURL("image/png");
+          let dataURL = canvas.toDataURL('image/png');
           this.imgUrl = dataURL;
-          if (this.imgUrl !== "") {
-            let b = this.dataURLtoFile(this.imgUrl, "printImg")
+          if (this.imgUrl !== '') {
+            let b = this.dataURLtoFile(this.imgUrl, 'printImg')
             let formdata = new FormData();
-            formdata.append("file", b);
+            formdata.append('file', b);
             axios({
               method: 'post',
               url: 'https://www.zthymaoyi.com/upload/admin',
@@ -257,13 +261,13 @@
             this.dialogTableVisible = true;
           }
         })
-        this.types = ""
+        this.types = ''
         // this.inspect = [] 
         this.isShowPrint = false
         this.$router.push({path:'inspectionManagement'})
       },
       typeChange(){
-        if(this.inspect.type == "干粮" && this.inspect.goodsName){
+        if(this.inspect.type == '干粮' && this.inspect.goodsName){
            getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
                 .toPromise()
                 .then((response) => { 
@@ -272,7 +276,7 @@
         }
       },
       closePrint(){
-           this.types = ""
+           this.types = ''
         // this.inspect = [] 
         this.isShowPrint = false
         this.$router.push({path:'inspectionManagement'})
@@ -371,7 +375,7 @@
           })
           return
         }
-        if(this.inspect.type == "干粮"){
+        if(this.inspect.type == '干粮'){
           if(!this.inspect.dryGrainPrice){
             this.$message({
               message:'干粮价格不能为空',
@@ -577,7 +581,7 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
-                      console.log(this.inspect,"cdsklh")
+                      console.log(this.inspect,'cdsklh')
                     })
                   this.isShowPrint = true
                 })
@@ -588,7 +592,7 @@
         }
       },
       cancel() {
-        this.types = ""
+        this.types = ''
         // this.inspect = [] 
         this.$router.push({
           path: 'inspectionManagement'
@@ -644,7 +648,7 @@
               this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)
             }
           }
-          if(this.inspect.type == "干粮"){
+          if(this.inspect.type == '干粮'){
              getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
                 .toPromise()
                 .then((response) => {