前端

main.js

@@ -9,7 +9,6 @@ const BrowserWindow = electron.BrowserWindow;
  
 const path = require('path');
 const url = require('url');
- console.log(process.env,111111111111)
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;

public/static/warehousePrint.html

@@ -241,7 +241,6 @@
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
-    // import  API_CONFIG from "../../vue.config.js"
     new Vue({
       el: '#app',
       data: {
@@ -299,7 +298,7 @@
         printBig() {}
       },
       mounted() {
-        // console.log(API_CONFIG,1111111111)
+        console.log(API_CONFIG,1111111111)
         // var ippath=API_CONFIG.devServer.proxy['/pb'].target
 
         this.company = localStorage.getItem("ws-pf_compName")

src/model/defalutConfig/indexRx.js

@@ -6,7 +6,6 @@ const instance = axios.create({
   withCredentials: process.env.VUE_APP_WITHCREDENTIALS,
   timeout: process.env.VUE_APP_AJAX_TIMEOUT
 })
-console.log(process.env,1234455)
 instance.interceptors.request.use(
   (config) => {
     if(config.params){

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1071,7 +1071,6 @@ export default {
       }
     },
     waterContentChange(type) {
-      // debugger
           //客户
           if(this.serviceManagementType==3){
           getcustomer({
@@ -1110,17 +1109,17 @@ export default {
         } else {
           this.deptBudgetList.type = '干粮'
         }
-        // if (!this.deptBudgetList.dryGrainPrice || this.deptBudgetList.dryGrainPrice == 0) {
-        //   getDryGrainPrice({
-        //     warehouseId: this.cangid,
-        //     goodsName: this.deptBudgetList.goodsName
-        //   })
-        //     .toPromise()
-        //     .then((response) => {
-        //       this.$set(this.deptBudgetList, 'dryGrainPrice', response)
-        //       this.dryGrainPrice=response
-        //     })
-        // }
+        if (!this.deptBudgetList.dryGrainPrice || this.deptBudgetList.dryGrainPrice == 0) {
+          getDryGrainPrice({
+            warehouseId: this.cangid,
+            goodsName: this.deptBudgetList.goodsName
+          })
+            .toPromise()
+            .then((response) => {
+              this.$set(this.deptBudgetList, 'dryGrainPrice', response)
+              this.dryGrainPrice=response
+            })
+        }
         // debugger
         for (var i = 0; i < this.purchasePriceList.length; i++) {
           if (this.purchasePriceList[i].goodsName == this.deptBudgetList.goodsName) {
@@ -1153,44 +1152,30 @@ export default {
                 .buckleMiscellaneous) / 100 * parseFloat(this.deptBudgetList.dryGrainPrice ? this.deptBudgetList
                   .dryGrainPrice : 0)).toFixed(4)
               }
-              if (!this.deptBudgetList.tidalGrainPrice) {
-									this.deptBudgetList.tidalGrainPrice = ''
-								}
-              if(this.deptBudgetList.type == '干粮'){
-                this.deptBudgetList.dryGrainPrice = response
-                this.dryGrainPrice = this.deptBudgetList.dryGrainPrice 
-              }
             } else {
-              if(this.deptBudgetList.type == '干粮'){
-                this.deptBudgetList.dryGrainPrice = response
-                this.dryGrainPrice = this.deptBudgetList.dryGrainPrice 
-              }else{
+              if (this.inspect.type == '干粮') {
+                if (response == 0) {
+                  getDryGrainPrice({
+                    warehouseId: this.cangid,
+                    goodsName: this.deptBudgetList.goodsName
+                  })
+                    .toPromise()
+                    .then((response) => {
+                      this.$set(this.deptBudgetList, 'dryGrainPrice', response)
+                      this.dryGrainPrice=response
+                    })
+                } else {
+                  if(response>0){
+                  this.deptBudgetList.dryGrainPrice = response
+                  this.dryGrainPrice = response
+                  }
+                }
+              } else {
+                if(response>0){
                 this.deptBudgetList.tidalGrainPrice = response
-                this.tidalGrainPrice = this.deptBudgetList.tidalGrainPrice 
+                this.tidalGrainPrice = response
+                }
               }
-              // if (this.inspect.type == '干粮') {
-              //   if (response == 0) {
-              //     getDryGrainPrice({
-              //       warehouseId: this.cangid,
-              //       goodsName: this.deptBudgetList.goodsName
-              //     })
-              //       .toPromise()
-              //       .then((response) => {
-              //         this.$set(this.deptBudgetList, 'dryGrainPrice', response)
-              //         this.dryGrainPrice=response
-              //       })
-              //   } else {
-              //     if(response>0){
-              //     this.deptBudgetList.dryGrainPrice = response
-              //     this.dryGrainPrice = response
-              //     }
-              //   }
-              // } else {
-              //   if(response>0){
-              //   this.deptBudgetList.tidalGrainPrice = response
-              //   this.tidalGrainPrice = response
-              //   }
-              // }
             }
           })
       }
@@ -1870,7 +1855,7 @@ export default {
           type: 'warning',
         })
         return
-      }
+      }waterContent
       if (
         this.deptBudgetList.titleNoOther &&
         this.deptBudgetList.titleNoOther.length > 20
@@ -2395,7 +2380,6 @@ export default {
           })
           return
         }
-
         if (this.value1 == false && this.statusTypetext == '初检') {
           this.deptBudgetList.warehouseInOutDetail.grade = this.deptBudgetList.grade
           if (!this.deptBudgetList.grade) {