Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/api/inspection.js

@@ -78,6 +78,31 @@ export function editPatientPICInspection(id, data) {
 }
 
 
+export function setRemind(params) {
+  return request({
+    url: '/api/patient/inspection_remind/set',
+    method: 'get',
+    params: params
+
+  })
+}
+
+export function setRemindDialog(id,is_open) {
+  return request({
+    url: '/api/checkremind/config/commit?is_open='+is_open+"&id="+id,
+    method: 'post'
+  })
+}
+
+
+
+
+
+
+
+
+
+
 
 
 

src/views/layout/components/Sidebar/index.vue

@@ -48,7 +48,7 @@ export default {
   },
   created(){
     if(this.navTitle == '透析管理'){
-      let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index'];
+      let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis'];
       // console.log('permission_routers',this.permission_routers)
       let routerArr = [];
       this.permission_routers.map(item => {

src/xt_pages/user/inspection.vue

@@ -40,6 +40,29 @@
         </el-col>
         <el-col :span="17" v-loading="itemLoading">
           <div class="filter-container" style="float:right">
+
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="setRemindDialog()"
+              v-if="project && project.project_id != 14"
+              icon="el-icon-circle-plus-outline"
+              :disabled="project ? false : true"
+            >设置提醒弹窗
+            </el-button>
+
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="setRemind()"
+              v-if="project && project.project_id != 14"
+              icon="el-icon-circle-plus-outline"
+              :disabled="project ? false : true"
+            >设置提醒周期
+            </el-button>
+
             <el-button
               size="small"
               class="filter-item"
@@ -196,6 +219,61 @@
       </el-row>
     </div>
 
+    <el-dialog
+      :title="formTitle"
+      :visible.sync="dialogRemindFormVisible"
+      width="1000px"
+      id="user-inspection-form"
+    >
+      <el-form :model="form" ref="form" label-position="top">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="周期提醒: ">
+              <el-radio-group v-model="temp_remind_cycle">
+                <el-radio :label="1">一月一次</el-radio>
+                <el-radio :label="2">两月一次</el-radio>
+                <el-radio :label="3">三月一次</el-radio>
+                <el-radio :label="4">半年一次</el-radio>
+                <el-radio :label="5">一年一次</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogRemindFormVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="submitNewRemind()"
+        >保 存
+        </el-button
+        >
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="dialogRemindDialogFormVisible"
+      width="1000px"
+      id="user-inspection-form"
+    >
+      <el-col :span="24">
+        <p style="margin-top:20px;">是否弹窗提醒：
+          <el-switch v-model="is_open"></el-switch>
+        </p>
+      </el-col>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogRemindDialogFormVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="submitRemindDialog()"
+        >保 存
+        </el-button
+        >
+      </div>
+    </el-dialog>
+
+
+
     <el-dialog
       :title="formTitle"
       :visible.sync="dialogFormVisible"
@@ -216,7 +294,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-
           <el-col :span="7">
             <el-form-item
               label="检验日期"
@@ -390,7 +467,9 @@ import {
   DeletePatientInspection,
   EditPatientInspection,
   fetchInspectionReference,
-  fetchPatientInspections
+  fetchPatientInspections,
+  setRemind,
+  setRemindDialog
 } from '@/api/inspection'
 import { getFileExtension, uParseTime } from '@/utils/tools'
 
@@ -399,6 +478,9 @@ export default {
   components: { PatientSidebar },
   data() {
     return {
+      temp_remind_cycle:"",
+      is_open:false,
+      record_id:0,
       total: 0,
       qiniuDomain: 'https://images.shengws.com/',
       isPic:false,
@@ -414,6 +496,8 @@ export default {
       },
       itemName: '请选择项目',
       formTitle: '',
+      dialogRemindFormVisible:false,
+      dialogRemindDialogFormVisible:false,
       dialogPicFormVisible: false,
       dialogFormVisible: false,
       patient_info: null,
@@ -579,8 +663,55 @@ export default {
         })
         .catch(() => {
         })
-    },
-    openEdit() {
+    },submitRemindDialog(){
+      var temp_is_open = 0
+      if(this.is_open){
+        temp_is_open = 1
+      }else{
+        temp_is_open = 0
+      }
+      setRemindDialog(this.record_id,temp_is_open).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.record_id = response.data.data.config.id
+          if(response.data.data.config.is_open == 1){
+            this.is_open = true
+          }else{
+            this.is_open = false
+          }
+          this.$notify({
+            title: '成功',
+            message: '设置成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.dialogRemindDialogFormVisible = false
+        }
+      })
+    },submitNewRemind(){
+      // console.log(this.is_open)
+      var params = {
+        patient: this.patientID,
+        project_id: this.project.project_id,
+        remind_cycle: this.temp_remind_cycle
+      }
+      setRemind(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.$notify({
+            title: '成功',
+            message: '设置成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.dialogRemindFormVisible = false
+        }
+      })
+    }, openEdit() {
 
       if (this.project == null) {
         this.$message.error('请先选择项目')
@@ -610,7 +741,11 @@ export default {
         this.form.project_id = this.project.project_id
         this.form.inspect_date = this.itemDate
         this.form.old_inspect_date = this.itemDate
-        this.form.remind_cycle = this.patient_info.remind_cycle
+        if(this.form.project_id == 14) {
+          this.form.remind_cycle = this.patient_info.remind_cycle
+        }else{
+          this.form.remind_cycle =""
+        }
         console.log(this.form.remind_cycle)
 
         this.form.formItem = []
@@ -633,7 +768,15 @@ export default {
 
       }
 
-    }, openPic() {
+    },setRemindDialog(){
+      this.dialogRemindDialogFormVisible = true
+
+
+    },setRemind(){
+      this.dialogRemindFormVisible = true
+      // this.temp_remind_cycle = this.
+
+    },openPic() {
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false
@@ -644,7 +787,9 @@ export default {
       this.form.project_id = this.project.project_id
       this.form.imgs=[]
       this.form.delete_imgs=[]
-      this.form.remind_cycle = this.patient_info.remind_cycle
+      if(this.form.project_id == 14) {
+        this.form.remind_cycle = this.patient_info.remind_cycle
+      }
       var today = new Date()
       this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
       this.form.formItem = []
@@ -681,7 +826,10 @@ export default {
       this.form.method = 'add'
       this.formTitle = '新增' + this.project.project_name
       this.form.project_id = this.project.project_id
-      this.form.remind_cycle = this.patient_info.remind_cycle
+      if(this.form.project_id == 14) {
+        this.form.remind_cycle = this.patient_info.remind_cycle
+      }
+      // this.form.remind_cycle = this.patient_info.remind_cycle
       var today = new Date()
       this.form.inspect_date = uParseTime(today, '{y}-{m}-{d} {h}:{i}')
       this.form.formItem = []
@@ -734,8 +882,8 @@ export default {
               this.itemDate = this.form.inspect_date
               this.items = []
               var inspections = response.data.data.inspections
-             
-              
+
+
               this.inspections = response.data.data.inspections
               if (inspections == null) {
                 this.inspections = []
@@ -749,7 +897,7 @@ export default {
                 this.inspectionsMap[inspections[index].item_id] =
                   inspections[index]
               }
-             
+
               var items = this.project.inspection_reference
               console.log('itmes', items)
               for (var index in items) {
@@ -1012,12 +1160,13 @@ export default {
       fetchInspectionReference(this.patientID).then(response => {
           if (response.data.state == 1) {
             var reference = response.data.data.reference
-           
+
             var patient_info = response.data.data.patient_info
             this.projects = reference
             this.patient_info = patient_info
             this.pageLoading = false
-            this.form.remind_cycle = this.patient_info.remind_cycle
+
+            // this.form.remind_cycle = this.patient_info.remind_cycle
           } else {
             this.$message.error(response.data.msg)
             return false
@@ -1068,9 +1217,32 @@ export default {
             console.log("inspections=========",inspections)
             console.log("时间",this.project.inspection_reference)
             var obj = {created_time:0,inspect_date:0,inspect_desc:"",inspect_tips:"",inspect_type:1,inspect_value:"",item_id:11063,item_name:"",org_id:0,patient_id:"",project_id:4,project_name:"",updated_time:"",status:1}
-           
+
             this.total = response.data.data.total
             this.itemDate = response.data.data.date
+            let remind = response.data.data.remind
+
+            let config = response.data.data.config
+            this.record_id = config.id
+            if(config.id > 0){
+
+              if(config.is_open == 1){
+                this.is_open = true
+              }else{
+                this.is_open = false
+
+              }
+            }else{
+              this.is_open = false
+            }
+
+
+            if(remind.id > 0 && remind.remind_cycle > 0){
+              this.temp_remind_cycle = remind.remind_cycle
+            }else{
+              this.temp_remind_cycle = ""
+            }
+
             this.inspections = response.data.data.inspections
             if (inspections == null) {
               this.inspections = []
@@ -1079,22 +1251,22 @@ export default {
             var inspectionsMap = {}
             this.inspectionsMap = {}
             for (var index in inspections) {
-             
+
               inspectionsMap[inspections[index].item_id] = inspections[index]
               this.inspectionsMap[inspections[index].item_id] = inspections[index]
             }
-           
+
             var items = this.project.inspection_reference
-           
+
             for (var index in items) {
               var item = {}
               for (var key in items[index]) {
-               
+
                 item[key] = items[index][key]
               }
-             
+
               if (item.item_id > 0) {
-                
+
                 if (inspectionsMap[items[index].item_id] == undefined) {
                   item.value = inspectionsMap[items[index].id].inspect_value
                   item.item_name = inspectionsMap[items[index].id].item_name
@@ -1105,14 +1277,14 @@ export default {
 
                 }
               } else {
-              
+
                 item.value = inspectionsMap[items[index].id].inspect_value
                 item.item_name = inspectionsMap[items[index].id].item_name
 
               }
-              
+
               item.value_direction = ''
-           
+
               if (item.range_type == 1) {
                 var value = parseFloat(item.value)
                 var range_min = parseFloat(item.range_min)
@@ -1123,7 +1295,7 @@ export default {
                   item.value_direction = '↑'
                 }
               }
-            
+
               this.items.push(item)
               console.log("item233333333333wo",this.items)
 

src/xt_pages/user/inspectionCheck.vue

@@ -40,6 +40,16 @@
         </el-col>
         <el-col :span="17" v-loading="itemLoading">
           <div class="filter-container" style="float:right">
+            <el-button
+              size="small"
+              class="filter-item"
+              type="primary"
+              @click="setRemind()"
+              v-if="project && project.project_id != 14"
+              icon="el-icon-circle-plus-outline"
+              :disabled="project ? false : true"
+            >设置提醒周期
+            </el-button>
             <el-button
               size="small"
               class="filter-item"
@@ -280,6 +290,39 @@
         </el-button>
       </div>
     </el-dialog>
+
+    <el-dialog
+      :title="formTitle"
+      :visible.sync="dialogRemindFormVisible"
+      width="1000px"
+      id="user-inspection-form"
+    >
+      <el-form :model="form" ref="form" label-position="top">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="周期提醒: ">
+              <el-radio-group v-model="temp_remind_cycle">
+                <el-radio :label="1">一月一次</el-radio>
+                <el-radio :label="2">两月一次</el-radio>
+                <el-radio :label="3">三月一次</el-radio>
+                <el-radio :label="4">半年一次</el-radio>
+                <el-radio :label="5">一年一次</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogRemindFormVisible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="submitNewRemind()"
+        >保 存
+        </el-button
+        >
+      </div>
+    </el-dialog>
+
   </div>
 
 </template>
@@ -295,7 +338,8 @@ import {
   DeletePatientInspection,
   EditPatientInspection,
   fetchInspectionReference,
-  fetchPatientInspections
+  fetchPatientInspections,
+  setRemind
 } from '@/api/inspection'
 import { getFileExtension, uParseTime } from '@/utils/tools'
 
@@ -304,6 +348,7 @@ export default {
   components: { PatientSidebar },
   data() {
     return {
+      temp_remind_cycle:"",
       total: 0,
       check_content:"",
       qiniuDomain: 'https://images.shengws.com/',
@@ -322,6 +367,7 @@ export default {
       formTitle: '',
       dialogPicFormVisible: false,
       dialogFormVisible: false,
+      dialogRemindFormVisible:false,
       patient_info: null,
 
       form: {
@@ -411,6 +457,26 @@ export default {
       this.$message.error(err)
       this.loading.close()
       return false
+    },submitNewRemind(){
+      var params = {
+        patient: this.patientID,
+        project_id: this.project.project_id,
+        remind_cycle: this.temp_remind_cycle
+      }
+      setRemind(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.$notify({
+            title: '成功',
+            message: '设置成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.dialogRemindFormVisible = false
+        }
+      })
     },
     handleAvatarSuccess(res, file) {
       this.form.imgs.push({
@@ -539,7 +605,11 @@ export default {
 
       }
 
-    }, openPic() {
+    }, setRemind(){
+      this.dialogRemindFormVisible = true
+      // this.temp_remind_cycle = this.
+
+    },openPic() {
       if (this.project == null) {
         this.$message.error('请先选择项目')
         return false