Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/customerManagement.vue

@@ -1,7 +1,7 @@
 <!--客户管理-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
         <ws-button type="primary" @click="getCustomer()">获取客户</ws-button>
         <ws-button type="primary" @click="createCustomer(1)">创建新客户</ws-button>
@@ -12,7 +12,6 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -8px;
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>

src/views/houseSelfCollect/inspectInfo.vue

@@ -179,7 +179,7 @@
         num:0,
       }
     },
-    activated() {debugger
+    activated() {
       this.types = this.$route.query.type
       if(!this.types){
           this.types = 1

src/views/houseSelfCollect/inspectionManagement.vue

@@ -1,7 +1,7 @@
 <!--质检管理-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
         <ws-button type="primary" @click="inspectInfo(1)" v-hasPermission="`acquisitionManagement.acquisitionQuality.add`">添加</ws-button>
       </template>
@@ -11,6 +11,7 @@
           placeholder=""
           @change="warehouseNameChange"
           :value="searchType"
+          style="margin: 0 10px"
         >
           <ws-option
             v-for="item in warehouseList"
@@ -37,7 +38,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -8px;
+              
             "
             src="../../../public/img/sousuo.png"
             alt=""

src/views/houseSelfCollect/paymentManagement.vue

@@ -1,7 +1,7 @@
 <!--付款管理-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
         <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen()">待审核</ws-button>
@@ -15,6 +15,7 @@
           v-model="warehouseNameKey"
           placeholder="请选择"
           @change="warehouseChange"
+          style="margin:0 10px"
         >
           <el-option
             v-for="item in warehouseList"
@@ -41,7 +42,6 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -358,7 +358,6 @@ export default {
           data = this.warehouseList[i]
         }
       }
-      debugger
       for (let i = 0; i < data.purchasePriceList.length; i++) {
         if (data.purchasePriceList[i].goodsName == row.goodsName) {
           data1 = data.purchasePriceList[i]

src/views/houseSelfCollect/settlement.vue

@@ -71,9 +71,9 @@
             <!-- <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.solidGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" :disabled='disabled' />
             </ws-form-item> -->
-             <ws-form-item v-if='paymentList.type=="潮粮"' label="纯重单价（元/公斤）" span="1" prop="tidalGrainPrice">
+             <!-- <ws-form-item v-if='paymentList.type=="潮粮"' label="纯重单价（元/公斤）" span="1" prop="tidalGrainPrice">
                 <ws-input v-model="paymentList.tidalGrainPrice" placeholder="请输入纯重单价" maxlength="100" size="small" disabled />
-            </ws-form-item>
+            </ws-form-item> -->
              <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价（元/公斤）" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
             </ws-form-item>
@@ -202,8 +202,9 @@
               span="1"
               prop="waterContent"
             >
+              <!-- v-model="paymentList.solidGrainPrice" -->
               <ws-input
-               v-model="paymentList.solidGrainPrice"
+              v-model="paymentList.tidalGrainPrice"
                 placeholder="请输入纯重单价"
                 maxlength="100"
                 size="small"
@@ -468,6 +469,7 @@ export default {
       getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
           this.paymentList = response
           this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
+          this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(2)
           this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
           this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
         this.paymentList.qualityInspectionManagement.weightDeduction=this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
@@ -705,15 +707,8 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
-             console.log(this.printData,"打印")
          })
          this.isShowPrint = true
-           
-        //   this.$router.push({ path: 'houseSelfCollectPrint',
-        //     query:{
-        //   name:"123"
-        // }
-        // })
         },
         )
     },

src/views/houseSelfCollect/weighingManagement.vue

@@ -1,7 +1,7 @@
 <!--检斤管理-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="16">
       <template slot="left"> </template>
       <template slot="right">
         <ws-select
@@ -9,6 +9,7 @@
           placeholder=""
           @change="warehouseNameChange"
           :value="searchType"
+          style="margin: 0 10px"
         >
           <ws-option
             v-for="item in warehouseList"
@@ -34,7 +35,6 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -8px;
             "
             src="../../../public/img/sousuo.png"
             alt=""

src/views/houseSelfCollect/weightCheck.vue

@@ -240,10 +240,8 @@ export default {
     },
     calculation() {
       if (this.weighingList.grossWeight && this.weighingList.tare) {
-        this.weighingList.netWeight =
-          this.weighingList.grossWeight -
-          this.weighingList.tare -
-          this.weighingList.buckleMiscellaneous
+        this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare - this.weighingList.buckleMiscellaneous
+        this.weighingList.netWeight = this.weighingList.netWeight.toFixed(2)
       }
     },
     printSmall() {

vue.config.js

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