随访显示

src/components/FormComponents/ReadForm/index.vue

@@ -313,8 +313,8 @@ export default {
     },
     // 绑定部分值(此时表单已渲染)
     initfields(obj) {
+      console.log("通用表单",obj)
       for (let k in obj) {
-        console.log("通用表单",k,obj)
         // if (this.form.hasOwnProperty(k)) {
         this.form[k] = obj[k]
         // }

src/store/modules/dict.js

@@ -32,7 +32,6 @@ const actions = {
         newDictSet.push(v.type)
       }
     })
-    console.log('执行getDictData', commit, state)
     commit("setDictSet", latestDict)
     newDictSet = Object.keys(dictMap).length === 0 ? latestDictSet : newDictSet
     // 存在新增加的字典

src/views/audit-qualitycontrol/index.vue

@@ -51,17 +51,17 @@ export default {
       listLoading: false,
       tableData: [
         {
-          "unionId": "2", 
+          "unionName": "111", 
           
-          "unionName": "合肥高新附院", 
+          "unionId": "1", 
           
-          "unCheckNums": 2, 
+          "reportTime": "2023-02-01 16:47:23", 
           
-          "checkNums": 0, 
+          "unCheckNums": 1, 
           
-          "reportTime": "2022-12-09 09:12:35" 
-        
-        } 
+          "checkNums": 0 
+          
+        }
       ],
     }
   },
@@ -192,7 +192,6 @@ export default {
   },
   methods: {
     handleClick() {
-      console.log("type:" + this.type, "auditStatus" + this.auditStatus)
       if (this.auditStatus == 1) {
         this.columns[this.columns.length - 1].operations[0].label =
           "修改审核意见"
@@ -201,7 +200,6 @@ export default {
       }
     },
     auditHandle(data, i) {
-      console.log(data, i)
       if (this.type == "1") {
         this.$router.push({
           path: "/followaudit",
@@ -232,7 +230,7 @@ export default {
           res = await getFollowCheck(params) //已审核
           break;
       }
-      this.tableData = res.data.records
+      // this.tableData = res.data.records //调试注释
       this.total= res.data.total
     },
   },

src/views/followupentry/components/followReview.vue

@@ -2,7 +2,35 @@
   <!-- 随访审核详情 -->
   <div class="follow-form">
     <!-- <ConfigForms form-type="2" formClass="follow-form"></ConfigForms> -->
-    <read-form ref="form" :options="followupForm" :formEdit="formEdit"></read-form>
+    <el-container>
+      <el-aside width="auto">
+        <div class="follow-tab">
+          <p class="tab-title">筛查病例数据</p>
+          <el-tabs tab-position="right" style="height: 200px;" v-model="activeTab">
+            <el-tab-pane
+              :label="'第'+ Number(index+1) + '次随访数据'"
+              v-for="(item,index) in formDataList"
+              :key="index"
+              :name="String(index)"
+            ></el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-aside>
+      <el-main>
+        <read-form ref="form" :options="followupForm" :formEdit="formEdit"></read-form>
+      </el-main>
+      <el-aside width="auto" class="transition-box">
+        <div class="follow-list">
+          <ul class="list">
+            <li v-for="(item, index) in screenList" :key="index">
+              <div class="time">{{ item.time }}</div>
+              <div class="time">{{ item.code }}</div>
+              <div class="time">{{ item.name }}</div>
+            </li>
+          </ul>
+        </div>
+      </el-aside>
+    </el-container>
   </div>
 </template>
 
@@ -16,8 +44,8 @@ export default {
     ReadForm
   },
   props: {
-    form: {
-      type: Object,
+    formDataList: {
+      type: Array,
     },
   },
   data() {
@@ -689,19 +717,38 @@ export default {
           }, 
         ]
       },
-      formEdit:{
-      }
+      // formEdit:{
+      // },
+      activeTab:0,
+      screenList: [
+        {
+          time: "2020-12-12 11:11:11",
+          code: "UK102",
+          name: "修改第一次随访计划",
+        },
+      ],
     }
   },
-  watch:{
-    form(val){
-      this.formEdit = val
-      console.log("form",val)
+  // watch:{
+  //   form(val){
+  //     this.formEdit = val[this.activeTab]
+  //     console.log("formReview",val)
+  //   }
+  // },
+  computed:{
+    formEdit:{
+      get(){
+        return this.formDataList[this.activeTab]
+      },
+      set(){
+
+      }
     }
   },
   created() {
   },
   mounted(){
+    this.formEdit = this.formDataList[this.activeTab]
   },
   methods: {},
 }
@@ -727,6 +774,70 @@ export default {
     background: #4e68ff;
     color: #fff;
   }
+  .el-main {
+    padding: 0px 20px;
+  }
+  .el-aside {
+    padding-bottom: 20px;
+  }
+}
+.follow-tab {
+  ::v-deep {
+    border-radius: 4px;
+    border: 1px solid #cccccc;
+    height: 100%;
+    .el-tabs__header {
+      margin-left: 0px;
+    }
+    .el-tabs__nav-wrap.is-right::after {
+      width: 0px;
+    }
+    .el-tabs__active-bar.is-right {
+      width: 3px;
+      height: 52px !important;
+    }
+    .el-tabs--right {
+      height: auto !important;
+    }
+    .tab-title {
+      padding: 16px;
+      background: #fafafa;
+      color: #333333;
+      border-bottom: 1px solid #cccccc;
+    }
+    .el-tabs__item {
+      padding: 16px;
+      width: 180px;
+      background: #fafafa;
+      height: auto;
+      line-height: inherit;
+      border-bottom: 1px solid #cccccc;
+      transition: all 1s;
+    }
+    .el-tabs__item.is-active {
+      background: transparent;
+    }
+  }
+}
+.follow-list {
+  border-radius: 4px;
+  border: 1px solid #cccccc;
+  height: 100%;
+  background: #fafafa;
+  li {
+    padding: 20px 30px;
+    border-bottom: 1px solid #ccc;
+    cursor: pointer;
+    .time {
+      font-size: 14px;
+      margin-bottom: 8px;
+      font-family: AlibabaPuHuiTiR;
+      text-align: left;
+      &:first-child {
+        color: #4e68ff;
+      }
+    }
+  }
 }
 .follow-form {
   ::v-deep {
@@ -746,6 +857,8 @@ export default {
       overflow: hidden;
       border: 1px solid #cccccc;
     }
+    .el-collapse-item:not(:last-child) {
+    }
     .el-collapse-item__wrap {
       border: none;
     }

src/views/followupentry/followaudit.vue

@@ -11,8 +11,7 @@
       </div>
     </div>
     <div class="table-content p-24">
-      <!-- <component :is="curComponent" :formEdit="formEdit"></component> -->
-      <follow-review :form="formEdit"></follow-review>
+      <follow-review :formDataList="formEdit"></follow-review>
     </div>
     <div class="choose-handle p-24">
       <span v-if="!editStatus">请选择审核结果:</span>
@@ -105,13 +104,22 @@ export default {
       medicalCombination:'无锡市人民医院医联体',
       mcCount:7,
       editStatus: false, //进入的状态是第一次审核还是修改审核,false为第一次,true为修改
-      formEdit:{
-        name:"djksh",
-        contact_phone:"12345678",
-        is_accept:"0",
-        gas_exam:"15",
-        G_17:"5"
-      },//填报数据
+      formEdit:[
+        {
+          name:"djksh",
+          contact_phone:"12345678",
+          is_accept:"0",
+          gas_exam:"15",
+          G_17:"5"
+        },
+        {
+          name:"djksh",
+          contact_phone:"12345678",
+          is_accept:"0",
+          gas_exam:"15",
+          G_17:"6"
+        },
+      ],//填报数据
       form: {},
       rules: {
         reson: [{ required: true, message: "请填写", trigger: "blur" }],
@@ -213,7 +221,7 @@ export default {
       this.loading = true
       let res = await getFollowUnCheckDetail(this.unionId)
       if(res.code==1){
-        this.formEdit=res.data[0]
+        // this.formEdit=res.data[0] //调试注释
       }
       this.loading = false
     },