Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_mobile into rongxin_dev

src/views/contracted/village/employer/employer.vue

@@ -50,6 +50,20 @@
         <van-field v-model="form.lxdh" label="联系电话：" placeholder="请输入联系电话" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="15" />
         <van-field v-model="form.fbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="100" />
         <van-field v-model="form.yzbm" label="邮政编码：" placeholder="请输入邮政编码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="6" />
+        <van-field v-model="form.fbfdcy" label="调查员：" placeholder="请输入调查员" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="30" />
+        <van-field v-model="form.fbfdcrq" label="调查日期：" placeholder="请选择调查日期" required :rules="[{ required: true }]"
+                   :border="false" input-align="right" right-icon="arrow-down" readonly clickable @click="showDcrq = true" />
+        <van-popup v-model="showDcrq" position="bottom">
+          <van-datetime-picker
+            :value="form.fbfdcrq ? new Date(form.fbfdcrq) : new Date()"
+            type="date"
+            title="请选择调查日期"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmDcrq"
+            @cancel="showDcrq = false"
+          />
+        </van-popup>
         <van-field v-model="form.fbfdcjs" label="调查记事：" placeholder="请输入调查记事" type="textarea" rows="3" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="200" />
         <van-field label="签字图片：" readonly :border="false" label-width="auto" />
         <img :src="'/api'+form.fbfdcqz" width="100%" alt="" />
@@ -115,6 +129,10 @@
           resultImg: "", // 最终画布生成的base64图片
           isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         },
+        // 调查日期弹出层
+        showDcrq: false,
+        minDate: new Date(1978, 0, 1),
+        maxDate: new Date(2100, 11, 31),
       };
     },
     created() {
@@ -123,6 +141,8 @@
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
       });
+    },
+    mounted() {
       this.getDetail();
     },
     methods: {
@@ -150,6 +170,10 @@
         this.credentialTypeText = value.dictLabel;
         this.showCredentialType = false;
       },
+      onConfirmDcrq(data) {
+        this.form.fbfdcrq = this.format(data, 'yyyy-MM-dd');
+        this.showDcrq = false;
+      },
       submitForm() {
         this.$refs.formData.validate().then(() => {
           if (this.form.id) {
@@ -192,6 +216,8 @@
           lxdh: null,
           fbfdz: null,
           yzbm: null,
+          fbfdcy: null,
+          fbfdcrq: null,
           fbfdcjs: null,
           fbfdcqz: null
         };