Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

src/components/iframePage/IframePage.vue

@@ -37,7 +37,6 @@ export default {
     watch: {
         src: {
             handler() {
-                debugger
                 this.load()
             },
             immediate: true

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = 'c7bd708b-d0a2-467d-a506-91544d5186fc'
+                    token = '8ae0fcf4-068a-4b1c-9344-a5bef4f1030d'
                 }
             }
             if (token) {

src/doctor/followUp/slowSpecialFU/form/FormCont.vue

@@ -4,8 +4,7 @@
             <div class='font-semibold'>随访信息</div>
             <div class='doc-form-label'>医保目录代码</div>
             <van-field :modelValue='form.medicalDirectoryCode'
-                       name='currentAge'
-                       type='digit'
+                       name='medicalDirectoryCode'
                        placeholder='请输入医保目录代码'
                        readonly
             >
@@ -429,8 +428,9 @@ export default {
     watch: {
         info: {
             handler(info) {
+                debugger
                 this.form = defaultForm(info)
-                this.form.medicalDirectoryCode = this.info.medicalInsuranceCode
+                this.form.medicalDirectoryCode = this.info.medicalInsuranceCode || this.info.medicalDirectoryCode
                 if (this.form.drugName) {
                     let list = []
                     this.form.drugName.split(",").forEach(item => {

src/doctor/followUp/slowSpecialFU/form/Index.vue

@@ -88,7 +88,6 @@ export default {
                 this.baseInfo = this.slowSpecialInfo.residentsRecord
             } else {
                 if (this.residentInfoId) {
-                    debugger
                     let res = await getChronicResidentsId(this.residentInfoId)
                     this.baseInfo = res.data || {}
                     this.slowSpecialInfo.residentInfoId = this.residentInfoId

src/doctor/patientDetail/components/slowSpecialVisit/List.vue

@@ -43,10 +43,10 @@
                         </div>
                         <div class="divider"></div>
                         <div class="bt-group">
-                            <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
-                            <van-button round size="small" class="doc-btn-primary" @click="editBtn(item)"
+                            <van-button round size="small" class="doc-btn-primary" @click.stop="toDetail(item)">详情</van-button>
+                            <van-button round size="small" class="doc-btn-primary" @click.stop="editBtn(item)"
                                         v-if="item.allowUpdate == 1">修改</van-button>
-                            <van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
+                            <van-button round size="small" class="doc-btn-red" @click.stop="delBtn(item)"
                                         v-if="item.allowDelete ==1">删除</van-button>
                         </div>
                     </div>
@@ -116,6 +116,7 @@ export default {
             this.load(false)
         },
         toDetail(record) {
+            debugger
             if (!record) return
             if (record.id == null) {
                 this.$message.info('暂时无法查看 详情信息')
@@ -129,6 +130,7 @@ export default {
             })
         },
         editBtn(record) {
+            debugger
             this.$router.push({
                 path: '/doctor/followUp/slowSpecialFU/add',
                 query: { residentInfoId: this.residentInfoId, id:record.id }