Merge remote-tracking branch 'remotes/origin/dev' into dev_lyj

# Conflicts:
#	src/views/audit-qualitycontrol/index.vue

src/api/dataoverview.js

@@ -5,7 +5,7 @@ import request from "@/utils/request"
 // 累计上报
 export function getPatientPage(params = {}) {
   return request({
-    url: "/disease-data/data/patient/page",
+    url: "/disease-data/data/report/page",
     method: "get",
     params,
   })

src/api/screeningAudit.js

+import request from "@/utils/request"
+
+/**
+ * 筛查审核
+ *
+ *  */
+///////////////筛查质控/////////////////////
+//筛查已审核列表
+export function getScreeningCheck(params = {}) {
+  return request({
+    url: "/disease-data/dataCheck/screening/check",
+    method: "get",
+    params,
+  })
+}
+//筛查待审核列表
+export function getScreeningUncheck(params = {}) {
+  return request({
+    url: "/disease-data/dataCheck/screening/unCheck",
+    method: "get",
+    params,
+  })
+}
+
+//筛查病例待审核(用户)
+export function getScreeningUser(id) {
+  return request({
+    url: `/disease-data/dataCheck/screening/unCheck/detail/${id}`,
+    method: "get",
+  })
+}
+//筛查病例审核
+export function putScreeningCheck(data = {}) {
+  return request({
+    url: "/disease-data/dataCheck/screening/uncheck",
+    method: "put",
+    data,
+  })
+}
+// 获取意见标签
+export function getSysCheckNote() {
+  return request({
+    url: "/disease-data/sysCheckNote",
+    method: "get",
+  })
+}
+// 删除意见标签
+export function saveSysCheckNote(data = {}) {
+  return request({
+    url: "/disease-data/sysCheckNote",
+    method: "post",
+    data,
+  })
+}
+
+// //修改筛查病例审核意见
+// export function putFollowCheckAdvice(data = {}) {
+//   return request({
+//     url: "/disease-data/dataCheck/follow/check/advice",
+//     method: "put",
+//     data,
+//   })
+// }

src/components/FormComponents/CustomForm/FormItemSelf.vue

@@ -53,7 +53,7 @@
               <form-item-text
                 :item="item"
                 :form="form"
-                :unionList="unionList"
+                :union-list="unionList"
               ></form-item-text>
             </template>
             <!-- 可输入 -->
@@ -279,7 +279,7 @@
                 @change="handleChange"
               ></el-time-picker>
               <!-- 日期 -->
-              <div class="flex" v-else-if="item.type === 'date'">
+              <div v-else-if="item.type === 'date'" class="flex">
                 <el-date-picker
                   v-model="form[item.prop]"
                   :placeholder="item.placeholder ? item.placeholder : '请选择'"
@@ -419,7 +419,9 @@ export default {
       default: false,
     },
     vwForm: {},
-    formId: {},
+    formId: {
+      default: () => "",
+    },
     getPatientId: {
       type: Function,
       default: () => {},
@@ -447,7 +449,6 @@ export default {
     columns: Array,
     columnIndex: Number,
     group: Array,
-    type: String,
   },
   data() {
     return {
@@ -486,20 +487,39 @@ export default {
     this.timerangeReset()
     this.numberReset()
     this.checkboxReset()
+    //! 处理医联体名称，新增直接请求，其他等union_id后再请求
     if (this.item.prop == "union_id") {
+      this.unionList = []
+      // this.getMedicalunionList()
+      if (this.$route.path == "/screening/add") {
+        this.getMedicalunionList()
+      } else {
+        this.$watch(
+          () => this.form[this.item.prop],
+          (newVal, oldVal) => {
+            // console.log("----------有值----------")
             this.getMedicalunionList()
+            // 做点什么
+          }
+        )
+      }
     }
   },
   mounted() {
     this.showFormItem()
   },
+  beforeDestroy() {
+    this.$watch(
+      () => this.form[this.item.prop],
+      (newVal, oldVal) => {}
+    )
+  },
   methods: {
     // 获取医联体列表
     getMedicalunionList() {
       getMedicalunionList().then((res) => {
-        console.log(res)
         if (res.code == 1) {
-          this.unionList = res.data
+          this.unionList = [...res.data]
         } else {
           this.unionList = []
         }
@@ -705,13 +725,16 @@ export default {
                 targetItem = group.find((_) => _.prop === key)
               }
               if (!targetItem) return
-              const values = dyMap[key]
               let display = false
+
+              const values = dyMap[key]
+
               if (Array.isArray(val)) {
                 display = values.filter((v) => val.includes(v)).length > 0
               } else {
-                display = values.includes(val)
+                display = values.includes(val + "")
               }
+
               //! 胃上皮瘤变（高级别）胃癌和进展性胃癌控制显隐+自定义规则
               if (
                 prop == "early_gastric_cancer" ||
@@ -734,7 +757,7 @@ export default {
                       : (flag = false)
                   }
                 }
-                console.log(flag, targetItem)
+                // console.log(flag, targetItem)
                 display = flag
                 if (display) {
                   targetItem.rules = [
@@ -764,7 +787,7 @@ export default {
                   this.$set(this.form, "$_hidden" + targetItem.prop, !display)
                 }, 200)
               } else {
-                // ! 设置每个表单中每项显隐的rules
+                // ! 设置每个表单中每项的rules
 
                 if (!filterArr.includes(targetItem.prop)) {
                   if (targetItem.rules && Boolean(display)) {
@@ -788,18 +811,18 @@ export default {
                   }
                 }
 
-                // !设置大表单里的每个小表单显隐rules
+                // !设置大表单里的每个小表单rules
                 if (targetItem.prop == "1669874397313_56690") {
+                  console.log(display)
                   // !只能写死，当前情况下，定义一个字段用来缓存是否回显，根据val
                   // if (val == 0) {
                   // this.showChildren = false
-
                   targetItem.column.forEach((e, index) => {
                     // 去除esd报告
                     if (e.prop == "esd_path") {
                       return
                     }
-                    console.log(e.label, ":", e.rules)
+                    // console.log(e.label, ":", e.rules)
                     if (e.rules && val == 0) {
                       targetItem.column[index].rules = []
                     } else if (e.rules && val == 1) {

src/components/FormComponents/CustomForm/FormItemText.vue

@@ -78,7 +78,7 @@ export default {
   watch: {
     unionList(v) {
       if (v.length > 0 && this.form[this.item.prop]) {
-        console.log()
+        // console.log("获取到了医联体列表", this.form[this.item.prop])
         this.unionName = v.filter(
           (e) => e.unionNo == this.form[this.item.prop]
         )[0].unionName

src/components/FormComponents/CustomForm/index.vue

@@ -177,6 +177,7 @@ export default {
   watch: {
     formEdit: {
       handler() {
+        // console.log("configforms:", this.formEdit)
         this.initfields(this.formEdit)
       },
     },

src/components/Upload/index.vue

@@ -124,7 +124,7 @@ export default {
   watch: {
     value: {
       handler(newValue, oldValue) {
-        console.log(this.value)
+        // console.log(this.value)
         if (newValue === oldValue) return
         this.fileList = newValue.map((_) => {
           return {

src/utils/request.js

@@ -126,7 +126,7 @@ service.interceptors.response.use(
       store.dispatch("user/resetAccessToken").then(() => {
         // location.reload()
         router.push({
-          path: "/login",
+          path: "/home",
         })
       })
       return Promise.reject(error)

src/views/Home/index.vue

@@ -6,21 +6,21 @@
       </div>
       <!-- 新闻会议tab -->
       <div class="right box tabbox videoboxs">
-        <el-tabs v-model="curTab">
+        <el-tabs v-model="curTab" @tab-click="handleClick">
           <el-tab-pane
             v-for="(e, index) in tabList"
             :key="index"
             :label="e.title"
-            :name="e.title"
+            :name="index + 1 + ''"
           >
             <ul class="tabslist">
               <li v-for="(item, index) in noticeList" :key="index">
                 <div class="left">
                   <div class="circle"></div>
-                  {{ item.title }}
+                  {{ item.articleTitle }}
                 </div>
                 <div class="right">
-                  {{ item.date }}
+                  {{ item.createTime }}
                 </div>
               </li>
             </ul>
@@ -43,7 +43,7 @@
               :label="e.title"
               :name="e.title"
             >
-              <ul class="tabslist" style="height: 380px">
+              <ul class="tabslist" style="height: 380px" :loading="listLoading">
                 <li v-for="(item, index) in exampleList" :key="index">
                   <div class="left">
                     <div class="circle"></div>
@@ -192,6 +192,7 @@
 </template>
 <script>
 import { getRankTotal, getCurrentQuarter } from "@/api/Home"
+import { articleList } from "@/api/operation-management"
 export default {
   data() {
     return {
@@ -245,30 +246,6 @@ export default {
           title: "典型案例小标题典型案例小标题",
           date: "2022-09-26",
         },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
       ],
       tabList: [
         {
@@ -322,12 +299,9 @@ export default {
           title: "典型案例小标题典型案例小标题",
           date: "2022-09-26",
         },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
       ],
-      curTab: "新闻会议",
+      curTab: "1",
+      listLoading: false,
       rangeList: [], // 上报排名
       curQuarterList: [], //当前季度排名
       typeList: [
@@ -373,6 +347,9 @@ export default {
       showFixed: false,
     }
   },
+  created() {
+    this.getArticleList("1")
+  },
   mounted() {
     this.getRankTotal()
     this.getCurrentQuarter()
@@ -392,6 +369,29 @@ export default {
     })
   },
   methods: {
+    handleClick() {
+      this.getArticleList(this.curTab)
+    },
+    // 获取新闻会议tab的数据
+    getArticleList(moduleType) {
+      this.listLoading = true
+      let params = {
+        size: 10,
+        current: 1,
+        moduleType: moduleType,
+      }
+      articleList(params)
+        .then((res) => {
+          if (res.code == 1) {
+            if (["1", "2", "3"].includes(moduleType)) {
+              this.noticeList = [...res.data.records]
+            }
+          }
+        })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
     getRankTotal() {
       getRankTotal().then((res) => {
         if (res.code == 1) {
@@ -421,9 +421,11 @@ export default {
       height: 100%;
       // background: blue;
       background: #fff;
+
       .video {
         width: 100%;
-        height: 400px;
+        border-radius: 5px;
+        height: 420px;
         object-fit: fill;
       }
     }
@@ -432,12 +434,15 @@ export default {
       border-radius: 8px;
       overflow: hidden;
       .tabslist {
-        height: 332px;
+        height: 352px;
         padding-right: 8px;
         overflow: hidden;
-        &:hover {
-          overflow: overlay;
-        }
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        // &:hover {
+        // overflow: overlay;
+        // }
 
         li {
           display: flex;

src/views/audit-detail/components/screenReview.vue

 <template>
+  <!-- 组件 -->
   <div>
     <el-container v-loading="fromLoading">
       <el-main class="transition-box">
-        <el-empty v-if="!isEmpty" description="暂无数据"></el-empty>
-        <template v-if="isEmpty">
+        <el-empty v-if="!isEmpty && noData" description="暂无数据"></el-empty>
+        <template v-if="isEmpty && !noData">
           <div ref="my-form" class="my-form">
+            <template v-for="(item, index) in jsonList">
               <custom-form
+                :key="index"
                 ref="customForm"
                 class="mb-20"
-              :options="jsonList[1]"
-              :form-edit="form"
-            ></custom-form>
-            <custom-form
-              ref="form"
-              :options="jsonList[2]"
-              class="mb-20"
-              :form-edit="form"
-            ></custom-form>
-            <custom-form
-              ref="form"
-              :options="jsonList[3]"
-              class="mb-20"
-              :form-edit="form"
-            ></custom-form>
-            <custom-form
-              ref="form"
-              class="mb-20"
-              :options="jsonList[4]"
-              :form-edit="form"
-            ></custom-form>
+                :options="item"
+                :form-edit="formList"
+              ></custom-form
+            ></template>
           </div>
         </template>
       </el-main>
@@ -55,20 +41,21 @@ import { mapGetters } from "vuex"
 import CustomForm from "@/components/FormComponents/CustomForm/index"
 import { getCurrentFormByType } from "@/api/coop-group.js"
 import { getFormDetail } from "@/api/field"
+import { getPatientDetail } from "@/api/patient.js"
 export default {
+  nameL: "组件",
   components: { CustomForm },
+  props: {
+    patientId: String,
+    noData: Boolean,
+  },
   data() {
     return {
-      fromLoading: true,
+      fromLoading: false,
       formTabs: [],
       formTabsList: [],
       jsonList: [],
-      form: {
-        name: "123",
-        phone: "18712412341",
-        age: "18",
-        is_continue_follow: "1",
-      },
+      formList: {},
       asideShow: true,
       screenList: [
         {
@@ -95,12 +82,30 @@ export default {
       return this.asideShow ? "200px" : "0px"
     },
   },
-  watch: {},
-  created() {
+  watch: {
+    patientId(v) {
       this.getCurrentFormByType()
     },
+  },
+  created() {},
   mounted() {},
   methods: {
+    // 获取当前用户的表单
+    getPatientDetail() {
+      console.log(this.formTabs)
+      for (let i = 0; i < this.formTabs.length; i++) {
+        getPatientDetail({
+          patientId: this.patientId,
+          formId: this.formTabs[i].formId,
+        }).then((res) => {
+          if (res.code == 1) {
+            const { data } = res.data
+            this.formList = { ...this.formList, ...data }
+            // console.log(this.formList)
+          }
+        })
+      }
+    },
     getCurrentFormByType(type = 1) {
       this.fromLoading = true
       getCurrentFormByType({
@@ -112,11 +117,11 @@ export default {
             const formTabs = []
             this.formTabsList = res.data.map((item, index) => {
               if (index === 0) {
-                formTabs.push({
-                  silent: false,
-                  ...item,
-                  label: item.tabName,
-                })
+                // formTabs.push({
+                //   silent: false,
+                //   ...item,
+                //   label: item.tabName,
+                // })
               } else {
                 formTabs.push({
                   id: item.id,
@@ -152,17 +157,24 @@ export default {
             obj.closeBtn = true
             obj.detail = true
             this.jsonList.push(obj)
-            if (i == 4) {
-              console.log(this.jsonList)
+            if (i == this.formTabs.length - 1) {
+              // console.log(this.jsonList)
               this.fromLoading = false
             }
           }
         })
         .finally(() => {
+          // console.log(this.formTabs)
           if (i < this.formTabs.length - 1) {
             i++
             this.initForm(i)
           }
+          // console.log(this.jsonList)
+          if (this.jsonList.length == this.formTabs.length) {
+            this.$nextTick(() => {
+              this.getPatientDetail()
+            })
+          }
         })
     },
   },

src/views/audit-qualitycontrol/index.vue

@@ -36,20 +36,22 @@
   </div>
 </template>
 <script>
-import CustomsTable from "@/components/CustomsTable"
+// import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
-import { getFollowCheck,getFollowUncheck } from "@/api/followup"
+import { getFollowCheck, getFollowUncheck } from "@/api/followup"
+import { getScreeningCheck, getScreeningUncheck } from "@/api/screeningAudit"
 export default {
   components: {
-    CustomsTable,
+    // CustomsTable,
   },
   mixins: [paginationMixin],
   data() {
     return {
-      type: "0",
-      auditStatus: "0",
+      type: "", // 0是筛查   1是随访
+      auditStatus: "", // 0 待审核  1 已审核
       listLoading: false,
       tableData: [
+<<<<<<< HEAD
         {
           "unionName": "合肥高新附院",
           "unionId": "2",
@@ -57,22 +59,31 @@ export default {
           "unCheckNums": 7,
           "checkNums": 0
         }
+=======
+        // {
+        //   unionId: "2",
+        //   unionName: "合肥高新附院",
+        //   unCheckNums: 2,
+        //   checkNums: 0,
+        //   reportTime: "2022-12-09 09:12:35",
+        // },
+>>>>>>> remotes/origin/dev
       ],
     }
   },
   watch: {
     auditStatus(val) {
-      sessionStorage.setItem('audit-status',val)
+      sessionStorage.setItem("audit-status", val)
       switch (this.type) {
         case "1":
           this.handleSearch()
           break
       }
-      console.log('status',val)
+      console.log("status", val)
     },
     type(val) {
-      console.log('type',val)
-      sessionStorage.setItem('audit-type',val)
+      console.log("type", val)
+      sessionStorage.setItem("audit-type", val)
       switch (val) {
         case "1":
           this.handleSearch()
@@ -80,8 +91,8 @@ export default {
       }
     },
   },
-  computed:{
-    columns(){
+  computed: {
+    columns() {
       const unCkeckColumns = [
         {
           label: "医联体",
@@ -152,7 +163,20 @@ export default {
         {
           label: "审核状态",
           minWidth: 120,
-          value: "unCheckNums",
+          value: "checkStatus",
+          formatter: (row) => {
+            let text = ""
+            if (row.checkStatus == 3) {
+              text = "合格"
+            } else if (row.checkStatus == 4) {
+              text = "不合格"
+            } else if (row.checkStatus == 5) {
+              text = "驳回修改"
+            } else if (row.checkStatus) {
+              text = "--"
+            }
+            return text
+          },
         },
         {
           label: "上报时间",
@@ -173,17 +197,18 @@ export default {
           ],
         },
       ]
-      return this.auditStatus == "1" ? checkColumns:unCkeckColumns
-    }
+      return this.auditStatus == "1" ? checkColumns : unCkeckColumns
+    },
   },
   mounted() {
-    if(sessionStorage.getItem('audit-status') || sessionStorage.getItem('audit-type') ){
-      this.auditStatus = sessionStorage.getItem('audit-status') || "0"
-      this.type = sessionStorage.getItem('audit-type') || "0"
+    if (
+      sessionStorage.getItem("audit-status") ||
+      sessionStorage.getItem("audit-type")
+    ) {
+      this.auditStatus = sessionStorage.getItem("audit-status") || "0"
+      this.type = sessionStorage.getItem("audit-type") || "0"
     }
-    else{
     this.handleSearch()
-    }  
   },
   methods: {
     handleClick() {
@@ -193,6 +218,7 @@ export default {
       } else {
         this.columns[this.columns.length - 1].operations[0].label = "审核"
       }
+      this.handleSearch()
     },
     auditHandle(data, i) {
       if (this.type == "1") {
@@ -207,27 +233,37 @@ export default {
         this.$router.push({
           path: "/auditdetail",
           query: {
-            id: i,
+            id: data["unionId"],
           },
         })
       }
     },
     async handleSearch() {
+      this.listLoading = true
       let params = {
-        pageSize:this.pageSize,
-        pageNum:this.pageIndex
+        pageSize: this.pageSize,
+        pageNum: this.pageIndex,
       }
       let res
       switch (this.auditStatus) {
         case "0":
+          if (this.type == "0") {
+            res = await getScreeningUncheck(params) //待审核
+          } else {
             res = await getFollowUncheck(params) //待审核
-          break;
+          }
+          break
         case "1":
+          if (this.type == "0") {
+            res = await getScreeningCheck(params) //待审核
+          } else {
             res = await getFollowCheck(params) //已审核
-          break;
           }
-      this.tableData = res.data.records //调试注释
-      this.total= res.data.total
+          break
+      }
+      this.tableData = res.data.records
+      this.total = res.data.total
+      this.listLoading = false
     },
   },
 }

src/views/screening/ScreeningAdd.vue

@@ -11,7 +11,6 @@ export default {
   },
   provide() {
     const showIndex = true
-
     return {
       showIndex,
     }