Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/data.js

@@ -178,7 +178,7 @@ export function createDrugUnitSafeguard(params) {
 
 export function createMZSick(params) {
   return request({
-    url: '/api/stock/dealer/create',
+    url: '/api/mz/sick/create',
     method: 'post',
     params: params
   })
@@ -186,7 +186,7 @@ export function createMZSick(params) {
 
 export function modifyMZSick(params) {
   return request({
-    url: '/api/stock/dealer/modify',
+    url: '/api/mz/sick/modify',
     method: 'post',
     params: params
   })
@@ -194,7 +194,7 @@ export function modifyMZSick(params) {
 
 export function getMZSickList(params) {
   return request({
-    url: '/api/stock/dealer/list',
+    url: '/api/mz/sick/list',
     method: 'get',
     params: params
   })
@@ -202,15 +202,15 @@ export function getMZSickList(params) {
 
 export function deleteMZSick(params) {
   return request({
-    url: '/api/stock/dealer/delete',
+    url: '/api/mz/sick/delete',
     method: 'post',
     params: params
   })
 }
 
-export function GetMZSickr(params) {
+export function GetMZSick(params) {
   return request({
-    url: '/api/stock/dealer/get',
+    url: '/api/mz/sick/get',
     method: 'get',
     params: params
   })

src/xt_pages/data/components/diagnosis.vue

@@ -0,0 +1,391 @@
+<template>
+  <div class="main-contain">
+    <div class=" sign-and-weigh-box" style="background: white">
+      <!--<manufacturer-or-dealer-dialog-->
+      <!--ref="dialog"-->
+      <!--:titles="manufacturerDialog.titles"-->
+      <!--:formValue="manufacturerDialog.formValue"-->
+      <!--:visibility="manufacturerDialog.isVisibility"-->
+      <!--:type="manufacturerDialog.type"-->
+      <!--:isCreated="manufacturerDialog.isCreated"-->
+      <!--v-on:dialog-comfirm="manufacturerDialogComfirm"-->
+      <!--v-on:dialog-cancle="manufacturerDialogCancle"-->
+      <!--&gt;</manufacturer-or-dealer-dialog>-->
+      <diagnosis-dialog
+        ref="dialog"
+        :titles="Dialog.titles"
+        :formValue="Dialog.formValue"
+        :visibility="Dialog.isVisibility"
+        :type="Dialog.type"
+        :isCreated="Dialog.isCreated"
+        v-on:dialog-comfirm="dialogComfirm"
+        v-on:dialog-cancle="dialogCancle"
+
+      ></diagnosis-dialog>
+
+
+      <el-row :gutter="15">
+        <el-col>
+          <div>
+            <el-button
+              size="small"
+              icon="el-icon-circle-plus-outline"
+              style="float: right;margin-bottom: 15px"
+              type="primary"
+              @click="showDialog"
+            >新增
+            </el-button>
+          </div>
+
+          <el-table
+            :row-style="{ color: '#303133' }"
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+            :data="manufacturerData"
+            style="width: 100%"
+            border
+            v-loading="loading"
+          >
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.country_code }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="目录代码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.content_code }}
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="大类名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.class_name }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="国家目录名称" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.country_content_name }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.remark }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="编辑"
+                  placement="top"
+                >
+                  <el-button
+                    size="small"
+                    type="primary"
+                    icon="el-icon-edit-outline"
+                    @click="handleEdit(scope.$index, scope.row)"
+                  >
+                  </el-button>
+                </el-tooltip>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  content="删除"
+                  placement="top"
+                >
+                  <el-button
+                    size="small"
+                    type="danger"
+                    icon="el-icon-delete"
+                    @click="handleDelete(scope.$index, scope.row)"
+                  >
+                  </el-button>
+                </el-tooltip>
+
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
+            background
+            align="right"
+            style="margin-top:20px;"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {
+    createMZSick,
+    modifyMZSick,
+    getMZSickList,
+    deleteMZSick,
+    GetMZSick
+  } from '@/api/data'
+  import DiagnosisDialog from './diagnosisDialog'
+
+  export default {
+    components: {
+      DiagnosisDialog
+    },
+    name: 'diagnosis',
+    data() {
+      return {
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        manufacturerData: [],
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+
+        page: 1,
+        limit: 10,
+        loading: false,
+
+        manufacturer_code: '',
+        editId: '',
+        editIndex: '',
+        Dialog: {
+          titles: '新增',
+          isVisibility: false,
+          isCreated: 1, //1.创建 2.编辑 3.查看详情
+          formValue: {
+            class_name: '',
+            content_code: '',
+            country_code: '',
+            country_content_name: '',
+            remark: '',
+            pinyin: '',
+            wubi: ''
+
+          },
+          resetForm: {
+            class_name: '',
+            content_code: '',
+            country_code: '',
+            country_content_name: '',
+            remark: '',
+            pinyin: '',
+            wubi: ''
+          }
+        }
+      }
+    },
+    methods: {
+      handleEdit: function(index, row) {
+        this.editId = row.id
+        this.editIndex = index
+        let params = {
+          id: row.id
+        }
+        GetMZSick(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.class_name =
+              response.data.data.sick.class_name
+            this.Dialog.formValue.content_code =
+              response.data.data.sick.content_code
+            this.Dialog.formValue.country_code =
+              response.data.data.sick.country_code
+            this.Dialog.formValue.country_content_name =
+              response.data.data.sick.country_content_name
+            this.Dialog.formValue.remark =
+              response.data.data.sick.remark
+            this.Dialog.formValue.pinyin =
+              response.data.data.sick.pinyin
+            this.Dialog.formValue.wubi =
+              response.data.data.sick.wubi
+
+            this.Dialog.isCreated = 2
+            this.$refs.dialog.show()
+
+          }
+        })
+      },
+      handleDelete: function(index, row) {
+        this.$confirm('确认删除这条记录?', '删除记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id
+            }
+            deleteMZSick(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.manufacturerData.splice(index, 1)
+                this.$message.success('厂家已经删除')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
+      showDetails: function(index, row) {
+        let params = {
+          id: row.id
+        }
+        GetMZSick(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.class_name =
+              response.data.data.sick.class_name
+            this.Dialog.formValue.content_code =
+              response.data.data.sick.content_code
+            this.Dialog.formValue.country_code =
+              response.data.data.sick.country_code
+            this.Dialog.formValue.country_content_name =
+              response.data.data.sick.country_content_name
+            this.Dialog.formValue.remark =
+              response.data.data.sick.remark
+            this.Dialog.formValue.pinyin =
+              response.data.data.sick.pinyin
+            this.Dialog.formValue.wubi =
+              response.data.data.sick.wubi
+
+            this.Dialog.isCreated = 3
+            this.Dialog.isVisibility = true
+          }
+        })
+      },
+      dialogComfirm: function(val) {
+        // this.manufacturerDialog.isVisibility = false
+        this.$refs.dialog.hide()
+        if (val.isCreated == 2) {
+          //修改
+          let params = {
+            class_name: val.class_name,
+            content_code: val.content_code,
+            country_code: val.country_code,
+            country_content_name: val.country_content_name,
+            remark: val.remark,
+            id: this.editId,
+            pinyin: val.pinyin,
+            wubi: val.wubi
+
+          }
+          modifyMZSick(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.manufacturerData[this.editIndex].class_name =
+                response.data.data.sick.class_name
+              this.manufacturerData[this.editIndex].content_code =
+                response.data.data.sick.content_code
+              this.manufacturerData[this.editIndex].country_code =
+                response.data.data.sick.country_code
+              this.manufacturerData[this.editIndex].country_code =
+                response.data.data.sick.country_code
+              this.manufacturerData[this.editIndex].country_content_name =
+                response.data.data.sick.country_content_name
+              this.manufacturerData[this.editIndex].remark =
+                response.data.data.sick.remark
+              this.manufacturerData[this.editIndex].pinyin =
+                response.data.data.sick.pinyin
+              this.manufacturerData[this.editIndex].wubi =
+                response.data.data.sick.wubi
+
+              this.$message.success('修改成功')
+            }
+          })
+        } else if (val.isCreated == 1) {
+          //新增
+          createMZSick(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.manufacturerData.unshift(response.data.data.sick)
+
+              this.$message.success('新增成功')
+            }
+          })
+        }
+      },
+      dialogCancle: function() {
+        this.$refs.dialog.hide()
+      },
+      showDialog: function() {
+        this.Dialog.formValue = Object.assign(
+          {},
+          this.Dialog.resetForm
+        )
+        this.$refs.dialog.show()
+        this.Dialog.isCreated = 1
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      },
+      getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit
+        }
+        this.loading = true
+        getMZSickList(params).then(response => {
+          if (response.data.state == 0) {
+            this.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.loading = false
+            this.total = response.data.data.total
+            this.manufacturerData = []
+            for (let i = 0; i < response.data.data.sick.length; i++) {
+              this.manufacturerData.push(response.data.data.sick[i])
+            }
+          }
+        })
+      }
+    },
+    created() {
+      this.getList()
+    }
+  }
+</script>
+
+<style lang="scss">
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+</style>

src/xt_pages/data/components/diagnosisDialog.vue

@@ -0,0 +1,161 @@
+<template>
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <el-form :model="formValue" :rules="rules" ref="formValue" class="demo-form-inline"
+             :label-position="labelPosition"
+             label-width="100px">
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="大类名称" prop="class_name">
+            <el-input v-model="formValue.class_name"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="拼音" prop="pinyin">
+            <el-input v-model="formValue.pinyin"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="五笔" prop="wubi">
+            <el-input v-model="formValue.wubi"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="目录代码" prop="content_code">
+            <el-input v-model="formValue.content_code"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="国家编码" prop="country_code">
+            <el-input v-model="formValue.country_code"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="国家目录名称" prop="country_content_name">
+            <el-input v-model="formValue.country_content_name"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-col>
+        <el-form-item label="备注">
+          <el-input type="textarea" :row="5" v-model="formValue.remark"
+                    placeholder="请输入内容">
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+    <el-button v-if="isCreated == 3" @click="cancle('formValue')">取 消</el-button>
+    <el-button v-if="isCreated != 3 " @click="cancle('formValue')">取 消</el-button>
+    <el-button v-if="isCreated != 3" type="primary" @click="comfirm('formValue')">保 存</el-button>
+  </span>
+  </el-dialog>
+
+</template>
+
+<script>
+  export default {
+    name: 'diagnosisDialog',
+
+    data() {
+
+      return {
+        visibility: false,
+        labelPosition: 'right',
+        isClose: false,
+        form: {
+          class_name: '',
+          content_code: '',
+          country_code: '',
+          country_content_name: '',
+          remark: '',
+          pinyin: '',
+          wubi: ''
+
+        },
+        resetForm: {
+          class_name: '',
+          content_code: '',
+          country_code: '',
+          country_content_name: '',
+          remark: '',
+          pinyin: '',
+          wubi: ''
+        },
+        rules: {
+          class_name: [
+            { required: true, message: '请输入大类名称', trigger: 'blur' }
+          ],
+          content_code: [
+            { required: true, message: '请输入目录代码', trigger: 'blur' }
+          ]
+
+        }
+      }
+    },
+    props: {
+
+      titles: {
+        type: String,
+        default: ''
+      },
+      formValue: {
+        type: Object
+      },
+      type: {
+        type: Number,
+        default: 1
+
+      },
+      isCreated: {
+        type: Number,
+        default: 1
+
+      }
+    },
+    methods: {
+      show: function() {
+        this.visibility = true
+
+      }, hide: function() {
+        this.visibility = false
+      },
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs['formValue'].resetFields()
+      },
+      comfirm: function(formName) {
+        this.$refs['formValue'].validate((valid) => {
+          if (valid) {
+            let value = {}
+            value = this.getValue()
+            this.$emit('dialog-comfirm', value)
+            this.form = Object.assign({}, this.resetForm)
+
+          }
+        })
+      },
+      getValue: function() {
+        let form = {}
+        form = this.formValue
+        form['title'] = this.titles
+        form['type'] = this.type
+        form['isCreated'] = this.isCreated
+        return form
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/data/specialDictionary.vue

@@ -26,11 +26,11 @@
           <dealer></dealer>
         </el-tab-pane>
 
-        <el-tab-pane label="门诊大病" name="6">
-          <manufacturer></manufacturer>
-
+        <el-tab-pane label="门诊大病" name="7">
+          <!--<manufacturer></manufacturer>-->
+          <diagnosis></diagnosis>
         </el-tab-pane>
-        <el-tab-pane label="配置项字典" name="7">
+        <el-tab-pane label="配置项字典" name="8">
           <configure></configure>
         </el-tab-pane>
       </el-tabs>
@@ -48,10 +48,12 @@
   import manufacturer from '../stock/config/manufacturer'
   import configure from './components/configure'
   import Dealer from '../stock/config/dealer'
+  import Diagnosis from './components/diagnosis'
 
   export default {
     name: 'specialDictionary',
     components: {
+      Diagnosis,
       Dealer,
       BreadCrumb,
       drugs,

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -4,22 +4,24 @@
               :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" prop="name" label="名称">
-        <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+      <el-table-column align="center" prop="name" width="90" label="单次用量">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.single_dose" readonly></el-input>
-          <div> {{scope.row.min_unit}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>
+            <div> {{scope.row.min_unit}}</div>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="用法">
+      <el-table-column align="center" prop="name" width="100" label="用法">
         <template slot-scope="scope">
           <el-input v-model="scope.row.delivery_way" readonly></el-input>
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="频率">
+      <el-table-column align="center" prop="name" width="100" label="频率">
         <template slot-scope="scope">
           <el-input v-model="scope.row.execution_frequency" readonly></el-input>
         </template>
@@ -27,20 +29,20 @@
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
-            <el-input v-model="scope.row.prescribing_number" style="width:50%" readonly placeholder=""></el-input>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>
             <div>{{scope.row.min_unit}}</div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <el-table-column align="center" prop="name" width="60" label="单价">
         <template slot-scope="scope">
           <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" style="width:50%" placeholder="" readonly></el-input>
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
     </el-table>
@@ -51,35 +53,35 @@
       <el-table-column align="center" prop="project_name" label="名称">
         <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
-      <el-table-column align="center" prop="statistical_classification" width="50" label="组">
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
           {{getGroup(scope.row.statistical_classification)}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="single_dose" width="130" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
           <el-input v-model="scope.row.single_dose" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="delivery_way" width="130" label="用法">
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
           <el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="execution_frequency" width="130" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
         <template slot-scope="scope">
           <el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="130" label="天数">
+      <el-table-column align="center" prop="number_days" width="50" label="天数">
         <template slot-scope="scope">
           <el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="total" width="100" label="总量">
+      <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>
+            <el-input v-model="scope.row.total" placeholder="" readonly></el-input>
           </div>
         </template>
       </el-table-column>
@@ -88,18 +90,13 @@
           <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="120" label="备注">
+      <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
           <el-input v-model="scope.row.remark" readonly></el-input>
         </template>
       </el-table-column>
     </el-table>
   </div>
-
-
-
-
-
 </template>
 
 <script>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -5,32 +5,32 @@
     </div>
     <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
       <div class="mainLeft">
-        <!--<div class="mainCell" style="justify-content: space-between;">-->
-        <!--<p>未就诊：<span>1</span>人</p>-->
-        <!--<p>已就诊：<span>0</span>人</p>-->
-        <!--</div>-->
-        <!--<div class="mainCell">-->
-        <!--<el-radio-group v-model="radio" @change="changeRadio">-->
-        <!--<el-radio :label=1>未就诊</el-radio>-->
-        <!--<el-radio :label=2>已就诊</el-radio>-->
-        <!--<el-radio :label=3>全部</el-radio>-->
-        <!--</el-radio-group>-->
-        <!--</div>-->
+        <div class="mainCell" style="justify-content: space-between;">
+        <p>未就诊：<span>1</span>人</p>
+        <p>已就诊：<span>0</span>人</p>
+        </div>
+        <div class="mainCell">
+        <el-radio-group v-model="radio" @change="changeRadio">
+        <el-radio :label=1>未就诊</el-radio>
+        <el-radio :label=2>已就诊</el-radio>
+        <el-radio :label=3>全部</el-radio>
+        </el-radio-group>
+        </div>
         <div class="mainCell" style="margin-bottom:10px;">
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
         </div>
-        <div style="flex:1;overflow-y:auto;">
-          <el-table :data="patientTableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+        <div>
+          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;" :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row ref="tab"
                     @current-change="handleCurrentChange">
-            <el-table-column align="center" prop="name" label="患者姓名">
+            <el-table-column align="center" prop="name" label="姓名" wdith='89'>
               <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="就诊号" width="90">
+            <el-table-column align="center" prop="name" label="就诊号" width="110">
               <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
             </el-table-column>
           </el-table>
@@ -229,6 +229,8 @@
           { path: false, name: '门诊收费' },
           { path: false, name: '门诊收费管理' }
         ],
+        tableHeight:'',
+        fullHeight: document.documentElement.clientHeight,
         activeName: 'first',
         info: {},
         curPrescriptions: {},
@@ -261,6 +263,8 @@
       }
     },
     created() {
+      let tableHeight = document.body.clientHeight - 263
+      this.tableHeight = tableHeight
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1
@@ -641,6 +645,29 @@
           }
         })
       }
+    },
+    mounted(){
+      const that = this
+      window.onresize = () => {
+        return (() => {
+          window.fullHeight = document.documentElement.clientHeight
+          that.fullHeight = window.fullHeight
+        })()
+      }
+    },
+    watch: {
+      fullHeight (val) {
+        if(!this.timer) {
+          this.fullHeight = val
+          let tableHeight = val - 263
+          this.tableHeight = tableHeight
+          this.timer = true
+          let that = this
+          setTimeout(function (){
+            that.timer = false
+          },400)
+        }
+      }
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -135,7 +135,7 @@
                           @select-all="changeAllGoodInfoTableData"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
                   <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                   </el-table-column>
@@ -164,7 +164,7 @@
                           :row-style="{ color: '#303133' }"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
                   <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{}}</template>
                   </el-table-column>
@@ -190,7 +190,7 @@
                           @select-all="changeAllGoodInfoTableDataTwo"
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row>
-                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
                   <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{ scope.row.project_name }}</template>
                   </el-table-column>
@@ -207,7 +207,7 @@
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                           highlight-current-row
                           @select='selectTeam'>
-                  <el-table-column type="selection" width="40"></el-table-column>
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
                   <el-table-column prop="name" label="名称">
                     <template slot-scope="scope">{{scope.row.project_team}}</template>
                   </el-table-column>
@@ -578,11 +578,18 @@
           this.$message.error('该处方已经结算或者退费，无法继续添加处方')
           return
         }
+        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0 ){
+          this.$message.error('当前处方无数据，新增数据后才能新增处方')
+          return
+        }
+
+
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         this.prescriptions.push({
           id: 0,
           name: newTabName,
+          order_status:0,
           advices: [],
           project: []
 
@@ -592,11 +599,14 @@
         this.curStatus = 0
       },
       removeTab(targetName) {
-        if(this.curPrescriptions.order_status >= 2){
-          this.$message.error('该处方已经结算或者退费，无法删除')
+        if(this.curPrescriptions.order_status == 2){
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        if(targetName == "处方1"){
+          this.$message.error('该处方无法删除')
           return
         }
-
         this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
@@ -1169,6 +1179,7 @@
     .el-tab-pane{
       display: flex;
       flex-direction: column;
+      height:100%;
     }
   }
   #tab-more {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -3,13 +3,13 @@
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" prop="drug_name" label="名称">
-        <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+        <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>
 
-      <el-table-column align="center" prop="single_dose" width="80" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.single_dose" style="width:60%;"></el-input>
+            <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
             <div>{{scope.row.min_unit}}</div>
           </div>
         </template>
@@ -54,7 +54,7 @@
       </el-table-column>
       <el-table-column align="center" prop="remark" width="50" label="备注">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.remark" placeholder=""></el-input>
+          <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
@@ -68,24 +68,22 @@
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <!-- <el-table-column align="center" type="index" width="40" label="序号"></el-table-column> -->
       <el-table-column align="center" prop="project_name" label="名称">
-        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+        <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-        <template slot-scope="scope">
-          {{getGroup(scope.row.statistical_classification)}}
-        </template>
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="single_dose" width="80" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
           <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="delivery_way" width="50" label="用法">
+      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
           <el-input v-model="scope.row.delivery_way" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="execution_frequency" width="50" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
         <template slot-scope="scope">
           <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
         </template>
@@ -109,7 +107,7 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
-           <el-input v-model="scope.row.remark"></el-input>
+           <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
@@ -193,7 +191,7 @@
         })
 
       },deleteDrug:function(index, row){
-       if(this.curPrescriptions.order_status >= 2){
+       if(this.prescription.order_status >= 2){
          this.$message.error('该处方已经结算或者退费，无法删除')
          return
        }
@@ -203,8 +201,8 @@
          type: "warning"
        }).then(() => {
          this.$nextTick(function(){
-           // this.prescription.advices.splice(index, 1)
            if(row.advice_id == 0){
+             this.prescription.advices.splice(index, 1)
            }else{
              let params = {
                'id': row.advice_id,
@@ -269,7 +267,7 @@
          return name
       },
       deleteProject(row,i){
-        if(this.curPrescriptions.order_status >= 2){
+        if(this.prescription.order_status = 2){
           this.$message.error('该处方已经结算或者退费，无法删除')
           return
         }
@@ -311,6 +309,9 @@
 
 <style lang="scss">
   .prescriptionTable {
+    .el-input__inner{
+      padding: 0 5px;
+    }
     .additionalBox{
       margin-top: 20px;
       display: flex;

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -17,7 +17,7 @@
           </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
-          <el-input size="small" @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
+          <el-input size="small" placeholder="请输入姓名或就诊号" @input="searchAction" @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
@@ -29,7 +29,7 @@
                     highlight-current-row
                     ref="tab"
           >
-            <el-table-column prop="name" label="姓名">
+            <el-table-column prop="name" label="姓名" width='89'>
               <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
@@ -41,16 +41,16 @@
       <div class="mainRight">
         <div class="mainHeader">
           <el-radio-group class="titleBox" v-model="titleType" @change="changeTab">
-            <el-radio-button label="处方"></el-radio-button>
-            <el-radio-button label="病历"></el-radio-button>
+            <el-radio-button label="电子处方"></el-radio-button>
+            <el-radio-button label="电子病历"></el-radio-button>
           </el-radio-group>
-          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '处方'">
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
             <el-button size="small" ref="button_one"   @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
             <el-button size="small" ref="button_two"   @click="open(2)" type="primary">打印</el-button>
             <el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>
             <el-button size="small" ref="button_four"  @click="open(5)" type="primary">存模板</el-button>
           </div>
-          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '病历'">
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary" style="margin-left:10px;">保存</el-button>
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
             <el-button size="small" @click="opentwo(3)" type="primary">病历调用</el-button>
@@ -105,13 +105,13 @@
         search_input: '',
         cal_one: 0,
         cal_two: 0,
-        radio: 0,
+        radio: 1,
         record_date: '',
         crumbs: [
           { path: false, name: '门诊医生站' },
           { path: false, name: '医生工作台' }
         ],
-        titleType: '处方',
+        titleType: '电子处方',
         patientTableData: [{}],
         patientTableDataTwo:[{}],
         patientInfo: {},
@@ -140,13 +140,11 @@
         }else{
           let arr = []
           for (let i = 0; i < this.patientTableData.length; i++){
-            if(this.patientTableData[i].patients.name.indexOf(this.search_input) != -1 ){
+            if(this.patientTableData[i].patients.name.indexOf(this.search_input) != -1 || this.patientTableData[i].his_patient.number.indexOf(this.search_input) != -1){
               arr = arr.concat(this.patientTableData[i])
             }
           }
-          if(arr.length > 0){
-            this.patientTableData = arr
-          }
+          this.patientTableData = arr
 
         }
 

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -13,11 +13,9 @@
                         :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
                         placeholder="选择日期时间" align="right"></el-date-picker>
       </div>
-      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
+      <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-        <el-table-column align="center" label="序号" width="60" type="index">
-          <!--<template slot-scope="scope">{{ scope.$index +1 }}</template>-->
-        </el-table-column>
+        <el-table-column align="center" label="序号" width="60" type="index"></el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
         </el-table-column>
@@ -119,6 +117,9 @@
             return false
           } else {
             this.tableData = response.data.data.order
+            this.$nextTick(() => {
+              this.$refs.table.doLayout(); //解决表格错位
+            });
 
           }
         })