代码合并

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = 'bcb597e9-feeb-4d76-b22c-546c9147bee0'
+                    token = '6b4cc93f-85a0-4c0c-b47c-db0411952ddd'
                 }
             }
             if (token) {

src/doctor/followUp/generalFU/form/GeneralFUForm.vue

@@ -163,37 +163,31 @@
 
             <div>
                 <div class='label-title mt-5'>下次随访日期</div>
+                <div class='mt-4'>
+                    <van-radio-group v-model="timeCycle" direction="horizontal">
+                        <van-radio name="1">一周后</van-radio>
+                        <van-radio name="2">一月后</van-radio>
+                        <van-radio name="3">三月后</van-radio>
+                    </van-radio-group>
+                </div>
                 <van-field
                     v-model='form.nextVisitDate'
                     is-link
                     readonly
                     name='nextVisitDate'
                     placeholder='下次随访日期'
-                    class='input-back mt-2 form-input'
+                    class='input-back mt-4 form-input'
                     :rules='rules.nextVisitDate'
                     @click='showDate = true' />
+
                 <van-popup v-model:show='showDate' position='bottom'>
                     <van-date-picker v-model='form._nextVisitDate'
                                      :min-date='nextVisitDateRange.min'
                                      :max-date='nextVisitDateRange.max'
                                      @confirm='dataConfirm' @cancel='showDate = false' />
                 </van-popup>
-                <!-- 快捷选项 -->
-                <van-radio-group
-                    v-model="timeCycle"
-                    shape="dot"
-                    direction="horizontal"
-                    class="w-full doc-radio-group mt-2"
-                >
-                    <van-radio
-                        v-for="item in timeCycleList"
-                        :key="item.value"
-                        :name="item.value"
-                        label-position="left"
-                    >
-                        {{ item.name }}
-                    </van-radio>
-                </van-radio-group>
+
+
             </div>
         </van-form>
 
@@ -262,12 +256,7 @@ export default {
                 min: undefined,
                 max: undefined
             },
-            timeCycle: undefined,
-            timeCycleList: [
-                { value: 1, name: '一周后' },
-                { value: 2, name: '一月后' },
-                { value: 3, name: '三月后' }
-            ]
+            timeCycle: undefined
         }
     },
     watch: {
@@ -276,6 +265,26 @@ export default {
                 this.form = this.setForm(this.info)
             },
             immediate: true
+        },
+        timeCycle(val) {
+            let today = new Date()
+            if (val == 1) {
+                let oneWeekLater = new Date(today)
+                oneWeekLater.setDate(today.getDate() + 7)
+                this.form.nextVisitDate = dayjs(oneWeekLater).format('YYYY-MM-DD')
+                // this.form._nextVisitDate = dayjs(oneWeekLater).format('YYYY-MM-DD')
+            } else if (val == 2) {
+                today.setMonth(today.getMonth() + 1)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                // this.form._nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+            } else if (val == 3) {
+                today.setMonth(today.getMonth() + 3)
+                this.form.nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+                // this.form._nextVisitDate = dayjs(today).format('YYYY-MM-DD')
+            }
+/*            if (this.modeEnumList.nextVisitDateReq) {
+                this.$refs.form.validateFields('nextVisitDate')
+            }*/
         }
     },
     computed: {

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

@@ -428,7 +428,6 @@ export default {
     watch: {
         info: {
             handler(info) {
-                debugger
                 this.form = defaultForm(info)
                 this.form.medicalDirectoryCode = this.info.medicalInsuranceCode || this.info.medicalDirectoryCode
                 if (this.form.drugName) {

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

@@ -45,8 +45,6 @@ export default {
             baseInfo: {},
             // 慢特病信息
             slowSpecialInfo: {},
-            // 结果
-            resultInfo: {}
         }
     },
     computed: {
@@ -116,14 +114,13 @@ export default {
                     query.residentsRecord = this.baseInfo
                     const func = query.id ? updateSlowSpecial : addSlowSpecial
                     func(query).then(res => {
-                        this.resultInfo = query
-                        this.store.onRefreshMark()
                         this.$router.replace({
                             path: '/doctor/patient-detail',
                             query: {
                                 residentInfoId: this.residentInfoId
                             }
                         })
+                        this.store.onRefreshMark()
                     })
                 })
             } else {

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

@@ -116,7 +116,6 @@ export default {
             this.load(false)
         },
         toDetail(record) {
-            debugger
             if (!record) return
             if (record.id == null) {
                 this.$message.info('暂时无法查看 详情信息')
@@ -130,7 +129,6 @@ export default {
             })
         },
         editBtn(record) {
-            debugger
             this.$router.push({
                 path: '/doctor/followUp/slowSpecialFU/add',
                 query: { residentInfoId: this.residentInfoId, id:record.id }