获取用户信息

folacin-app/src/views/canvas/canvas.vue

@@ -6,7 +6,7 @@
             </template>
         </van-nav-bar>
         <div class="height_44"></div>
-        <vue-esign ref="esign" :isCrop="false" :width="400" :height="700"/>
+        <vue-esign ref="esign" :isCrop="false" :width="400" :height="600"/>
         <div class="btn">
             <div class="btn_right" @click="handleReset">
                 <img src="../../assets/images/abrase.png" alt="">

folacin-app/src/views/index/index.vue

@@ -31,7 +31,7 @@ export default {
       scrollPosition: 0,
       userInfo: {
         account: null,
-        token: "52d30e396dff44eca2f51f614e42a8c0",
+        token: "44c1ef4e-de9e-4d32-9af4-3c0196e1ec83",
         userId: null,
         residentId: null,
         nickName: null,

folacin-app/src/views/receiveApply/receiveApply.vue

@@ -91,6 +91,35 @@
         <span>*</span>
         <van-field type="number" v-model.trim="formData.telephone" label="联系电话" placeholder="请输入联系电话"/>
       </div>
+
+      <div class="item_box">
+        <span>*</span>
+        <van-field
+            is-link
+            readonly
+            label="户籍地址"
+            placeholder="点击选择"
+            @click="showPopup1 = true"
+        />
+      </div>
+      <div class="item_box" style="font-size: 14px;margin-left: 20px" @click="showPopup1 = true">
+        {{ formData.registeredCodeName }}
+      </div>
+      <van-popup v-model="showPopup1" position="bottom" round>
+        <van-cascader
+            v-model="formData.registeredCode"
+            title="请选择户籍地址"
+            :options="optionsList1"
+            @close="showPopup1 = false"
+            @change="(val)=>{areaChange(val,'registeredCode')}"
+            @finish="(val)=>{areaFinish(val,'registeredCode')}"
+        />
+      </van-popup>
+      <div class="item_box">
+        <span>*</span>
+        <van-field v-model.trim="formData.permanentAddress" label="户籍详细地址" placeholder="请输入详细地址"/>
+      </div>
+
       <div class="item_box">
         <span>*</span>
         <van-field
@@ -102,23 +131,21 @@
         />
       </div>
       <div class="item_box" style="font-size: 14px;margin-left: 20px" @click="showPopup = true">
-                {{ formData.presentName }}
+        {{ formData.presentCodeName }}
       </div>
       <van-popup v-model="showPopup" position="bottom" round>
-                <!--                <van-area v-model="formData.presentCode" title="地区" :area-list="areaList" @confirm="handleConfirm"-->
-                <!--                          @cancel="showPopup = false"/>-->
         <van-cascader
             v-model="formData.presentCode"
             title="请选择现住地址"
             :options="optionsList"
             @close="showPopup = false"
-                        @change="areaChange"
-                        @finish="areaFinish"
+            @change="(val)=>{areaChange(val,'presentCode')}"
+            @finish="(val)=>{areaFinish(val,'presentCode')}"
         />
       </van-popup>
       <div class="item_box">
         <span>*</span>
-                <van-field v-model.trim="formData.nowAddress" label="详细地址" placeholder="请输入详细地址"/>
+        <van-field v-model.trim="formData.nowAddress" label="现住详细地址" placeholder="请输入详细地址"/>
       </div>
       <div class="item_box border_none">
         <span>*</span>
@@ -151,27 +178,38 @@ export default {
         birthDate: undefined,
         womanName: "",
         womenCertificateType: 1,
-                presentName: undefined,
+        presentCodeName: undefined,
+        registeredCodeName: undefined,
         height: undefined,
         weight: undefined,
         bmi: undefined,
         question: '',
         telephone: '',
         recommendEat: "",
-                birthDateObj: new Date(), presentCode: '', womenIdCard: '', nowAddress: '', provideNumber: undefined
+        birthDateObj: new Date(),
+        registeredCode: '',
+        permanentAddress:'',
+        presentCode: '',
+        womenIdCard: '',
+        nowAddress: '',
+        provideNumber: undefined
       },
       optionsList: [],
+      optionsList1: [],
       showPopup: false,
+      showPopup1: false,
       scrollPosition: 0,
       applyUnitInfo: {unitName: ""},
       birthDateShow: false,
       minDate: new Date(1950, 0, 1),
       maxDate: new Date(),
       indexArr: [],
+      indexArr1: [],
     }
   },
   created() {
-        this.getChildArea(0, 0);
+    this.getChildArea(0, 0,'registeredCode');
+    this.getChildArea(0, 0,'presentCode');
   },
   watch: {
     'formData.height': {
@@ -201,14 +239,19 @@ export default {
     }
   },
   methods: {
-        getChildArea(areaCode, areaLevel) {
+    getChildArea(areaCode, areaLevel, filed) {
       getChildAreaByParentCode(areaCode).then(res => {
         if (res.code === 'SUCCESS') {
           let optionsList = [];
           let areaList = res.data;
           if (areaList != null) {
             let index = 0;
-                        let length = this.indexArr.length;
+            let length = 0;
+            if (filed == 'presentCode') {
+              length = this.indexArr.length;
+            } else {
+              length = this.indexArr1.length;
+            }
             areaList.forEach(area => {
               let item = {
                 text: area.areaName,
@@ -223,6 +266,7 @@ export default {
               optionsList.push(item)
               index++;
             })
+            if (filed == 'presentCode') {
               if (areaLevel == 0) {
                 this.optionsList = optionsList;
               } else {
@@ -239,30 +283,54 @@ export default {
                   this.optionsList[this.indexArr[0]].children[this.indexArr[1]].children[this.indexArr[2]].children[this.indexArr[3]].children = optionsList;
                 }
               }
+            } else {
+              if (areaLevel == 0) {
+                this.optionsList1 = optionsList;
+              } else {
+                if (this.indexArr1.length == 1) {
+                  this.optionsList1[this.indexArr1[0]].children = optionsList;
+                }
+                if (this.indexArr1.length == 2) {
+                  this.optionsList1[this.indexArr1[0]].children[this.indexArr1[1]].children = optionsList;
+                }
+                if (this.indexArr1.length == 3) {
+                  this.optionsList1[this.indexArr1[0]].children[this.indexArr1[1]].children[this.indexArr1[2]].children = optionsList;
+                }
+                if (this.indexArr1.length == 4) {
+                  this.optionsList1[this.indexArr1[0]].children[this.indexArr1[1]].children[this.indexArr1[2]].children[this.indexArr1[3]].children = optionsList;
+                }
+              }
+            }
           }
         }
       }).catch(res => {
       })
     },
-        areaChange(val) {
-            this.formData.presentName = val.selectedOptions.map((item) => item.text).join('/');
+    areaChange(val, filed) {
+      this.formData[filed + "Name"] = val.selectedOptions.map((item) => item.text).join('/');
       let indexArr = [];
       val.selectedOptions.forEach(item => {
         indexArr.push(item.index);
       });
       if (indexArr.length == 5) {
+        if (filed == 'presentCode') {
           this.showPopup = false;
+        } else {
+          this.showPopup1 = false;
+        }
         return;
       }
-            console.log(this.formData)
+      if (filed == 'presentCode') {
         this.indexArr = indexArr;
-            this.getChildArea(val.value, val.areaLevel);
+      } else {
+        this.indexArr1 = indexArr;
       }
-        ,
-        areaFinish(val) {
-            this.formData.presentName = val.selectedOptions.map((item) => item.text).join('/');
+      this.getChildArea(val.value, val.areaLevel, filed);
     }
     ,
+    areaFinish(val,field) {
+      this.formData[field+"Name"] = val.selectedOptions.map((item) => item.text).join('/');
+    },
     //计算BMI值
     heightWeightChange() {
       let height = null, weight = null;
@@ -324,7 +392,7 @@ export default {
     // 地区选择确定按钮
     handleConfirm(val) {
       this.showPopup = false;
-            this.formData.presentName = val.map((item) => item.name).join('/');
+      this.formData.presentCodeName = val.map((item) => item.name).join('/');
       this.formData.presentCode = val[2].code;
     }
     ,
@@ -389,12 +457,20 @@ export default {
         this.$toast.tips('请输入正确的电话号码');
         return false;
       }
+      if (isEmpty(this.formData.registeredCode)) {
+        this.$toast.tips('请选择户籍地址');
+        return false;
+      }
+      if (isEmpty(this.formData.permanentAddress)) {
+        this.$toast.tips('请输入户籍详细地址');
+        return false;
+      }
       if (isEmpty(this.formData.presentCode)) {
         this.$toast.tips('请选择现住地址');
         return false;
       }
       if (isEmpty(this.formData.nowAddress)) {
-                this.$toast.tips('请输入详细地址');
+        this.$toast.tips('请输入现住详细地址');
         return false;
       }
       if (isEmpty(this.formData.isSignedName)) {
@@ -434,6 +510,8 @@ export default {
           recommendEat: this.formData.recommendEat,
           provideNumber: this.formData.provideNumber,
           bmi: 0,
+          registeredCode: this.formData.registeredCode,
+          permanentAddress: this.formData.permanentAddress,
         };
         let height = null, weight = null;
         if (this.formData.height) {
@@ -480,7 +558,8 @@ export default {
       }
       let {
         question, recommendEat, presentCode, womenCertificateType, womanName, womenIdCard,
-                birthDate, height, weight, bmi, telephone, nowAddress, provideNumber, presentCodeName
+        birthDate, height, weight, bmi, telephone, nowAddress, provideNumber, presentCodeName,registeredCodeName,
+        registeredCode,permanentAddress
       } = lastRecord;
       if (!womenCertificateType) {
         return;
@@ -497,11 +576,17 @@ export default {
       this.formData.telephone = telephone;
       this.formData.nowAddress = nowAddress;
       this.formData.provideNumber = provideNumber;
-            this.formData.presentName = presentCodeName;
+      this.formData.presentCodeName = presentCodeName;
       this.formData.presentCode = presentCode;
+      this.formData.registeredCode = registeredCode;
+      this.formData.registeredCodeName = registeredCodeName;
+      this.formData.permanentAddress = permanentAddress;
       if (!presentCodeName) {
         this.formData.presentCode = null;
       }
+      if (!registeredCodeName) {
+        this.formData.registeredCode = null;
+      }
       if (this.formData.birthDate) {
         let dateArr = this.formData.birthDate.split("-");
         this.formData.birthDateObj = new Date(Number(dateArr[0]), Number(dateArr[1]) - 1, Number(dateArr[2]));

folacin-pc/.env.dev

@@ -3,8 +3,8 @@ NODE_ENV = dev
 VUE_APP_BASE_URL2222= https://beta-ysservice.yiboshi.com
 VUE_APP_BASE_URL22 = https://ys-service.yiboshi.com
 VUE_APP_BASE_URL4 = http://59.230.237.90:8115
-VUE_APP_BASE_URL2 = http://127.0.0.1:8083
-VUE_APP_BASE_URL = https://beta-cqbp-yesuan.yiboshi.com:86/service-api
+VUE_APP_BASE_URL = http://127.0.0.1:8083
+VUE_APP_BASE_URL33 = https://beta-cqbp-yesuan.yiboshi.com:86/service-api
 VUE_APP_BASE_PATH = https://beta-yac.yiboshi.com
 VUE_APP_KEY_WORD = 'XwKsGlMcdPMEhR1B'
 

folacin-pc/src/views/Home.vue

@@ -47,7 +47,7 @@ export default {
     },
     created() {
         //获取妇幼权限和登录基本信息
-        let cookieToken = "dd21a4cd-844a-47df-8627-d0dff82482c1";
+        let cookieToken = "44c1ef4e-de9e-4d32-9af4-3c0196e1ec83";
         if (process.env.NODE_ENV != "dev") {
             cookieToken = getCookie('bGNnd3lwdF9hdA');
         }

folacin-pc/src/views/indexComponent/folviteDistribution/components/addFolviteDistribution.vue

@@ -118,25 +118,52 @@
                            :disabled="disabled"></a-input>
                 </a-form-model-item>
               </a-col>
+            </a-row>
+            <a-row :gutter="16">
               <a-col :span="24">
-                                <a-form-model-item label="现住地址" prop="presentCode" :labelCol="{span: 3}"
+                <a-form-model-item label="户籍地址" prop="registeredCode" :labelCol="{span: 3}"
                                    :wrapperCol="{span: 20}">
-                                    <DocAddress v-model="formData.presentCode"/>
+                  <a-row>
+                    <a-col :span="12">
+                      <DocAddress v-model="formData.registeredCode" />
+                    </a-col>
+                    <a-col :span="12">
+                      <a-form-model-item label="" prop="permanentAddress" :labelCol="{span: 3}">
+                        <a-input
+                            @keyup.enter.native="nextFocus(9)" ref="input9"
+                            v-toInputNum="{num: 100}"
+                            placeholder="详细地址，最多可输入100个字"
+                            v-model="formData.permanentAddress"
+                            :disabled="disabled"></a-input>
+                      </a-form-model-item>
+                    </a-col>
+                  </a-row>
                 </a-form-model-item>
               </a-col>
             </a-row>
             <a-row :gutter="16">
               <a-col :span="24">
-                                <a-form-model-item label="详细地址" prop="nowAddress" :labelCol="{span: 3}"
+                <a-form-model-item label="现住地址" prop="presentCode" :labelCol="{span: 3}"
                                    :wrapperCol="{span: 20}">
+                  <a-row>
+                    <a-col :span="12">
+                      <DocAddress v-model="formData.presentCode"/>
+                    </a-col>
+                    <a-col :span="12">
+                      <a-form-model-item label="" prop="nowAddress" :labelCol="{span: 3}">
                       <a-input
-                                            @keyup.enter.native="nextFocus(9)" ref="input9"
+                          @keyup.enter.native="nextFocus(10)" ref="input10"
                           v-toInputNum="{num: 100}"
-                                            placeholder="请输入详细地址，最多可输入100个字"
+                          placeholder="详细地址，最多可输入100个字"
                           v-model="formData.nowAddress"
                           :disabled="disabled"></a-input>
                         </a-form-model-item>
                     </a-col>
+                  </a-row>
+                </a-form-model-item>
+              </a-col>
+            </a-row>
+            <a-row :gutter="16">
               <a-col :span="12">
                 <a-form-model-item label="签署方式" prop="signedMode">
                   <a-select v-model="formData.signedMode" placeholder="请选择" disabled>
@@ -151,12 +178,14 @@
               <a-col :span="12">
                 <a-form-model-item label="签署日期" prop="parentDate">
                   <a-date-picker v-model="formData.parentDate" format="yyyy-MM-DD"
-                                                   @change="nextFocus(10)" ref="input10"
+                                 @change="nextFocus(11)" ref="input11"
                                  value-format="yyyy-MM-DD"
                                  :disabled="disabled"
                                  style="width: 100%"/>
                 </a-form-model-item>
               </a-col>
+            </a-row>
+            <a-row :gutter="16">
               <a-col :span="12" :offset="3" v-if="this.routerParams.routerFlag == 'applyGrant'">
                 <a-form-model-item :wrapperCol="{span: 16}">
                   <div style="border: 1px dashed #EEEEEE;text-align: center">
@@ -177,7 +206,7 @@
             <a-col :span="12">
               <a-form-model-item label="发放日期" prop="provideDate">
                 <a-date-picker v-model="formData.provideDate" value-format="yyyy-MM-DD"
-                                               @change="nextFocus(11)" ref="input11"
+                               @change="nextFocus(12)" ref="input12"
                                format="YYYY-MM-DD"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -185,7 +214,7 @@
             <a-col :span="12">
               <a-form-model-item label="发放数量" prop="provideNumber">
                 <a-input type="number" placeholder="请输入发放数量"
-                                         @keyup.enter.native="nextFocus(12)" ref="input12"
+                         @keyup.enter.native="nextFocus(13)" ref="input13"
                          v-model="formData.provideNumber" suffix="瓶"
                 ></a-input>
               </a-form-model-item>
@@ -195,7 +224,7 @@
             <a-col :span="12">
               <a-form-model-item label="发放医生" prop="provideDoctorId">
                 <a-select v-model="formData.provideDoctorId" placeholder="请选择"
-                                          @keyup.enter.native="nextFocus(13)" ref="input13">
+                          @keyup.enter.native="nextFocus(14)" ref="input14">
                   <a-select-option v-for="item in doctorInfoList"
                                    :key="item.id" :value="item.id"
                   >
@@ -208,7 +237,7 @@
           <a-col :span="24">
             <a-form-model-item label="备注" prop="remarks" :labelCol="{span: 3}" :wrapperCol="{span: 20}">
               <a-textarea placeholder="请输入备注，最多可输入500字" v-model="formData.remarks" :rows="5"
-                                        @keyup.enter.native="nextFocus(14)" ref="input14"
+                          @keyup.enter.native="nextFocus(15)" ref="input15"
                           :maxLength="500"></a-textarea>
             </a-form-model-item>
           </a-col>
@@ -237,9 +266,10 @@ import {cardType} from "../../../utils/dropDownCollection";
 import moment from 'moment'
 import InStockManageInfo from "./inStockManageInfo";
 import DocAddress from "../../../components/DocAddress.vue";
+
 let vm = this
 export default {
-    components: {InStockManageInfo,DocAddress},
+  components: {InStockManageInfo, DocAddress},
   data() {
     let unitInfo = JSON.parse(window.sessionStorage.getItem('unitInfo'));
     let userInfo = JSON.parse(window.sessionStorage.getItem('userInfo'));
@@ -266,6 +296,8 @@ export default {
         manName: undefined,
         menIdCard: undefined,
         telephone: undefined,
+        registeredCode: undefined,
+        permanentAddress: "",
         presentCode: undefined,
         nowAddress: "",
         signedMode: '2',
@@ -345,6 +377,12 @@ export default {
         presentCode: [
           {required: true, message: '请选现住地址', trigger: 'change'}
         ],
+        registeredCode: [
+          {required: true, message: '请选择户籍地址', trigger: 'change'}
+        ],
+        permanentAddress: [
+          {required: true, message: '请输入详细地址', trigger: 'change'}
+        ],
         sendNumber: [
           {required: true, message: '请输入发放数量'}
         ]
@@ -390,6 +428,7 @@ export default {
       }
     } else {//由新增过来的发放
       this.formData.presentCode = this.unitInfo.areaCode
+      this.formData.registeredCode = this.unitInfo.areaCode
     }
   },
   mounted() {
@@ -451,7 +490,7 @@ export default {
             callback(new Error(msg));
             return
           }
-                }else {
+        } else {
           if (value < 30 || value > 180) {
             callback(new Error(msg));
             return;
@@ -481,6 +520,8 @@ export default {
           womenIdCard: data.womenIdCard,
           provideNumber: data.provideNumber,
           telephone: data.telephone,
+          registeredCode: data.registeredCode,
+          permanentAddress: data.permanentAddress,
           presentCode: data.presentCode,
           nowAddress: data.nowAddress,
           signedMode: data.signedMode ? data.signedMode.toString() : "1",
@@ -522,6 +563,8 @@ export default {
           pregnantNum: data.pregnantNum,
           provideNumber: data.provideNumber,
           telephone: data.telephone,
+          registeredCode: data.registeredCode,
+          permanentAddress: data.permanentAddress,
           presentCode: data.presentCode,
           nowAddress: data.nowAddress,
           signedMode: data.signedMode ? data.signedMode.toString() : "1",
@@ -570,6 +613,8 @@ export default {
         this.formData.telephone = data.telephone;
         this.formData.presentCode = data.presentCode;
         this.formData.nowAddress = data.nowAddress;
+        this.formData.registeredCode = data.registeredCode;
+        this.formData.permanentAddress = data.permanentAddress;
       }).catch(() => {
       })
     },
@@ -605,10 +650,6 @@ export default {
         this.doctorInfoList = data
       })
     },
-        save() {
-            const {isEmpty, data} = this.$refs.signaturePad.saveSignature();
-        },
-
     getChecked(val) {
       this.readyGetChecked = false
       this.$refs.inStockManageInfo.visible = false
@@ -655,23 +696,30 @@ export default {
             parentDate,
             provideNumber,
             provideDate,
+            registeredCode,
             presentCode,
             provideDoctorId,
             ...others
           } = vm.formData
           let parentTime = moment(parentDate).format('YYYY-MM-DD')
           let provideTme = moment(provideDate).format('YYYY-MM-DD')
-                    let presentCodeInfo = "";
+          let presentCodeInfo = "",registeredCodeInfo="";
           if (presentCode != null && presentCode.length > 1) {
             presentCodeInfo = presentCode;
           } else {
             presentCodeInfo = this.unitInfo.areaCode;
           }
+          if (registeredCode != null && registeredCode.length > 1) {
+            registeredCodeInfo = registeredCode;
+          } else {
+            registeredCodeInfo = this.unitInfo.areaCode;
+          }
           let provideDoctorInfo = vm.doctorInfoList.filter(item => item.id == provideDoctorId)
           params = {
             id: id,
             parentDate: parentTime,
             provideDate: provideTme,
+            registeredCode: registeredCodeInfo,
             presentCode: presentCodeInfo,
             provideDoctorId: provideDoctorInfo[0].id,
             provideDoctorName: provideDoctorInfo[0].staffName,

folacin-pc/src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue

@@ -17,27 +17,30 @@
               </div>
               <div style="clear: both"></div>
             </div>
-                        <a-descriptions bordered class="folvite_title">
-                            <a-descriptions-item label="姓名">
+            <a-descriptions bordered class="folvite_title" :column="6">
+              <a-descriptions-item label="姓名" :span="2">
                 {{ detailInfo.womanName || '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="证件类型">
+              <a-descriptions-item label="证件类型" :span="2">
                 {{ detailInfo.womenCertificateTypeName || '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="证件号码">
+              <a-descriptions-item label="证件号码" :span="2">
                 {{ detailInfo.womenIdCard || '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="出生日期">
+              <a-descriptions-item label="出生日期" :span="2">
                 {{ detailInfo.birthDate || '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="身高">
+              <a-descriptions-item label="联系电话" :span="2">
+                {{ detailInfo.telephone || '--' }}
+              </a-descriptions-item>
+              <a-descriptions-item label="身高" :span="2">
                 {{ detailInfo.height ? detailInfo.height + "cm" : '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="体重">
+              <a-descriptions-item label="体重" :span="2">
                 {{ detailInfo.weight ? detailInfo.weight + "kg" : '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="BMI">
-                                {{ detailInfo.bmi ? detailInfo.bmi: '--' }}
+              <a-descriptions-item label="BMI" :span="2">
+                {{ detailInfo.bmi ? detailInfo.bmi : '--' }}
               </a-descriptions-item>
             </a-descriptions>
             <div class="detail_title" style="border-top: 0px">
@@ -46,28 +49,31 @@
               </div>
               <div style="clear: both"></div>
             </div>
-                        <a-descriptions bordered class="folvite_title">
-                            <a-descriptions-item label="联系电话">
-                                {{ detailInfo.telephone || '--' }}
+            <a-descriptions bordered class="folvite_title" :column="6">
+              <a-descriptions-item label="户籍地址" :span="2">
+                {{ detailInfo.registeredCodeName || '--' }}
+              </a-descriptions-item>
+              <a-descriptions-item label="户籍地址详细" :span="2">
+                {{ detailInfo.permanentAddress || '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="现在住址">
+              <a-descriptions-item label="现住址" :span="2">
                 {{ detailInfo.presentCodeName || '--' }}
               </a-descriptions-item>
 
-                            <a-descriptions-item label="详细地址">
+              <a-descriptions-item label="现住址详细" :span="2">
                 {{ detailInfo.nowAddress || '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="签署方式" :span="detailInfo.source == 2 ? 2: 1">
+              <a-descriptions-item label="签署方式" :span="2">
                 {{ detailInfo.signedModeName || '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="签署日期" :span="detailInfo.source == 2 ? 2: 1">
+              <a-descriptions-item label="签署日期" :span="2">
                 {{ detailInfo.parentDate || '--' }}
               </a-descriptions-item>
-                            <a-descriptions-item label="上传照片" v-if="detailInfo.source != 2">
+              <a-descriptions-item label="上传照片" v-if="detailInfo.source != 2" :span="2">
                 <img style="cursor: pointer" width="120px" height="120px" :src="detailInfo.consentUrl"
                      @click="showVisible=true"/>
               </a-descriptions-item>
-                            <a-descriptions-item label="签名" v-if="detailInfo.source == 2">
+              <a-descriptions-item label="签名" v-if="detailInfo.source == 2" :span="4">
                 <img style="margin-left: 30px;width: auto;height: 80px;transform: rotate(-90deg)"
                      :src="detailInfo.applySignUrl">
               </a-descriptions-item>
@@ -78,14 +84,14 @@
             <div class="divider_my"><span class="midText">问卷</span></div>
             <div style="clear: both"></div>
           </div>
-                    <a-descriptions bordered   class="folvite_title">
-                        <a-descriptions-item label="结果"  >
+          <a-descriptions bordered class="folvite_title" :column="4">
+            <a-descriptions-item label="结果" :span="2">
               <div v-if="checkedList&&checkedList.length>0">
-                                <p  v-for="item in checkedList ">{{item}}</p>
+                <p v-for="item in checkedList ">{{ item }}</p>
               </div>
               <p v-else>--</p>
             </a-descriptions-item>
-                        <a-descriptions-item label="建议服用">
+            <a-descriptions-item label="建议服用" :span="2">
               {{ detailInfo.recommendEat || '--' }}
             </a-descriptions-item>
           </a-descriptions>
@@ -172,10 +178,10 @@ export default {
         if (data.question) {
           let questionList = data.question.split(",");
           questionList.forEach(x => {
-                        this.checkedList.push(this.plainOptions["key"+x]);
+            this.checkedList.push(this.plainOptions["key" + x]);
           })
         }
-            }).catch(res=>{
+      }).catch(res => {
         this.spinning = false;
       })
     },

folacin-pc/src/views/indexComponent/folviteDistribution/folviteDistribution.vue

@@ -51,6 +51,14 @@
           <span class="ellipsis">{{ (record.presentCodeName || "") + record.nowAddress }}</span>
         </a-tooltip>
       </template>
+      <template slot="registeredCode" slot-scope="text, record">
+        <a-tooltip placement="top">
+          <template slot="title">
+            <span>  {{ (record.registeredCodeName || "") + record.permanentAddress }}</span>
+          </template>
+          <span class="ellipsis">{{ (record.registeredCodeName || "") + record.permanentAddress }}</span>
+        </a-tooltip>
+      </template>
       <template slot="action" slot-scope="record">
         <a-button class="ant-table-btn" size="small" @click="toDetail(record)">查看</a-button>
         <a-button style="margin-left: 10px" class="ant-table-btn" size="small" @click="updateRecord(record)">修改
@@ -205,6 +213,13 @@ const columns = [
     dataIndex: 'sourceName',
     width: '140px'
   },
+  {
+    title: '户籍地址',
+    // dataIndex: 'nowAddress',
+    key: 'registeredCode',
+    ellipsis: true,
+    scopedSlots: {customRender: 'registeredCode'},
+  },
   {
     title: '现住址',
     // dataIndex: 'nowAddress',
@@ -212,6 +227,7 @@ const columns = [
     ellipsis: true,
     scopedSlots: {customRender: 'nowAddress'},
   },
+
   {
     title: '操作',
     fixed: 'right',

folacin-pc/src/views/utils/common.js

@@ -105,30 +105,6 @@ export const timeFormat = (time, format = 'YYYY-MM-DD') => {
     return atime
 }
 
-/**
- * 非空判断 已挂载到原型上$isNot
- * 解决Vue Template模板中无法使用可选链的问题
- * eg:
- * let ces = {
-                    data: {
-                        data1: {
-                            name: '测试'
-                        }
-                    }
-                }
- let b = this.$isNot(ces, 'data', 'data1', 'name') //测试
- {{$isNot(ces, 'data', 'data1', 'name')}} //测试
- */
-// export const optionalChaining = (obj, ...rest) => {
-//     let tmp = obj;
-//     for (let key in rest) {
-//         let name = rest[key];
-//         tmp = tmp?.[name]; //es11可选链
-//     }
-//     return tmp ?? "未知";
-// };
-
-
 // 校验手机号
 export const checkPhone = (rule, value, callback) => {
     if (value == '' || value == undefined) {
@@ -231,18 +207,22 @@ export function areCodeTrans(areaCode) {
         //末尾填充0实现
         return areCodeTrans2(areaCode);
     }
+    areaCode = areaCode.replaceAll("0000000000", "");
+    areaCode = areaCode.replaceAll("00000000", "");
+    areaCode = areaCode.replaceAll("000000", "");
+    areaCode = areaCode.replaceAll("000", "");
     //末尾不填充0实现
     if (areaCode.length >= 2) {
         areaCodeList.push(areaCode.substring(0, 2))
     }
     if (areaCode.length >= 4) {
-        areaCodeList.push(areaCode.substring(0, 4))
+        areaCodeList.push(areaCode.substring(0, 4) + "00000000")
     }
     if (areaCode.length >= 6) {
-        areaCodeList.push(areaCode.substring(0, 6))
+        areaCodeList.push(areaCode.substring(0, 6) + "000000")
     }
     if (areaCode.length >= 9) {
-        areaCodeList.push(areaCode.substring(0, 9))
+        areaCodeList.push(areaCode.substring(0, 9) + "000")
     }
     if (areaCode.length >= 12) {
         areaCodeList.push(areaCode)