提交代码

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -305,9 +305,12 @@
                                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                             highlight-current-row>
                                       <el-table-column type="selection" width="40" align="center"></el-table-column>
-                                      <el-table-column label="名称">
-                                          <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+                                      <el-table-column label="名称"  v-if="org_id != 10206">
+                                          <template slot-scope="scope">{{ scope.row.drug_name}}</template>
                                       </el-table-column>
+                                    <el-table-column label="名称"  v-if="org_id == 10206">
+                                      <template slot-scope="scope">{{ scope.row.drug_name}} {{scope.row.number}}</template>
+                                    </el-table-column>
                                       <el-table-column label="规格" width="60" v-if="org_id == 10206 || org_id == 0">
                                           <template slot-scope="scope">
                                               <span>{{scope.row.drug_spec}}</span>
@@ -419,9 +422,12 @@
                                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                             highlight-current-row>
                                       <el-table-column type="selection" width="40" align="center"></el-table-column>
-                                      <el-table-column prop="name" label="名称">
+                                      <el-table-column prop="name" label="名称" v-if="org_id != 10206">
                                           <template slot-scope="scope">{{ scope.row.project_name }}</template>
                                       </el-table-column>
+                                    <el-table-column prop="name" label="名称" v-if="org_id == 10206">
+                                      <template slot-scope="scope">{{ scope.row.project_name }}{{scope.row.number}}</template>
+                                    </el-table-column>
                                       <el-table-column label="规格" width="60">
                                           <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                       </el-table-column>
@@ -531,13 +537,13 @@ import { uParseTime } from '@/utils/tools'
 import NextOrLastPrescription from './nextOrLastPrescription'
 import CallPrescription from './callPrescription'
 import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
+import axios from 'axios'
 
 const moment = require('moment')
 
 export default {
   props: {
     zuobiao_drug:Array,
-    zuobiao_project:Array,
     drugs:Array,
     allDrugs:Array,
     advices_template:Array,
@@ -575,6 +581,7 @@ export default {
   },
   data() {
     return {
+      zuobiao_project:[],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       register10206: [
@@ -728,7 +735,41 @@ export default {
     }
   },
   methods: {
+    getzuobiao(){
+      if(this.org_id == 10206){
+        var that = this
+        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
+
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingtwo = false
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
+
+              } else {
+                // that.zuobiao_drug  = response.data.data.drug
+                that.zuobiao_project  = response.data.data.project
+
+
+              }
+            }
+          })
+          .catch(function(error) {
+          })
+      }
+
 
+    },
     changeClass(id) {
       this.tabProject = []
       if (id == 0) {
@@ -3608,6 +3649,7 @@ export default {
               first_letter:project[i].first_letter,
               bbx01:project[i].bbx01,
               zuobiao_stock_num:0,
+              number:""
 
             }
             this.tabProject.push(obj)
@@ -3644,10 +3686,14 @@ export default {
               first_letter:good_info[i].first_letter,
               bbx01:good_info[i].bbx01,
               zuobiao_stock_num:0,
+              number: good_info[i].good_number
 
             }
             this.tabProject.push(obj)
           }
+
+          this.allProject = this.tabProject
+
           //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
           if(this.org_id == 10206 ) {
             for (let i = 0; i < this.zuobiao_project.length; i++) {
@@ -3660,6 +3706,8 @@ export default {
           }
 
           this.allProject = this.tabProject
+
+
           // console.log('cccc',this.allProject);
         }
       })
@@ -3826,6 +3874,7 @@ export default {
     this.request_record_date = this.record_date
     // this.getInitData()
     //获取所有项目
+    this.getzuobiao()
     this.getlist()
     //获取所以项目组套
     this.getAllProjectTeam()

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -45,6 +45,8 @@
             highlight-current-row
             ref="tab"
           >
+            <el-table-column type="index" align="center" label="序号" width="60">
+            </el-table-column>
             <el-table-column prop="name" label="姓名">
               <template slot-scope="scope"
                 >{{ scope.row.name }}（{{ scope.row.dialysis_no }}）</template
@@ -106,7 +108,7 @@
         </el-pagination>
       </div>
     </div>
-    
+
   </div>
 </template>