Merge branch 'master' of http://47.110.145.204:8085/godwithdh/wx_h5

src/App.vue

 <template>
   <div id="app">
     <v-app>
-      <keep-alive>
+      <keep-alive >
         <router-view v-wechat-title="$route.meta.title"/>
       </keep-alive>
     </v-app>

src/router/health.js

@@ -96,7 +96,7 @@ module.exports = [
                 meta:{
                     title: '返程统计',
                     showTabbar:true,
-                    activeTab:1
+                    activeTab:2
                 }
             },
         ]

src/view/healthCard/index.vue

@@ -25,7 +25,7 @@
     <div class="vApp">
       <div class="keepAlive">
         <keep-alive>
-          <router-view></router-view>
+          <router-view ></router-view>
         </keep-alive>
       </div>
       <div class="TABBAR" v-if="showTabbar">
@@ -147,6 +147,7 @@ export default {
       if(result && result.length > 0){
         result[0].iEmploeeId = result[0].iIden;
         result[0].openId = result[0].sCreateAppid;
+        result[0].bBackFromother = result[0].bBackFromother ? 'true' : 'false';
         this.$store.dispatch('saveHealthBaseData',result[0]);
       }
     }

src/view/healthCard/returnTrack/index.vue

@@ -149,24 +149,24 @@
 </style>
 <template>
     <div id="healthCardReturnTrack">
-        <div class="editArea" v-if="showEditArea">
+        <div class="editArea" v-if="showEditArea && !readOnly">
             <i class='iconfont icon-banben'></i>
             <span>表单已填写</span>
             <div class="editBtn">
                 <span @click="edit">我要修改</span>
             </div>
         </div>
-        <div class="iCard" :style="{'margin-bottom':'10px','margin-top':showEditArea ? '0' : '8px'}">
+        <div class="iCard" :style="{'margin-bottom':'10px','margin-top':showEditArea && !readOnly ? '0' : '8px'}">
             <div class="list">
                 <div class="tip">1. 是否从其他城市返回<span style="color:red;">*</span></div>
-                <v-radio-group v-model="baseData.bBackFromother" :disabled="!!baseData.bBackFromother" @change="changeRadio">
-                    <div style="margin-bottom:10px;"><v-radio value="1" label="从其他城市返回"/></div>
-                    <div><v-radio value="0" label="一直在工作地，无需返程"/></div>
+                <v-radio-group v-model="baseData.bBackFromother" :disabled="baseData.bBackFromother == 'true' ? (showEditArea || submitForm.length > 0) : showEditArea" @change="changeRadio">
+                    <div style="margin-bottom:10px;"><v-radio value="true" label="从其他城市返回"/></div>
+                    <div><v-radio value="false" label="一直在工作地，无需返程"/></div>
                 </v-radio-group>
             </div>
         </div>
         <div class="CONTENT" v-if="baseData.bBackFromother">
-            <div v-for="(item,index) in filterSubmitForm" :key="index" >
+            <div v-for="(item,index) in submitForm" :key="index" >
                 <div class="deleteArea">
                     <span style="color:#3399ff;">返回统计（{{index + 1}}）</span>
                     <span style="color:#ff6600;" @click="del(index)"  v-if="!showEditArea">删除</span>
@@ -242,7 +242,7 @@
                     </div>
                 </div>
             </div>
-            <div class="addBtn" @click="add" v-if="!showEditArea">
+            <div class="addBtn" @click="add" v-if="!showEditArea && baseData.bBackFromother == 'true'">
                 <i class='iconfont icon-jia1'></i>
             </div>
         </div>
@@ -279,33 +279,70 @@ export default {
             submitForm:[],
             isDisabled:false,
             isOtherCityReturn:'',
-            list:list()
+            list:list(),
+            baseData:{},
+            readOnly:false
         }
     },
     computed:{
         ...mapState({
-            baseData:state => state.healthStatistics.baseData,
-        }),
-        filterSubmitForm(){
-            return this.submitForm.filter(x=>x.iStatus != 3);
-        }
+
+        })
     },
     async activated(){
+        if (window.history && window.history.pushState) {
+            // 往历史记录里面添加一条新的当前页面的url
+            history.pushState(null, null, document.URL);
+            // 给 popstate 绑定一个方法 监听页面刷新
+            window.addEventListener('popstate', this.backChange, false);//false阻止默认事件
+        }
         window.d = this;
         this.$store.dispatch('saveHealthStatisticsOpen',this.$route.query.openId);
+        if(this.$route.query.hasOwnProperty('readOnly')){
+            this.readOnly = this.$route.query.readOnly;
+        }else{
+            this.readOnly = false;
+        }
+        await this.getHealthcompany();
         await this.getHealthData();
     },
     methods:{
+        async getHealthcompany(){
+            let result = await this.request('getHealthcompany',{
+                data:[
+                    {key: "url", value: "check_bhavecompany"},
+                    {key: "openid", value: this.$route.query.openId}
+                ]
+            })
+            if(result && result.length > 0){
+                result[0].iEmploeeId = result[0].iIden;
+                result[0].openId = result[0].sCreateAppid;
+                result[0].bBackFromother = result[0].bBackFromother ? 'true' : 'false';
+                this.baseData = result[0];
+            }
+        },
+        backChange() {
+            const that = this;
+            wx.miniProgram.switchTab({
+                url:'/pages/home'
+            })
+        },
         changeRadio(e){
             let data = util.deepClone(this.baseData);
             this.request('saveHealthemploee',{
                 data:{
                     iIden:data.iIden,
                     iStatus:2,
-                    bBackFromother:e == '1' ? true : false
+                    bBackFromother:e == 'true' ? true : false
                 }
             }).then(res=>{
                 data.bBackFromother = e;
+                if(e == 'true'){
+                    let data = list();
+                    data.iCompanyId = this.baseData.iCompanyId;
+                    data.iEmploeeId = this.baseData.iEmploeeId;
+                    this.submitForm.push(data);
+                }
                 this.$store.dispatch('saveHealthBaseData',data);
             })
         },
@@ -313,7 +350,7 @@ export default {
             let res = await this.request('getHealthbacklog',{
                 data:[
                     {key:'url',value:'HealthBackLog'},
-                    {key:'iEmploeeId',value: this.$route.params.iEmploeeId},
+                    {key:'iEmploeeId',value: this.baseData.iEmploeeId},
                 ],
                 params:{},
             },'加载中',{});
@@ -327,17 +364,19 @@ export default {
                     this.isDisabled = true;
                     this.showEditArea = true;
                 }else{
-                    let data = list();
-                    data.iCompanyId = this.$route.params.iCompanyId;
-                    data.iEmploeeId = this.$route.params.iEmploeeId;
-                    this.submitForm.push(data);
+                    if(this.baseData.bBackFromother == 'true'){
+                        let data = list();
+                        data.iCompanyId = this.baseData.iCompanyId;
+                        data.iEmploeeId = this.baseData.iEmploeeId;
+                        this.submitForm.push(data);
+                    }
                 }
             }
         },
         add(){
             let data = list();
-            data.iCompanyId = this.$route.params.iCompanyId;
-            data.iEmploeeId = this.$route.params.iEmploeeId;
+            data.iCompanyId = this.baseData.iCompanyId;
+            data.iEmploeeId = this.baseData.iEmploeeId;
             this.submitForm.push(data);
         },
         edit(){
@@ -369,13 +408,19 @@ export default {
         del(index){
             this.$vux.confirm.show({
                 title:"提示",
-                content:'是否删除？',
+                content:'该数据将永久删除，是否删除？',
                 showCancelButton:true,
-                onConfirm :()=> {
+                onConfirm :async ()=> {
                     if(this.submitForm[index].iStatus == 1){
                         this.submitForm.splice(index,1);
                     }else if(this.submitForm[index].iStatus == 2){
-                        this.submitForm[index].iStatus = 3;
+                        let res = await this.request('saveHealthbacklog',{
+                            data:[Object.assign(this.submitForm[index],{iStatus:3})],
+                            params:{},
+                        },'加载中',{});
+                        if(res.iStatus == 1){
+                            this.submitForm.splice(index,1);
+                        }
                     }
                 },
                 onCancel () {}
@@ -411,5 +456,8 @@ export default {
             return true;
         }
     },
+    deactivated(){
+        window.removeEventListener('popstate', this.backChange, false);//false阻止默认事件
+    }
 }
 </script>
\ No newline at end of file