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

src/view/healthCard/punchClockDetail.vue

@@ -80,19 +80,19 @@
                 value-text-align="left"
                 :show.sync="showAddress"/>
         </div>
-        <div class="list" v-if="readOnly">
-            <div class="tip">2. 目前所在城市</div>
+        <div class="list">
+            <div class="tip">3. 详细地址</div>
             <span>{{value.sAddressFull}}</span>
         </div>
         <div class="list">
-            <div class="tip"><span style="color:red;" v-if="!readOnly">*</span>3. 是否接触过疑似或确诊的新型肺炎患者</div>
+            <div class="tip"><span style="color:red;" v-if="!readOnly">*</span>4. 是否接触过疑似或确诊的新型肺炎患者</div>
             <v-radio-group v-model="value.bTouch" :disabled="readOnly">
                 <div><v-radio :value="0" label="否"/></div>
                 <div><v-radio :value="1" label="是"/></div>
             </v-radio-group>
         </div>
         <div class="list" v-if="value.bTouch">
-            <div class="tip">4. 接触日期</div>
+            <div class="tip">5. 接触日期</div>
             <datetime
                 :disabled="readOnly"
                 title=""
@@ -103,7 +103,7 @@
                 v-model="value.dTouchDate"/>
         </div>
         <div class="list">
-            <div class="tip"><span style="color:red;" v-if="!readOnly">*</span>5. 体温</div>
+            <div class="tip"><span style="color:red;" v-if="!readOnly">*</span>6. 体温</div>
             <xInput
                 title=""
                 :disabled="readOnly"
@@ -112,32 +112,32 @@
                 type="number" />
         </div>
         <div class="list">
-            <div class="tip">4. 是否自我隔离</div>
+            <div class="tip">7. 是否自我隔离</div>
             <v-radio-group v-model="value.bQuarantine" :disabled="readOnly">
                 <div><v-radio :value="0" label="否"/></div>
                 <div><v-radio :value="1" label="是"/></div>
             </v-radio-group>
         </div>
         <div class="list">
-            <div class="tip">5. 是否就医</div>
+            <div class="tip">8. 是否就医</div>
             <v-radio-group v-model="value.bHospital" :disabled="readOnly">
                 <div><v-radio :value="0" label="否"/></div>
                 <div><v-radio :value="1" label="是"/></div>
             </v-radio-group>
         </div>
         <div class="list">
-            <div class="tip"><span style="color:red;" v-if="!readOnly">*</span>6. 是否去过疫区(湖北,武汉)</div>
+            <div class="tip"><span style="color:red;" v-if="!readOnly">*</span>9. 是否去过疫区(湖北,武汉)</div>
             <v-radio-group v-model="value.bHaveBeen" :disabled="readOnly">
                 <div><v-radio :value="0" label="否"/></div>
                 <div><v-radio :value="1" label="是"/></div>
             </v-radio-group>
         </div>
         <div class="list">
-            <div class="tip">7. 出行明细</div>
+            <div class="tip">10. 出行明细</div>
             <textarea :placeholder="readOnly ? '' : '请输入'" :disabled="readOnly" autoHeight="true" v-model="value.sHaveBeenDetail"/>
         </div>
         <div class="list">
-            <div class="tip">8. 其他情况</div>
+            <div class="tip">11. 其他情况</div>
             <textarea :placeholder="readOnly ? '' : '请输入'" :disabled="readOnly" autoHeight="true" v-model="value.sRemark"/>
         </div>
         <button @click="upData" v-if="!readOnly">提交</button>