Merge branch 'master' of ssh://47.110.145.204:2222/godwithdh/wx_h5

src/view/healthCard/punchClockDetail.vue

@@ -134,30 +134,37 @@
         </div>
         <div class="list">
             <div class="tip">9. 出行明细</div>
-            <textarea :placeholder="readOnly ? '' : '请输入'" :disabled="status==2" autoHeight="true" v-model="value.sHaveBeenDetail"/>
+            <textarea :placeholder="status==2 ? '' : '请输入'" :disabled="status==2" autoHeight="true" v-model="value.sHaveBeenDetail"/>
         </div>
         <div class="list">
             <div class="tip">10. 其他情况</div>
-            <textarea :placeholder="readOnly ? '' : '请输入'" :disabled="status==2" autoHeight="true" v-model="value.sRemark"/>
+            <textarea :placeholder="status==2 ? '' : '请输入'" :disabled="status==2" autoHeight="true" v-model="value.sRemark"/>
         </div>
-        <button @click="upData" v-if="status!=2">{{!status?'提交':'修改'}}</button>
+        <button @click="upData" v-if="status!=2">{{btnName}}</button>
+
+        <confirm v-model="isShowConfirm"
+            title="提示"
+            @on-confirm="onConfirm">
+            <p style="text-align:center;">{{status==1?'修改数据会覆盖原来的数据':'补卡后不能再修改'}},是否继续?</p>
+        </confirm>
     </div>
 </template>
 
 <script>
 import util from "@/libs/util.js"
 import {mapState} from 'vuex';
-import { XAddress,ChinaAddressV4Data,Datetime,XInput } from 'vux'
+import { XAddress,ChinaAddressV4Data,Datetime,XInput,Confirm } from 'vux'
 
 export default {
     name: 'punchClockDetail',
-    components:{XAddress,Datetime,XInput},
+    components:{XAddress,Datetime,XInput,Confirm},
     data () {
         return {
             address:[],
             addressData:ChinaAddressV4Data,
             showAddress:false,
             isShowDate:false,
+            isShowConfirm:false,
             value:{
                 iEmploeeId:"",      //员工主键
                 dCheckDate:"",      //打卡日期
@@ -176,32 +183,33 @@ export default {
                 sCreateAppid:"",    //openID
                 iStatus:1,
             },
-            status:0,//0 新增,1 修改,2 只读
-            readOnly:false,//是否只读
+            status:0,//0 新增,1 修改,2 只读,3 补卡
         }
     },
     computed:{
         ...mapState({
             hdr:state => state.healthStatistics.hdr,
-        })
+        }),
+        btnName(){
+            if(this.status==0)return "新增";
+            else if(this.status==1)return "修改";
+            else return "补卡"
+        }
     },
     async activated(){
-        this.status = this.$route.query.readOnly == 'true' ? 2 : 0;
-        if(this.$route.query.readOnly == 'true'){
-            this.status=2
-            var date=new Date(Number(this.$route.query.dDate))
-            if(util.dateFormat(date,"yyyy-MM-dd")==util.dateFormat(new Date(),"yyyy-MM-dd")){
-                this.status=1
-            }
-        }
+        this.status = parseInt(this.$route.query.readOnly)||0
+
         this.value.sCreateAppid=this.$route.params.openId
-        if(this.status>0){
+        if(/^1$|^2$/.test(this.status)){
             await this.getHealthDate();
         }else{
             this.value.iEmploeeId=this.$route.params.id
             this.value.sAddressFull=this.$route.params.address
         }
         this.value.dCheckDate=this.value.tCreateTime=util.dateFormat(new Date(),"yyyy-MM-dd hh:mm:ss")
+        if(this.status==3){
+            this.value.dCheckDate=util.dateFormat(new Date(Number(this.$route.query.dDate)),"yyyy-MM-dd")
+        }
     },
     methods:{
         async getHealthDate(){
@@ -241,19 +249,29 @@ export default {
         onShadowChange(e){
             console.log(e)
         },
-        async upData(){//保存数据
+        upData(){//保存数据
             if(this.checkData()){
-                this.value.iStatus=this.status>0?2:1
-                var value=await this.request("saveHealth",{
-                    data:this.value,
-                },"加载中",{})
-                if(/^\d+$/.test(value)){
-                    wx.miniProgram.navigateBack()
+                if(this.status>0){
+                    this.isShowConfirm=true
                 }else{
-                    this.$vux.toast.text(this.status>0?'修改失败!':'保存失败!', 'middle');
+                    this.saveData()
                 }
             }
         },
+        onConfirm(){
+            this.saveData()
+        },
+        async saveData(){
+            this.value.iStatus=this.status==1?2:1
+            var value=await this.request("saveHealth",{
+                data:this.value,
+            },"加载中",{})
+            if(/^\d+$/.test(value)){
+                wx.miniProgram.navigateBack()
+            }else{
+                this.$vux.toast.text(this.status==0?'保存':(this.status==1?'修改':'补卡')+'失败!', 'middle');
+            }
+        },
         checkData(){
             if(!this.value.sStatus){
                 this.$vux.toast.text('健康状态必填!', 'middle');

src/view/healthCard/statistics/chart.vue

@@ -537,7 +537,7 @@ export default {
         this.$router.push({name:'healthCardStatisticsList',params:{type:type}});
     },
     routerToPunchClockDetail(item){
-        this.$router.push({name:'punchClockDetail',params:{id:'1',address:'1',openId:item.sCreateAppid},query:{readOnly:'true',dDate:new Date(Util.dateFormat(this.hdr.dDate,'yyyy-MM-dd')).getTime()}})
+        this.$router.push({name:'punchClockDetail',params:{id:'1',address:'1',openId:item.sCreateAppid},query:{readOnly:'2',dDate:new Date(Util.dateFormat(this.hdr.dDate,'yyyy-MM-dd')).getTime()}})
     }
   }
 }