前端 更新 sdy

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -54,15 +54,15 @@
           </div>
 
           <ws-form-item label="姓名" span="1" prop="customerName" label-width="80px">
-            <ws-input v-model="customerList.customerName" placeholder="请输入姓名" maxlength="100" size="small"
+            <ws-input v-model="customerList.customerName" placeholder="请输入姓名" maxlength="15" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="身份证号" span="1" prop="customerNumberCard">
-            <ws-input v-model="customerList.customerNumberCard" placeholder="请输入身份证号" maxlength="100" size="small"
+            <ws-input v-model="customerList.customerNumberCard" placeholder="请输入身份证号" maxlength="18" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="银行卡号" span="1" prop="bankCard">
-            <ws-input v-model="customerList.bankCard" placeholder="请输入银行卡号" maxlength="100" size="small"
+            <ws-input v-model="customerList.bankCard" placeholder="请输入银行卡号" maxlength="19" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="开户行" span="1" prop="bankDeposit">
@@ -74,15 +74,15 @@
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="收款人姓名" span="1" prop="payeeName">
-            <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="100" size="small"
+            <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="15" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="收款人身份证号" span="1" prop="payeeNumberCard">
-            <ws-input v-model="customerList.payeeNumberCard" placeholder="请输入收款人身份证号" maxlength="100" size="small"
+            <ws-input v-model="customerList.payeeNumberCard" placeholder="请输入收款人身份证号" maxlength="18" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="手机号" span="1" prop="customerPhone">
-            <ws-input v-model="customerList.customerPhone" placeholder="请输入手机号" maxlength="100" size="small"
+            <ws-input v-model="customerList.customerPhone" placeholder="请输入手机号" maxlength="11" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="联系地址" span="1" prop="compAddress">
@@ -357,8 +357,76 @@
           })
           return
         }
-
-
+        if (!this.customerList.customerName) {
+          this.$message({
+            message: '请输入姓名',
+            type: 'warning',
+          })
+          return
+        }
+           if (!this.customerList.customerNumberCard) {
+          this.$message({
+            message: '请输入输入银行卡号',
+            type: 'warning',
+          })
+          return
+        }
+           if (!this.customerList.bankDeposit) {
+          this.$message({
+            message: '请输入开户行',
+            type: 'warning',
+          })
+          return
+        }
+          if (!this.customerList.bankDepositBranch) {
+          this.$message({
+            message: '请输入开户支行',
+            type: 'warning',
+          })
+          return
+        }
+         if (!this.customerList.payeeName) {
+          this.$message({
+            message: '请输入收款人姓名',
+            type: 'warning',
+          })
+          return
+        } 
+         if (!this.customerList.payeeNumberCard) {
+          this.$message({
+            message: '请输入收款人身份证号',
+            type: 'warning',
+          })
+          return
+        }
+         if (this.customerList.payeeNumberCard.length != 18) {
+          this.$message({
+            message: '收款人身份证号输入有误，请重新输入',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.customerList.customerPhone) {
+          this.$message({
+            message: '请输入手机号',
+            type: 'warning',
+          })
+          return
+        }
+         if (this.customerList.customerPhone.length != 11) {
+          this.$message({
+            message: '输入的手机号有误，请重新输入',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.customerList.compAddress) {
+          this.$message({
+            message: '请输入联系地址',
+            type: 'warning',
+          })
+          return
+        }
         // 验证码校验
         GetCustomerCodeJY({
             phone: this.customerList.customerPhone,

src/views/houseSelfCollect/inspectInfo.vue

@@ -115,7 +115,7 @@
       <div slot="footer">
         <inspectInfoPrint :printData="inspect" ref="saveImg"></inspectInfoPrint>
         <div class="bottom-row4">
-          <el-button type="primary" @click="isShowPrint= false">关闭</el-button>
+          <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>
@@ -175,8 +175,11 @@
       }
     },
     activated() {
-      
       this.types = this.$route.query.type
+      if(!this.types){
+          this.types = 1
+           this.information = '添加'
+      }
       this.cangid = this.$route.query.cangid
       this.warehouseName = this.$route.query.warehouseName
       this.cangNo = this.$route.query.warehouseNo
@@ -251,6 +254,10 @@
           }
         });
       },
+      closePrint(){
+        this.isShowPrint = false
+        this.$router.push({path:'inspectionManagement'})
+      },
       print() {
         if (!this.inspect.qualityNo) {
           this.$message({
@@ -459,6 +466,7 @@
         }
       },
       cancel() {
+        this.types = ""
         this.inspect = [] 
         this.$router.push({
           path: 'inspectionManagement'

src/views/houseSelfCollect/paymentManagement.vue

@@ -370,6 +370,9 @@ export default {
           return false
         })
     },
+    find(){
+       this.getList()
+    },
     settlement(index, row) {
       var data = {}
       var data1 = {}
@@ -378,7 +381,6 @@ export default {
           data = this.warehouseList[i]
         }
       }
-      console.log(data)
       for (let i = 0; i < data.purchasePriceList.length; i++) {
         if (data.purchasePriceList[i].goodsName == row.goodsName) {
           data1 = data.purchasePriceList[i]
@@ -394,7 +396,6 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择要付款的条目')
       } else {
-        console.log(this.modification)
         let sum = 0
         let count = 0
         for (let i = 0; i < this.modification.length; i++) {
@@ -443,8 +444,9 @@ export default {
       }
       this.payments.paymentScreenshot = this.imageUrl
       this.payments.cashier = sessionStorage.getItem('ws-pf_staffName')
+      this.payments.paymentManagementList = this.modification
       console.log(this.payments,"付款")
-      return
+      
 
       this.$confirm('确定提交付款信息？', '提示', {
         confirmButtonText: '确定',
@@ -460,8 +462,10 @@ export default {
                 title: '成功',
                 message: '付款成功',
               })
+               this.paymentForm = false
+               this.getList()
               // this.paymentList = response
-              this.$router.go(-1)
+              // this.$router.go(-1)
             })
         })
         .catch(() => {
@@ -645,6 +649,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
+  min-width: 125px;
   text-align: center;
   background: #ffffff;
   color: #8890b1;
@@ -660,7 +665,7 @@ export default {
   text-align: center !important;
   padding: 10px 0 !important;
   height: auto !important;
-  border: none;
+  // border-bottom: none !important;
   border-top-left-radius: 3px;
   border-top-right-radius: 3px;
 }

src/views/houseSelfCollect/settlement.vue

@@ -680,6 +680,7 @@ export default {
         }
 
       this.paymentList.id=this.$route.query.id 
+      this.paymentList.amountIngPayable = this.paymentList.actualPayment
       this.paymentList.settlementClerk =  sessionStorage.getItem('ws-pf_staffName')
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {

src/views/houseSelfCollect/weighingManagement.vue

@@ -76,17 +76,17 @@
         label="称重时间"
       >
         <template slot-scope="scope">
-          <sapn
+          <div
             v-if="
               scope.row.status == '已称毛重'
             "
-            > {{scope.row.grossDate}}</sapn
+            > {{scope.row.grossDate}}</div
           >
-         <sapn
+         <div
             v-if="
               scope.row.status == '已称皮重'
             "
-            > {{scope.row.tareDate}}</sapn
+            > {{scope.row.tareDate}}</div
           >
         </template></el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
@@ -99,10 +99,12 @@
             "
             >毛重</el-button
           >
+          <!-- scope.row.paymentManagement.status == '待结算' && -->
           <el-button
+          :disabled = "scope.row.allow == 2"
             @click="weightCheck(scope.row, 2)"
             v-if="
-              scope.row.status == '已称毛重' || scope.row.status == '已称皮重'
+              scope.row.status == '已称毛重' || scope.row.status == '已称皮重' 
             "
             >皮重</el-button
           >
@@ -174,6 +176,8 @@ export default {
         qualityInspectionManagement:{},
       },
       purchasePriceList:[],
+      allowEdit:"",
+      disabled:false
     }
   },
   activated() {
@@ -210,6 +214,7 @@ export default {
         if (this.warehouseList[i].value == e) {
           this.warehouseId = this.warehouseList[i].warehouseId
          this.purchasePriceList = this.warehouseList[i].warehouseList
+          this.allowEdit = this.warehouseList[i].allowEdit
         }
       }
       this.getList()
@@ -231,7 +236,8 @@ export default {
           netWeight: row.netWeight,
           relationId: row.relationId,
           warehouseId: this.warehouseId,
-          purchasePriceList: this.purchasePriceList
+          purchasePriceList: this.purchasePriceList,
+          allowEdit:this.allowEdit
         },
       })
     },
@@ -265,9 +271,11 @@ export default {
             this.warehouseList.push({
               value: response[i].warehouseName,
               warehouseId: response[i].id,
-              warehouseList:response[i].purchasePriceList
+              warehouseList:response[i].purchasePriceList,
+              allowEdit:response[i].allowEdit
             })
           }
+          this.allowEdit = this.warehouseList[0].allowEdit
           this.warehouseName = this.warehouseList[0].value
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
@@ -286,8 +294,20 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          for(let i = 0 ; i < response.records.length ; i++){
+            if(response.records[i].paymentManagement){
+              if(response.records[i].paymentManagement.status == '待结算'){
+                  response.records[i].allow = 1
+              }else{
+                response.records[i].allow = 2
+              }
+            }else{
+              response.records[i].allow = 1
+            }  
+          }
           this.weighingList = response.records
           this.deptBudgetTotal = response.total
+
         })
         .catch((response) => {
           // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/houseSelfCollect/weightCheck.vue

@@ -123,7 +123,6 @@
                   placeholder="请输入扣杂"
                   maxlength="100"
                   size="small"
-                  :disabled="disabled"
                 />
               </ws-form-item>
 
@@ -162,11 +161,10 @@
       :visible.sync="isShowPrint"
       title="粮食检斤单"
       @close="closeDialog"
-      
     >
       <weightCheckPrint :tableData="inspect" ref="saveImg"></weightCheckPrint>
       <div style="text-align:center">
-      <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
+      <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>
@@ -219,6 +217,13 @@ export default {
     this.warehouseId = this.$route.query.warehouseId
     this.weighingList.grossWeight = this.$route.query.grossWeight
     this.purchasePriceList = this.$route.query.purchasePriceList
+    this.allowEdit = this.$route.query.allowEdit
+    if( this.allowEdit == 0){
+      this.disabled = true
+    }else if(this.allowEdit == 1){
+      this.disabled = false
+    }
+    console.log(this.disabled)
     if (this.tpyeNo == 1) {
       this.information = '毛重'
     } else if (this.tpyeNo == 2) {
@@ -276,6 +281,10 @@ export default {
         }
       })
     },
+    closePrint(){
+      this.isShowPrint = false
+      this.$router.push({path:'weighingManagement'})
+    },
     print() {
       if (!this.weighingList.grossWeight) {
         this.$message({