diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue
index 137b9dc..63f1655 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue
@@ -1,84 +1,84 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新建' :'编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
+  <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
     class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
     <el-row :gutter="15" class="">
       <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
         label-position="right">
         <template v-if="!loading">
           <!-- 具体表单 -->
-          <el-col :span="8">
+          <el-col :span="12">
             <jnpf-form-tip-item label="用户编码" prop="userCode">
-              <JnpfInput v-model="dataForm.userCode" @change="changeData('userCode',-1)" placeholder="请输入" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.userCode" :disabled="!changeId" @change="changeData('userCode', -1)"
+                placeholder="请输入" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <jnpf-form-tip-item label="用户名" prop="userName">
-              <JnpfInput v-model="dataForm.userName" @change="changeData('userName',-1)" placeholder="请输入" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.userName" @change="changeData('userName', -1)" placeholder="请输入" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-         
-          <el-col :span="8">
+
+          <el-col :span="12">
             <jnpf-form-tip-item label="联系电话" prop="phone">
-              <JnpfInput v-model="dataForm.phone" @change="changeData('phone',-1)" placeholder="请输入" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.phone" @change="changeData('phone', -1)" placeholder="请输入" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <jnpf-form-tip-item label="人员归属" prop="userAscription">
-              <JnpfSelect v-model="dataForm.userAscription" @change="changeData('userAscription',-1)" placeholder="请选择"
-                clearable :style='{"width":"100%"}' :options="userAscriptionOptions" :props="userAscriptionProps">
+              <JnpfSelect v-model="dataForm.userAscription" @change="changeData('userAscription', -1)" placeholder="请选择"
+                clearable :style='{ "width": "100%" }' :options="userAscriptionOptions" :props="userAscriptionProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <jnpf-form-tip-item label="身份证号" prop="idCard">
-              <JnpfInput v-model="dataForm.idCard" @change="changeData('idCard',-1)" placeholder="请输入" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.idCard" @change="changeData('idCard', -1)" placeholder="请输入" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <jnpf-form-tip-item label="开始时间" prop="effectiveStartTime">
-              <JnpfDatePicker v-model="dataForm.effectiveStartTime" @change="changeData('effectiveStartTime',-1)"
-                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
-                :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss">
+              <JnpfDatePicker v-model="dataForm.effectiveStartTime" @change="changeData('effectiveStartTime', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
+                :style='{ "width": "100%" }' type="datetime" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="12">
             <jnpf-form-tip-item label="结束时间" prop="effectiveEndTime">
-              <JnpfDatePicker v-model="dataForm.effectiveEndTime" @change="changeData('effectiveEndTime',-1)"
-                :startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable
-                :style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss">
+              <JnpfDatePicker v-model="dataForm.effectiveEndTime" @change="changeData('effectiveEndTime', -1)"
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
+                :style='{ "width": "100%" }' type="datetime" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <jnpf-form-tip-item label="出入码" prop="entryCodes">
-              <JnpfInput v-model="dataForm.entryCodes" @change="changeData('entryCodes',-1)" placeholder="请输入" clearable
-                :style='{"width":"100%"}'>
+              <JnpfInput v-model="dataForm.entryCodes" @change="changeData('entryCodes', -1)" placeholder="请输入" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="12">
             <jnpf-form-tip-item label="归属部门" prop="merchantId" v-if="dataForm.userAscription == 2">
               <JnpfDepSelect v-model="dataForm.merchantId" @change="depSelectChangeData" placeholder="请选择"
-                selectType="all" :ableIds="ableAll.merchantIdableIds" clearable :style='{"width":"100%"}'>
+                selectType="all" :ableIds="ableAll.merchantIdableIds" clearable :style='{ "width": "100%" }'>
               </JnpfDepSelect>
             </jnpf-form-tip-item>
             <jnpf-form-tip-item label="归属商户" prop="merchantId" v-if="dataForm.userAscription == 1">
               <JnpfPopupSelect v-model="dataForm.merchantId" @change="selectChangeData" :rowIndex="null"
                 :formData="dataForm" :templateJson="interfaceRes.merchantId" placeholder="请选择" propsValue="id"
                 popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='cmp_nm' field='merchantId'
-                interfaceId="582919057313895877" :pageSize="20" :columnOptions="merchantIdcolumnOptions" clearable
-                :style='{"width":"100%"}'>
+                interfaceId="587625521974612357" :pageSize="20" :columnOptions="merchantIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -86,7 +86,7 @@
         </template>
       </el-form>
       <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
-        @select="addForSelect" @close="selectDialogVisible=false" />
+        @select="addForSelect" @close="selectDialogVisible = false" />
     </el-row>
     <span slot="footer" class="dialog-footer">
       <!-- <div class="upAndDown-button" v-if="dataForm.id">
@@ -99,7 +99,7 @@
       </div>
       <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
         {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button> -->
-        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> 确 定</el-button>
       <el-button @click="visible = false"> 取 消</el-button>
     </span>
   </el-dialog>
@@ -107,448 +107,451 @@
 
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getDefaultCurrentValueUserId
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentId
-  } from '@/api/permission/organize'
-  import {
-    getDateDay,
-    getLaterData,
-    getBeforeData,
-    getBeforeTime,
-    getLaterTime
-  } from '@/components/Generator/utils/index.js'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  export default {
-    components: {},
-    props: [],
-    data() {
-      return {
-        dataFormSubmitType: 0,
-        continueBtnLoading: false,
-        index: 0,
-        prevDis: false,
-        nextDis: false,
-        allList: [],
-        visible: false,
-        loading: false,
-        btnLoading: false,
-        formRef: 'formRef',
-        setting: {},
-        eventType: '',
-        userBoxVisible: false,
-        selectDialogVisible: false,
-        currTableConf: {},
-        dataValueAll: {},
-        addTableConf: {},
-        //可选范围默认值
-        ableAll: {},
-        tableRows: {},
-        Vmodel: "",
-        currVmodel: "",
-        dataForm: {
-          userCode: undefined,
-          userName: undefined,
-          idCard: undefined,
-          phone: undefined,
-          userAscription: "1",
-          effectiveStartTime: undefined,
-          effectiveEndTime: undefined,
-          entryCodes: undefined,
-          merchantId: undefined,
-          version: 0,
-        },
-        tableRequiredData: {},
-        dataRule: {
-          userCode: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          userName: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          idCard: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-          phone: [{
-              required: true,
-              message: '请输入',
-              trigger: 'blur'
-            },
-            {
-              pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-              message: '请输入正确的联系方式',
-              trigger: 'blur'
-            },
-          ],
-          userAscription: [{
-            required: true,
-            message: '请至少选择一个',
-            trigger: 'change'
-          }, ],
-          effectiveStartTime: [{
-            required: true,
-            message: '请选择身份证有效开始时间',
-            trigger: 'change'
-          }, ],
-          effectiveEndTime: [{
-            required: true,
-            message: '请选择身份证有效结束时间',
-            trigger: 'change'
-          }, ],
-          entryCodes: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }, ],
-        },
-        userAscriptionOptions: [{
-          "fullName": "商户",
-          "id": "1"
-        }, {
-          "fullName": "公司",
-          "id": "2"
-        }],
-        userAscriptionProps: {
-          "label": "fullName",
-          "value": "id"
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getDefaultCurrentValueUserId
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentId
+} from '@/api/permission/organize'
+import {
+  getDateDay,
+  getLaterData,
+  getBeforeData,
+  getBeforeTime,
+  getLaterTime
+} from '@/components/Generator/utils/index.js'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {},
+      //可选范围默认值
+      ableAll: {},
+      tableRows: {},
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        userCode: undefined,
+        userName: undefined,
+        idCard: undefined,
+        phone: undefined,
+        userAscription: "1",
+        effectiveStartTime: undefined,
+        effectiveEndTime: undefined,
+        entryCodes: undefined,
+        merchantId: undefined,
+        version: 0,
+      },
+      tableRequiredData: {},
+      dataRule: {
+        userCode: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        userName: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        idCard: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
+        phone: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
         },
-        merchantIdcolumnOptions: [{
-          "label": "编码",
-          "value": "cmp_no"
-        }, {
-          "label": "名称",
-          "value": "cmp_nm"
-        }, ],
-        childIndex: -1,
-        isEdit: false,
-        interfaceRes: {
-          userCode: [],
-          userName: [],
-          idCard: [],
-          phone: [],
-          userAscription: [],
-          effectiveStartTime: [],
-          effectiveEndTime: [],
-          entryCodes: [],
-          merchantId: [],
+        {
+          pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
+          message: '请输入正确的联系方式',
+          trigger: 'blur'
         },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo'])
-    },
-    watch: {},
-    created() {
-      this.dataAll()
-      this.initDefaultData()
-      this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-    },
-    mounted() {},
-    methods: {
-      selectChangeData(var1, var2){
-        this.dataForm.merchantId = var2.id;
-        this.dataForm.merchantName = var2.cmp_nm;
+        ],
+        userAscription: [{
+          required: true,
+          message: '请至少选择一个',
+          trigger: 'change'
+        },],
+        effectiveStartTime: [{
+          required: true,
+          message: '请选择身份证有效开始时间',
+          trigger: 'change'
+        },],
+        effectiveEndTime: [{
+          required: true,
+          message: '请选择身份证有效结束时间',
+          trigger: 'change'
+        },],
+        entryCodes: [{
+          required: true,
+          message: '请输入',
+          trigger: 'blur'
+        },],
       },
-      depSelectChangeData(var1, var2){
-        this.dataForm.merchantId = var2.id;
-        this.dataForm.merchantName = var2.fullName;
+      userAscriptionOptions: [{
+        "fullName": "商户",
+        "id": "1"
+      }, {
+        "fullName": "公司",
+        "id": "2"
+      }],
+      userAscriptionProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      prev() {
-        this.index--
-        if (this.index === 0) {
-          this.prevDis = true
-        }
-        this.nextDis = false
-        for (let index = 0; index < this.allList.length; index++) {
-          const element = this.allList[index];
-          if (this.index == index) {
-            this.getInfo(element.id)
-          }
-        }
+      merchantIdcolumnOptions: [{
+        "label": "编码",
+        "value": "cmp_no"
+      }, {
+        "label": "名称",
+        "value": "cmp_nm"
+      },],
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        userCode: [],
+        userName: [],
+        idCard: [],
+        phone: [],
+        userAscription: [],
+        effectiveStartTime: [],
+        effectiveEndTime: [],
+        entryCodes: [],
+        merchantId: [],
       },
-      next() {
-        this.index++
-        if (this.index === this.allList.length - 1) {
-          this.nextDis = true
-        }
-        this.prevDis = false
-        for (let index = 0; index < this.allList.length; index++) {
-          const element = this.allList[index];
-          if (this.index == index) {
-            this.getInfo(element.id)
-          }
+    }
+  },
+  computed: {
+    changeId() {
+      return !this.dataForm.id;
+    },
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    selectChangeData(var1, var2) {
+      this.dataForm.merchantId = var2.id;
+      this.dataForm.merchantName = var2.cmp_nm;
+    },
+    depSelectChangeData(var1, var2) {
+      this.dataForm.merchantId = var2.id;
+      this.dataForm.merchantName = var2.fullName;
+    },
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-      },
-      getInfo(id) {
-        request({
-          url: '/api/example/Person/' + id,
-          method: 'get'
-        }).then(res => {
-          this.dataInfo(res.data)
-        });
-      },
-      goBack() {
-        this.visible = false
-        this.$emit('refreshDataList', true)
-      },
-      changeData(model, index) {
-        this.isEdit = false
-        this.childIndex = index
-        let modelAll = model.split("-");
-        let faceMode = "";
-        for (let i = 0; i < modelAll.length; i++) {
-          faceMode += modelAll[i];
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        for (let key in this.interfaceRes) {
-          if (key != faceMode) {
-            let faceReList = this.interfaceRes[key]
-            for (let i = 0; i < faceReList.length; i++) {
-              if (faceReList[i].relationField == model) {
-                let options = 'get' + key + 'Options';
-                if (this[options]) {
-                  this[options]()
-                }
-                this.changeData(key, index)
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/example/Person/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
               }
+              this.changeData(key, index)
             }
           }
         }
-      },
-      changeDataFormData(type, data, model, index, defaultValue) {
-        if (!this.isEdit) {
-          if (type == 2) {
-            for (let i = 0; i < this.dataForm[data].length; i++) {
-              if (index == -1) {
-                this.dataForm[data][i][model] = defaultValue
-              } else if (index == i) {
-                this.dataForm[data][i][model] = defaultValue
-              }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
             }
-          } else {
-            this.dataForm[data] = defaultValue
-          }
-        }
-      },
-      dataAll() {},
-      clearData() {
-        this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-      },
-      init(id, isDetail, allList) {
-        this.prevDis = false
-        this.nextDis = false
-        this.allList = allList || []
-        if (allList.length) {
-          this.index = this.allList.findIndex(item => item.id === id)
-          if (this.index == 0) {
-            this.prevDis = true
-          }
-          if (this.index == this.allList.length - 1) {
-            this.nextDis = true
           }
         } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() { },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
           this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
           this.nextDis = true
         }
-        this.dataForm.id = id || 0;
-        this.visible = true;
-        this.$nextTick(() => {
-          if (this.dataForm.id) {
-            this.loading = true
-            request({
-              url: '/api/example/Person/' + this.dataForm.id,
-              method: 'get'
-            }).then(res => {
-              this.dataInfo(res.data)
-              this.loading = false
-            });
-          } else {
-            this.clearData()
-            this.initDefaultData()
-          }
-        });
-        this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-      },
-      //初始化默认数据
-      initDefaultData() {
-
-      },
-      // 表单提交
-      dataFormSubmit(type) {
-        this.dataFormSubmitType = type ? type : 0
-        this.$refs['formRef'].validate((valid) => {
-          if (valid) {
-            this.request()
-          }
-        })
-      },
-      request() {
-        let _data = this.dataList()
-        if (this.dataFormSubmitType == 2) {
-          this.continueBtnLoading = true
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/example/Person/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
         } else {
-          this.btnLoading = true
+          this.clearData()
+          this.initDefaultData()
         }
-        if (!this.dataForm.id) {
-          request({
-            url: '/api/example/Person',
-            method: 'post',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (this.dataFormSubmitType == 2) {
-                  this.$nextTick(() => {
-                    this.clearData()
-                    this.initDefaultData()
-                  })
-                  this.continueBtnLoading = false
-                  return
-                }
-                this.visible = false
-                this.btnLoading = false
-                this.$emit('refresh', true)
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
+
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/example/Person',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
+                this.$nextTick(() => {
+                  this.clearData()
+                  this.initDefaultData()
+                })
+                this.continueBtnLoading = false
+                return
               }
-            })
-          }).catch(() => {
-            this.btnLoading = false
-            this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
           })
-        } else {
-          request({
-            url: '/api/example/Person/' + this.dataForm.id,
-            method: 'PUT',
-            data: _data
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: 'success',
-              duration: 1000,
-              onClose: () => {
-                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                this.visible = false
-                this.btnLoading = false
-                this.$emit('refresh', true)
-              }
-            })
-          }).catch(() => {
-            this.btnLoading = false
-            this.continueBtnLoading = false
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/example/Person/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
           })
-        }
-      },
-      openSelectDialog(key) {
-        this.currTableConf = this.addTableConf[key]
-        this.currVmodel = key
-        this.selectDialogVisible = true
-        this.$nextTick(() => {
-          this.$refs.selectDialog.init()
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
         })
-      },
-      addForSelect(data) {
-        for (let i = 0; i < data.length; i++) {
-          let t = data[i]
-          if (this['get' + this.currVmodel]) {
-            this['get' + this.currVmodel](t)
-          }
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
         }
-      },
-      dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-        let timeDataValue = null;
-        let timeValue = Number(timeValueData)
-        if (timeRule) {
-          if (timeType == 1) {
-            timeDataValue = timeValue
-          } else if (timeType == 2) {
-            timeDataValue = dataValue
-          } else if (timeType == 3) {
-            timeDataValue = new Date().getTime()
-          } else if (timeType == 4) {
-            let previousDate = '';
-            if (timeTarget == 1 || timeTarget == 2) {
-              previousDate = getDateDay(timeTarget, timeType, timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else if (timeTarget == 3) {
-              previousDate = getBeforeData(timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else {
-              timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-            }
-          } else if (timeType == 5) {
-            let previousDate = '';
-            if (timeTarget == 1 || timeTarget == 2) {
-              previousDate = getDateDay(timeTarget, timeType, timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else if (timeTarget == 3) {
-              previousDate = getLaterData(timeValue)
-              timeDataValue = new Date(previousDate).getTime()
-            } else {
-              timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-            }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
           }
         }
-        return timeDataValue;
-      },
-      time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-        let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-        let timeDataValue = null
-        if (timeRule) {
-          if (timeType == 1) {
-            timeDataValue = timeValue || '00:00:00'
-            if (timeDataValue.split(':').length == 3) {
-              timeDataValue = timeDataValue
-            } else {
-              timeDataValue = timeDataValue + ':00'
-            }
-          } else if (timeType == 2) {
-            timeDataValue = dataValue
-          } else if (timeType == 3) {
-            timeDataValue = this.jnpf.toDate(new Date(), format)
-          } else if (timeType == 4) {
-            let previousDate = '';
-            previousDate = getBeforeTime(timeTarget, timeValue)
-            timeDataValue = this.jnpf.toDate(previousDate, format)
-          } else if (timeType == 5) {
-            let previousDate = '';
-            previousDate = getLaterTime(timeTarget, timeValue)
-            timeDataValue = this.jnpf.toDate(previousDate, format)
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
           }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
         }
-        return timeDataValue;
-      },
-      dataList() {
-        var _data = this.dataForm;
-        return _data;
-      },
-      dataInfo(dataAll) {
-        let _dataAll = dataAll
-        this.dataForm = _dataAll
-        this.isEdit = true
-        this.dataAll()
-        this.childIndex = -1
-      },
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
     },
-  }
+  },
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue
index e94aff6..9ef55c6 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/person/index.vue
@@ -56,12 +56,12 @@
           </el-table-column>
           <el-table-column prop="effectiveStartTime" label="有效开始时间" align="center">
             <template slot-scope="scope">
-              {{ scope.row.effectiveStartTime | toDate("yyyy-MM-dd HH:mm:ss") }}
+              {{ scope.row.effectiveStartTime | toDate("yyyy-MM-dd") }}
             </template>
           </el-table-column>
           <el-table-column prop="effectiveEndTime" label="有效结束时间" align="center">
             <template slot-scope="scope">
-              {{ scope.row.effectiveEndTime | toDate("yyyy-MM-dd HH:mm:ss") }}
+              {{ scope.row.effectiveEndTime | toDate("yyyy-MM-dd") }}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="150"align="center">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/Detail.vue
index 4d6872d..f996eaa 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/Detail.vue
@@ -51,11 +51,11 @@
                             <p>{{ dataForm.ascriptionId }}</p>
                         </jnpf-form-tip-item>
                     </el-col>
-                    <el-col :span="8">
+                    <!-- <el-col :span="8">
                         <jnpf-form-tip-item label="归属名称" prop="ascriptionName">
                             <p>{{ dataForm.ascriptionName }}</p>
                         </jnpf-form-tip-item>
-                    </el-col>
+                    </el-col> -->
                 </template>
             </el-form>
         </el-row>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue
index a72dd22..64a133b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue
@@ -8,7 +8,7 @@
           <!-- 具体表单 -->
           <el-col :span="8">
             <jnpf-form-tip-item label="车牌号" prop="vehicleNumber">
-              <JnpfInput v-model="dataForm.vehicleNumber" @change="changeData('vehicleNumber',-1)" placeholder="请输入"
+              <JnpfInput v-model="dataForm.vehicleNumber" :disabled="!changeId" @change="changeData('vehicleNumber',-1)" placeholder="请输入"
                 clearable :style='{"width":"100%"}'>
               </JnpfInput>
             </jnpf-form-tip-item>
@@ -87,7 +87,7 @@
               <JnpfPopupSelect v-model="dataForm.ascriptionId" @change="selectChangeData" :rowIndex="null"
                 :formData="dataForm" :templateJson="interfaceRes.ascriptionName" placeholder="请选择" propsValue="id"
                 popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='cmp_nm' field='ascriptionId'
-                interfaceId="582919057313895877" :pageSize="20" :columnOptions="ascriptionNamecolumnOptions" clearable
+                interfaceId="587625521974612357" :pageSize="20" :columnOptions="ascriptionNamecolumnOptions" clearable
                 :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>