更新

.env.production

@@ -4,8 +4,8 @@
 
 NODE_ENV = 'production'
 # base api
-#VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
-VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+#VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

public/static/inspection.html

@@ -13,8 +13,8 @@
       }
 
       #app {
-        height: 98vh;
-        position: relative;
+        /* height: 98vh;
+        position: relative; */
       }
 
       .content {
@@ -183,7 +183,6 @@
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
           <div>粮食质检单</div>
-          <img class="small-img" src="../img/add.png" alt="">
         </div>
         <div class="small-row">
           <div>编号</div>

public/static/payprint.html

@@ -213,6 +213,7 @@
             <tr class="row">
               <td class="col col-bgc" v-if="printData.type == '潮粮'">净重单价</td>
               <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
+              <td class="col col-bgc">扣单价</td>
               <td class="col col-bgc">粮款</td>
               <td class="col col-bgc">称重补助</td>
               <td class="col col-bgc">运费补助</td>
@@ -221,11 +222,11 @@
               <td class="col col-bgc">称重扣款</td>
               <td class="col col-bgc">运费扣款</td>
               <td class="col col-bgc">卸车扣款</td>
-              <td class="col col-bgc">质量扣款</td>
             </tr>
             <tr class="row">
               <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
               <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
+              <td class="col ">{{printData.unitDeduction}}</td>
               <td class="col ">{{printData.grainMoney}}</td>
               <td class="col ">{{printData.weighingSubsidy}}</td>
               <td class="col ">{{printData.freightSubsidy}}</td>
@@ -234,9 +235,9 @@
               <td class="col ">{{printData.weighingDeduction}}</td>
               <td class="col ">{{printData.freightDeduction}}</td>
               <td class="col ">{{printData.unloadDeduction}}</td>
-              <td class="col ">{{printData.qualityDeduction}}</td>
             </tr>
             <tr class="row">
+              <td class="col col-bgc">质量扣款</td>
               <td class="col col-bgc">其他扣款</td>
               <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td>
               <td class="col col-bgc">合计应付</td>
@@ -245,6 +246,7 @@
               <td class="col col-bgc" colspan="5">记事</td>
             </tr>
             <tr class="row">
+              <td class="col ">{{printData.qualityDeduction}}</td>
               <td class="col ">{{printData.otherDeduction}}</td>
               <td class="col " v-if="printData.type == '潮粮'">{{printData.solidGrainPrice}}</td>
               <td class="col ">{{printData.calculationPayable}}</td>

public/static/weightCheck.html

@@ -13,8 +13,8 @@
       }
 
       #app {
-        height: 98vh;
-        position: relative;
+        /* height: 98vh;
+        position: relative; */
       }
 
       .content {
@@ -92,7 +92,7 @@
         left: 0;
         right: 0;
         margin: auto;
-        height: 650px;
+        height: 450px;
       }
 
       .small-title {
@@ -202,7 +202,6 @@
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
           <div>粮食检斤单</div>
-          <img class="small-img" src="../img/add.png" alt="">
         </div>
         <div class="small-row">
           <div>编号</div>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -39,17 +39,17 @@
         </div>
         <div class="row2">
           <div class="grid-content">
-            <el-form-item label="干粮水分">
+            <el-form-item label="干粮水分(%)">
               <el-input v-model="baseInfoForm.waterMin" @input="changeMinWater" :disabled="!isEdit" id="aaa"></el-input>
             </el-form-item>
           </div>
           <div class="grid-content">
-            <el-form-item label="水分上限">
+            <el-form-item label="水分上限(%)">
               <el-input v-model="baseInfoForm.waterMax" @input="changeMaxWater" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
           <div class="grid-content">
-            <el-form-item label="销售上限(年/吨)">
+            <el-form-item label="销售上限(吨/年)">
               <el-input v-model="baseInfoForm.saleLimit" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.122:8090/',
+        target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',