Merge branch 'pengyouhao_dev'

src/views/userManagement/customerManagement/index.vue

@@ -38,6 +38,11 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="24">
+						<el-form-item label="银行卡号">
+							<el-input v-model="workerForm.bankAccount" placeholder="请输入"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24">
 						<el-form-item label="身份证号码" :required="true">
 							<el-input v-model="workerForm.idCard" placeholder="请输入"></el-input>
 						</el-form-item>
@@ -108,7 +113,8 @@ export default {
 	  		websitId: '',
 	  		userId: '',
 			idCard: '',
-			name: ''
+			name: '',
+			bankAccount: ''
 	  },
 	  queryUser: {}, // 查询
 	  fileList: [],
@@ -239,6 +245,7 @@ export default {
 			websitId: this.workerForm.websitId,
 			name: this.workerForm.name,
 			idCard: this.workerForm.idCard,
+			bankAccount: this.workerForm.bankAccount,
 			idCardImg: this.fileList.map(item => item.url).join(","),
 			workerImgs
 		}).then(res => {

src/views/userManagement/distributorManagement/index.vue

@@ -36,7 +36,7 @@
 		  <div v-if="~['worker'].indexOf(activeKey)" style="box-sizing: border-box;padding: 16px;">
 		  	<el-form ref="workerForm" :model="workerForm" label-width="110px" size="small" label-position="left">
 		  		<el-row :gutter="20">
-		  			<el-col :span="8">
+		  			<el-col :span="6">
 		  				<el-form-item label="入驻网点" :required="true">
 		  					<el-select v-model="workerForm.websitId" placeholder="请选择" style="width: 100%;">
 		  					    <el-option
@@ -48,16 +48,21 @@
 		  					  </el-select>
 		  				</el-form-item>
 		  			</el-col>
-		  			<el-col :span="8">
+		  			<el-col :span="6">
 		  				<el-form-item label="姓名" :required="true">
 		  					<el-input v-model="workerForm.name" placeholder="请输入"></el-input>
 		  				</el-form-item>
 		  			</el-col>
-		  			<el-col :span="8">
+		  			<el-col :span="6">
 		  				<el-form-item label="身份证号码" :required="true">
 		  					<el-input v-model="workerForm.idCard" placeholder="请输入"></el-input>
 		  				</el-form-item>
 		  			</el-col>
+					<el-col :span="6">
+						<el-form-item label="银行卡号">
+							<el-input v-model="workerForm.bankAccount" placeholder="请输入"></el-input>
+						</el-form-item>
+					</el-col>
 		  			<el-col :span="24">
 		  				<el-form-item label="身份证正面照" :required="true">
 		  					<ImageUpload :fileList="fileList" :limit="1" :isEdit="true" />
@@ -121,7 +126,8 @@ export default {
 				websitId: '',
 				userId: '',
 				idCard: '',
-				name: ''
+				name: '',
+				bankAccount: ''
 			},
 			fileList: [],
 			imgList: []
@@ -448,6 +454,7 @@ export default {
 			websitId: this.workerForm.websitId,
 			name: this.workerForm.name,
 			idCard: this.workerForm.idCard,
+			bankAccount: this.workerForm.bankAccount,
 			idCardImg: this.fileList.map(item => item.url).join(","),
 			workerImgs
 		}).then(res => {

src/views/userManagement/masterManagement/index.vue

@@ -188,6 +188,16 @@ export default {
           rules: []
         }
       }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '银行卡',
+          prop: 'bankAccount',
+          rules: []
+        }
+      }, {
         md: 24,
         isShow: true,
         name: 'el-input',