前端 收购检斤重量修改sdy

src/views/houseSelfCollect/paymentManagement.vue

@@ -41,14 +41,10 @@
         >待付款</ws-button>
         <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)" v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
         <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
-<<<<<<< HEAD
-        <ws-button type="primary" @click="reject" v-if="isShowAdopt == 'true'">驳回</ws-button>
-        <ws-button type="primary" @click="adopt" v-if="isShowAdopt == 'true'">通过</ws-button>
-=======
+
         <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
         <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
         <ws-button type="primary" @click="invoicingClick" v-if="isShowAdopt" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
->>>>>>> e236289d9cae97f6c171795170f1988c99718604
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <ws-button
           type="primary"

src/views/houseSelfCollect/weightCheck.vue

@@ -639,7 +639,7 @@
                       //累计售粮超上限不能完成毛检保存
                       let count = (this.purchasePriceList[i].saleLimit - response / 1000).toFixed(2)
                       // console.log(this.weighingList.grossWeight / 1000, '毛重转吨')
-                      this.weighingList.grossWeight/=1000
+                      // this.weighingList.grossWeight/=1000
                       if (count - this.weighingList.grossWeight / 1000 < 0) {
                         this.$alert(
                           '该客户累计销售' +
@@ -679,12 +679,12 @@
                   }
                 })
             } else if (this.tpyeNo == 2) {
-              this.weighingList.grossWeight/=1000
-              this.weighingList.tare/=1000
-              if(this.weighingList.buckleMiscellaneous){
-                this.weighingList.buckleMiscellaneous/=1000
-              }
-              this.weighingList.netWeight/=1000
+              // this.weighingList.grossWeight/=1000
+              // this.weighingList.tare/=1000
+              // if(this.weighingList.buckleMiscellaneous){
+              //   this.weighingList.buckleMiscellaneous/=1000
+              // }
+              // this.weighingList.netWeight/=1000
               this.weighingList.warehouseId = this.warehouseId;
               (this.weighingList.skinInspector =
                 sessionStorage.getItem('ws-pf_staffName')),