20200213buglist修复

joe
Showing 6 changed files with 38 additions and 13 deletions
src/common/lang/en.js
src/common/lang/tc.js
src/common/lang/zh.js
src/components/clarms/clarms-plugins-material.js
src/components/clarms/clarms-plugins-material.vue
src/components/clarms/clarms-plugins-upload.vue
--- a/src/common/lang/en.js
View file @3f6327e
+++ b/src/common/lang/en.js
View file @3f6327e
@@ -64,7 +64,7 @@ module.exports = {
 			path: "/product/introduction",
 			list: [{
 				name: "VHIS",
-				path: "/vhis?p=VHIS001"
+				path: "/vhis/detail"
 			},
 			{
 				name: "Insurance with Investment Focus",
--- a/src/common/lang/tc.js
View file @3f6327e
+++ b/src/common/lang/tc.js
View file @3f6327e
@@ -65,7 +65,7 @@ module.exports = {
 				path: "/product/introduction",
 				list: [{
 					name: "自願醫保計劃",
-					path: "/vhis?p=VHIS001"
+					path: "/vhis/detail"
 				},
 				{
 					name: "投資成份保險",
@@ -866,7 +866,7 @@ module.exports = {
 			label12: "病歷資料",
 			label13: "選傳資料",
 			label14: "醫院診斷報告",
-			label15: "索償人資料",
+			label15: "索償人賬戶資料",
 			label16: "其他",
 			label17: "授權聲明：",
 			label18: "收集個人資料聲明：",
--- a/src/common/lang/zh.js
View file @3f6327e
+++ b/src/common/lang/zh.js
View file @3f6327e
@@ -64,7 +64,7 @@ module.exports = {
 			path: "/product/introduction",
 			list: [{
 				name: "自愿医保计划",
-				path: "/vhis?p=VHIS001"
+				path: "/vhis/detail"
 			},
 			{
 				name: "投资成份保险",
@@ -868,7 +868,7 @@ module.exports = {
 			label12: "病例资料",
 			label13: "选传资料",
 			label14: "医院诊断报告",
-			label15: "索偿人资料",
+			label15: "索偿人账户资料",
 			label16: "其他",
 			label17: "授权声明：",
 			label18: "收集个人资料声明：",
--- a/src/components/clarms/clarms-plugins-material.js
View file @3f6327e
+++ b/src/components/clarms/clarms-plugins-material.js
View file @3f6327e
@@ -49,7 +49,7 @@ export default {
            agress: false,
            data: {
                insuredIndex: "",
-                amount: 0,
+                amount: null,
                contactDate: "",
                // 必传资料
                HT41: null,
@@ -244,7 +244,8 @@ export default {
            var time = new Date(this.data.contactDate.replace(/\-/g, "/") + " 00:00:00").getTime();
            for (let index = 0; index < insured.policyInfoList.length; index++) {
                let policy = insured.policyInfoList[index];
-                if (policy.activeDate <= time && policy.expireDate >= time) {
+                // 有效期为生效日至满期日+60天
+                if (policy.activeDate <= time && policy.expireDate + 60 * 24 * 60 * 60 * 1000 >= time) {
                    return policy;
                }
            }
@@ -253,7 +254,29 @@ export default {
        }
    },
    watch: {
-        "data.insuredIndex": function () {
+        "data.insuredIndex": function (v, ov) {
+            this.typeSelected = [];
+            let d = {
+                insuredIndex: this.data.insuredIndex,
+                amount: null,
+                contactDate: "",
+                // 必传资料
+                HT41: null,
+                HT26: null,
+                // 非必传资料
+                HT29: null,
+                HT34: null,
+                HT16: null,
+                // 是否正在上传
+                HT41Uploading: false,
+                HT26Uploading: false,
+                HT29Uploading: false,
+                HT34Uploading: false,
+                HT16Uploading: false,
+            };
+            this.$set(this, "data", d);
            if (this.checkPolicy()) {
                this.policyIllegal = false;
            } else {
--- a/src/components/clarms/clarms-plugins-material.vue
View file @3f6327e
+++ b/src/components/clarms/clarms-plugins-material.vue
View file @3f6327e
@@ -34,7 +34,7 @@
        </div>
        <hr>
        <div class="gird-g form default-mt">
-          <div class="pure-u-1 form-item-2">
+          <div class="pure-u-1 form-item-2" v-if="data.insuredIndex">
            <div class="label">
              <div class="main-label">
                {{$t('clarms.step2.label3')}}
@@ -72,7 +72,7 @@
            </div>
          </div>
-          <div class="pure-u-1 form-item-2 mt20">
+          <div class="pure-u-1 form-item-2 mt20" v-if="typeSelected && typeSelected.length > 0">
            <div class="label">
              <div class="main-label">
                {{$t('clarms.step2.label6')}}
@@ -89,7 +89,7 @@
            </div>
          </div>
-          <div class="pure-u-1 form-item-2 mt20">
+          <div class="pure-u-1 form-item-2 mt20" v-if="data.amount && data.amount > 0">
            <div class="label">
              <div class="main-label">
                {{$t('clarms.step2.label9')}}
@@ -103,6 +103,7 @@
            </div>
          </div>
+          <template v-if="data.contactDate">
            <div class="pure-u-1 form-item-2 mt20">
              <div class="label">
                <div class="main-label">
@@ -127,8 +128,9 @@
                <clarms-upload class="mt20" :icon="require('@/assets/images/clarms/icon5.png')" :options="{name:$t('clarms.step2.label16'),imageTypeID:'HT16',imageMainTypeID:'HT03',toast:$t('clarms.step2.toast5')}" @success="uploadSuccess" @beforeUpload="beforeUpload"></clarms-upload>
              </div>
            </div>
+          </template>
        </div>
-        <hr>
+        <hr v-if="data.amount > 0">
        <div class="bottom-tip orange mt20">{{$t('clarms.step2.label17')}}</div>
        <div class="bottom-tip gray mt10">{{$t('clarms.step2.tip1')}}</div>
--- a/src/components/clarms/clarms-plugins-upload.vue
View file @3f6327e
+++ b/src/components/clarms/clarms-plugins-upload.vue
View file @3f6327e
@@ -34,7 +34,7 @@
 									Uploading{{item.tips}}
 								</div>
 								<div class="clarms-img-mask mask-bg-2" v-if="item.err" @click="removeItem(index)">
-									Uploading{{item.err}}
+									{{item.err}}
 								</div>
 							</div>
 						</div>