diff --git a/src/components/PopoverInput.vue b/src/components/PopoverInput.vue
index 2262057..3b008a6 100644
--- a/src/components/PopoverInput.vue
+++ b/src/components/PopoverInput.vue
@@ -1,21 +1,20 @@
-
-
 <template>
-  <el-popover placement="bottom-start" trigger="click" :width="props.width" >
+  <el-popover placement="bottom-start" trigger="click" :width="props.width">
     <template #reference>
-      <el-input v-model="input" :style="{'width': props.width+'px'}" clearable></el-input>
+      <el-input v-model="input" :style="{'width': props.width+'px'}" clearable :disabled="disabled"></el-input>
     </template>
     <div class="code-popo" v-if="props.list.length > 0">
-      <div class="code-item" v-for="item in props.list" >
-          <div class="code-item-name" v-for="subItem in item" @click="inputStr(subItem)">
-            {{subItem}}
-          </div>
+      <div class="code-item" v-for="item in props.list">
+        <div class="code-item-name" v-for="subItem in item" @click="inputStr(subItem)">
+          {{ subItem }}
+        </div>
       </div>
     </div>
   </el-popover>
 </template>
 <script setup lang="ts">
 import {ref} from "vue";
+
 const input = defineModel<string | null>();
 const props = defineProps({
   list: {
@@ -25,35 +24,43 @@ const props = defineProps({
   width: {
     type: Number,
     default: 1000
+  },
+  disabled: {
+    type: Boolean,
+    default: false
   }
 })
 
 const inputStr = (str: string) => {
-  let strList = input.value?input.value.split(","):[];
+  let strList = input.value ? input.value.split(",") : [];
   strList.push(str);
   input.value = strList.join(",");
 }
 
 </script>
 <style scoped lang="scss">
-.code-popo{
+.code-popo {
   width: 100%;
-  .code-item{
+
+  .code-item {
     display: flex;
     flex-wrap: wrap;
     padding: 5px 0;
     border-bottom: 1px solid #DDDDDD;
-    .code-item-name{
+
+    .code-item-name {
       float: left;
       font-size: 16px;
       box-sizing: border-box;
       padding: 5px;
       text-align: center;
       cursor: pointer;
-      &:hover{
+
+      &:hover {
         color: #000;
       }
-      &:after{
+
+      &:after {
         clear: both;
       }
     }
diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index 012a38a..5092cc3 100644
--- a/src/components/SearchInput.vue
+++ b/src/components/SearchInput.vue
@@ -10,6 +10,7 @@
                        clearable
                        @input="changeInput"
                        class="no-border-input"
+                       :disabled="disabled"
       >
       </el-input>
     </template>
@@ -63,6 +64,10 @@ const props = defineProps({
   placeholder: {
     type: String,
     default: ""
+  },
+  disabled: {
+    type: Boolean,
+    default: false
   }
 });
 
diff --git a/src/components/common/Mask.vue b/src/components/common/Mask.vue
index fc817c5..b1f86fc 100644
--- a/src/components/common/Mask.vue
+++ b/src/components/common/Mask.vue
@@ -18,8 +18,8 @@ const {
 
 _isShow.value = isShow == null ? false : isShow;
 _showFooter.value = showFooter == null ? false : showFooter;
-_width.value = width == null ? 1200 : width;
-_height.value = height == null ? 800 : height;
+_width.value = width == null ? 1200 : Number(width);
+_height.value = height == null ? 800 : Number(height);
 _close.value = close == null ? true : close;
 
 watch(() => isShow, (newVal) => {
@@ -45,9 +45,7 @@ const closeBtn = () => {
             </div>
           </div>
           <div class="content" >
-            <el-scrollbar  style="height:100%;margin-top: 0">
               <slot></slot>
-            </el-scrollbar>
           </div>
           <div class="footer" v-if="_showFooter">
             <slot name="footer"></slot>
diff --git a/src/components/inventory/goods/Edit.vue b/src/components/inventory/goods/Edit.vue
index a60faef..11305f7 100644
--- a/src/components/inventory/goods/Edit.vue
+++ b/src/components/inventory/goods/Edit.vue
@@ -1,346 +1,355 @@
 <template>
   <Mask :is-show="isShow" :height="900" @close="exit" title="新增" :show-footer="true">
-    <div class="header">
-      <el-button type="primary" style="margin-top: 10px" round class="btn" @click="openCreateSearch" v-if="_type!=0"
-                 plain>
-        一键建档
-      </el-button>
-    </div>
-    <div class="common-layout">
-      <el-container>
-        <el-aside width="800px">
-          <div class="body">
-            <el-form ref="formRef"
-                     :model="edit_data"
-                     :rules="rules" style="width: 100%">
-              <el-descriptions title="基础" border direction="vertical">
-                <el-descriptions-item label="名称">
-                  <el-form-item label="" prop="name" class="form-item">
-                    <el-input v-model="edit_data.name"/>
-                  </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="类型" style="display: flex">
-                  <el-form-item label="" prop="cateId" class="form-item">
-                    <el-select v-model="edit_data.cateId" placeholder="请选择" style="width: 70%">
-                      <el-option
-                          v-for="item in cate_list"
-                          :key="item.id"
-                          :label="item.name"
-                          :value="item.id">
-                      </el-option>
-                    </el-select>
-                    <el-button @click="showCateEdit(true)">
-                      <el-icon>
-                        <Setting/>
-                      </el-icon>
-                    </el-button>
-                  </el-form-item>
+    <template #default>
+      <el-scrollbar>
+        <div class="header">
+          <el-button type="primary" style="margin-top: 10px" round class="btn" @click="openCreateSearch" v-if="_type!=0"
+                     plain>
+            一键建档
+          </el-button>
+        </div>
+        <div class="common-layout">
+          <el-container>
+            <el-aside width="800px">
+              <div class="body">
+                <el-form ref="formRef"
+                         :model="edit_data"
+                         :rules="rules" style="width: 100%">
+                  <el-descriptions title="基础" border direction="vertical">
+                    <el-descriptions-item label="名称">
+                      <el-form-item label="" prop="name" class="form-item">
+                        <el-input v-model="edit_data.name"/>
+                      </el-form-item>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="类型" style="display: flex">
+                      <el-form-item label="" prop="cateId" class="form-item">
+                        <el-select v-model="edit_data.cateId" placeholder="请选择" style="width: 70%">
+                          <el-option
+                              v-for="item in cate_list"
+                              :key="item.id"
+                              :label="item.name"
+                              :value="item.id">
+                          </el-option>
+                        </el-select>
+                        <el-button @click="showCateEdit(true)">
+                          <el-icon>
+                            <Setting/>
+                          </el-icon>
+                        </el-button>
+                      </el-form-item>
 
-                </el-descriptions-item>
-                <el-descriptions-item label="进口|国产" v-if="_type==1306">
-                  <el-select
-                      v-model="edit_data.extra.maintainCate"
-                      placeholder="进口|国产"
-                      clearable
-                      style="width: 240px"
-                  >
-                    <el-option
-                        v-for="item in imported"
-                        :key="item.label"
-                        :label="item.label"
-                        :value="item.label"
-                    />
-                  </el-select>
-                </el-descriptions-item>
-                <el-descriptions-item label="批准文号" v-if="_type==1301">
-                  <el-form-item lable="" prop="approvalCode" class="form-item">
-                    <el-input v-model="edit_data.approvalCode" class="input">
-                    </el-input>
-                  </el-form-item>
-                </el-descriptions-item>
-
-                <el-descriptions-item label="进价参考">
-                  <el-form-item label="" prop="purchaseUnitPrice" class="form-item">
-                    <el-input v-model.number="edit_data.purchaseUnitPrice">
-                      <template #append>元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-descriptions-item>
-
-                <el-descriptions-item label="生产企业" v-if="_type!=1302">
-                  <el-form-item label="" prop="producer" class="form-item">
-                    <el-input v-model="edit_data.producer"/>
-                  </el-form-item>
-                </el-descriptions-item>
-
-
-                <el-descriptions-item label="注册证名称" v-if="_type==1306">
-                  <el-form-item>
-                    <el-input v-model="edit_data.extra.registrationCertificateName" class="input">
-                    </el-input>
-                  </el-form-item>
-                </el-descriptions-item>
-
-                <el-descriptions-item label="条形码">
-                  <el-form-item>
-                    <el-input v-model="edit_data.barcode"/>
-                  </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="规格" v-if="_type==1302||_type==1306||_type==0">
-                  <el-form-item>
-                    <el-input v-model="edit_data.medicineDosageNum" class="input">
-                    </el-input>
-                  </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="最小制剂数量|单位" v-if="_type==1301">
-                  <el-form-item>
-                    <div class="unit-item">
-                      <el-input ref="medicineDosageRef" v-model="edit_data.medicineDosageNum" class="input"
-                                style="width: 200px;">
-                      </el-input>
-                      <el-popover
-                          placement="bottom"
-                          title="Title"
-                          :width="200"
-                          trigger="click"
+                    </el-descriptions-item>
+                    <el-descriptions-item label="进口|国产" v-if="_type==1306">
+                      <el-select
+                          v-model="edit_data.extra.maintainCate"
+                          placeholder="进口|国产"
+                          clearable
+                          style="width: 240px"
                       >
-                        <template #reference>
-                          <div class="unit">{{ edit_data.medicineDosageUnit }}</div>
-                        </template>
-                        <UnitSelector :units="dosageUnitList" v-model="edit_data.medicineDosageUnit"></UnitSelector>
-                      </el-popover>
-                    </div>
-                  </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="最小包装数量|单位">
-                  <el-form-item>
-                    <div class="unit-item">
-                      <el-input ref="minPackagingRef" v-model="edit_data.minPackagingNumber" type="number" class="input"
-                                style="width: 200px;">
-                      </el-input>
-                      <el-popover
-                          placement="bottom"
-                          title="Title"
-                          :width="200"
-                          trigger="click"
-                      >
-                        <template #reference>
-                          <div class="unit">{{ edit_data.minPackagingUnit }}</div>
-                        </template>
-                        <UnitSelector :units="packagingUnit" v-model="edit_data.minPackagingUnit"></UnitSelector>
-                      </el-popover>
-                    </div>
-                  </el-form-item>
+                        <el-option
+                            v-for="item in imported"
+                            :key="item.label"
+                            :label="item.label"
+                            :value="item.label"
+                        />
+                      </el-select>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="批准文号" v-if="_type==1301">
+                      <el-form-item lable="" prop="approvalCode" class="form-item">
+                        <el-input v-model="edit_data.approvalCode" class="input">
+                        </el-input>
+                      </el-form-item>
+                    </el-descriptions-item>
+
+                    <el-descriptions-item label="进价参考">
+                      <el-form-item label="" prop="purchaseUnitPrice" class="form-item">
+                        <el-input v-model.number="edit_data.purchaseUnitPrice">
+                          <template #append>元</template>
+                        </el-input>
+                      </el-form-item>
+                    </el-descriptions-item>
+
+                    <el-descriptions-item label="生产企业" v-if="_type!=1302">
+                      <el-form-item label="" prop="producer" class="form-item">
+                        <el-input v-model="edit_data.producer"/>
+                      </el-form-item>
+                    </el-descriptions-item>
 
 
-                </el-descriptions-item>
-                <el-descriptions-item label="包装单位">
-                  <el-form-item>
-                    <div class="unit-item">
-                      <el-popover
-                          placement="bottom"
-                          title="Title"
-                          :width="200"
-                          trigger="click"
-                      >
-                        <template #reference>
-                          <div class="unit" style="width: 232px">{{ edit_data.packagingUnit }}</div>
-                        </template>
-                        <UnitSelector :units="packagingUnit" v-model="edit_data.packagingUnit"></UnitSelector>
-                      </el-popover>
-                    </div>
-                  </el-form-item>
-
-                </el-descriptions-item>
-                <!--              <el-descriptions-item :label="_type==1301?'国药准字':'国械注准'" v-if="_type==1301 || _type==1306">-->
-                <!--                <el-input v-model="edit_data.approvalCode"/>-->
-                <!--              </el-descriptions-item>-->
-                <el-descriptions-item label="注册剂型" v-if="_type==1301">
-                  <el-form-item>
-                    <el-input v-model="edit_data.extra.regType" class="input">
-                    </el-input>
-                  </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="药品标识码">
-                  <el-form-item>
-                    <el-popover
-                        :visible="showPopover"
-                        placement="bottom"
-                        :width="200"
-                        id="code-pop"
-                        class="code-popo"
-                    >
-                      <div style="color: #6c6b6b;font-size: 12px">已关联({{ idCodeList ? idCodeList.length : 0 }})</div>
-                      <Divider/>
-                      <div class="item">
-                        <div v-for="(item,index) in idCodeList" :key="index">
-                          <div class="remove">
-                            <el-icon @click="removeIdCode(item)" id="code-remove">
-                              <Close/>
-                            </el-icon>
-                          </div>
-                          <div style="width: 70%" class="text">
-                            {{ item }}
-                          </div>
-
+                    <el-descriptions-item label="注册证名称" v-if="_type==1306">
+                      <el-form-item>
+                        <el-input v-model="edit_data.extra.registrationCertificateName" class="input">
+                        </el-input>
+                      </el-form-item>
+                    </el-descriptions-item>
 
+                    <el-descriptions-item label="条形码">
+                      <el-form-item>
+                        <el-input v-model="edit_data.barcode"/>
+                      </el-form-item>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="规格" v-if="_type==1302||_type==1306||_type==0">
+                      <el-form-item>
+                        <el-input v-model="edit_data.medicineDosageNum" class="input">
+                        </el-input>
+                      </el-form-item>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="最小制剂数量|单位" v-if="_type==1301">
+                      <el-form-item>
+                        <div class="unit-item">
+                          <el-input ref="medicineDosageRef" v-model="edit_data.medicineDosageNum" class="input"
+                                    style="width: 200px;">
+                          </el-input>
+                          <el-popover
+                              placement="bottom"
+                              title="Title"
+                              :width="200"
+                              trigger="click"
+                          >
+                            <template #reference>
+                              <div class="unit">{{ edit_data.medicineDosageUnit }}</div>
+                            </template>
+                            <UnitSelector :units="dosageUnitList" v-model="edit_data.medicineDosageUnit"></UnitSelector>
+                          </el-popover>
                         </div>
-                      </div>
+                      </el-form-item>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="最小包装数量|单位">
+                      <el-form-item>
+                        <div class="unit-item">
+                          <el-input ref="minPackagingRef" v-model="edit_data.minPackagingNumber" type="number"
+                                    class="input"
+                                    style="width: 200px;">
+                          </el-input>
+                          <el-popover
+                              placement="bottom"
+                              title="Title"
+                              :width="200"
+                              trigger="click"
+                          >
+                            <template #reference>
+                              <div class="unit">{{ edit_data.minPackagingUnit }}</div>
+                            </template>
+                            <UnitSelector :units="packagingUnit" v-model="edit_data.minPackagingUnit"></UnitSelector>
+                          </el-popover>
+                        </div>
+                      </el-form-item>
 
-                      <template #reference>
-                        <el-input v-model="idCode" id="code-input" @keydown.enter="addIdCode"
-                                  @click="clickIdCodeInput"></el-input>
-                      </template>
-                    </el-popover>
-                  </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="标签">
-                  <el-form-item>
-                    <el-input-tag
-                        draggable
-                        v-model="edit_data.tags"
-                        class="input"
+
+                    </el-descriptions-item>
+                    <el-descriptions-item label="包装单位">
+                      <el-form-item>
+                        <div class="unit-item">
+                          <el-popover
+                              placement="bottom"
+                              title="Title"
+                              :width="200"
+                              trigger="click"
+                          >
+                            <template #reference>
+                              <div class="unit" style="width: 232px">{{ edit_data.packagingUnit }}</div>
+                            </template>
+                            <UnitSelector :units="packagingUnit" v-model="edit_data.packagingUnit"></UnitSelector>
+                          </el-popover>
+                        </div>
+                      </el-form-item>
+
+                    </el-descriptions-item>
+                    <!--              <el-descriptions-item :label="_type==1301?'国药准字':'国械注准'" v-if="_type==1301 || _type==1306">-->
+                    <!--                <el-input v-model="edit_data.approvalCode"/>-->
+                    <!--              </el-descriptions-item>-->
+                    <el-descriptions-item label="注册剂型" v-if="_type==1301">
+                      <el-form-item>
+                        <el-input v-model="edit_data.extra.regType" class="input">
+                        </el-input>
+                      </el-form-item>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="药品标识码">
+                      <el-form-item>
+                        <el-popover
+                            :visible="showPopover"
+                            placement="bottom"
+                            :width="200"
+                            id="code-pop"
+                            class="code-popo"
+                        >
+                          <div style="color: #6c6b6b;font-size: 12px">已关联({{
+                              idCodeList ? idCodeList.length : 0
+                            }})
+                          </div>
+                          <Divider/>
+                          <div class="item">
+                            <div v-for="(item,index) in idCodeList" :key="index">
+                              <div class="remove">
+                                <el-icon @click="removeIdCode(item)" id="code-remove">
+                                  <Close/>
+                                </el-icon>
+                              </div>
+                              <div style="width: 70%" class="text">
+                                {{ item }}
+                              </div>
+
+
+                            </div>
+                          </div>
+
+                          <template #reference>
+                            <el-input v-model="idCode" id="code-input" @keydown.enter="addIdCode"
+                                      @click="clickIdCodeInput"></el-input>
+                          </template>
+                        </el-popover>
+                      </el-form-item>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="标签">
+                      <el-form-item>
+                        <el-input-tag
+                            draggable
+                            v-model="edit_data.tags"
+                            class="input"
+                        >
+                        </el-input-tag>
+                      </el-form-item>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="备注">
+                      <el-form-item>
+                        <el-input v-model="edit_data.remark" class="input"/>
+                      </el-form-item>
+                    </el-descriptions-item>
+                  </el-descriptions>
+                  <el-descriptions title="扩展" border style="margin-top: 20px" direction="vertical">
+                    <el-descriptions-item label="养护分类">
+                      <el-select
+                          v-model="edit_data.extra.maintainCate"
+                          placeholder="选择养护分类"
+                          clearable
+                          style="width: 240px"
+                      >
+                        <el-option
+                            v-for="item in maintainOptions"
+                            :key="item.label"
+                            :label="item.label"
+                            :value="item.label"
+                        />
+                      </el-select>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="储存条件">
+                      <el-select
+                          v-model="edit_data.extra.storageConditions"
+                          placeholder="选择养护分类"
+                          clearable
+                          style="width: 240px;"
+                      >
+                        <el-option
+                            v-for="item in storageConditionsOptions"
+                            :key="item.label"
+                            :label="item.label"
+                            :value="item.label"
+                        />
+                      </el-select>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="保质期">
+                      <el-input v-model="edit_data.expiryTime" type="number">
+                        <template #append>月</template>
+                      </el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="柜号">
+                      <el-input v-model="edit_data.extra.cabinetNumber">
+                      </el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="用法用量" v-if="_type==1301">
+                      <el-input v-model="edit_data.extra.usage">
+                      </el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="处方药/OTC" v-if="_type==1301">
+                      <el-select
+                          v-model="edit_data.extra.drugCategory"
+                          placeholder="选择药品分类"
+                          clearable
+                          style="width: 240px"
+                      >
+                        <el-option
+                            v-for="item in drugCategoryOptions"
+                            :key="item.label"
+                            :label="item.label"
+                            :value="item.label"
+                        />
+                      </el-select>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="精麻毒放" v-if="_type==1301">
+                      <el-input v-model="edit_data.extra.JMDF"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抗菌药物" v-if="_type==1301">
+                      <el-input v-model="edit_data.extra.isAntibacterialAgents"></el-input>
+                    </el-descriptions-item>
+
+                    <el-descriptions-item label="基药" v-if="_type==1301">
+                      <el-input v-model="edit_data.extra.baseMedicine"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="医疗器械分类" v-if="_type==1306">
+                      <el-input v-model="edit_data.extra.instrumentCategroy"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="上市许可持有人">
+                      <el-input v-model="edit_data.extra.authorizationMaster"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="批准文号有效期" v-if="_type==1306">
+                      <el-input v-model="edit_data.extra.approvalNumberExpirDate"></el-input>
+                    </el-descriptions-item>
+                  </el-descriptions>
+
+                </el-form>
+              </div>
+            </el-aside>
+            <el-aside width="350px" style="border-left: 1px #ddd solid">
+              <el-form style="width: 100%;" label-width="100px">
+                <el-descriptions title="定价" border direction="vertical" :column="2" style="margin-left: 5px">
+                  <el-descriptions-item label="定价模式" width="180">
+                    <el-select v-model="edit_data.pricingModel" placeholder="请选择">
+                      <el-option
+                          v-for="item in pricingModelOptions"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                      </el-option>
+
+                    </el-select>
+                  </el-descriptions-item>
+                  <el-descriptions-item label="加成率" v-if="edit_data.pricingModel==1">
+                    <el-input v-model="edit_data.makeUp" type="number">
+                      <template #append>%</template>
+                    </el-input>
+
+                  </el-descriptions-item>
+                  <el-descriptions-item label="零售价格" v-if="edit_data.pricingModel==2">
+                    <el-input v-model="edit_data.unitPrice" type="number"
                     >
-                    </el-input-tag>
-                  </el-form-item>
-                </el-descriptions-item>
-                <el-descriptions-item label="备注">
-                  <el-form-item>
-                    <el-input v-model="edit_data.remark" class="input"/>
-                  </el-form-item>
-                </el-descriptions-item>
-              </el-descriptions>
-              <el-descriptions title="扩展" border style="margin-top: 20px" direction="vertical">
-                <el-descriptions-item label="养护分类">
-                  <el-select
-                      v-model="edit_data.extra.maintainCate"
-                      placeholder="选择养护分类"
-                      clearable
-                      style="width: 240px"
-                  >
-                    <el-option
-                        v-for="item in maintainOptions"
-                        :key="item.label"
-                        :label="item.label"
-                        :value="item.label"
-                    />
-                  </el-select>
-                </el-descriptions-item>
-                <el-descriptions-item label="储存条件">
-                  <el-select
-                      v-model="edit_data.extra.storageConditions"
-                      placeholder="选择养护分类"
-                      clearable
-                      style="width: 240px;"
-                  >
-                    <el-option
-                        v-for="item in storageConditionsOptions"
-                        :key="item.label"
-                        :label="item.label"
-                        :value="item.label"
-                    />
-                  </el-select>
-                </el-descriptions-item>
-                <el-descriptions-item label="保质期">
-                  <el-input v-model="edit_data.expiryTime" type="number">
-                    <template #append>月</template>
-                  </el-input>
-                </el-descriptions-item>
-                <el-descriptions-item label="柜号">
-                  <el-input v-model="edit_data.extra.cabinetNumber">
-                  </el-input>
-                </el-descriptions-item>
-                <el-descriptions-item label="用法用量" v-if="_type==1301">
-                  <el-input v-model="edit_data.extra.usage">
-                  </el-input>
-                </el-descriptions-item>
-                <el-descriptions-item label="处方药/OTC" v-if="_type==1301">
-                  <el-select
-                      v-model="edit_data.extra.drugCategory"
-                      placeholder="选择药品分类"
-                      clearable
-                      style="width: 240px"
-                  >
-                    <el-option
-                        v-for="item in drugCategoryOptions"
-                        :key="item.label"
-                        :label="item.label"
-                        :value="item.label"
-                    />
-                  </el-select>
-                </el-descriptions-item>
-                <el-descriptions-item label="精麻毒放" v-if="_type==1301">
-                  <el-input v-model="edit_data.extra.JMDF"></el-input>
-                </el-descriptions-item>
-                <el-descriptions-item label="抗菌药物" v-if="_type==1301">
-                  <el-input v-model="edit_data.extra.isAntibacterialAgents"></el-input>
-                </el-descriptions-item>
+                      <template #prefix>￥</template>
+                      <template #append>/{{ edit_data.packagingUnit }}</template>
+                    </el-input>
+                  </el-descriptions-item>
 
-                <el-descriptions-item label="基药" v-if="_type==1301">
-                  <el-input v-model="edit_data.extra.baseMedicine"></el-input>
-                </el-descriptions-item>
-                <el-descriptions-item label="医疗器械分类" v-if="_type==1306">
-                  <el-input v-model="edit_data.extra.instrumentCategroy"></el-input>
-                </el-descriptions-item>
-                <el-descriptions-item label="上市许可持有人">
-                  <el-input v-model="edit_data.extra.authorizationMaster"></el-input>
-                </el-descriptions-item>
-                <el-descriptions-item label="批准文号有效期" v-if="_type==1306">
-                  <el-input v-model="edit_data.extra.approvalNumberExpirDate"></el-input>
-                </el-descriptions-item>
-              </el-descriptions>
+                  <el-descriptions-item>
+                    <template #label>
+                      <el-checkbox v-model="edit_data.trdnFlag" label="是否允许拆零" size="large"/>
+                    </template>
+                    <el-input v-model="edit_data.disassemblyPrice" type="number" :disabled="!edit_data.trdnFlag">
+                      <template #prefix>￥</template>
+                      <template #append>/{{ edit_data.minPackagingUnit }}</template>
+                    </el-input>
+                  </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions title="医保" border direction="vertical" :column="1" style="margin-left: 5px">
+                  <el-descriptions-item label="医保对码">
+                    <SocialInfo v-model="edit_data.hilistCode" v-if="edit_data.hilistCode"
+                                @openSearch="openContrastCodeSearch"></SocialInfo>
+                  </el-descriptions-item>
+                </el-descriptions>
+              </el-form>
+            </el-aside>
+          </el-container>
+        </div>
+      </el-scrollbar>
+    </template>
 
-            </el-form>
-          </div>
-        </el-aside>
-        <el-aside width="350px" style="border-left: 1px #ddd solid">
-          <el-form style="width: 100%;" label-width="100px">
-            <el-descriptions title="定价" border direction="vertical" :column="2" style="margin-left: 5px">
-              <el-descriptions-item label="定价模式" width="180">
-                <el-select v-model="edit_data.pricingModel" placeholder="请选择">
-                  <el-option
-                      v-for="item in pricingModelOptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                  </el-option>
-
-                </el-select>
-              </el-descriptions-item>
-              <el-descriptions-item label="加成率" v-if="edit_data.pricingModel==1">
-                <el-input v-model="edit_data.makeUp" type="number">
-                  <template #append>%</template>
-                </el-input>
-
-              </el-descriptions-item>
-              <el-descriptions-item label="零售价格" v-if="edit_data.pricingModel==2">
-                <el-input v-model="edit_data.unitPrice" type="number"
-                >
-                  <template #prefix>￥</template>
-                  <template #append>/{{ edit_data.packagingUnit }}</template>
-                </el-input>
-              </el-descriptions-item>
-
-              <el-descriptions-item>
-                <template #label>
-                  <el-checkbox v-model="edit_data.trdnFlag" label="是否允许拆零" size="large"/>
-                </template>
-                <el-input v-model="edit_data.disassemblyPrice" type="number" :disabled="!edit_data.trdnFlag">
-                  <template #prefix>￥</template>
-                  <template #append>/{{ edit_data.minPackagingUnit }}</template>
-                </el-input>
-              </el-descriptions-item>
-            </el-descriptions>
-            <el-descriptions title="医保" border direction="vertical" :column="1" style="margin-left: 5px">
-              <el-descriptions-item label="医保对码">
-                <SocialInfo v-model="edit_data.hilistCode" v-if="edit_data.hilistCode"
-                            @openSearch="openContrastCodeSearch"></SocialInfo>
-              </el-descriptions-item>
-            </el-descriptions>
-          </el-form>
-        </el-aside>
-      </el-container>
-    </div>
     <template #footer>
       <div class="footer">
         <el-button @click="returnInit" type="primary" v-if="edit_data.id != null">医保库存重新初始化</el-button>
diff --git a/src/components/outpatient/Case.vue b/src/components/outpatient/Case.vue
index cb2ab76..546625c 100644
--- a/src/components/outpatient/Case.vue
+++ b/src/components/outpatient/Case.vue
@@ -15,10 +15,11 @@
     <div class="container">
       <el-form :model="formDate" label-width="auto" ref="formRef">
         <el-form-item label="主诉">
-          <PopoverInput v-model="formDate.mainAppeal" :list="mainAppealList"/>
+          <PopoverInput :disabled="disabled" v-model="formDate.mainAppeal" :list="mainAppealList"/>
         </el-form-item>
         <el-form-item label="诊断">
           <DiagnosisSearchInput
+              :disabled="disabled"
               :request-api="diagnosisSearchApi"
               :show-config="diagnosisShowConfig"
               @selectedCallBack="diagnosisSelect"
@@ -26,31 +27,31 @@
           </DiagnosisSearchInput>
         </el-form-item>
         <el-form-item label="现病史">
-          <PopoverInput v-model="formDate.nowMedicalHistory" :list="nowMedicalHistoryList"/>
+          <PopoverInput :disabled="disabled" v-model="formDate.nowMedicalHistory" :list="nowMedicalHistoryList"/>
         </el-form-item>
         <el-form-item label="既往史">
-          <PopoverInput v-model="formDate.beforeMedicalHistory" :list="beforeMedicalHistoryList"/>
+          <PopoverInput :disabled="disabled" v-model="formDate.beforeMedicalHistory" :list="beforeMedicalHistoryList"/>
         </el-form-item>
         <el-form-item label="过敏史">
-          <PopoverInput v-model="formDate.allergyHistory" :list="allergyHistoryList"/>
+          <PopoverInput :disabled="disabled" v-model="formDate.allergyHistory" :list="allergyHistoryList"/>
         </el-form-item>
         <el-form-item label="体格检查">
-          <PhysiqueExamInuput v-model="formDate.exam" :list="physiqueExamList"/>
+          <PhysiqueExamInuput :disabled="disabled" v-model="formDate.exam" :list="physiqueExamList"/>
         </el-form-item>
         <el-form-item label="望闻问切" v-if="modelType==1">
-          <PopoverInput v-model="formDate.chinaAdjunctCheck" :list="chinaAdjunctCheckList"/>
+          <PopoverInput :disabled="disabled" v-model="formDate.chinaAdjunctCheck" :list="chinaAdjunctCheckList"/>
         </el-form-item>
         <el-form-item label="治法" v-if="modelType==1">
-          <el-input v-model="formDate.chinaDeal"></el-input>
+          <el-input v-model="formDate.chinaDeal" :disabled="disabled"></el-input>
         </el-form-item>
         <el-form-item label="口腔检查" v-if="modelType==2">
-          <el-input v-model="formDate.mouthCheck"></el-input>
+          <el-input :disabled="disabled" v-model="formDate.mouthCheck"></el-input>
         </el-form-item>
         <el-form-item label="辅助检查" v-if="modelType==2 || modelType ==0">
-          <el-input v-model="formDate.adjunctCheck"></el-input>
+          <el-input :disabled="disabled" v-model="formDate.adjunctCheck"></el-input>
         </el-form-item>
         <el-form-item label="处置" v-if="modelType==0 || modelType ==2">
-          <el-input v-model="formDate.deal"></el-input>
+          <el-input :disabled="disabled" v-model="formDate.deal"></el-input>
         </el-form-item>
       </el-form>
     </div>
@@ -58,7 +59,7 @@
   </Panel>
 </template>
 <script setup lang="ts">
-import {ref} from "vue";
+import {computed, ref} from "vue";
 import {
   mainAppealList,
   nowMedicalHistoryList,
@@ -71,6 +72,17 @@ import PopoverInput from "@/components/PopoverInput.vue";
 import DiagnosisSearchInput from "@/components/outpatient/DiagnosisSearchInput.vue";
 import PhysiqueExamInuput from "@/components/outpatient/PhysiqueExamInuput.vue";
 
+const props = defineProps({
+  status: {
+    type: Number,
+    default: 0
+  }
+})
+const disabled = computed(() => {
+  if(props.status === 1){
+    return true
+  }
+})
 const formDate = defineModel<any>();
 const modelType = ref(0)
 
@@ -95,6 +107,7 @@ const diagnosisSelect = (list: any) => {
   formDate.value.diagnosisDetail = JSON.stringify(list)
   formDate.value.diagnosisSummary = diagnosisNames
 }
+defineExpose({diagnosisSelect})
 </script>
 <style scoped lang="scss">
 .content {
diff --git a/src/components/outpatient/DiagnosisSearchInput.vue b/src/components/outpatient/DiagnosisSearchInput.vue
index 25f1943..7c33edb 100644
--- a/src/components/outpatient/DiagnosisSearchInput.vue
+++ b/src/components/outpatient/DiagnosisSearchInput.vue
@@ -1,7 +1,8 @@
 <template>
   <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef" @before-enter="beforeShow">
     <template #reference>
-      <el-input v-model="keyword" :style="{'width': props.width+'px'}" @input="changeInput" placeholder="诊断选择"></el-input>
+      <el-input v-model="keyword" :style="{'width': props.width+'px'}" @input="changeInput" :disabled="disabled"
+                placeholder="诊断选择"></el-input>
     </template>
     <div class="container" v-if="searchList.length > 0">
       <el-table :data="searchList" style="width: 100%" @row-click="clickRow" :show-header="props.showHeader"
@@ -16,7 +17,7 @@
 import {ref, watch} from "vue";
 import {post} from "@/utils/request.ts";
 
-const keyword =ref("");
+const keyword = ref("");
 const popoverRef = ref();
 
 interface showConfig {
@@ -40,6 +41,10 @@ const props = defineProps({
   showHeader: {
     type: Boolean,
     default: true
+  },
+  disabled: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -84,14 +89,13 @@ const beforeShow = () => {
 }
 const selectList = ref<any>()
 const nameList = ref<any>([]);
-watch(selectList, (newVal,oldVal ) => {
-  emit('selectedCallBack',newVal)
-},{deep:true});
-const init = (list:any,nList:any) => {
+watch(selectList, (newVal, oldVal) => {
+  emit('selectedCallBack', newVal)
+}, {deep: true});
+const init = (list: any, nList: any) => {
   selectList.value = list;
   nameList.value = nList;
   keyword.value = nameList.value.join(",") + ","
-
 }
 defineExpose({init})
 </script>
diff --git a/src/components/outpatient/DiseaseDetails.vue b/src/components/outpatient/DiseaseDetails.vue
index 1016778..ec3a3d4 100644
--- a/src/components/outpatient/DiseaseDetails.vue
+++ b/src/components/outpatient/DiseaseDetails.vue
@@ -1,13 +1,9 @@
 <template>
   <div class="disease-detail">
-    <div class="top">
-      <span>复制全部医嘱</span>
-      <span>复制病例</span>
-    </div>
     <div class="content">
       <div class="content-title">
         <div class="name">病例</div>
-        <button class="btn">复制</button>
+        <button class="btn" @click="copy">复制</button>
       </div>
       <div class="content-middle">
         <p>主诉:{{ detailObj.diagnosisMedicalRecord.mainAppeal }}</p>
@@ -16,21 +12,28 @@
         <p>体查:{{ detailObj.diagnosisMedicalRecord.exam }}</p>
         <p>复查:{{ detailObj.diagnosisMedicalRecord.allergy }}</p>
         <p>过敏:{{ detailObj.diagnosisMedicalRecord.allergyHistory }}</p>
-        <p>诊断:{{ detailObj.diagnosisMedicalRecord.pastMedicalHistory }}</p>
+        <p>诊断:{{ detailObj.diagnosisMedicalRecord.diagnosisSummary}}</p>
         <p>处置:{{ detailObj.diagnosisMedicalRecord.treatment }}</p>
       </div>
     </div>
     <div class="content">
       <div class="content-title">
         <div class="name">服务项目</div>
-        <button class="btn">复制</button>
+        <button class="btn" @click="copyItem">复制</button>
       </div>
       <div class="content-middle">
         <div class="item" v-for="item in detailObj.itemDetail">
-          <div class="name">{{item.name}}</div>
+          <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="item.itemName"
+              placement="bottom-start"
+          >
+            <div class="name">{{ item.itemName }}</div>
+          </el-tooltip>
           <div class="price">
-            <div class="price-left">{{item.unit}}</div>
-            <div class="price-right">￥{{item.unitPrice}}</div>
+            <div class="price-left">{{ item.selectedNum || 0 }}{{ item.selectedUnit }}</div>
+            <div class="price-right">￥{{ item.unitPrice }}</div>
           </div>
         </div>
       </div>
@@ -38,14 +41,21 @@
     <div class="content">
       <div class="content-title">
         <div class="name">药品耗材</div>
-        <button class="btn">复制</button>
+        <button class="btn" @click="copyGoods">复制</button>
       </div>
       <div class="content-middle">
         <div class="item" v-for="item in detailObj.goodsDetail">
-          <div class="name">{{item.name}}</div>
+          <el-tooltip
+              class="box-item"
+              effect="dark"
+              :content="item.name"
+              placement="bottom-start"
+          >
+            <div class="name">{{ item.name }}</div>
+          </el-tooltip>
           <div class="price">
             <div class="price-left">{{ item.selectedNum || 0 }}{{ item.selectedUnit }}</div>
-            <div class="price-right">￥{{item.selectedPrice}}</div>
+            <div class="price-right">￥{{ item.selectedPrice }}</div>
           </div>
         </div>
       </div>
@@ -55,7 +65,7 @@
         <div class="item">
           <div class="name">合计</div>
           <div class="price">
-            <div class="price-right">￥{{sumPrice}}</div>
+            <div class="price-right">￥{{ sumPrice }}</div>
           </div>
         </div>
       </div>
@@ -68,12 +78,22 @@ import {ref, defineProps, onMounted} from 'vue'
 const {detail} = defineProps(['detail']);
 const detailObj = ref<any>(detail)
 const sumPrice = ref(0)
-onMounted(()=>{
+const emit = defineEmits(['copy', 'copyItem', 'copyGoods'])
+const copy = () => {
+  emit('copy', detailObj.value)
+}
+const copyItem = () => {
+  emit('copyItem', detailObj.value)
+}
+const copyGoods = () => {
+  emit('copyGoods', detailObj.value)
+}
+onMounted(() => {
   const pharmaceuticalTotalAmount = detailObj.value.itemDetail.reduce((pre: any, cur: any) => {
-    return pre + cur.unitPrice
+    return pre + cur.selectedNum * cur.selectedPrice
   }, 0);
 
-  const serviceTotalAmount =detailObj.value.goodsDetail.reduce((pre: any, cur: any) => {
+  const serviceTotalAmount = detailObj.value.goodsDetail.reduce((pre: any, cur: any) => {
     return pre + cur.selectedNum * cur.selectedPrice
   }, 0);
   sumPrice.value = pharmaceuticalTotalAmount + serviceTotalAmount;
@@ -114,7 +134,6 @@ onMounted(()=>{
       .name {
         font-weight: bold;
         font-size: 16px;
-        color: #333333;
       }
 
       .btn {
@@ -139,9 +158,17 @@ onMounted(()=>{
         display: flex;
         justify-content: space-between;
         margin-bottom: 8px;
-        .price{
+        .name{
+          white-space: nowrap; /* 防止文本换行 */
+          overflow: hidden; /* 隐藏溢出的文本 */
+          text-overflow: ellipsis; /* 显示省略号 */
+          width: 100px;
+        }
+
+        .price {
           display: flex;
-          .price-left{
+
+          .price-left {
             margin-right: 38px;
           }
         }
diff --git a/src/components/outpatient/MedicalHistory.vue b/src/components/outpatient/MedicalHistory.vue
index 3be39e9..ce5f455 100644
--- a/src/components/outpatient/MedicalHistory.vue
+++ b/src/components/outpatient/MedicalHistory.vue
@@ -19,7 +19,7 @@
               </div>
             </template>
             <div>
-              <DiseaseDetails :detail="item"></DiseaseDetails>
+              <DiseaseDetails :detail="item" @copy="copy" @copyItem="copyItem" @copyGoods="copyGoods"></DiseaseDetails>
             </div>
           </el-collapse-item>
         </el-collapse>
@@ -41,6 +41,16 @@ const init = (patientId: any) => {
 const clearList = () => {
   list.value = []
 }
+const emit = defineEmits(['copy','copyItem','copyGoods'])
+const copy = (item: any) => {
+  emit('copy', item)
+}
+const copyItem = (item: any) => {
+  emit('copyItem', item)
+}
+const copyGoods = (item: any) => {
+  emit('copyGoods', item)
+}
 defineExpose({init,clearList})
 </script>
 <style scoped lang="scss">
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 35d88c0..c1a0463 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -44,6 +44,7 @@ import Panel from "@/components/common/Panel.vue";
 import {post} from "@/utils/request.ts";
 import {formatTime} from "@/utils/dateUtils.ts";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
+import {ElMessageBox} from "element-plus";
 
 const props = defineProps({
   status: {
@@ -82,7 +83,9 @@ const statusList = ref<any>([
     num: 0
   }
 ])
+const itemId=defineModel()
 onMounted(() => {
+  curItem.value = itemId
   initStatusList()
   init()
 })
@@ -126,8 +129,8 @@ const clickLi = (item: any) => {
   curItem.value = item
   emit('getId', item)
 }
+
 watch(() => props.status, () => {
-  curItem.value = ''
   initStatusList()
   init() // 重新初始化数据
 })
diff --git a/src/components/outpatient/PharmaceuticalConsumables.vue b/src/components/outpatient/PharmaceuticalConsumables.vue
index 86b1fc6..87851d2 100644
--- a/src/components/outpatient/PharmaceuticalConsumables.vue
+++ b/src/components/outpatient/PharmaceuticalConsumables.vue
@@ -37,6 +37,7 @@
               :show-config="itemShowConfig"
               @selectedCallBack="itemSelect"
               :placeholder="'请输入药材名称'"
+              :disabled="disabled"
           >
           </SearchInput>
         </div>
@@ -51,9 +52,19 @@
 import Panel from "@/components/common/Panel.vue";
 import SearchInput from "@/components/SearchInput.vue";
 import {CircleClose} from "@element-plus/icons-vue";
-import {watch,ref} from "vue";
-
+import {watch, ref, computed} from "vue";
 
+const props = defineProps({
+  status: {
+    type: Number,
+    default: 0
+  }
+})
+const disabled=computed(()=>{
+  if(props.status === 1){
+    return true
+  }
+})
 const itemSearchApi = "goods/goods/search";
 const itemShowConfig = [
   {
diff --git a/src/components/outpatient/PhysiqueExamInuput.vue b/src/components/outpatient/PhysiqueExamInuput.vue
index 24b9b53..4adefec 100644
--- a/src/components/outpatient/PhysiqueExamInuput.vue
+++ b/src/components/outpatient/PhysiqueExamInuput.vue
@@ -1,7 +1,7 @@
 <template>
   <el-popover placement="bottom-start" trigger="click" :width="props.width">
     <template #reference>
-      <el-input v-model="input" :style="{'width': props.width+'px'}" clearable></el-input>
+      <el-input v-model="input" :style="{'width': props.width+'px'}" clearable :disabled="disabled"></el-input>
     </template>
     <el-tabs v-model="tabName" class="demo-tabs">
       <el-tab-pane v-for="item in props.list" :label="item.name" :name="item.name">
@@ -41,6 +41,10 @@ const props = defineProps({
   width: {
     type: Number,
     default: 1000
+  },
+  disabled: {
+    type: Boolean,
+    default: false
   }
 })
 
diff --git a/src/components/outpatient/ServiceItems.vue b/src/components/outpatient/ServiceItems.vue
index beb490c..4a4d060 100644
--- a/src/components/outpatient/ServiceItems.vue
+++ b/src/components/outpatient/ServiceItems.vue
@@ -27,6 +27,7 @@
               :show-config="serviceShowConfig"
               @selectedCallBack="serviceSelect"
               :placeholder="'请输入项目名称'"
+              :disabled="disabled"
           >
           </SearchInput>
         </div>
@@ -35,10 +36,22 @@
   </Panel>
 </template>
 <script setup lang="ts">
+import {defineModel, computed} from "vue";
 import Panel from "@/components/common/Panel.vue";
 import {CircleClose} from '@element-plus/icons-vue'
 import SearchInput from "@/components/SearchInput.vue";
 
+const props=defineProps({
+  status: {
+      type: Number,
+    default: 0
+  }
+})
+const disabled = computed(() => {
+  if(props.status === 1){
+    return true
+  }
+})
 const serviceSearchApi = "item/search";
 const serviceShowConfig = [
   {
@@ -63,6 +76,7 @@ const list = defineModel<any[]>({default: () => []});
 const deleteItem = (id: any) => {
   list.value = list.value.filter((item) => item.id !== id);
 };
+
 </script>
 
 <style scoped lang="scss">
diff --git a/src/components/settings/AddUser.vue b/src/components/settings/AddUser.vue
new file mode 100644
index 0000000..5034212
--- /dev/null
+++ b/src/components/settings/AddUser.vue
@@ -0,0 +1,111 @@
+<template>
+  <Mask :top="100" :width="400" :height="400" :is-show="show">
+    <CloseBtn @click="close"></CloseBtn>
+    <el-card>
+      <template #header>
+        <span>添加用户</span>
+      </template>
+      <div>
+        <el-form
+            :model="userInfo"
+            ref="formDataRef"
+            :rules="rules"
+            label-width="80px"
+        >
+          <el-form-item label="姓名" prop="name">
+            <el-input v-model="userInfo.name"></el-input>
+          </el-form-item>
+          <el-form-item label="用户名" prop="username">
+            <el-input v-model="userInfo.username"></el-input>
+          </el-form-item>
+          <el-form-item label="密码" prop="password">
+            <el-input v-model="userInfo.password"></el-input>
+          </el-form-item>
+          <el-form-item label="人员类型" prop="type">
+            <el-select v-model="userInfo.type">
+              <el-option
+                  v-for="item in personType"
+                  :key="item.key"
+                  :label="item.value"
+                  :value="item.key"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-button type="primary" @click="save">保存</el-button>
+          <el-button @click="close">取消</el-button>
+        </el-form>
+      </div>
+    </el-card>
+  </Mask>
+</template>
+<script setup lang="ts">
+import Mask from "@/components/Mask.vue";
+import {type PropType, ref} from "vue";
+import CloseBtn from "@/components/CloseBtn.vue";
+import {post} from "@/utils/request.ts";
+
+const props = defineProps({
+  saveCallback: {
+    type: Function as PropType<(args?: any) => void>,
+    default: () => {}
+  }
+})
+const personType = ref<any>([
+    {
+  key: "0",
+  value: "普通用户",
+},
+{
+  key: "1",
+  value: "管理员",
+},
+{
+  key: "2",
+  value: "医师",
+}
+]);
+const show = ref<boolean>(false);
+const userInfo = ref<any>({})
+const formDataRef = ref();
+const open = () => {
+  show.value = true;
+};
+const close = () => {
+  show.value = false;
+  props.saveCallback();
+};
+defineExpose({open})
+
+const rules = {
+  name: [
+    {required: true, message: "请输入姓名", trigger: 'blur'}
+  ],
+  username: [
+    {required: true, message: "请输入用户名", trigger: 'blur'}
+  ],
+  password: [
+    {required: true, message: "请输入密码", trigger: 'blur'}
+  ],
+  type: [
+    {required: true, message: "请输入人员类型", trigger: 'blur'}
+  ]
+}
+const save = () => {
+  formDataRef.value?.validate((valid: boolean) => {
+    if (!valid) {
+      console.log("表单验证失败");
+      return;
+    }
+    // 如果验证通过，发送请求
+    post("setting/user/save", {userInfo: userInfo.value}).then((res: any) => {
+        formDataRef.value?.resetFields();
+        close()
+    });
+  });
+}
+
+</script>
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/components/settings/Detail.vue b/src/components/settings/Detail.vue
new file mode 100644
index 0000000..dce9b58
--- /dev/null
+++ b/src/components/settings/Detail.vue
@@ -0,0 +1,53 @@
+<template>
+  <CloseBtn @click="close"></CloseBtn>
+  <el-form
+      :model="form"
+  >
+    <el-descriptions
+        :column="3"
+        border
+        title="详情"
+        direction="vertical"
+        label-width="20"
+    >
+      <el-descriptions-item label="名称">
+        <div>{{ form.name }}</div>
+      </el-descriptions-item>
+      <el-descriptions-item label="编码">
+        <div>{{ form.code }}</div>
+      </el-descriptions-item>
+      <el-descriptions-item label="状态">
+        <div>{{ form.status }}</div>
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        <div>{{ form.create_time }}</div>
+      </el-descriptions-item>
+      <el-descriptions-item label="状态">
+        <div>{{ form.status }}</div>
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        <div>{{ form.create_time }}</div>
+      </el-descriptions-item>
+    </el-descriptions>
+  </el-form>
+
+</template>
+<script setup lang="ts">
+import {reactive,defineEmits} from "vue";
+import {ElDescriptionsItem} from "element-plus";
+import CloseBtn from "@/components/CloseBtn.vue";
+
+const form= reactive({
+  name: '1',
+  code: '2',
+  status: '3',
+  create_time: '4',
+})
+const emit = defineEmits(['close'])
+const close = () => {
+emit('close')
+}
+</script>
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/src/components/settings/ItemEdit.vue b/src/components/settings/ItemEdit.vue
index 101dccd..b7995fc 100644
--- a/src/components/settings/ItemEdit.vue
+++ b/src/components/settings/ItemEdit.vue
@@ -1,56 +1,59 @@
 <template>
-  <Mask :is-show="isShow" @close="close" :title="props.id?'项目编辑':'项目新增'" :show-footer="true">
-    <div style="padding: 24px">
-      <div class="header" style="width: 100%;display: flex;justify-content: center;margin-bottom: 10px">
-        <el-button type="primary" style="margin-top:10px" round class="btn" @click="openCreateSearch"
-                   plain>
-          一键建档
-        </el-button>
-      </div>
-      <el-form :model="form" label-width="auto">
-        <el-descriptions
-            :column="3"
-            direction="vertical"
-            border
-        >
-          <el-descriptions-item label="项目名称">
-            <el-form-item>
-              <el-input v-model="form.itemName"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="单位">
-            <el-form-item>
-              <el-input v-model.number="form.unit" min="0">
-                <template #append>次</template>
-              </el-input>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="医保码">
-            <el-form-item>
-              <el-input v-model="form.itemSocialCode"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="原价">
-            <el-form-item>
-              <el-input v-model="form.purchaseUnitPrice">
-                <template #append>
-                  <el-button text @click="imageURL">￥</el-button>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="售价">
-            <el-form-item>
-              <el-input v-model="form.unitPrice">
-                <template #append>
-                  <el-button type="text" @click="imageURL">￥</el-button>
-                </template>
-              </el-input>
-            </el-form-item>
-          </el-descriptions-item>
-        </el-descriptions>
-      </el-form>
-    </div>
+  <Mask :is-show="isShow" width="400" height="550" @close="close" :title="props.id?'项目编辑':'项目新增'"
+        :show-footer="true">
+    <template #default>
+      <el-scrollbar>
+        <div style="padding: 0 24px">
+          <div class="header" style="width: 100%;display: flex;justify-content: center;margin-bottom: 10px">
+            <el-button type="primary" style="margin-top:10px" round class="btn" @click="openCreateSearch"
+                       plain>
+              一键建档
+            </el-button>
+          </div>
+          <el-form :model="form" label-width="auto" :rules="formRules">
+            <el-descriptions
+                :column="2"
+                direction="vertical"
+                border
+            >
+              <el-descriptions-item label="项目名称">
+                <el-form-item>
+                  <el-input v-model="form.itemName"/>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="单位">
+                <el-form-item prop="unit">
+                  <el-input v-model.number="form.unit" min="0">
+                    <template #append>次</template>
+                  </el-input>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="原价">
+                <el-form-item>
+                  <el-input v-model="form.purchaseUnitPrice">
+                    <template #prefix>
+                      ￥
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="售价">
+                <el-form-item>
+                  <el-input v-model="form.unitPrice">
+                    <template #prefix>￥</template>
+                  </el-input>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="医保码">
+                <el-form-item>
+                  <el-input v-model="form.itemSocialCode"/>
+                </el-form-item>
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-form>
+        </div>
+      </el-scrollbar>
+    </template>
     <template #footer>
       <div class="bottom">
         <el-button type="primary" @click="save()">保存</el-button>
@@ -155,11 +158,21 @@ onMounted(() => {
 const init = () => {
   isShow.value = true
   if (props.id) {
-    post("item/getItemById", {id:props.id}).then((res: any) => {
+    post("item/getItemById", {id: props.id}).then((res: any) => {
       form.value = res
+      form.value.unit = Number(res.unit)
     })
   }
 }
+const formRules = {
+  itemName: [
+    {required: true, message: '请输入项目名称', trigger: 'blur'},
+  ],
+  unit: [
+    {required: true, message: '请输入单位', trigger: 'blur'},
+    {type: 'number', message: '单位必须为数字值'}
+  ],
+}
 defineExpose({init})
 </script>
 <style scoped>
diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue
index 95d6e7f..3b0ebfe 100644
--- a/src/components/settings/MemberEdit.vue
+++ b/src/components/settings/MemberEdit.vue
@@ -1,122 +1,124 @@
 <template>
   <Mask :is-show="isShow" @close="exit" :width="800" :height="600" title="成员管理" :show-footer="true">
-    <div style="padding: 24px">
-      <el-form :model="userInfo" label-width="auto" :rules="rules" ref="ruleFormRef" style="width: 100%;height: 100%">
-        <el-descriptions
-            title="基本信息"
-            :column="3"
-            direction="vertical"
-            border
-        >
-          <el-descriptions-item label="账号">
-            <el-form-item prop="username">
-              <el-input v-model="userInfo.username"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="密码">
-            <el-form-item prop="password">
-              <el-input v-model="userInfo.password" show-password/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="用户名">
-            <el-form-item>
-              <el-input v-model="userInfo.name"/>
-            </el-form-item>
-          </el-descriptions-item>
-        </el-descriptions>
-      </el-form>
-      <el-form :model="memberInfo" label-width="auto">
-        <el-descriptions
-            title="扩展信息"
-            :column="3"
-            direction="vertical"
-            border
-        >
-          <el-descriptions-item label="姓名">
-            <el-form-item>
-              <el-input v-model="memberInfo.name"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="性别">
-            <el-form-item>
-             <el-select
-                 v-model="memberInfo.gender"
-                 placeholder="选择性别"
-             >
-               <el-option
-                   v-for="item in ['男', '女']"
-                   :key="item"
-                   :label="item"
-                   :value="item"
-               />
-             </el-select>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="年龄">
-            <el-form-item>
-              <el-input v-model="memberInfo.age"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="手机号">
-            <el-form-item>
-              <el-input v-model="memberInfo.tel"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="角色">
-            <el-form-item>
-              <el-select
-                  v-model="memberInfo.role"
-                  placeholder="选择角色"
-                  size="large"
-              >
-                <el-option
-                    v-for="item in roleList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="身份证号">
-            <el-form-item>
-              <el-input v-model="memberInfo.idCardNumber"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="科室">
-            <el-form-item>
-              <el-select
-                  v-model="memberInfo.sectionId"
-                  placeholder="选择科室"
-              >
-                <el-option
-                    v-for="item in sectionList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="医保人员代码">
-            <el-form-item>
-              <el-input v-model="memberInfo.socialMemberCode"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="备注">
-            <el-form-item>
-              <el-input v-model="memberInfo.memo"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="电子签名">
-            <el-form-item>
-              <UpLoad v-model="uploadURL" ref="uploadRef"
-                      @uploadSuccess="(url)=>{memberInfo.electronicSignature=url}"></UpLoad>
-            </el-form-item>
-          </el-descriptions-item>
-        </el-descriptions>
-      </el-form>
-    </div>
+    <el-scrollbar>
+      <div style="padding: 24px">
+        <el-form :model="userInfo" label-width="auto" :rules="rules" ref="ruleFormRef" style="width: 100%;height: 100%">
+          <el-descriptions
+              title="基本信息"
+              :column="3"
+              direction="vertical"
+              border
+          >
+            <el-descriptions-item label="账号">
+              <el-form-item prop="username">
+                <el-input v-model="userInfo.username"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="密码">
+              <el-form-item prop="password">
+                <el-input v-model="userInfo.password" show-password/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="用户名">
+              <el-form-item>
+                <el-input v-model="userInfo.name"/>
+              </el-form-item>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-form>
+        <el-form :model="memberInfo" label-width="auto">
+          <el-descriptions
+              title="扩展信息"
+              :column="3"
+              direction="vertical"
+              border
+          >
+            <el-descriptions-item label="姓名">
+              <el-form-item>
+                <el-input v-model="memberInfo.name"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="性别">
+              <el-form-item>
+                <el-select
+                    v-model="memberInfo.gender"
+                    placeholder="选择性别"
+                >
+                  <el-option
+                      v-for="item in ['男', '女']"
+                      :key="item"
+                      :label="item"
+                      :value="item"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="年龄">
+              <el-form-item>
+                <el-input v-model="memberInfo.age"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="手机号">
+              <el-form-item>
+                <el-input v-model="memberInfo.tel"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="角色">
+              <el-form-item>
+                <el-select
+                    v-model="memberInfo.role"
+                    placeholder="选择角色"
+                    size="large"
+                >
+                  <el-option
+                      v-for="item in roleList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="身份证号">
+              <el-form-item>
+                <el-input v-model="memberInfo.idCardNumber"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="科室">
+              <el-form-item>
+                <el-select
+                    v-model="memberInfo.sectionId"
+                    placeholder="选择科室"
+                >
+                  <el-option
+                      v-for="item in sectionList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="医保人员代码">
+              <el-form-item>
+                <el-input v-model="memberInfo.socialMemberCode"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="备注">
+              <el-form-item>
+                <el-input v-model="memberInfo.memo"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="电子签名">
+              <el-form-item>
+                <UpLoad v-model="uploadURL" ref="uploadRef"
+                        @uploadSuccess="(url)=>{memberInfo.electronicSignature=url}"></UpLoad>
+              </el-form-item>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-form>
+      </div>
+    </el-scrollbar>
     <template #footer>
       <div class="bottom">
         <el-button type="primary" @click="save()">保存</el-button>
@@ -267,7 +269,7 @@ const deleteDetail = () => {
 }
 const init = () => {
   isShow.value = true
-  if(props.id){
+  if (props.id) {
     getById()
   }
 }
diff --git a/src/components/settings/Search.vue b/src/components/settings/Search.vue
index dd43b4d..b1aaca5 100644
--- a/src/components/settings/Search.vue
+++ b/src/components/settings/Search.vue
@@ -1,6 +1,6 @@
 <template>
   <Mask :width="800" :height="600" :is-show="show" :top="100" @close="close" title="药品" :show-footer="true">
-    <div class="search_content_wrapper">
+    <div class="search_content_wrapper" style="padding: 24px">
       <div class="search_wrapper">
         <span>项目名称:</span>
         <el-input
@@ -8,8 +8,9 @@
             v-model="keyword"
             placeholder="请输入药品名称或者编号"
             @keydown.enter="search_social"
-            clearable/>
-        <button @click="search_social">搜索</button>
+            clearable
+        />
+        <el-button type="primary" @click="search_social">搜索</el-button>
       </div>
       <div class="search_result">
 
@@ -86,14 +87,16 @@ let change_page = (page: number) => {
 // })
 const change_current_search_data_index = (val: any) => {
   current_search_data = JSON.parse(JSON.stringify(val));
-  console.log(current_search_data.id)
+  // console.log(current_search_data.id)
   // proos.changeData(current_search_data)
 }
 const init = (_name: string) => {
   keyword.value = _name;
   show.value = true;
-  // init_search_data()
-  // search_social()
+  if(_name != ''){
+    init_search_data()
+    search_social()
+  }
 };
 defineExpose({init});
 
@@ -108,7 +111,7 @@ function init_search_data() {
 }
 
 let confirm = () => {
-  let jsondata = current_search_data.json;
+  let jsondata = current_search_data;
   let data = {
     id: null,
     type: null,
@@ -130,13 +133,10 @@ let confirm = () => {
       regType: jsondata.reg_type,
       approvalNumber: jsondata.approval_number,
       category: jsondata.category
-
-
     }
   }
-  console.log("data", data)
   emit('confirm', data)
-  show.value = false;
+  close()
 
 }
 let isloading = ref(false);
@@ -172,6 +172,7 @@ let search_social = () => {
 }
 const close = () => {
   show.value = false;
+  // search_result.value = {}
 }
 </script>
 <style scoped lang="scss">
@@ -185,11 +186,8 @@ const close = () => {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  margin: auto;
-  margin-top: 24px;
   border-radius: 10px;
   box-sizing: border-box;
-  padding: 10px;
 }
 
 .search_wrapper {
@@ -232,11 +230,15 @@ const close = () => {
   width: 100%;
   height: 400px;
 }
-.bottom{
+
+.bottom {
   height: 100%;
   display: flex;
   justify-content: space-between;
   align-items: center;
   padding: 0 24px;
 }
+:deep(.el-input__wrapper){
+  width: 100%;
+}
 </style>
diff --git a/src/components/settings/SectionEdit.vue b/src/components/settings/SectionEdit.vue
index 649998e..47fad39 100644
--- a/src/components/settings/SectionEdit.vue
+++ b/src/components/settings/SectionEdit.vue
@@ -1,114 +1,118 @@
 <template>
   <Mask :is-show="isShow" @close="exit" :height="570" :title="props.id?'编辑':'新增'" :show-footer="true">
-    <div style="padding: 24px">
-      <el-form :model="form" label-width="auto">
-        <el-descriptions
-            :column="4"
-            direction="vertical"
-            border
-        >
-          <el-descriptions-item label="科室名称">
-            <el-form-item>
-              <el-input v-model="form.name"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="科室类别">
-            <el-form-item>
-              <el-cascader :props="{ checkStrictly: true }" v-model="form.caty" :options="options"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="开始日期">
-            <el-form-item>
-              <div class="demo-date-picker">
-                <el-date-picker
-                    v-model="form.beginDate"
-                    type="date"
-                    placeholder="请选择开始日期"
-                />
-              </div>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="结束日期">
-            <el-form-item>
-              <div class="demo-date-picker">
-                <el-date-picker
-                    v-model="form.endDate"
-                    type="date"
-                    placeholder="请选择结束日期"
-                />
-              </div>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="成立时间">
-            <el-form-item>
-              <div class="demo-date-picker">
-                <el-date-picker
-                    v-model="form.creationDate"
-                    type="date"
-                    placeholder="请选择成立时间"
-                    :default-value="new Date(2010, 9, 1)"
-                />
-              </div>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="简介">
-            <el-form-item>
-              <el-input v-model="form.info" type="text" :show-word-limit="true" :clearable="true" :size="'large'"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="负责人姓名">
-            <el-form-item>
-              <el-input v-model="form.resperName"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="负责人电话">
-            <el-form-item>
-              <el-input v-model="form.resperTel"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="医疗服务范围">
-            <el-form-item>
-              <el-input v-model="form.medServScp"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="批准床位数">
-            <el-form-item>
-              <el-input v-model="form.bedCnt" type="number"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="医保认可床位数量">
-            <el-form-item>
-              <el-input v-model.number="form.socialBedCnt" type="number"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="医师人数">
-            <el-form-item>
-              <el-input v-model.number="form.drPsncnt" type="number"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="药师人数">
-            <el-form-item>
-              <el-input v-model.number="form.pharPsncnt" type="number"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="护士人数">
-            <el-form-item>
-              <el-input v-model.number="form.nursPsncnt" type="number"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="技术人员人数">
-            <el-form-item>
-              <el-input v-model.number="form.tecnPsncnt" type="number"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="备注">
-            <el-form-item>
-              <el-input v-model="form.memo" type="text" :show-word-limit="true" :clearable="true"/>
-            </el-form-item>
-          </el-descriptions-item>
-        </el-descriptions>
-      </el-form>
-    </div>
+    <template #default>
+      <el-scrollbar>
+      <div style="padding: 24px">
+        <el-form :model="form" label-width="auto">
+          <el-descriptions
+              :column="4"
+              direction="vertical"
+              border
+          >
+            <el-descriptions-item label="科室名称">
+              <el-form-item>
+                <el-input v-model="form.name"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="科室类别">
+              <el-form-item>
+                <el-cascader :props="{ checkStrictly: true }" v-model="form.caty" :options="options"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="开始日期">
+              <el-form-item>
+                <div class="demo-date-picker">
+                  <el-date-picker
+                      v-model="form.beginDate"
+                      type="date"
+                      placeholder="请选择开始日期"
+                  />
+                </div>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="结束日期">
+              <el-form-item>
+                <div class="demo-date-picker">
+                  <el-date-picker
+                      v-model="form.endDate"
+                      type="date"
+                      placeholder="请选择结束日期"
+                  />
+                </div>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="成立时间">
+              <el-form-item>
+                <div class="demo-date-picker">
+                  <el-date-picker
+                      v-model="form.creationDate"
+                      type="date"
+                      placeholder="请选择成立时间"
+                      :default-value="new Date(2010, 9, 1)"
+                  />
+                </div>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="简介">
+              <el-form-item>
+                <el-input v-model="form.info" type="text" :show-word-limit="true" :clearable="true" :size="'large'"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="负责人姓名">
+              <el-form-item>
+                <el-input v-model="form.resperName"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="负责人电话">
+              <el-form-item>
+                <el-input v-model="form.resperTel"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="医疗服务范围">
+              <el-form-item>
+                <el-input v-model="form.medServScp"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="批准床位数">
+              <el-form-item>
+                <el-input v-model="form.bedCnt" type="number"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="医保认可床位数量">
+              <el-form-item>
+                <el-input v-model.number="form.socialBedCnt" type="number"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="医师人数">
+              <el-form-item>
+                <el-input v-model.number="form.drPsncnt" type="number"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="药师人数">
+              <el-form-item>
+                <el-input v-model.number="form.pharPsncnt" type="number"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="护士人数">
+              <el-form-item>
+                <el-input v-model.number="form.nursPsncnt" type="number"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="技术人员人数">
+              <el-form-item>
+                <el-input v-model.number="form.tecnPsncnt" type="number"/>
+              </el-form-item>
+            </el-descriptions-item>
+            <el-descriptions-item label="备注">
+              <el-form-item>
+                <el-input v-model="form.memo" type="text" :show-word-limit="true" :clearable="true"/>
+              </el-form-item>
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-form>
+      </div>
+      </el-scrollbar>
+    </template>
     <template #footer>
       <div class="bottom">
         <el-button type="primary" @click="save()">保存</el-button>
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index 7fe0dbd..a40eab4 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -1,22 +1,22 @@
 <template>
   <div class="container">
     <div class="left">
-      <MedicalQueue :status="status" @getId="getId" @getStatus="getStatus"></MedicalQueue>
+      <MedicalQueue v-model="itemId" :status="status" @getId="getId" @getStatus="getStatus"></MedicalQueue>
     </div>
     <div class="middle">
       <el-scrollbar>
         <div class="case">
-          <CaseDetail v-if="patientRegistration.status==3" v-model="formData"></CaseDetail>
-          <Case v-else v-model="formData"></Case>
+          <CaseDetail v-if="patientRegistration.status==3" v-model="formData" ></CaseDetail>
+          <Case ref="caseRef" v-else v-model="formData" :status="status"></Case>
         </div>
         <div class="service-items">
           <ServiceItemsDetail v-if="patientRegistration.status==3" v-model="itemList"></ServiceItemsDetail>
-          <ServiceItems v-else v-model="itemList"></ServiceItems>
+          <ServiceItems v-else v-model="itemList" :status="status"></ServiceItems>
         </div>
         <div class="pharmaceutical-consumables">
           <PharmaceuticalConsumablesDetail v-if="patientRegistration.status==3"
-                                           v-model="goodsList"></PharmaceuticalConsumablesDetail>
-          <PharmaceuticalConsumables v-else v-model="goodsList"></PharmaceuticalConsumables>
+                                           v-model="goodsList" ></PharmaceuticalConsumablesDetail>
+          <PharmaceuticalConsumables v-else v-model="goodsList" :status="status"></PharmaceuticalConsumables>
         </div>
         <div class="bottom">
           <Settlement v-if="status!=1" v-model="totalAmount" @deleteItem="deleteItem" @save="save" :status="status"
@@ -29,7 +29,7 @@
         <MedicalInformation v-model="patientRegistration" ref="medicalInformationRef"></MedicalInformation>
       </div>
       <div class="bottom">
-        <MedicalHistory ref="medicalHistoryRef"></MedicalHistory>
+        <MedicalHistory ref="medicalHistoryRef" @copy="copyForm" @copyItem="copyItemList" @copyGoods="copyGoodsList"></MedicalHistory>
       </div>
     </div>
   </div>
@@ -94,20 +94,22 @@ const medicalHistoryRef = ref()
 const patientRegistration = ref<any>({})
 const getId = (item: any) => {
   registerId.value = item.id
+  itemId.value = item.id
   patientId.value = item.patientInfoId
   status.value = item.status
   nextTick(() => {
     medicalHistoryRef.value?.init(patientId.value);
   })
   if (item.status == 1) {
-    ElMessageBox.alert(`您将要接诊${item.name}`, '提示', {
+    ElMessageBox.confirm(`您将要接诊${item.name}`, "提示", {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
-      showClose: true,
-      callback: (action: Action) => {
-        post('registration/changeStatus', {id: item.id, status: 2}).then((res: any) => {
-          status.value = 2
-        })
+      callback: (action: any) => {
+        if (action == "confirm") {
+          post('registration/changeStatus', {id: item.id, status: 2}).then((res: any) => {
+            status.value = 2
+          })
+        }
       },
     })
   }
@@ -138,6 +140,7 @@ const getStatus = (e: any) => {
     medicalHistoryRef.value?.clearList();
   })
 }
+const itemId = ref<any>('')
 const edit = () => {
   post('registration/changeStatus', {id: registerId.value, status: 2}).then((res: any) => {
     status.value = 2
@@ -153,6 +156,21 @@ watch([() => goodsList.value, itemList], ([newGoodsList, newItemList]) => {
   }, 0);
   totalAmount.value = pharmaceuticalTotalAmount + serviceTotalAmount;
 }, {deep: true});
+const caseRef= ref<any>("")
+const copyForm=(item:any) => {
+  formData.value = item.diagnosisMedicalRecord
+  const diagnosisNames =JSON.parse(item.diagnosisMedicalRecord.diagnosisDetail)
+  nextTick(()=>{
+    caseRef.value?.diagnosisSelect(diagnosisNames)
+  })
+}
+const copyItemList=(item:any) => {
+  console.log(item)
+  itemList.value = item.itemDetail
+}
+const copyGoodsList=(item:any) => {
+  goodsList.value = item.goodsDetail
+}
 </script>
 <style scoped lang="scss">
 .container {
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index c1bbf3a..7b5e17a 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -113,8 +113,9 @@ const handleSelect = (item: any) => {
 }
 const isShow = ref(false)
 const ItemEditRef = ref<any>('')
-const id = ref('')
+const id = ref<any>('')
 const rowClick = ((row: any) => {
+  id.value = row.id
   openDialog()
 })
 
diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue
index debd3a0..e48f394 100644
--- a/src/views/settings/log.vue
+++ b/src/views/settings/log.vue
@@ -1,11 +1,94 @@
 <template>
-  <div class="container-wrapper">
-    log
+  <div class="container-wrapper" style="padding: 24px">
+    <div class="title">操作日志</div>
+    <div class="content">
+      <el-table
+          :data="tableData"
+          style="width: 100%"
+          :default-sort="{prop: 'id', order: 'descending'}"
+          @row-click="rowClick"
+      >
+        <el-table-column prop="id" label="ID"></el-table-column>
+        <el-table-column prop="username" label="用户名"></el-table-column>
+        <el-table-column prop="operation" label="操作"></el-table-column>
+        <el-table-column prop="time" label="时间"></el-table-column>
+        <el-table-column prop="method" label="方法"></el-table-column>
+      </el-table>
+    </div>
+    <div class="pagination">
+      <el-pagination
+          background
+          layout="prev, pager, next"
+          :current-page="currentPage"
+          :page-size="pageSize"
+          :total="total"
+          @current-change="handleCurrentChange"
+      ></el-pagination>
+    </div>
+    <Mask :is-show="isShow" :width="800" :height="500">
+      <Detail @close="isShow = false"/>
+    </Mask>
   </div>
 </template>
 <script setup lang="ts">
-
-
+import {onMounted, ref} from 'vue'
+import {post} from '@/utils/request.ts'
+import Mask from "@/components/Mask.vue";
+import Detail from "@/components/settings/Detail.vue";
+const tableData = ref<any>([
+  {
+    id: 1,
+    username: 'admin',
+    operation: '新增用户',
+    time: '2021-01-01 00:00:00',
+  }
+])
+onMounted(()=>{
+  init()
+})
+const init=()=>{
+  const params = {
+    currentPage: currentPage.value,
+    pageSize: pageSize.value,
+  }
+  // post("",{params:params}).then((res:any)=>{
+  //   tableData.value=res
+  // })
+}
+const currentPage = ref(1)
+const pageSize = ref(20)
+const total = ref(0)
+const handleCurrentChange = (val: any) => {
+  currentPage.value = val
+}
+const isShow = ref(false)
+const rowClick=(row:any)=>{
+  isShow.value=true
+  console.log(row,'ROW')
+}
 </script>
 <style scoped lang="scss">
+.container-wrapper{
+  display: flex;
+  flex-direction: column;
+  .title{
+    font-size: 20px;
+    height: 60px;
+    line-height: 60px;
+    background: #fff;
+    font-weight: 500;
+  }
+  .content{
+    flex: 1;
+    background: #fff;
+  }
+  .pagination{
+    height: 60px;
+    background: #fff;
+    border-top: 1px solid #ebeef5;
+    display: flex;
+    align-items: center;
+  }
+}
+
 </style>
\ No newline at end of file
diff --git a/src/views/settings/print.vue b/src/views/settings/print.vue
index 12bd215..2ce82c0 100644
--- a/src/views/settings/print.vue
+++ b/src/views/settings/print.vue
@@ -1,69 +1,81 @@
 <template>
-  <div class="container-wrapper">
-    <el-button @click="sendMessage">发送消息 </el-button>
-    <el-button @click="getarry">拉配置 </el-button>
-    <el-button @click="getNetwork">拿ip</el-button>
+  <div class="container-wrapper" style="padding: 24px">
+    <el-form ref="ruleFormRef" style="max-width: 600px" :model="tableDate" label-width="auto"
+             class="demo-ruleForm" status-icon>
+      <el-form-item label="打印机名称" prop="common_name">
+        <el-select v-model="printConfig.printName" >
+          <el-option v-for="item in tableDate" :label="item" :value="item">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="打印类型" prop="common_sortName">
+        <el-select v-model="printConfig.pageType">
+          <el-option v-for="item in pageTypes" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-button type="primary" @click="save">保存</el-button>
+    </el-form>
   </div>
 </template>
 <script setup lang="ts">
-
-import {getKey} from "@/utils/discrotyUtil.ts";
-import gends from "@/assets/config/directory/gends.json";
-import natys from "@/assets/config/directory/antys.json";
-import psnCertTypes from "@/assets/config/directory/psnCertTypes.json";
-import insutypes from "@/assets/config/directory/insutypes.json";
 import {onMounted, onUnmounted, ref} from "vue";
-import {ElMessage} from "element-plus";
 import {post} from "@/utils/request.ts";
-import type {Request, Response} from "@/utils/ws.ts";
 import {useWsStore} from "@/stores/wsStore.ts";
+import type {Request, Response} from "@/utils/ws.ts";
+import {ElMessage} from "element-plus";
 
+const pageTypes = [
+  {
+    label: "80小票打印机",
+    value: "80"
+  },
+  {
+    label: "58小票打印机",
+    value: "58"
+  }
+]
+const printConfig= ref<any>({
+  printName:"",
+  pageType:""
+})
+
+
+const save = () => {
+  post("common/config/savePrinter", {printConfig:printConfig.value}).then((res:any)=>{
+    ElMessage.success("保存成功")
+  })
+}
+const getPrintConfig = () => {
+  post("common/config/getPrintConfig").then((res:any)=>{
+    printConfig.value.printName=res.printName
+    printConfig.value.pageType=res.pageType
+  })
+}
+const tableDate = ref<any>([])
 const wsStore = useWsStore();
-const isReading = ref(false)
-const ReadSocialCard = async (readType: string) => {
-  isReading.value = true;
-  let data: any = {}
-  data.key ="111111111111";
-  data.val="哈哈哈哈122222222222222";
-  let request: Request = {
-    type: "Config/set",
-    config: {},
-    data: data
-  }
-  wsStore.sendMessage(request);
-};
-const sendMessage = () => {
-  ReadSocialCard("CardDefault");
+
+
+let request: Request = {
+  type: "getPrintList",
+  config: null,
+  data: null
 }
+wsStore.sendMessage(request);
 const reciceMessage = (response: Response) => {
-  console.log(response);
-}
-const getarry = () => {
-  let data: any = {}
-  let request: Request = {
-    type: "Config/getAll",
-    config: {},
-    data: data
-  }
-  wsStore.sendMessage(request);
-}
-const getNetwork = () => {
-  let data: any = {}
-  let request: Request = {
-    type: "getNetwork",
-    config: {},
-    data: data
-  }
-  wsStore.sendMessage(request);
+  tableDate.value = response.Data;
+  getPrintConfig()
 }
 
+
 onMounted(async () => {
   wsStore.setMessageCallback(reciceMessage)
-});
+})
 onUnmounted(() => {
   wsStore.removeAllMessageCallback()
 })
 
 </script>
 <style scoped lang="scss">
+
 </style>
\ No newline at end of file