Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/data.js

@@ -176,4 +176,52 @@ export function createDrugUnitSafeguard(params) {
 
 
 
+export function createMZSick(params) {
+  return request({
+    url: '/api/stock/dealer/create',
+    method: 'post',
+    params: params
+  })
+}
+
+export function modifyMZSick(params) {
+  return request({
+    url: '/api/stock/dealer/modify',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getMZSickList(params) {
+  return request({
+    url: '/api/stock/dealer/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteMZSick(params) {
+  return request({
+    url: '/api/stock/dealer/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function GetMZSickr(params) {
+  return request({
+    url: '/api/stock/dealer/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+
+
+
+
+
+
 

src/xt_pages/data/specialDictionary.vue

@@ -25,6 +25,11 @@
           <!--<supplier></supplier>-->
           <dealer></dealer>
         </el-tab-pane>
+
+        <el-tab-pane label="门诊大病" name="6">
+          <manufacturer></manufacturer>
+
+        </el-tab-pane>
         <el-tab-pane label="配置项字典" name="7">
           <configure></configure>
         </el-tab-pane>

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="prescription.type == 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="name" label="名称">
+        <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.single_dose" readonly></el-input>
+          <div> {{scope.row.min_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" 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="频率">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.execution_frequency" readonly></el-input>
+        </template>
+      </el-table-column>
+
+      <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>{{scope.row.min_unit}}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" 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>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table v-if="prescription.type == 2" :data="prescription.project" 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="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="组">
+        <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用量'">
+        <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="用法">
+        <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="频率">
+        <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="天数">
+        <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="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;">
+            <el-input v-model="scope.row.total" style="width:50" placeholder="" readonly></el-input>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <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="备注">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.remark" readonly></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+
+
+
+
+
+</template>
+
+<script>
+  import { getInitData } from '@/api/his/his'
+  import { getDictionaryDataConfig} from "@/utils/data";
+
+  export default {
+    props: {
+      prescription: Object
+    },
+    data() {
+      return {
+        drugways: [],
+        efs: []
+      }
+    }, mounted() {
+      getInitData().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.drugways = response.data.data.drugways
+          this.efs = response.data.data.efs
+        }
+      })
+    }, methods:  {
+
+
+      getGroup(id){
+        var name = ""
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
+        console.log("2235",statistics_category)
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable{
+  .additionalBox{
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+  .additionalOne{
+    margin-right:20px;
+    margin-bottom:10px;
+    display: flex;
+    align-items: center;
+  >span{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width:60px;
+    display: inline-block;
+    font-size: 14px;
+  }
+  }
+  .deleteIcon{
+    color:red;
+    margin-left:5px;
+  }
+  }
+  .el-table th .cell, .el-table td .cell{
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+  .el-icon-delete{
+    color:red;
+  }
+  }
+</style>