审核标签接口变更 表单显隐

src/api/note.js

@@ -13,7 +13,7 @@ export function getSysCheckNote(params = {}) {
   });
 }
 
-//新增意见标签
+//保存意见标签
 export function postSysCheckNote(data = {}) {
   return request({
     url: "/disease-data/sysCheckNote",
@@ -22,18 +22,18 @@ export function postSysCheckNote(data = {}) {
   });
 }
 
-//修改意见标签
-export function putSysCheckNote(data = {}) {
-  return request({
-    url: "/disease-data/sysCheckNote",
-    method: "put",
-    data
-  });
-}
-//删除意见标签
-export function delSysCheckNote(id) {
-  return request({
-    url: `/disease-data/sysCheckNote/${id}`,
-    method: "delete",
-  });
-}
+// //修改意见标签
+// export function putSysCheckNote(data = {}) {
+//   return request({
+//     url: "/disease-data/sysCheckNote",
+//     method: "put",
+//     data
+//   });
+// }
+// //删除意见标签
+// export function delSysCheckNote(id) {
+//   return request({
+//     url: `/disease-data/sysCheckNote/${id}`,
+//     method: "delete",
+//   });
+// }
\ No newline at end of file

src/components/FormComponents/CustomForm/FormItemSelf.vue

@@ -5,18 +5,13 @@
     :style="item.styles"
     :class="{ isDefects: defectsSet.includes(item.prop) }"
   >
-    <el-col
-      :lg="item.width"
-      :style="{ height: item.type === 'upload' ? '116px' : '53px' }"
-    >
+    <el-col :lg="item.width" :style="{ height: item.type === 'upload' ? '116px' : '53px' }">
       <div
         v-if="
           showIndex || (configForms && configForms.showIndex) || item.showIndex
         "
         :class="['formIndex', item.labelSuffix == '5' ? 'computeIndex' : '']"
-      >
-        {{ item.labelSuffix || columnIndex + 1 }}
-      </div>
+      >{{ item.labelSuffix || columnIndex + 1 }}</div>
       <!-- <el-form-item
         :label="
           !hiddenLabel && item.label
@@ -50,11 +45,7 @@
             ></el-upload-self>
             <!-- 表单改文本 -->
             <template v-else-if="getVwForm.detail">
-              <form-item-text
-                :item="item"
-                :form="form"
-                :union-list="unionList"
-              ></form-item-text>
+              <form-item-text :item="item" :form="form" :union-list="unionList"></form-item-text>
             </template>
             <!-- 可输入 -->
             <template v-else>
@@ -62,10 +53,10 @@
               <el-input
                 v-if="item.type === 'input'"
                 v-model="form[item.prop]"
-                :class="item.prop == 'other_sickness' ? 'needlong' : ''"
+                :class="item.prop == 'other_sickness' ? 'needlong' : item.readonly ? 'read-input' :''"
                 :readonly="item.readonly"
                 :disabled="item.disabled"
-                :placeholder="
+                :placeholder="item.disabled || item.readonly ? '':
                   item.placeholder ||
                   ` ${item.label ? '请输入' + item.label : ''}`
                 "
@@ -85,14 +76,17 @@
                   slot="append"
                   class="toothBit"
                   @click="openToothBit"
-                  >{{ item.append || "牙位" }}</el-button
-                >
-                <template v-else-if="item.append" slot="append">{{
+                >{{ item.append || "牙位" }}</el-button>
+                <template v-else-if="item.append" slot="append">
+                  {{
                   item.append
-                }}</template>
-                <template v-if="item.prepend" slot="prepend">{{
+                  }}
+                </template>
+                <template v-if="item.prepend" slot="prepend">
+                  {{
                   item.prepend
-                }}</template>
+                  }}
+                </template>
               </el-input>
 
               <!-- 密码框 -->
@@ -115,12 +109,16 @@
                 "
                 @blur="handleBlur"
               >
-                <template v-if="item.append" slot="append">{{
+                <template v-if="item.append" slot="append">
+                  {{
                   item.append
-                }}</template>
-                <template v-if="item.prepend" slot="prepend">{{
+                  }}
+                </template>
+                <template v-if="item.prepend" slot="prepend">
+                  {{
                   item.prepend
-                }}</template>
+                  }}
+                </template>
               </el-input>
 
               <!-- 文本域 -->
@@ -166,13 +164,12 @@
                   v-if="item.append"
                   class="el-input-group__append"
                   style="line-height: 28px"
-                  >{{ item.append }}</span
-                >
+                >{{ item.append }}</span>
               </div>
 
               <!-- 单选框 -->
               <el-radio-group
-                v-if="item.type === 'radio'"
+                v-if="item.type === 'radio' && !item.disabled"
                 v-model="form[item.prop]"
                 :disabled="item.disabled"
                 @change="handleChange"
@@ -181,9 +178,22 @@
                   v-for="(opt, optIndex) in item.dicData"
                   :key="optIndex"
                   :label="opt.value"
-                  >{{ opt.label }}</el-radio
-                >
+                >{{ opt.label }}</el-radio>
               </el-radio-group>
+              <!-- 单选框只读 -->
+              <div
+                v-for="(opt, optIndex) in item.dicData"
+                :key="optIndex"
+                v-else-if="item.type === 'radio' && item.disabled "
+              >
+                <el-radio
+                  v-model="form[item.prop]"
+                  :class="item.class ? item.class : item.disabled ? 'read-radio':''"
+                  :label="opt.value"
+                  v-show="opt.value == form[item.prop]"
+                  @change="item.func ? item.func($event) : {}"
+                >{{ opt.label}}</el-radio>
+              </div>
 
               <!-- 多选框 -->
               <template v-if="item.type === 'checkbox'">
@@ -196,8 +206,7 @@
                     v-for="(opt, optIndex) in item.dicData"
                     :key="optIndex"
                     :label="opt.value"
-                    >{{ opt.label }}</el-checkbox
-                  >
+                  >{{ opt.label }}</el-checkbox>
                 </el-checkbox-group>
               </template>
 
@@ -259,6 +268,7 @@
                 :value-format="item.valueFormat"
                 :format="item.format"
                 :disabled="item.disabled"
+                :class="item.disabled ? 'read-time' : ''"
                 style="width: 100%"
                 clearable
                 @change="handleChange"
@@ -275,11 +285,16 @@
                 :value-format="item.valueFormat"
                 :format="item.format"
                 :disabled="item.disabled"
+                :class="item.disabled ? 'read-time' : ''"
                 clearable
                 @change="handleChange"
               ></el-time-picker>
               <!-- 日期 -->
-              <div v-else-if="item.type === 'date'" class="flex">
+              <div
+                v-else-if="item.type === 'date'"
+                class="flex"
+                :class="item.disabled ? 'read-time' : ''"
+              >
                 <el-date-picker
                   v-model="form[item.prop]"
                   :placeholder="item.placeholder ? item.placeholder : '请选择'"
@@ -292,8 +307,7 @@
                 <span
                   v-if="item.prop == 'birthday'"
                   style="margin-left: 12px"
-                  >{{ age + (age ? "岁" : "") }}</span
-                >
+                >{{ age + (age ? "岁" : "") }}</span>
               </div>
               <!-- 年 -->
               <el-date-picker
@@ -355,9 +369,10 @@
                 v-else-if="item.type === 'datetime'"
                 v-model="form[item.prop]"
                 type="datetime"
-                :placeholder="item.placeholder ? item.placeholder : '请选择'"
+                :placeholder="item.placeholder ? item.placeholder : item.disabled ? '':'请选择'"
                 clearable
                 :disabled="item.disabled"
+                :class="item.disabled ? 'read-time' : ''"
                 :picker-options="pickerOptions"
                 :value-format="item.valueFormat"
                 :format="item.format"
@@ -385,8 +400,7 @@
           <span
             v-if="item.importantField && !getVwForm.detail"
             class="important_field"
-            >{{ item.importantFieldDesc || "*" }}</span
-          >
+          >{{ item.importantFieldDesc || "*" }}</span>
         </div>
       </el-form-item>
     </el-col>
@@ -720,10 +734,29 @@ export default {
             Object.keys(dyMap).forEach((key) => {
               // !获取显隐目标
               let targetItem = columns.find((_) => _.prop === key)
+              
               if (!targetItem) {
                 // !没有在表单子组件中找到，查找大表单id
                 targetItem = group.find((_) => _.prop === key)
               }
+              //没有找到再细化查找
+              if (!targetItem) {
+                group.forEach((_) =>{
+                  if(_.column){
+                    _.column.find((item)=> {
+                      if(item.prop === key){
+                        targetItem = item
+                        return
+                      }
+                      else{
+                        if(item.children && item.children.column){
+                          targetItem = item.children.column.find((e)=>  e.prop=== key)
+                        }
+                      }
+                    })
+                  }
+                })
+              }
               if (!targetItem) return
               let display = false
 

src/components/Upload/index.vue

@@ -23,7 +23,10 @@
       <!-- :http-request="handleUpload" -->
       <template v-if="drag">
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
       </template>
       <template v-else-if="listType === 'picture-card'">
         <i class="el-icon-plus"></i>
@@ -37,13 +40,7 @@
       <div slot="tip" class="el-upload__tip">{{ tip }}</div>
     </el-upload>
 
-    <el-image
-      ref="image"
-      style="display: none"
-      :src="imgUrl"
-      :preview-src-list="previewList"
-    >
-    </el-image>
+    <el-image ref="image" style="display: none" :src="imgUrl" :preview-src-list="previewList"></el-image>
   </el-row>
 </template>
 

src/views/followupentry/index.vue

@@ -30,7 +30,6 @@ export default {
   },
   watch:{
     model(val){
-      console.log('val',val)
       switch(val){
          case 'view':
            this.disabled = true

src/views/followupresearch/index.vue

@@ -140,65 +140,7 @@ export default {
         },
       ],
       tableData: [
-        // {
-        //   "patientId": "1598222607734341634",
-        //   "name": "小飞", //姓名
-        //   "idCard": "340822199510260215", //身份证
-        //   "phone": "18311112222", //手机号
-        //   "sex": 1, //性别
-        //   "birthday": "2022-12-31 00:00:00", //生日
-        //   "age": 18, //年龄
-        //   "id": "", //id
-        //   "unionName": "合肥高新附院", //医联体名称
-        //   "screeningTime": "2022-12-01 00:00:00", //筛查时间
-        //   "riskRank": "", //风险等级
-        //   "followTime": "", //随访时间
-        //   "followContents": "", //随访内容
-        //   "nextFollowTime": "", //计划随访时间
-        //   "followBatch": 0, //随访进度
-        //   "unionId": "2", //联盟id
-        //   "riskScore": "", //风险分数
-        //   "screeningAdvise": "", //筛查建议
-        //   "formRecordId": "", //表单记录id
-        //   "linkPhone": "0556-5556666", //联系方式
-        //   "isContinueFollow": 1, //是否继续随访
-        //   "checkStatus": "", //审核状态
-        //   "riskRank":"medium"
-        //   },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-        // {
-        //   name:'11',
-        // },
-      ],//调试
+      ],
       formList: [
         {
           xs: 24,
@@ -324,7 +266,7 @@ export default {
     },
     rowOpration(data, i,label) {
       console.log('跳转',data, i,label)
-      this.$router.push({path:"/followupentry",query:{formEdit:JSON.stringify(data)}})
+      this.$router.push({path:"/followupentry",query:{patientId:data.patientId,formEdit:JSON.stringify(data)}})
     },
     onSearch(form) {
       sessionStorage.setItem('followResearch-form',JSON.stringify(form))

src/views/screening/components/ConfigForms.vue

@@ -201,7 +201,7 @@ export default {
   created() {
     // 字典formType 1 筛查表单
     this.getCurrentFormByType(this.formType)
-    console.log('大表单',this.disabled,this.tabDisabled)
+    console.log('大表单',this.disabled,this.tabDisabled,this.patientId)
   },
   methods: {
     handleConfirm(data, done, cb) {
@@ -392,7 +392,10 @@ export default {
       //   border-width: 0px 0px 0px 1px;
       // }
       .el-form-item {
+        height: 100%;
+        padding: 0px;
         .el-form-item__label {
+          height: 100%;
           text-align: left;
           background: #fafafa;
           font-size: 14px;
@@ -403,10 +406,39 @@ export default {
           padding: 18px 10px;
           margin-right: 20px;
           text-align: center;
+          display: flex;
+          align-items: center;
+          justify-content: center;
         }
       }
-      .el-form-item {
-        padding: 0px;
+    }
+  }
+  //只读表单
+  ::v-deep {
+    .read-input,
+    .read-time {
+      .el-input__inner {
+        border: none;
+        padding: 0px 30px 0px 15px;
+        cursor: text;
+      }
+      .el-input.is-disabled .el-input__icon,
+      .el-input__prefix {
+        display: none;
+      }
+      .el-input__icon {
+      }
+    }
+    .read-radio {
+      cursor: text;
+      .is-checked {
+        display: none;
+      }
+      .el-radio__input.is-checked + .el-radio__label {
+        color: #606266;
+      }
+      .el-radio__label {
+        padding-left: 15px;
       }
     }
   }

src/views/screening/components/FormTab.vue

@@ -170,6 +170,7 @@ export default {
       this.$refs.form.clearAge()
     },
     initData() {
+      console.log('初始化',this.formData)
       this.formData.formRecordId = null
       this.formCacheList = []
       this.getPatientDetail()
@@ -332,7 +333,7 @@ export default {
       if (form["YZZKJC"] && typeof form["YZZKJC"] === "string") {
         form["YZZKJC"] = JSON.parse(form["YZZKJC"])
       }
-      console.log(form)
+      console.log('form形成',form,this.formData)
       if (!cache) {
         this.formData.formEdit = form
       }
@@ -357,6 +358,7 @@ export default {
       this.formData.formEdit = form
     },
     getRecordList(formRecordId) {
+      console.log('获取表单id',formRecordId)
       if (!this.patientId) return
       getRecordList({
         patientId: this.patientId,
@@ -388,7 +390,7 @@ export default {
       handler(v) {
         if (v) {
           this.$set(this.formData, "formEdit", { ...v })
-          console.log(this.formData.formEdit)
+          console.log('form-tab',this.formData.formEdit)
         }
       },
       deep: true,