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

src/api/V2/houseSelfCollect/index.js

@@ -79,6 +79,4 @@ 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'
-
-
+export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'

src/model/houseSelfCollect/index.js

@@ -1,6 +1,5 @@
 import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
-
 import {
   API_GET_CUSTOMER_MANAGE,
   API_POST_CUSTOMER_ADD,

src/views/home/index.vue

@@ -554,17 +554,17 @@ export default {
         // 监听来自串行设备的数据
         while (true) {
           const { value, done } = await this.reader.read();
-          console.log(value,done);
+          // console.log(value,done);
           if (done) {
             // 允许稍后关闭串口。
             this.reader.releaseLock();
             break;
           }
           var result="";
-          if(value.length < 5){
-          }
+          
           for(var i=0;i<value.length;i++){
             result += String.fromCharCode(value[i])
+            console.log(result);
           }
           this.text = result
           // value 是一个 Uint8Array

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -95,8 +95,7 @@
                       v-show="item1.type!=1&&item1.type!=2&&item1.type!=3" :disabled="!isEdit">-</el-button>
                   </div>
                   <div v-show="item1.type!=4">
-                    <input v-if='item1.type==1' class="water-price" v-model="baseInfoForm.waterMin"
-                      :disabled="item1.isWrite?false:true"></input>
+                    <input v-if='item1.type==1' class="water-price" v-model="baseInfoForm.waterMin" :disabled="item1.isWrite?false:true"></input>
                     <input v-if='item1.type==2' class="water-price" v-model="baseInfoForm.waterBase"
                       :disabled="item1.isWrite?false:true"></input>
                     <input v-if='item1.type==3' class="water-price" v-model="baseInfoForm.waterMax"

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -74,7 +74,7 @@
             <ws-select v-else v-model="customerList.bankDepositBranch" placeholder="请输入开户支行" :disabled="disabled">
               <ws-option v-for="item in bankList" :key="item" :label="item" :value="item" />
             </ws-select>
-            <el-button type="primary" @click="bankInputChange" >{{bankText}}</el-button>
+            <el-button type="primary" @click="bankInputChange" v-if="switchType != 2">{{bankText}}</el-button>
           </ws-form-item>
           <ws-form-item label="收款人姓名" span="1" prop="payeeName">
             <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="15" size="small"

src/views/houseSelfCollect/paymentManagement.vue

@@ -345,7 +345,6 @@ export default {
     screen(num){
       this.searchType = num
       this.getList()
-
     },
     find(){
        this.getList()
@@ -398,13 +397,6 @@ export default {
         })
         return
       }
-      // if(this.payments.money > this.payments.amountNotPayable){
-      //   this.$message({
-      //     message: '付款金额不能超过未付金额',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
       if (!this.payments.paymentDate) {
         this.$message({
           message: '付款日期不能为空',
@@ -438,8 +430,6 @@ export default {
               })
                this.paymentForm = false
                this.getList()
-              // this.paymentList = response
-              // this.$router.go(-1)
             })
         })
         .catch(() => {
@@ -536,7 +526,7 @@ export default {
           this.isShowPrint = true
           this.printData = response
           let date = new Date()
-           this.printData.currentTime = date.getFullYear() +"年"+ date.getMonth() +"月"+ date.getDay()+"日"
+          this.printData.currentTime = date.getFullYear() +"年"+ date.getMonth() +"月"+ date.getDay()+"日"
         })
      
     },
@@ -555,16 +545,6 @@ export default {
           })
       }
     },
-    // print(){
-    //   // this.xx = true;
-    //   let newstr = document.getElementById("print").innerHTML;
-    //   let oldstr = document.body.innerHTML;
-    //   document.body.innerHTML = newstr;
-    //   window.print();
-    //   document.body.innerHTML = oldstr;
-    //   // window.location.reload()
-    //    this.$router.push({ path: 'paymentManagement' })
-    // },
     selectInit(row) {
       //在这里一定要记得类型匹配的上。
       if (row.status != '已驳回') {
@@ -578,7 +558,6 @@ export default {
         return true
       }
     },
-
     handleSelectionChange(val) {
       this.modification = val
     },

src/views/houseSelfCollect/weightCheck.vue

@@ -103,13 +103,9 @@
                 placeholder="未获取到皮重"
                 maxlength="100"
                 size="small"
-                :disabled="disabled"
-              />
+                :disabled="disabled"/>
             </ws-form-item>
-
-            <el-button type="primary" v-if="this.tpyeNo == 2"
-              >重新获取</el-button
-            >
+            <el-button type="primary" v-if="this.tpyeNo == 2">重新获取</el-button>
             <div class="formItem">
               <ws-form-item
                 label="扣杂（公斤）"