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

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -59,6 +59,14 @@
           <ws-form-item label="身份证号" span="1" prop="customerNumberCard">
             <ws-input v-model="customerList.customerNumberCard" placeholder="请输入身份证号" maxlength="18" size="small"
               :disabled="disabled" />
+          </ws-form-item>
+           <ws-form-item label="所属供应商" span="1" prop="supplier" label-width="80px">
+            <ws-input v-model="customerList.supplier" placeholder="请输入供应商姓名" maxlength="15" size="small"
+              :disabled="disabled" />
+          </ws-form-item>
+           <ws-form-item label="供应商电话 " span="1" prop="supplierPhone" label-width="80px">
+            <ws-input v-model="customerList.supplierPhone" placeholder="请输入供应商电话" maxlength="15" size="small"
+              :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="银行卡号" span="1" prop="bankCard">
             <ws-input type="number" @mousewheel.native.prevent v-model="customerList.bankCard" placeholder="请输入银行卡号" maxlength="19" size="small"

src/views/tradeServicesManagement/repayment.vue

@@ -6,6 +6,9 @@
 				<h2 class="bg-left title">还款记录</h2>
 			</el-col>
 			<el-col :span="12" class="bg-right">
+           <el-button class="bg-bottom" type="primary" size="small" @click="cancel"><img width="6" height="10"
+            style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
 			</el-col>
 		</el-row>
 		<div class="span_css">
@@ -153,7 +156,11 @@
       handleClose(){
        this.accessoryTFs = false
       },
-      
+      cancel() {
+        this.$router.push({
+          path: 'warehouseReceiptRegulation'
+        })
+      },
       getList(){
         getWarehouseReceiptLook({id:this.id})
         .toPromise()

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -167,7 +167,7 @@
         })
       },
       repaymentBtnClick(row, val2) {
-        let repayment = JSON.stringify(row)
+        // let repayment = JSON.stringify(row)
         this.$router.push({
           name: 'repayment',
           query:{id:row.id,contractNo:row.contractNo}