Merge branch 'master' of http://47.107.245.0:3000/xiongxing/kyj-yanglao-web-new

src/views/elderly/nursing/column.ts

@@ -112,10 +112,10 @@ export const LifeCarePlanColumns = reactive([
     label: '护理等级',
     field: 'nurseLevelName'
   },
-  {
-    label: '状态',
-    field: 'status'
-  }
+  // {
+  //   label: '状态',
+  //   field: 'status'
+  // }
 ])
 
 // =============护理日志=====================

src/views/elderly/nursing/life-care-plan/Form.vue

@@ -158,48 +158,48 @@
                   <div v-else class="itemName">{{ p.nurseItemName }}</div>
                 </div>
               </el-col>
-              <el-col :span="4">
-                <el-input
-                  :disabled="isDetail"
-                  v-model="p.frequency"
-                  placeholder="请输入频次"
-                >
-                  <template #prepend>
-                   <el-text>频次</el-text>
-                  </template>
-                </el-input>
+<!--              <el-col :span="4">-->
+<!--                <el-input-->
+<!--                  :disabled="isDetail"-->
+<!--                  v-model="p.frequency"-->
+<!--                  placeholder="请输入频次"-->
+<!--                >-->
+<!--                  <template #prepend>-->
+<!--                   <el-text>频次</el-text>-->
+<!--                  </template>-->
+<!--                </el-input>-->
 
-              </el-col>
-              <el-col :span="6">
-                <TgSelect
-                  placeholder="请选择频次单位"
-                  v-model="p.frequencyUnit"
-                  :list="getDictOptions(DICT_TYPE.NURSING_FREQUENCY_TYPE)"
-                  :class="['itemName', { border: isDetail }]"
-                >
-                  <el-option
-                    v-for="(dict, d) in getStrDictOptions(DICT_TYPE.NURSING_FREQUENCY_TYPE)"
-                    :key="d"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
-                </TgSelect>
-              </el-col>
-              <el-col :span="6">
-                <TgSelect
-                  placeholder="请选择操作方式"
-                  v-model="p.operatingMode"
-                  :list="getDictOptions(DICT_TYPE.NURSING_OPERATING)"
-                  :class="['itemName', { border: isDetail }]"
-                >
-                  <el-option
-                    v-for="(dict, d) in getStrDictOptions(DICT_TYPE.NURSING_OPERATING)"
-                    :key="d"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
-                </TgSelect>
-              </el-col>
+<!--              </el-col>-->
+<!--              <el-col :span="6">-->
+<!--                <TgSelect-->
+<!--                  placeholder="请选择频次单位"-->
+<!--                  v-model="p.frequencyUnit"-->
+<!--                  :list="getDictOptions(DICT_TYPE.NURSING_FREQUENCY_TYPE)"-->
+<!--                  :class="['itemName', { border: isDetail }]"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="(dict, d) in getStrDictOptions(DICT_TYPE.NURSING_FREQUENCY_TYPE)"-->
+<!--                    :key="d"-->
+<!--                    :label="dict.label"-->
+<!--                    :value="dict.value"-->
+<!--                  />-->
+<!--                </TgSelect>-->
+<!--              </el-col>-->
+<!--              <el-col :span="6">-->
+<!--                <TgSelect-->
+<!--                  placeholder="请选择操作方式"-->
+<!--                  v-model="p.operatingMode"-->
+<!--                  :list="getDictOptions(DICT_TYPE.NURSING_OPERATING)"-->
+<!--                  :class="['itemName', { border: isDetail }]"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="(dict, d) in getStrDictOptions(DICT_TYPE.NURSING_OPERATING)"-->
+<!--                    :key="d"-->
+<!--                    :label="dict.label"-->
+<!--                    :value="dict.value"-->
+<!--                  />-->
+<!--                </TgSelect>-->
+<!--              </el-col>-->
             </el-row>
           </el-col>
         </el-row>

src/views/elderly/nursing/life-care-plan/index.vue

@@ -34,14 +34,14 @@
   <!-- 列表 -->
   <ContentWrap>
     <TabBarBtn @add="openForm()">
-      <template #middle>
+      <!-- <template #middle>
         <el-button @click="handleCopy"
           ><Icon icon="ep:document-copy" class="mr-5px" /> 复制</el-button
         >
-      </template>
+      </template> -->
     </TabBarBtn>
+    <!-- isRadio -->
     <Table2
-      isRadio
       v-loading="loading"
       :data="list"
       :columns="LifeCarePlanColumns"