Merge branch 'feature/语言国际化--dev公卫' of…

Merge branch 'feature/语言国际化--dev公卫' of https://gitlab.suvalue.com/ninglupeng/ShanghaiGongwei into feature/语言国际化--dev公卫

# Conflicts:
#	src/components/page4.vue
#	src/components/page6.vue

src/components/page4.vue

 <!--
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
- * @LastEditors: ninglupeng
- * @LastEditTime: 2022-11-04 16:39:07
+ * @LastEditors: wsq
+ * @LastEditTime: 2022-11-04 16:26:05
  * @Description: 
 -->
 <template>
@@ -302,7 +302,7 @@ export default {
             city: "", //籍贯 （市）
             address: "", //地址
             idCard: "", //身份证号
-            typeOfMedicalInsurance: "", //医保类型---默认值 
+            typeOfMedicalInsurance: "", //医保类型---默认值 上海医保
             insurance: this.$i18n.locale == "zh" ? "无" : "يوق", //商业保险---默认值 无
 
             HasSymptom: this.$i18n.locale == "zh" ? "否" : "ياق", //有无症状---默认值 否
@@ -409,6 +409,90 @@ export default {
                 }
             });
         },
+        mounted() {
+            if (this.$i18n.locale == "zh") {
+                this.getResource();
+            } else {
+                //症状列表
+                this.symptomList = [
+                    { id: 1, element: "يۇتقۇنچاق ئاغرىش", sort: 1 },
+                    { id: 2, element: "بۇرنى پۈتۈپ قىلىش", sort: 2 },
+                    { id: 3, element: "قىزىتماق", sort: 3 },
+                    { id: 5, element: "يۆتەل", sort: 5 },
+                    { id: 6, element: "بەلغەم يۆتەل", sort: 6 },
+                    { id: 7, element: "بېشى قايماق", sort: 7 },
+                    { id: 8, element: "باش ئاغرىقى", sort: 8 },
+                    { id: 9, element: "مۇسكۇل ئاغرىش", sort: 9 },
+                    { id: 10, element: "ماغدۇرسىزلىق", sort: 10 },
+                    { id: 11, element: "نەپەس قىيىنلىشىش", sort: 11 },
+                    { id: 12, element: "بۇرنىدىن سۇ ئېقىش", sort: 12 },
+                ];
+                //国籍列表
+                this.nationalityList = [
+                    "جۇڭگو",
+                    "جۇڭگو شياڭگاڭ",
+                    "جۇڭگو ئاۋمېن",
+                    "جۇڭگو تەيۋەن",
+                    "چەتئەل",
+                ];
+                //医保类型列表
+                this.typeOfMedicalInsuranceList = [
+                    "شاڭخەي داۋالىنىش سۇغۇرتىسى",
+                    "سىرتتىكى داۋالىنىش سۇغۇرتىسى",
+                    "ئۆزى چىقىم قىلىش",
+                ];
+                //职业列表
+                this.occupationList = [
+                    "خىزمەتچى",
+                    "ئىشچى",
+                    "مەمۇرى خادىم",
+                    "دېھقان",
+                    "دېھقان",
+                    "ھەربىي سەپتىن چېكىنگەن",
+                    "باشقا خىزمەت",
+                ];
+            }
+
+            this.setLastValue();
+        },
+        methods: {
+            setLastValue() {
+                if (this.getLocalStorge("symptom")) {
+                    this.symptom = this.getLocalStorge("symptom").split(",");
+                }
+                let arr = [
+                    "patientName", //患者姓名
+                    "nationality", //国籍
+                    "passportId", //护照号
+                    "HasSymptom", //是否有症状
+                    "otherSymptom", //其他症状
+                    "otherOccupation", //其他职业
+                    "age", //年龄
+                    "gender", //性别
+                    "height", //身高
+                    "weight", //体重
+                    "maritalStatus", //婚姻状况
+                    "birthday", //出生日期
+                    "isConceive", //怀孕状况
+                    "gestationalWeeks", //怀孕周期
+                    "occupation", //职业
+                    "contactInformation", //联系方式
+                    "FamilyMembersPhone", //家属联系方式
+                    "Registeredresidence", //籍贯 （包括省市）
+                    "province", //籍贯 （省）
+                    "city", //籍贯 （市）
+                    "address", //地址
+                    "idCard", //身份证号
+                    "typeOfMedicalInsurance", //医保类型
+                    "insurance", //商业保险
+                ];
+
+                arr.map((item) => {
+                    if (this.getLocalStorge(item)) {
+                        this[`${item}`] = this.getLocalStorge(item);
+                    }
+                });
+            },
 
             getLocalStorge(key) {
                 return window.localStorage.getItem(key);
@@ -600,7 +684,7 @@ export default {
             },
         },
         computed: {},
-};
+    };
 </script>
 
 <style lang="scss" scoped>

src/components/page6.vue

 <!--
  * @Author: ninglupeng
  * @Date: 2020-11-24 16:18:58
- * @LastEditors: wsq
- * @LastEditTime: 2022-11-04 15:59:15
+ * @LastEditors: ninglupeng
+ * @LastEditTime: 2022-11-04 16:58:20
  * @Description: 
 -->
 <template>
@@ -88,7 +88,7 @@
                     }
                 " v-model="HasPreviousHistory" direction="horizontal">
                     <van-radio :name="$t('have')">{{ $t("have") }}</van-radio>
-                    <van-radio :name="$t('noHave')">无</van-radio>
+                    <van-radio :name="$t('noHave')">{{ $t("noHave") }}</van-radio>
                 </van-radio-group>
             </template>
         </van-field>