518合并代码

src/xt_pages/hospitalStation/components/deskRecord.vue

           :disabled="true"
         ></el-input>
       </el-form-item>
-      <el-form-item label="药物过敏史: " prop="name">
+      <!-- <el-form-item label="药物过敏史: " prop="name">
         <el-input
           v-model="allergic_history"
           placeholder="药物过敏史"
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

           :disabled="true"
         ></el-input>
       </el-form-item>
-      <el-form-item label="药物过敏史: " prop="name">
+      <!-- <el-form-item label="药物过敏史: " prop="name">
         <el-input
           v-model="allergic_history"
           placeholder="药物过敏史"
           v-model="lab_apparatus"
           placeholder="实验室及器械检查"
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
     <div class="mainTitle">体格信息：</div>
     <el-form

src/xt_pages/outpatientTool/components/drugDetail.vue

         keywords: '',
         tableData: [],
         chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
-        limit:10,
+        limit:1000,
         page:1,
         total:0,
        drugList:[],

src/xt_pages/outpatientTool/components/goodDetail.vue

         keywords: '',
         tableData: [],
         chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
-        limit:10,
+        limit:1000,
         page:1,
         total:0,
         goodList:[],