diff --git a/src/assets/scss/pages/caiji.scss b/src/assets/scss/pages/caiji.scss
index dede8360..8dafd6eb 100644
--- a/src/assets/scss/pages/caiji.scss
+++ b/src/assets/scss/pages/caiji.scss
@@ -1,4 +1,4 @@
-.bg-app {
+.bg-caiji {
   background-color: rgba(189, 214, 255, 0.89);
   height: 100%;
   width: 100vw;
@@ -39,7 +39,8 @@
     justify-content: center;
 
     .btn {
-      width: 100px;
+      width: 150px;
+      font-size: 16px;
     }
   }
 }
@@ -47,3 +48,35 @@
 .picker_content {
   color: rgb(59, 59, 59);
 }
+
+.bg-caiji-success {
+  height: 100vh;
+  width: 100vw;
+
+  text-align: center;
+  .title {
+    background-color: rgba(189, 214, 255, 0.89);
+    padding: 20px;
+    text-align: center;
+    font-size: 20px;
+  }
+
+  .main {
+    margin-top: 100px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+
+    .icon-success {
+      font-size: 40px;
+      // width: 20px;
+      // height: 20px;
+    }
+
+    .success-content {
+      margin-top: 10px;
+      font-size: 25px;
+    }
+  }
+}
diff --git a/src/router/index.js b/src/router/index.js
index 2961eea4..8b2d8ab6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -53,6 +53,15 @@ export const pageRoutes = [
       title: "居民信息填报",
     },
   },
+  {
+    path: "/caijisuccess",
+    props: true,
+    name: "caijisuccess",
+    component: () => import("@/views/pages/caijisuccess"),
+    meta: {
+      title: "居民信息填报",
+    },
+  },
 ];
 
 // 模块路由(基于主入口布局页面)
diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue
index c19c93d6..cd63b2a8 100644
--- a/src/views/pages/caiji.vue
+++ b/src/views/pages/caiji.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-app">
+  <div class="bg-caiji">
     <div class="title">
       居民信息填报
     </div>
@@ -201,6 +201,8 @@
 
 import { requestPost } from "@/js/dai/request";
 import { Toast } from "mint-ui";
+import { MessageBox } from 'mint-ui';
+import { Loading } from 'element-ui' // 引入Loading服务
 
 let loading // 加载动画
 export default {
@@ -247,6 +249,7 @@ export default {
         customerId: '',//customerId
 
       },
+      showMessagsBox: false,//是否显示人员未填写提示弹出框
 
       selMemberIndex: null,
 
@@ -316,7 +319,8 @@ export default {
     let envShow = process.env.VUE_APP_NODE_ENV
     console.log('环境', envShow)
 
-    let internalShequId = '1202807601961984002'
+    let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',]
+    // let internalShequId = ['1202807601961984002',]
     // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境
     //   internalShequId = null
     // } else if (envShow === 'prod:uat') { // 体验
@@ -326,14 +330,14 @@ export default {
     // }
 
     this.formData.customerId = this.customerId
-    if (this.shequId === internalShequId) {
+    if (internalShequId.indexOf(this.shequId) > -1) {
       this.formData.origin = 'internal'
     } else {
       this.formData.origin = 'external'
     }
     this.loadVillage()
     this.detNumList = []
-    for (let i = 1; i < 11; i++) {
+    for (let i = 0; i < 11; i++) {
       let obj = {
         value: i + '',
         label: i + '次',
@@ -551,17 +555,29 @@ export default {
     },
 
     async handleSubmit () {
-
       let message = this.validataFormData()
+
+
       if (message) {
-        Toast({
-          message: message,
-          duration: 3000
-        });
-        return false
+        if (this.showMessagsBox) {
+          MessageBox.confirm(message).then(action => {
+            this.submit()
+          });
+        } else {
+          Toast({
+            message: message,
+            duration: 3000
+          });
+        }
+      } else {
+        this.submit()
       }
 
 
+    },
+    async submit () {
+
+
       if (this.formData.origin === 'internal') {
 
         this.formData.villageId = this.selVillage.value
@@ -600,64 +616,71 @@ export default {
       this.formData.memberList = this.memberList
       console.log(this.formData)
       this.btnDisabled = true
+      this.startLoading()
       const url = "/epmetuser/icresicollect/save"
 
       const { data, code, msg } = await requestPost(url, this.formData)
-
+      this.endLoading()
+      this.btnDisabled = false
       if (code === 0) {
-        Toast({
-          message: '提交成功',
-          duration: 3000
-        });
-        this.btnDisabled = false
+
+        this.$router.replace({ name: 'caijisuccess' })
+        // Toast({
+        //   message: '提交成功',
+        //   duration: 3000
+        // });
+
       } else {
         Toast({
           message: msg,
           duration: 3000
         });
-        this.btnDisabled = false
+
       }
     },
 
+
+
     //必填验证
     validataFormData () {
 
-      let message = ''
+      let aletMessage = ''
+      this.showMessagsBox = false
       if (this.formData.origin === 'internal') {//内部
-
         if (!this.selVillage) {
-          message = '请选择小区'
-          return message
+          aletMessage = '请选择小区'
+
+          return aletMessage
         }
         if (!this.selBuild) {
-          message = '请选择楼栋'
-          return message
+          aletMessage = '请选择楼栋'
+          return aletMessage
         }
 
         if (!this.selUnit) {//没有选择单元
-          message = '请选择单元'
-          return message
+          aletMessage = '请选择单元'
+          return aletMessage
 
         } else {//选择了单元
           if (this.selUnit.value === 'else') {//单元选择了其他
             if (!this.unitContent) {
-              message = '请填写单元号'
-              return message
+              aletMessage = '请填写单元号'
+              return aletMessage
             }
 
             if (!this.homeContent) {//房屋必须填写内容
-              message = '请填写房屋'
-              return message
+              aletMessage = '请填写房屋'
+              return aletMessage
             }
 
           } else {//单元没有选择其他
             if (!this.selHome) {
-              message = '请选择房屋'
-              return message
+              aletMessage = '请选择房屋'
+              return aletMessage
 
             } else if (this.selHome.value === 'else' && !this.homeContent) {
-              message = '请填写房屋'
-              return message
+              aletMessage = '请填写房屋'
+              return aletMessage
             }
           }
 
@@ -666,29 +689,44 @@ export default {
 
       } else {
         if (!this.formData.address) {
-          message = '请填写地址'
-          return message
+          aletMessage = '请填写地址'
+          return aletMessage
         }
       }
 
       if (!this.selHomeType) {
-        message = '请选择房屋类型'
-        return message
+        aletMessage = '请选择房屋类型'
+        return aletMessage
       }
       if (!this.formData.houseHolderName) {
-        message = '请填写户主姓名'
-        return message
+        aletMessage = '请填写户主姓名'
+        return aletMessage
       }
-      let member = this.memberList[0]
+      let member1 = this.memberList[0]
+
+
+      if (!member1.name || !member1.mobile || !member1.idNum || !member1.selDetNum.value || !member1.selDetCondition.value) {
+        aletMessage = '请完整填写用户1信息'
+        return aletMessage
+      }
+
 
-      for (let i = 0; i < this.memberList.length; i++) {
+      for (let i = 1; i < this.memberList.length; i++) {
         let item = this.memberList[i]
-        if (!item.name || !item.mobile || !item.idNum || !item.selDetNum.value || !item.selDetCondition.value) {
-          message = '请完整填写用户' + (i + 1) + '信息'
-          return message
+
+        if (item.name || item.mobile || item.idNum || item.selDetNum.value || item.selDetCondition.value) {//填写了信息的，必须填写姓名身份证
+          if (!item.name || !item.idNum) {
+            aletMessage = '请完整填写用户' + (i + 1) + '的姓名和身份证信息'
+            return aletMessage
+          }
+        } else {
+          aletMessage = '用户' + (i + 1) + '的信息没有填写，是否继续'
+          this.showMessagsBox = true
+          return aletMessage
+
         }
-      }
 
+      }
 
 
     },
@@ -792,7 +830,21 @@ export default {
 
     },
 
-
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
 
 
   }
diff --git a/src/views/pages/caijisuccess.vue b/src/views/pages/caijisuccess.vue
new file mode 100644
index 00000000..7127c126
--- /dev/null
+++ b/src/views/pages/caijisuccess.vue
@@ -0,0 +1,78 @@
+<template>
+  <div class="bg-caiji-success">
+    <div class="title">
+      居民信息填报
+    </div>
+
+    <div class="main">
+
+      <div class="icon-success">
+        <i class="el-icon-circle-check "></i>
+      </div>
+      <div class="success-content"> 提交成功</div>
+
+    </div>
+  </div>
+</template>
+<script>
+
+
+import { requestPost } from "@/js/dai/request";
+import { Toast } from "mint-ui";
+import { MessageBox } from 'mint-ui';
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+
+    }
+  },
+  components: {},
+  computed: {
+
+  },
+  created () { },
+  mounted () {
+
+  },
+
+  methods: {
+
+
+
+
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/pages/caiji.scss";
+
+.my-field /deep/ .mint-field-core {
+  text-align: right;
+  margin-right: 20px;
+}
+
+/deep/ .mint-popup-bottom {
+  width: 100vw;
+}
+
+.picker-toolbar-title {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  align-items: center;
+  background-color: #eee;
+  height: 44px;
+  line-height: 44px;
+  font-size: 16px;
+  .usi-btn-cancel,
+  .usi-btn-sure {
+    color: #26a2ff;
+    font-size: 16px;
+  }
+}
+</style>