前端 修改缺陷 sdy

public/static/inspection.html

@@ -130,17 +130,17 @@
           </tr>
           <tr class="row">
             <td class="col col-bgc">收货单位</td>
-            <td class="col" colspan="2">{{tableData.receivingUnit}}</td>
+            <td class="col" colspan="2">{{tableData.compName}}</td>
             <td class="col col-bgc">联系人</td>
-            <td class="col" colspan="2">{{tableData.contacts}}</td>
+            <td class="col" colspan="2">{{tableData.person}}</td>
             <td class="col col-bgc">联系电话</td>
-            <td class="col">{{tableData.contactsPhone}}</td>
+            <td class="col">{{tableData.personPhone}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">货名</td>
             <td class="col">{{tableData.goodsName}}</td>
             <td class="col col-bgc">类型</td>
-            <td class="col">{{tableData.customerName}}</td>
+            <td class="col">{{tableData.type}}</td>
             <td class="col col-bgc">容量（克/升）</td>
             <td class="col">{{tableData.bulkDensity}}</td>
             <td class="col col-bgc">不完整粒（%）</td>
@@ -162,7 +162,7 @@
             <td class="col col-bgc">霉变粒（%）</td>
             <td class="col">{{tableData.mildewGrain}}</td>
             <td class="col col-bgc" colspan="2">购粮性质</td>
-            <td class="col" colspan="2">{{tableData.customerName}}</td>
+            <td class="col" colspan="2">{{tableData.natureOfGrainPurchase}}</td>
           </tr>
         </table>
         <div class="bottom">
@@ -203,15 +203,15 @@
         </div>
         <div class="small-row">
           <div>收货单位</div>
-          <div>{{tableData.receivingUnit}}</div>
+          <div>{{tableData.compName}}</div>
         </div>
         <div class="small-row">
           <div>联系人</div>
-          <div>{{tableData.contacts}}</div>
+          <div>{{tableData.person}}</div>
         </div>
         <div class="small-row">
           <div>联系电话</div>
-          <div>{{tableData.contactsPhone}}</div>
+          <div>{{tableData.personPhone}}</div>
         </div>
         <div class="small-row">
           <div>货名</div>
@@ -219,7 +219,7 @@
         </div>
         <div class="small-row">
           <div>类型</div>
-          <div>{{tableData.customerName}}</div>
+          <div>{{tableData.type}}</div>
         </div>
         <div class="small-row">
           <div>容量（克/升）</div>
@@ -255,7 +255,7 @@
         </div>
         <div class="small-row">
           <div>购粮性质</div>
-          <div>{{tableData.customerName}}</div>
+          <div>{{tableData.natureOfGrainPurchase}}</div>
         </div>
         <div class="small-row">
           <div>质检</div>

public/static/weightCheck.html

@@ -156,7 +156,7 @@
             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
             <td class="col col-bgc">热损伤（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
-            <td class="col col-bgc" colspan="2">质检{{tableData.qualityInspectionManagement.suqualityTestingDate}}</td>
+            <td class="col col-bgc" colspan="2">质检&nbsp;&nbsp;{{tableData.qualityInspectionManagement.qualityDate}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>

src/api/V2/houseSelfCollect/index.js

@@ -76,6 +76,7 @@ export const API_POST_PAYMENT_AUDIT = '/paymentManagement/api/openAuditFlow'
 export const API_POST_PAYMENT_PAYMENTSUBMIT = '/paymentManagement/api/payMoney'
 //付款结算修改
 export const API_POST_PAYMENT_SETTLEMENTEDIT = '/paymentManagement/api/editCollect'
-
+//付款结算修改
+export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
 
 

src/model/houseSelfCollect/index.js

@@ -40,7 +40,8 @@ import {
   API_POST_PAYMENT_PAYMENTSUBMIT,
   API_POST_PAYMENT_SETTLEMENTEDIT,
   API_GET_CUSTOMER_CODE,
-  API_GET_CUSTOMER_CODEJY
+  API_GET_CUSTOMER_CODEJY,
+  API_GET_INSPECT_GETDRYGRAINPRICE
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -120,3 +121,5 @@ export const auditpayment  = appRx.post(API_POST_PAYMENT_AUDIT, errorCatcher, er
 export const paymentCommit = appRx.post(API_POST_PAYMENT_PAYMENTSUBMIT, errorCatcher, errorHandle, filter)
 //付款结算修改
 export const settlementEdit = appRx.post(API_POST_PAYMENT_SETTLEMENTEDIT, errorCatcher, errorHandle, filter)
+//质检干粮单价查看
+export const getDryGrainPrice = appRx.get(API_GET_INSPECT_GETDRYGRAINPRICE, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -46,7 +46,7 @@
         <el-table-column prop="saleLimit" label="销量上限(年/吨)"></el-table-column>
         <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
         <el-table-column prop="status" label="状态"></el-table-column>
-        <el-table-column prop="passDate" label="通过时间"></el-table-column>
+        <el-table-column prop="updateDate" label="通过时间"></el-table-column>
         <el-table-column label="操作" width="300">
           <template slot-scope="scope">
             <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -23,7 +23,7 @@
         <td class="col col-bgc">货名</td>
         <td class="col">{{ printData.goodsName }}</td>
         <td class="col col-bgc">类型</td>
-        <td class="col">{{ printData.customerName }}</td>
+        <td class="col">{{ printData.type }}</td>
         <td class="col col-bgc">容量（克/升）</td>
         <td class="col">{{ printData.bulkDensity }}</td>
         <td class="col col-bgc">不完整粒（%）</td>
@@ -45,7 +45,7 @@
         <td class="col col-bgc">霉变粒（%）</td>
         <td class="col">{{ printData.mildewGrain }}</td>
         <td class="col col-bgc" colspan="2">购粮性质</td>
-        <td class="col" colspan="2">{{ printData.customerName }}</td>
+        <td class="col" colspan="2">{{ printData.natureOfGrainPurchase }}</td>
       </tr>
     </table>
     <div class="bottom">

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -36,7 +36,7 @@
             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
             <td class="col col-bgc">热损伤（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
-            <td class="col col-bgc" colspan="2">质检{{tableData.qualityInspectionManagement.suqualityTestingDate}}</td>
+            <td class="col col-bgc" colspan="2">质检&nbsp;&nbsp;{{tableData.qualityInspectionManagement.qualityDate}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>

src/views/houseSelfCollect/customerManagement.vue

@@ -39,7 +39,11 @@
       <el-table-column prop="customerName" label="客户"></el-table-column>
       <el-table-column prop="customerPhone" label="手机号"></el-table-column>
       <el-table-column prop="bankCard" label="银行卡号"></el-table-column>
-      <el-table-column prop="bankDeposit" label="开户行"></el-table-column>
+      <el-table-column prop="bankDeposit" label="开户行">
+        <template slot-scope="scope">
+          <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div> 
+        </template>
+      </el-table-column>
       <el-table-column prop="payeeName" label="收款人"></el-table-column>
       <el-table-column prop="authenticationStatus" label="状态"></el-table-column>
       <el-table-column prop="address" label="操作" width="300">

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -69,8 +69,14 @@
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="开户支行" span="1" prop="bankDepositBranch">
-            <ws-input v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" maxlength="100" size="small"
-              :disabled="disabled" />
+            <!-- <ws-input v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" maxlength="100" size="small"
+              :disabled="disabled" /> -->
+
+                <ws-select v-model="customerList.bankDepositBranch" placeholder="请输入开户支行"
+                :disabled="disabled">
+                <ws-option v-for="item in bankList" :key="item" :label="item"
+                  :value="item" />
+              </ws-select>
           </ws-form-item>
           <ws-form-item label="收款人姓名" span="1" prop="payeeName">
             <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="15" size="small"
@@ -88,12 +94,11 @@
             <ws-input v-model="customerList.compAddress" placeholder="请输入联系地址" maxlength="100" size="small"
               :disabled="disabled" />
           </ws-form-item>
-          <ws-form-item label="验证码" label-width="0px" span="1" prop="compAddress">
-            <el-button type="primary" class="veriCode" @click="toSend()" v-if="!sendDisabled">获取验证码</el-button>
+          <div v-if="this.switchType == 1 || this.switchType == 3" class = "jiaoYan">
+              <el-button type="primary" class="veriCode" @click="toSend()" v-if="!sendDisabled">获取验证码</el-button>
             <el-button type="warning" class="veriCode" v-if="sendDisabled">{{sendText}}</el-button>
-
             <ws-input v-model="verifyCode" placeholder="请输入验证码" maxlength="100" size="small" :disabled="disabled" />
-          </ws-form-item>
+          </div>
         </ws-info-table>
         <div class="but">
           <el-button type="primary" @click="commit" v-if="switchType == 1 || switchType == 3">提交</el-button>
@@ -156,7 +161,8 @@
         bankLows: 'bankLow',
         sendText: '',
         sendDisabled: false,
-        verifyCode: ""
+        verifyCode: "",
+        bankList:[],
       }
     },
     activated() {
@@ -268,13 +274,13 @@
           .toPromise()
           .then((response) => {
             if (response.recPerson ) {
-              this.customerList.customerName = response.recPerson
+               this.$set( this.customerList,'customerName',response.recPerson)
+               this.$set( this.customerList,'payeeName',response.recPerson)
             }
-            console.log(this.customerList.customerName)
             if (response.recPersonNo ) {
-              this.customerList.customerNumberCard = response.recPersonNo
+              this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
+               this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
             }
-            console.log(this.customerList.customerNumberCard)
           })
       },
       upLoadSuccess2(e) {
@@ -287,11 +293,13 @@
           .toPromise()
           .then((response) => {
             if (response.recPerson ) {
-              this.customerList.customerName = response.recPerson
+                this.$set( this.customerList,'customerName',response.recPerson)
+                this.$set( this.customerList,'payeeName',response.recPerson)
             }
             
             if (response.recPersonNo ) {
-              this.customerList.customerNumberCard = response.recPersonNo
+              this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
+               this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
             }
             
           })
@@ -305,11 +313,14 @@
           })
           .toPromise()
           .then((response) => {
+            if (response.bankNameZhihang.length > 0) {
+              this.bankList = response.bankNameZhihang
+            }
             if (response.bankNo) {
-              this.customerList.bankCard = response.bankNo
+                  this.$set(this.customerList,'bankCard',response.bankNo)
             }
             if (response.bankName) {
-              this.customerList.bankDeposit = response.bankName
+              this.$set(this.customerList,'bankDeposit',response.bankName)
             }
           })
       },
@@ -322,11 +333,14 @@
           })
           .toPromise()
           .then((response) => {
+             if (response.bankNameZhihang) {
+              this.bankList = response.bankNameZhihang
+            }
             if (response.bankNo) {
-              this.customerList.bankCard = response.bankNo
+              this.$set(this.customerList,'bankCard',response.bankNo)
             }
             if (response.bankName) {
-              this.customerList.bankDeposit = response.bankName
+              this.$set(this.customerList,'bankDeposit',response.bankName)
             }
           })
       },
@@ -660,6 +674,15 @@
   }
 
   .veriCode {
-    margin-right: 20px;
+    margin: 0 9px;
   }
+  .jiaoYan{
+    display: flex;
+    width: 50%;
+    padding: 0 9px;
+  }
+  /deep/.jiaoYan .el-input__inner{
+    width: 100%;
+  }
+
 </style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -38,7 +38,7 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNumber">
-              <ws-input v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="100" size="small"
+              <ws-input v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">
@@ -53,16 +53,19 @@
                 :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="inspect.type" placeholder="" :disabled="disabled">
+              <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
             <ws-form-item label="购粮性质" span="1" prop="natureOfGrainPurchase">
-              <ws-input v-model="inspect.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small"
+              <ws-input v-model="inspect.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="10" size="small"
                 :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="净重单价（元/公斤）" span="1" prop="buckleWeightRatio">
-              <ws-input v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="100" size="small" disabled />
+            <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
+              <ws-input v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" disabled />
+            </ws-form-item>
+            <ws-form-item label="干粮单价（元/公斤）" span="1" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
+              <ws-input v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small"  :disabled="disabled" />
             </ws-form-item>
           </ws-info-table>
 
@@ -112,14 +115,12 @@
       </ws-form>
     </div>
     <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @close="closeDialog">
-      <div slot="footer">
         <inspectInfoPrint :printData="inspect" ref="saveImg"></inspectInfoPrint>
-        <div class="bottom-row4">
+        <div style="text-align:center">
           <el-button type="primary" @click="closePrint">关闭</el-button>
           <el-button type="primary" @click="printSmall">打印小票</el-button>
           <el-button type="primary" @click="printBig">打印单据</el-button>
         </div>
-      </div>
     </el-dialog>
   </div>
 </template>
@@ -134,6 +135,7 @@
     getinspectEdit,
     getamount,
     getCount,
+    getDryGrainPrice
   } from '@/model/houseSelfCollect/index'
    import {
     packList
@@ -153,6 +155,8 @@
         inspect: {
           tidalGrainPrice: 0,
           buckleWeightRatio: 0,
+          natureOfGrainPurchase:"贸易粮",
+          type:"潮粮"
         },
         disabled: false,
         disabled1: false,
@@ -172,6 +176,7 @@
         id: '',
         imgUrl:"",
         printData:{},
+        num:0,
       }
     },
     activated() {
@@ -202,12 +207,12 @@
       printSmall() {
         window.location.href =
           '../../../static/inspection.html?type=1&dataList=' +
-          JSON.stringify(this.printData)
+          JSON.stringify(this.inspect)
       },
       printBig() {
         window.location.href =
           '../../../static/inspection.html?type=2&dataList=' +
-          JSON.stringify(this.printData)
+          JSON.stringify(this.inspect)
       },
       getdate() {
         var date = new Date()
@@ -249,11 +254,19 @@
                 .then((response) => {
                 })
             })
-
             this.dialogTableVisible = true;
           }
         });
       },
+      typeChange(){
+        if(this.inspect.type == "干粮" && this.inspect.goodsName){
+           getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
+                .toPromise()
+                .then((response) => { 
+                  this.$set(this.inspect,'dryGrainPrice',response)
+                })
+        }
+      },
       closePrint(){
         this.isShowPrint = false
         this.$router.push({path:'inspectionManagement'})
@@ -302,7 +315,7 @@
           })
           return
         }
-        if (this.inspect.carNumber.length > 7) {
+        if (this.inspect.carNumber.length > 7 || this.inspect.carNumber.length != 7) {
           this.$message({
             message: '车牌号输入错误',
             type: 'warning',
@@ -359,6 +372,31 @@
           })
           return
         }
+        if(this.inspect.type == "干粮"){
+          if(!this.inspect.dryGrainPrice){
+            this.$message({
+              message:'干粮价格不能为空',
+              type:'warning'
+            })
+            return
+          }
+           if(this.inspect.dryGrainPrice < 0 || this.inspect.dryGrainPrice > 1000){
+            this.$message({
+              message:'干粮价格输入错误',
+              type:'warning'
+            })
+            return
+          }
+          if (
+          String(this.inspect.dryGrainPrice).indexOf('.') != -1 &&
+          String(this.inspect.dryGrainPrice).length - (String(this.inspect.dryGrainPrice).indexOf('.') + 1) > 4) {
+          this.$message({
+            message: '干粮价格输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        }
         if (!this.inspect.grade) {
           this.$message({
             message: '等级不能为空',
@@ -488,7 +526,7 @@
           .then((response) => {
                count = response
           })
-        //  客户下拉校验
+          //  客户下拉校验
         getamount({
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
@@ -518,10 +556,17 @@
         if (this.inspect.goodsName) {
           for (var i = 0; i < this.purchasePriceList.length; i++) {
             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
-              this.inspect.buckleWeightRatio =
-                this.purchasePriceList[i].deductWeight
+              this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)
             }
           }
+          if(this.inspect.type == "干粮"){
+             getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
+                .toPromise()
+                .then((response) => { 
+                  console.log(response,'干粮')
+                  this.$set(this.inspect,'dryGrainPrice',response)
+                })
+          }
         }
         //潮粮单价改变事件
         if (
@@ -541,9 +586,9 @@
               this.unitPrice = response
             })
         }
-        if(this.inspect.goodsName && this.inspect.customerName){
+        if(this.inspect.goodsName && this.inspect.customerName ){
              // //查看当前用户对应货名有未结算状态的送货
-        let count = 0
+       let count = 0
         getCount({
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
@@ -576,7 +621,6 @@
             }
           })
         }
-        
       },
 
       getList(ids) {

src/views/houseSelfCollect/inspectionManagement.vue

@@ -69,7 +69,7 @@
        <el-table-column prop="type" label="类型"></el-table-column>
       <el-table-column
         prop="tidalGrainPrice"
-        label="净重单价（元/公斤）"
+        label="单价（元/公斤）"
       ></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
@@ -92,7 +92,13 @@
       :visible.sync="isShowPrint"
       title="粮食质检单"
     >
-    <inspectInfoPrint :printData="printData"></inspectInfoPrint>
+    <!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
+    <inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
+    <div style="text-align:center">
+          <el-button type="primary" @click="closePrint">关闭</el-button>
+          <el-button type="primary" @click="printSmall">打印小票</el-button>
+          <el-button type="primary" @click="printBig">打印单据</el-button>
+        </div>
     </el-dialog>
     <div style="text-align: center">
       <el-pagination
@@ -147,6 +153,20 @@ export default {
     this.selectWarehouse()
   },
   methods: {
+    printSmall() {
+        window.location.href =
+          '../../../static/inspection.html?type=1&dataList=' +
+          JSON.stringify(this.printData)
+      },
+      printBig() {
+        window.location.href =
+          '../../../static/inspection.html?type=2&dataList=' +
+          JSON.stringify(this.printData)
+      },
+     closePrint(){
+        this.isShowPrint = false
+        this.$router.push({path:'inspectionManagement'})
+      },
     find() {
       this.getList()
     },
@@ -249,7 +269,6 @@ export default {
         searchKeyWord: (this.searchKeyWord).toUpperCase(),
         warehouseName: this.warehouseName,
         managementType:1
-        
       })
         .toPromise()
         .then((response) => {

src/views/houseSelfCollect/settlement.vue

@@ -37,7 +37,7 @@
             </ws-form-item>
             <ws-form-item label="仓位号" span="1" prop="waterContent">
               <ws-input
-              v-model="paymentList.binNumber"
+              v-model="paymentList.qualityInspectionManagement.binNumber"
                 placeholder="请输入仓位号"
                 maxlength="100"
                 disabled
@@ -54,10 +54,10 @@
               />
             </ws-form-item>
             <ws-form-item label="囤位号" span="1" prop="waterContent">
-              <ws-input  v-model="paymentList.storageNumber" placeholder="请输入囤位号" maxlength="100" size="small" disabled />
+              <ws-input  v-model="paymentList.qualityInspectionManagement.storageTagNo" placeholder="请输入囤位号" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="waterContent">
-              <ws-input v-model="paymentList.carNumber" placeholder="请输入车牌号" maxlength="100" size="small" disabled />
+              <ws-input v-model="paymentList.carNo" placeholder="请输入车牌号" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="货名" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.goodsName" placeholder="请输入货名" maxlength="100" size="small" disabled />
@@ -66,10 +66,16 @@
               <ws-input v-model="paymentList.type" placeholder="请输入类型" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="购粮性质" span="1" prop="waterContent">
-                <ws-input v-model="paymentList.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
+                <ws-input v-model="paymentList.qualityInspectionManagement.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价" span="1" prop="waterContent">
+            <!-- <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-input v-model="paymentList.tidalGrainPrice" placeholder="请输入纯重单价" maxlength="100" size="small" disabled />
+            </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>
           </ws-info-table>
           <div class="titles">质检数据</div>
@@ -217,15 +223,15 @@
               prop="waterContent"
               class="formItem"
             >
-              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" :disabled='disabled'/>
+              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="干粮"'
+            <ws-form-item v-if='paymentList.type=="干粮"' 
               label="粮款 = 净重 x  干粮单价 ="
               span="1"
               prop="waterContent"
               class="formItem"
             >
-              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" :disabled='disabled'/>
+              <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item label="称重补助" span="1" prop="waterContent">
               <ws-input
@@ -333,7 +339,7 @@
             </ws-form-item>
             <ws-form-item label="实际付款" span="1" prop="waterContent">
               <ws-input
-              @input='actualPayment'
+              @change='actualPayment'
               v-model="paymentList.actualPayment"
                 placeholder="请输入实际付款"
                 maxlength="100"
@@ -403,7 +409,8 @@ export default {
        qualityInspectionManagement:{
          waterContent:'',
          buckleWeightRatio:0,
-         grainMoney:0
+         grainMoney:0,
+         waterMin:0,
        }
      },
       disabled:false,
@@ -424,6 +431,7 @@ export default {
          this.information = '结算'   
     }
    this.getList()
+ 
   },
   methods: {
     closeDialog(){
@@ -470,19 +478,29 @@ export default {
           if(!this.paymentList.solidGrainPrice){
             this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }
-          if(this.paymentList.type='潮粮'){
+          if(this.paymentList.type =='潮粮'){
             this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.tidalGrainPrice*this.paymentList.weighingManagement.netWeight
+            this.paymentList.calculationPayable =  this.paymentList.grainMoney
+              this.paymentList.actualPayment = this.paymentList.calculationPayable
+              this.actualPayment( this.paymentList.actualPayment)
           }else{
-            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
+            // this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
+             this.paymentList.grainMoney = this.paymentList.qualityInspectionManagement.dryGrainPrice * this.paymentList.weighingManagement.netWeight
+              this.paymentList.calculationPayable =  this.paymentList.grainMoney
+                this.paymentList.actualPayment = this.paymentList.calculationPayable
+                this.actualPayment( this.paymentList.actualPayment)
           }
            this.paymentList.grainMoney = this.paymentList.grainMoney.toFixed(2)
         })
+          
     },
     actualPayment(e){
      this.paymentList.capitalize=this.convertCurrency(e)
     },
     grainMoney(){
        this.paymentList.calculationPayable=(Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy))-this.paymentList.weighingDeduction-this.paymentList.freightDeduction-this.paymentList.unloadDeduction-this.paymentList.otherDeduction-this.paymentList.qualityDeduction
+      this.paymentList.actualPayment = this.paymentList.calculationPayable
+      this.actualPayment( this.paymentList.actualPayment)
       // this.paymentList.calculationPayable=num.toFixed(2)
     },
      /**
@@ -763,6 +781,9 @@ export default {
 .formItem {
   width: 70% !important;
 }
+/deep/.ws-info-table .formItem .el-form-item__label{
+  width: 220px;
+}
 /deep/.el-table .el-table__header .cell,
 .el-table .el-table__body .cell {
   text-align: center;

src/views/houseSelfCollect/weighingManagement.vue

@@ -64,6 +64,8 @@
         label="毛重（公斤）"
       ></el-table-column>
       <el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
+       <el-table-column prop="buckleMiscellaneous" label="扣杂（公斤）"></el-table-column>
+        <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
       <el-table-column prop="secretaryWeigher" label="司称员">

src/views/houseSelfCollect/weightCheck.vue

@@ -223,7 +223,6 @@ export default {
     }else if(this.allowEdit == 1){
       this.disabled = false
     }
-    console.log(this.disabled)
     if (this.tpyeNo == 1) {
       this.information = '毛重'
     } else if (this.tpyeNo == 2) {
@@ -241,7 +240,6 @@ export default {
     },
     calculation() {
       if (this.weighingList.grossWeight && this.weighingList.tare) {
-        let count = 0
         this.weighingList.netWeight =
           this.weighingList.grossWeight -
           this.weighingList.tare -
@@ -329,6 +327,13 @@ export default {
             type: 'warning',
           })
           return
+        }
+         if (this.weighingList.tare > this.weighingList.grossWeight) {
+          this.$message({
+            message: '皮重不能大于毛重',
+            type: 'warning',
+          })
+          return
         }
         if (this.weighingList.tare < 1 || this.weighingList.tare > 100000) {
           this.$message({
@@ -349,6 +354,14 @@ export default {
           })
           return
         }
+        
+         if (this.weighingList.netWeight < 0) {
+          this.$message({
+            message: '净重不能小于0',
+            type: 'warning',
+          })
+          return
+        }
       }
       this.$confirm('确定保存检斤信息？', '提示', {
         confirmButtonText: '确定',