Merge remote-tracking branch 'origin/master'

src/views/customerManagement/numberManagement/addCustomer.vue

@@ -6,7 +6,7 @@
           <span class="card_title">基本信息</span>
           <el-card shadow="always" style="padding: 15px 5px 5px 15px">
             <el-row>
-              <el-col :span="3" class="col-txt"><span>小区-分期</span></el-col>
+              <el-col :span="3" class="col-txt"><span>*小区-分期</span></el-col>
               <el-col :span="9" class="col-input">
                 <el-form-item prop="findids">
                   <el-cascader
@@ -20,27 +20,27 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="3" class="col-txt"><span>选房日</span></el-col>
+              <el-col :span="3" class="col-txt"><span>*选房日</span></el-col>
               <el-col :span="9" class="col-input">
                 <el-form-item prop="roomSelectionDate">
                   <el-date-picker
                     v-model="form.roomSelectionDate"
                     popper-class="statistic_base"
-                    type="date"
+                    type="datetime"
                     placeholder="年月日"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                   />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="3" class="col-txt"><span>批次号</span></el-col>
+              <el-col :span="3" class="col-txt"><span>*批次号</span></el-col>
               <el-col :span="9" class="col-input">
                 <el-form-item prop="batchNumber">
                   <el-input v-model="form.batchNumber" />
                 </el-form-item>
               </el-col>
-              <el-col :span="3" class="col-txt"><span>选房号</span></el-col>
+              <el-col :span="3" class="col-txt"><span>*选房号</span></el-col>
               <el-col :span="9" class="col-input">
                 <el-form-item prop="roomSelectionNumber">
                   <el-input v-model="form.roomSelectionNumber" />
@@ -51,7 +51,7 @@
               <!-- 特殊表单 -->
               <div v-for="(item, index) in form.dynamicItem" :key="index">
                 <el-row style="margin-top: 10px">
-                  <el-col :span="2" class="col-txt"><span>购房人{{ index + 1 }}</span></el-col>
+                  <el-col :span="2" class="col-txt"><span>*购房人{{ index + 1 }}</span></el-col>
                   <el-col :span="4" class="col-input">
                     <el-form-item :prop="'dynamicItem.' + index + '.name'">
                       <el-input
@@ -220,6 +220,20 @@ export default {
         },
         confirmSubmit: function() {
             const _this = this
+            if (!_this.form.findids[0]) {
+                this.$message({
+                    message: '请选择小区',
+                    type: 'warning'
+                })
+                return
+            }
+            if (!_this.form.findids[1]) {
+                this.$message({
+                    message: '请选择分期',
+                    type: 'warning'
+                })
+                return
+            }
             this.$refs.form.validate(valid => {
                 if (valid) {
                     _this.addLoading = true

src/views/customerManagement/roomChose/addHouse.vue

@@ -1,6 +1,34 @@
 <template>
   <div>
     <div>
+      <el-row class="handle-box">
+        <el-col :span="24">
+          <span class="card_title">客户信息</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <el-col :span="4">
+          <span>小区-分期:</span>
+          <span>{{ form.groupDiscName }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span>批次号:</span>
+          <span>{{ form.batchNumber }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span>选房号:</span>
+          <span>{{ form.roomSelectionNumber }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span>买受人:</span>
+          <span>{{ form.buyerName }}</span>
+        </el-col>
+        <el-col :span="4">
+          <span>选房日期:</span>
+          <span>{{ form.roomSelectionDate }}</span>
+        </el-col>
+      </el-row>
+      <el-divider />
       <el-row class="handle-box">
         <el-col :span="24">
           <span class="card_title">房屋信息</span>
@@ -113,7 +141,8 @@ export default {
             dataStr: '',
             username: '',
             groupId: '',
-            discId: ''
+            discId: '',
+            form: {}
         }
     },
     mounted() {
@@ -125,6 +154,7 @@ export default {
     },
     methods: {
         initData(data) {
+            this.form = data
             this.initDict(this.dc_key).then(res => {
                 this.customerManagementId = data.id
                 this.groupId = data.groupId