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

config/prod.env.js

@@ -9,4 +9,3 @@ module.exports = {
   MIRCO_MALL_HOST: '"http://mall.kuyicloud.com"',
   CDM_HOST: '"http://cdm.kuyicloud.com"',
 }
-

src/api/config.js

@@ -148,7 +148,7 @@ export function postMonitorIsOpen(params){
 
 
 export function getMonitorConfig(params){
-  
+
   return request({
     url:"/api/monitor/getmonitorconfig",
     method:"Get",
@@ -158,7 +158,7 @@ export function getMonitorConfig(params){
 
 
 export function addOrderConfig(params){
-  
+
   return request({
     url:"/api/order/addorderconfig",
     method:"Get",
@@ -168,7 +168,7 @@ export function addOrderConfig(params){
 }
 
 export function getOrderConfig(params){
-  
+
   return request({
     url:"/api/order/getorderconfig",
     method:"get",
@@ -177,7 +177,7 @@ export function getOrderConfig(params){
 }
 
 export function changeFuncPrint(params){
-  
+
   return request({
     url:"/api/order/changefuncprint",
     method:"get",
@@ -186,10 +186,21 @@ export function changeFuncPrint(params){
 }
 
 export function getDataPrintList(params){
-  
+
   return request({
     url:"/api/order/getdataprint",
     method:"get",
     params:params
   })
-}
+}
+
+
+
+export function postXtHisProjectIsOpen(params){
+
+  return request({
+    url:"/api/xtconfigproject/isopen",
+    method:"post",
+    params:params
+  })
+}

src/api/his/his.js

@@ -429,7 +429,47 @@ export function getHisHospitalPrescriptionList (params) {
 
 
 
+export function getIncomeStatisticsDataList(params) {
+  return request({
+    url: "/api/incomestatistics/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
+
+
+
+
+export function saveTeam(data, params) {
+  return request({
+    url: "/api/his/saveprojectteam",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+
+
 
+export function editTeam(params,data) {
+  return request({
+    url: "/api/his/updateprojectteam",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
 
+export function createdTemplate(params,data) {
+  return request({
+    url: "/api/hisprescriptiontemplate/create",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
 
 

src/api/his/his_config.js

@@ -0,0 +1,82 @@
+import request from "@/utils/request";
+
+
+
+export function getPatientList(params) {
+  return request({
+    url: "/api/his/patient/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getPrescriptiontemplateList(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getPrescriptionTemplateInfo(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/info",
+    method: "get",
+    params:params
+  });
+}
+
+
+
+export function createdTemplate(params,data) {
+  return request({
+    url: "/api/his/prescriptiontemplate/create",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+
+
+
+export function delHisPrescriptionTemplate(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+export function delHisPrescriptionInfoTemplate(params) {
+  return request({
+    url: "/api/his/prescriptioninfotemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+
+export function delHisPrescriptionAdviceTemplate(params) {
+  return request({
+    url: "/api/his/advicetemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+export function delHisPrescriptionProjectTemplate(params) {
+  return request({
+    url: "/api/his/projecttemplate/delete",
+    method: "post",
+    params:params,
+  });
+}

src/api/project/project.js

@@ -1,5 +1,5 @@
 import request from "@/utils/request";
-import url from "postcss-url";
+
 
 export function saveProject(params){
 
@@ -47,14 +47,14 @@ export function deleteHisProject(id,params){
   })
 }
 
-export function saveProjectTeam(params){
-
-  return request({
-    url:"/api/his/saveprojectteam",
-    methods:"Get",
-    params:params
-  })
-}
+// export function saveProjectTeam(params,data){
+//   return request({
+//     url:"/api/his/saveprojectteam",
+//     methods:"DELETE",
+//     data:data,
+//     params:params,
+//   })
+// }
 
 export function getProjectTeamList(params){
 

src/lang/zh.js

@@ -247,6 +247,8 @@ export default {
     hospitalStation:"住院工作站",
     pastInquiries:"既往查询",
 
+    prescriptionTemplate:"处方模版",
+
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/outpatientDoctorStation.js

@@ -24,6 +24,24 @@ export default {
         name: 'outpatientDoctorStationPastInquiries',
         meta: { title: 'outpatientDoctorStationPastInquiries', noCache: true }
     },
+    {
+      path: '/outpatientDoctorStation/prescriptionTemplate',
+      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplate'),
+      name: 'prescriptionTemplate',
+      meta: { title: 'prescriptionTemplate', noCache: true }
+    },
+
+    {
+      path: '/outpatientDoctorStation/prescriptionTemplatedetail',
+      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail'),
+      name: 'prescriptionTemplatedetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'prescriptionTemplatedetail', noCache: true }
+    },
+
+
+
     {
         path: '/outpatientDoctorStation/templateManagement',
         component: () => import('@/xt_pages/outpatientDoctorStation/templateManagement'),

src/xt_pages/data/basicConfig.vue

@@ -26,6 +26,15 @@
           </p>
         </div>
 
+        <div class="configBox">
+            <p style="font-size:18px;font-weight:bold">处方项目同步到临时医嘱</p>
+            <p style="font-size:14px;margin-top:5px;color:#333;">开启门诊处方的项目同步后，护士则在血透的临时医嘱中可以看到相关的耗材/检验检查数据</p>
+            <p style="margin-top:20px;">门诊处方项目同步到透析医嘱：
+                <el-switch v-model="is_open_xt_his_project" @change="changeFuncProject"></el-switch>
+            </p>
+        </div>
+
+
         <!-- <div class="configBox">
           <p style="font-size:18px;font-weight:bold">血压数据自动获取</p>
           <p style="font-size:14px;margin-top:5px;color:#333;">在联机的状态下,开启透析监测-血压数据自动获取功能后,则不需要手动输入,数据会自动上传到监测中</p>
@@ -71,14 +80,14 @@
                 <!--<el-switch v-model="value"></el-switch>-->
             <!--</p>-->
         <!--</div>-->
-        
+
     </div>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -95,6 +104,7 @@ export default {
       is_open_monitor:false,
       is_open_order:false,
       is_open_print:false,
+      is_open_xt_his_project: false,
     };
   },
   methods: {
@@ -104,10 +114,18 @@ export default {
           if (response.data.state === 1) {
             if(response.data.data.is_open_xt_his == 1) {
               this.is_open_xt_his = true
+
             }else{
               this.is_open_xt_his = false
             }
 
+            if(response.data.data.is_open_xt_his_project == 1) {
+              this.is_open_xt_his_project = true
+
+            }else{
+              this.is_open_xt_his_project = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -146,6 +164,38 @@ export default {
         )
       }
     },
+    changeFuncProject(val){
+      if(this.is_open_xt_his_project){
+        let params={
+          is_open:this.is_open_xt_his_project
+        }
+        postXtHisProjectIsOpen(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.is_open_xt_his_project = response.data.data.is_open
+
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      }else{
+        let params={
+          is_open:this.is_open_xt_his_project
+        }
+        postXtHisProjectIsOpen(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.is_open_xt_his_project = response.data.data.is_open
+
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      }
+    },
+
 
     changeFuncTwo(){
       console.log("3333333",this.is_open_monitor)
@@ -193,7 +243,7 @@ export default {
        }
       let params = {
          is_open:is_open,
-       } 
+       }
       addOrderConfig(params).then(response=>{
          if(response.data.state == 1){
            var config = response.data.data.config
@@ -224,11 +274,11 @@ export default {
       }
       if(val == false){
         is_open = 0
-      } 
+      }
       var params = {
         is_open:is_open,
       }
-     
+
       changeFuncPrint(params).then(response=>{
          if(response.data.state == 1){
            var dataPrint =  response.data.data.dataPrint

src/xt_pages/data/components/addInspection.vue

@@ -1,12 +1,13 @@
 <template>
     <el-dialog
-        :title="formTitle"
-        width="900px"
-        :visible.sync="visible"
-        :before-close="_close"
+            :title="formTitle"
+            width="900px"
+            :visible.sync="visible"
+            :before-close="_close"
     >
         <div>
-            <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form :model="form" :rules="rules" ref="form" label-width="100px"
+                     style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                 <el-form-item label="组套名称 : " prop="project_team" style="width:100%">
                     <el-input v-model="form.project_team" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
@@ -19,61 +20,65 @@
                 <el-form-item label="五笔 : " prop="wubi" style="width:50%">
                     <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
-                
+
                 <el-form-item label="试管颜色 : " prop="tube_color" style="width:50%">
                     <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
                         <el-option
-                         v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
-                         :key="index"
-                         :label="item.name"
-                         :value="item.id">
+                                v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
                         </el-option>
-                  </el-select>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="组套类型 : " prop="team_type" style="width:50%">
                     <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
-  
-                 <el-form-item label="组套明细" style="width:50%;">
+
+                <el-form-item label="组套明细" style="width:50%;">
                     <el-select v-model="form.project_detail" placeholder="请选择">
                         <el-option
-                        v-for="item in projectList"
-                        :key="item.id"
-                        :label="item.project_name"
-                        :value="item.id">
+                                v-for="item in projectList"
+                                :key="item.id"
+                                :label="item.project_name"
+                                :value="item.id">
                         </el-option>
                     </el-select>
 
-                    </el-form-item>
-                 <el-form-item label="数量" style="width:50%;"> 
-                      <div style="display:flex;"> 
-                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>
-                         <el-button type="primary" @click="addProjectList">添加</el-button>
-                      </div>
-                  </el-form-item>
+                </el-form-item>
+                <el-form-item label="数量" style="width:50%;">
+                    <div style="display:flex;">
+                        <el-input v-model="form.number" style="margin-right:10px;"></el-input>
+                        <el-button type="primary" @click="addProjectList">添加</el-button>
+                    </div>
+                </el-form-item>
             </el-form>
             <el-form>
-                <el-table :data="tableData" border  style="100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row ref="tab">
+                <el-table :data="tableData" border style="100%" :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row ref="tab">
                     <el-table-column align="center" prop="name" label="分类" width="120">
-                        <template slot-scope="scope">{{getId(scope.row.statistical_classification)}}</template>
+                        <template slot-scope="scope">
+                            <div >{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="组套明细" width="120">
                         <template slot-scope="scope">{{scope.row.project_name}}</template>
                     </el-table-column>
-                     <el-table-column align="center" prop="name" label="数量" width="120">
+                    <el-table-column align="center" prop="name" label="数量" width="120">
                         <template slot-scope="scope">{{scope.row.number}}</template>
                     </el-table-column>
-                     <el-table-column align="center" prop="name" label="单位" width="120">
+                    <el-table-column align="center" prop="name" label="单位" width="120">
                         <template slot-scope="scope">{{scope.row.unit}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
@@ -81,18 +86,18 @@
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="操作">
                         <template slot-scope="scope">
-                          <el-tooltip
-                            class="item"
-                            effect="dark"
-                            content="删除"
-                            placement="top"
+                            <el-tooltip
+                                    class="item"
+                                    effect="dark"
+                                    content="删除"
+                                    placement="top"
                             >
-                            <el-button
-                                type="danger"
-                                icon="el-icon-delete"
-                                size="small"
-                                @click="DeleteProject(scope.row.id,scope.$index)"
-                            ></el-button>
+                                <el-button
+                                        type="danger"
+                                        icon="el-icon-delete"
+                                        size="small"
+                                        @click="DeleteProject(scope.row.id,scope.$index)"
+                                ></el-button>
                             </el-tooltip>
                         </template>
                     </el-table-column>
@@ -103,202 +108,231 @@
 
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary"  @click="submitAction('form')">保 存</el-button>
+            <el-button type="primary" @click="submitAction('form')">保 存</el-button>
         </div>
-  </el-dialog>
+    </el-dialog>
 </template>
 
 <script>
-import { getDictionaryDataConfig,getDataConfig } from "@/utils/data";
-import { saveProjectTeam,getAllProjectList,addProjectList,DeleteProject,getProjectDetail } from "@/api/project/project"
-export default {
-    data(){
-        return{
-            visible:false,
-            formTitle:'',
-            activeName:'first',
-            form:{
-              project_team:'',
-              price:"",
-              pinyin:"",
-              wubi:"",
-              tube_color:"",
-              team_type:"",
-              remark:"",
-              project_detail:"",
-              number:""
-            },
-            options: [
-            {value: 1,label: '是'},
-            {value: 2,label: '否'}
-            ],
-            value: '',
-            radio:'1',
-            rules: {
-              project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
-            //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-            //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
-              price: [{ required: true, message: '请填写价格', trigger: 'change' }],
-              team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
-           },
-           tableData:[],
-           projectList:[],
-           tabList:[],
-           itemList:[]
-        }
-    },
-    methods:{
-        getDataConfig(module, filed_name){
-            return getDataConfig(module, filed_name)
-        },
-            getDictionaryDataConfig(module, filed_name) {
-            return getDictionaryDataConfig(module, filed_name)
-        },
-        _close: function(done) {
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show(id) {
-            this.visible = true
-            this.formTitle = '新增' 
-         },
-        hide() {
-         this.visible = false
-        },
-        submitAction(formName){
-           this.$refs[formName].validate((valid)=>{
-                var arr = []
-                var listId = []
-                for(let i=0;i<this.tableData.length;i++){
-                    arr.push(this.tableData[i].id)
-                    
-                }
-                console.log("arr",arr)
-                console.log("table",this.tableData)
-                var ids = arr.join(",")
-                var listIds = this.itemList.join(",")
-                var params = {
-                 project_team:this.form.project_team,
-                 price:this.form.price,
-                 pinyin:this.form.pinyin,
-                 wubi:this.form.wubi,
-                 tube_color:this.form.tube_color,
-                 team_type:this.form.team_type,
-                 remark:this.form.remark,
-                 ids:ids,
-                 item_id:listIds
-               }
-              
-              saveProjectTeam(params).then(response=>{
-                 if(response.data.state == 1){
-                   var projectTeam = response.data.data.projectTeam
-                   console.log("projectTeam",projectTeam)
-                   this.$message.success("保存成功")  
-                   this.visible = false
-                   this.form.project_team = "",
-                   this.form.price = "",
-                   this.form.pinyin = "",
-                   this.form.wubi = "",
-                   this.form.tube_color = "",
-                   this.form.team_type = "",
-                   this.form.remark = ""
-                   this.tableData = []
-                   this.form.number = ""
-                   this.$parent.getlist()
-                 }else{
-                    this.$message.error("项目组套名称已存在!")
-                 }
-              }) 
-           })
+  import { getDataConfig, getDictionaryDataConfig } from '@/utils/data'
+  import {
+    addProjectList,
+    DeleteProject,
+    getAllProjectList,
+    getProjectDetail,
+    saveProjectTeam
+  } from '@/api/project/project'
+
+  import {
+    saveTeam
+  } from '@/api/his/his'
+
+
+  export default {
+    data() {
+      return {
+        visible: false,
+        formTitle: '',
+        activeName: 'first',
+        form: {
+          project_team: '',
+          price: '',
+          pinyin: '',
+          wubi: '',
+          tube_color: '',
+          team_type: '',
+          remark: '',
+          project_detail: '',
+          number: '1'
         },
-        getlist(){
-          getAllProjectList().then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               console.log('projectlist33333',projectList)
-              
-               this.projectList = projectList
-            //    var hisprojectlist = response.data.data.hisprojectlist
-            //    console.log("hisprojectlist",hisprojectlist)
-            //    this.tableData = hisprojectlist
-             }
-          })   
+        options: [
+          { value: 1, label: '是' },
+          { value: 2, label: '否' }
+        ],
+        value: '',
+        radio: '1',
+        rules: {
+          project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur' }],
+          //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+          //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+          price: [{ required: true, message: '请填写价格', trigger: 'change' }],
+          team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
         },
-       
-        getId(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
-             }
+        tableData: [],
+        projectList: [],
+        tabList: [],
+        itemList: []
+      }
+    },
+    methods: {
+      getDataConfig(module, filed_name) {
+        return getDataConfig(module, filed_name)
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      _close: function(done) {
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show(id) {
+        this.visible = true
+        this.formTitle = '新增'
+      },
+      hide() {
+        this.visible = false
+      },
+      submitAction(formName) {
+        this.$refs[formName].validate((valid) => {
+          var params = {
+            project_team: this.form.project_team,
+            price: this.form.price,
+            pinyin: this.form.pinyin,
+            wubi: this.form.wubi,
+            tube_color: this.form.tube_color,
+            team_type: this.form.team_type,
+            remark: this.form.remark,
           }
-          return name
-        },
-        chagneInspection(id){
-           getProjectDetail(id).then(response=>{
-              if(response.data.state == 1){
-               var projectdetail = response.data.data.projecDetail
-               console.log("projectdetail",projectdetail)
-               this.tableData.push(projectdetail)
-              }
-           })
-        },
-       addProjectList(){
-          
-          for(let i=0;i<this.projectList.length;i++){
-            if(this.form.project_detail == this.projectList[i].id){
-                this.projectList[i].number = this.form.number
-                this.tableData.push(this.projectList[i])
-            }
-         }
-         console.log("33333",this.tableData)
-      
-         
-            const params = {
-              id:this.form.project_detail,
-              number:parseInt(this.form.number)
-            }
-           console.log("params",params)
-          addProjectList(params).then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               var item = response.data.data.item
-               console.log("item22222",item)
-               this.itemList.push(item.id)
-               this.$message.success("保存成功")
-               this.form.project_detail = ""
-               this.form.number = ""
-            //    this.getlist()
-             }
-          })
-        },
-        DeleteProject(id,index){
-           this.$confirm("确认删除此项目吗?", "删除", {
-            confirmButtonText: "确 定",
-            cancelButtonText: "取 消",
-            type: "warning"
-         }).then(() => {
-          DeleteProject(id).then(response => {
+          let data = {
+            "info":this.tableData
+          }
+          saveTeam(data,params).then(response => {
             if (response.data.state == 1) {
-               this.tableData.splice(index, 1);
+              var projectTeam = response.data.data.projectTeam
+              console.log('projectTeam', projectTeam)
+              this.$message.success('保存成功')
+              this.visible = false
+              this.form.project_team = '',
+                this.form.price = '',
+                this.form.pinyin = '',
+                this.form.wubi = '',
+                this.form.tube_color = '',
+                this.form.team_type = '',
+                this.form.remark = ''
+              this.tableData = []
+              this.form.number = ''
+              this.$parent.getlist()
             } else {
-             
+              this.$message.error('项目组套名称已存在!')
             }
-          });
+          })
+        })
+      },
+      getlist() {
+        getAllProjectList().then(response => {
+          if (response.data.state == 1) {
+            var projectList = response.data.data.projectList
+            var goodInfos = response.data.data.good_info
+
+            for (let i = 0; i < projectList.length; i++) {
+              let obj = {
+                id: projectList[i].id,
+                statistical_classification: projectList[i].statistical_classification,
+                number: '1',
+                project_name: projectList[i].project_name,
+                unit: projectList[i].unit,
+                price: projectList[i].price,
+                type: 2
+              }
+              this.projectList.push(obj)
+
+            }
+
+            for (let i = 0; i < goodInfos.length; i++) {
+              let obj = {
+                id: goodInfos[i].id,
+                statistical_classification: goodInfos[i].statistical_classification,
+                number: '1',
+                project_name: goodInfos[i].good_name,
+                unit: goodInfos[i].good_unit,
+                price: goodInfos[i].retail_price,
+                type: 3
+              }
+              this.projectList.push(obj)
+            }
+
+            console.log(this.projectList)
+
+            // this.projectList = projectList
+            //    var hisprojectlist = response.data.data.hisprojectlist
+            //    console.log("hisprojectlist",hisprojectlist)
+            //    this.tableData = hisprojectlist
+          }
         })
-        .catch(() => {});
+      },
+
+      getId(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
+      },
+      chagneInspection(id) {
+        getProjectDetail(id).then(response => {
+          if (response.data.state == 1) {
+            var projectdetail = response.data.data.projecDetail
+            console.log('projectdetail', projectdetail)
+            this.tableData.push(projectdetail)
+          }
+        })
+      },
+      addProjectList() {
+        console.log(this.projectList)
+        for (let i = 0; i < this.projectList.length; i++) {
+          if (this.form.project_detail == this.projectList[i].id) {
+            this.projectList[i].number = this.form.number
+            this.projectList[i].number =  this.projectList[i].number.toString()
+            this.tableData.push(this.projectList[i])
+            this.form.project_detail = ""
+            this.form.number = ""
+          }
+        }
+        // console.log("33333",this.tableData)
+        //
+        //
+        //    const params = {
+        //      id:this.form.project_detail,
+        //      number:parseInt(this.form.number)
+        //    }
+        //   console.log("params",params)
+        //  addProjectList(params).then(response=>{
+        //     if(response.data.state == 1){
+        //       var projectList = response.data.data.projectList
+        //       var item = response.data.data.item
+        //       console.log("item22222",item)
+        //       this.itemList.push(item.id)
+        //       this.$message.success("保存成功")
+        //       this.form.project_detail = ""
+        //       this.form.number = ""
+        //    //    this.getlist()
+        //     }
+        //  })
+      },
+      DeleteProject(id, index) {
+        this.$confirm('确认删除此项目吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+            this.tableData.splice(index, 1)
+        })
+          .catch(() => {
+          })
+      }
     },
-    created(){
+    created() {
       //获取所以的项目
       this.getlist()
-   
+
     }
-}
+  }
 </script>

src/xt_pages/data/components/editInspection.vue

@@ -1,12 +1,13 @@
 <template>
     <el-dialog
-        :title="formTitle"
-        width="900px"
-        :visible.sync="visible"
-        :before-close="_close"
+            :title="formTitle"
+            width="900px"
+            :visible.sync="visible"
+            :before-close="_close"
     >
         <div>
-            <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+            <el-form :model="form" :rules="rules" ref="form" label-width="100px"
+                     style="display: flex;flex-wrap: wrap;justify-content: space-between;">
                 <el-form-item label="组套名称 : " prop="project_team" style="width:100%">
                     <el-input v-model="form.project_team" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
@@ -19,60 +20,64 @@
                 <el-form-item label="五笔 : " prop="wubi" style="width:50%">
                     <el-input v-model="form.wubi" placeholder="" maxlength="30"></el-input>
                 </el-form-item>
-                
+
                 <el-form-item label="试管颜色 : " prop="name" style="width:50%">
-                     <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
+                    <el-select v-model="form.tube_color" style="width:160px;" placeholder="请选择">
                         <el-option
-                         v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
-                         :key="index"
-                         :label="item.name"
-                         :value="item.id">
+                                v-for="(item,index) in getDictionaryDataConfig('system','tube_color')"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.id">
                         </el-option>
-                  </el-select>
+                    </el-select>
                 </el-form-item>
                 <el-form-item label="组套类型 : " prop="team_type" style="width:50%">
                     <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                                v-for="item in options"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注 : " prop="name" style="width:100%;">
                     <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
                 </el-form-item>
-                 <el-form-item label="组套明细" style="width:50%;">
+                <el-form-item label="组套明细" style="width:50%;">
                     <el-select v-model="form.project_detail" placeholder="请选择">
                         <el-option
-                        v-for="item in projectList"
-                        :key="item.id"
-                        :label="item.project_name"
-                        :value="item.id">
+                                v-for="item,index in projectList"
+                                :key="index"
+                                :label="item.project_name"
+                                :value="item.id">
                         </el-option>
                     </el-select>
 
-                    </el-form-item>
-                 <el-form-item label="数量" style="width:50%;"> 
-                      <div style="display:flex;"> 
-                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>
-                         <el-button type="primary" @click="addProjectList">添加</el-button>
-                      </div>
-                  </el-form-item>
+                </el-form-item>
+                <el-form-item label="数量" style="width:50%;">
+                    <div style="display:flex;">
+                        <el-input v-model="form.number" style="margin-right:10px;"></el-input>
+                        <el-button type="primary" @click="addProjectList">添加</el-button>
+                    </div>
+                </el-form-item>
             </el-form>
             <el-form>
-                <el-table :data="tableData" border  style="100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row ref="tab">
+                <el-table :data="tableData" border style="100%" :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row ref="tab">
                     <el-table-column align="center" prop="name" label="分类" width="120">
-                        <template slot-scope="scope">{{getId(scope.row.statistical_classification)}}</template>
+                        <template slot-scope="scope">
+                            <div>{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="组套明细" width="120">
                         <template slot-scope="scope">{{scope.row.project_name}}</template>
                     </el-table-column>
-                     <el-table-column align="center" prop="name" label="数量" width="120">
+                    <el-table-column align="center" prop="name" label="数量" width="120">
                         <template slot-scope="scope">{{scope.row.number}}</template>
                     </el-table-column>
-                     <el-table-column align="center" prop="name" label="单位" width="120">
+                    <el-table-column align="center" prop="name" label="单位" width="120">
                         <template slot-scope="scope">{{scope.row.unit}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
@@ -80,18 +85,18 @@
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="操作">
                         <template slot-scope="scope">
-                          <el-tooltip
-                            class="item"
-                            effect="dark"
-                            content="删除"
-                            placement="top"
+                            <el-tooltip
+                                    class="item"
+                                    effect="dark"
+                                    content="删除"
+                                    placement="top"
                             >
-                            <el-button
-                                type="danger"
-                                icon="el-icon-delete"
-                                size="small"
-                                @click="DeleteProject(scope.row.id,scope.$index)"
-                            ></el-button>
+                                <el-button
+                                        type="danger"
+                                        icon="el-icon-delete"
+                                        size="small"
+                                        @click="DeleteProject(scope.row.m_id,scope.$index)"
+                                ></el-button>
                             </el-tooltip>
                         </template>
                     </el-table-column>
@@ -102,234 +107,279 @@
 
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary"  @click="submitAction('form')">保 存</el-button>
+            <el-button type="primary" @click="submitAction('form')">保 存</el-button>
         </div>
-  </el-dialog>
+    </el-dialog>
 </template>
 
 <script>
-import { getProjectTeamDetail,updatedProjectTeam,getAllProjectList,addProjectList,DeleteProject } from "@/api/project/project"
-import { getDictionaryDataConfig,getDataConfig} from "@/utils/data";
-export default {
-    data(){
-        return{
-            visible:false,
-            formTitle:'',
-            activeName:'first',
-            form:{
-              id:"",
-              project_team:'',
-              price:"",
-              pinyin:"",
-              wubi:"",
-              tube_color:"",
-              team_type:"",
-              remark:"",
-              project_detail:"",
-              number:"",
-              item_id:"",
-            },
-            options: [{
-            value: 1,
-            label: '是'
-            }, {
-            value: 2,
-            label: '否'
-            },],
-            value: '',
-            radio:'1',
-            rules: {
-              project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
-            //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-            //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
-              price: [{ required: true, message: '请填写价格', trigger: 'change' }],
-              team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
-           },
-           tableData:[],
-           item_id:[],
-           projectList:[]
-        }
-    },
-    methods:{
-         getDataConfig(module, filed_name){
-            return getDataConfig(module, filed_name)
-        },
-            getDictionaryDataConfig(module, filed_name) {
-            return getDictionaryDataConfig(module, filed_name)
-        },
-        _close: function(done) {
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show(id) {
-         this.visible = true
-         this.formTitle = '编辑'
-         this.getProjectTeamDetail(id) 
+  import {
+    editTeam
+  } from '@/api/his/his'
+  import {
+    addProjectList,
+    DeleteProject,
+    getAllProjectList,
+    getProjectTeamDetail,
+    updatedProjectTeam
+  } from '@/api/project/project'
+  import { getDataConfig, getDictionaryDataConfig } from '@/utils/data'
+
+  export default {
+    data() {
+      return {
+        visible: false,
+        formTitle: '',
+        activeName: 'first',
+        form: {
+          id: '',
+          project_team: '',
+          price: '',
+          pinyin: '',
+          wubi: '',
+          tube_color: '',
+          team_type: '',
+          remark: '',
+          project_detail: '',
+          number: '',
+          item_id: ''
         },
-        hide() {
-    
-            this.visible = false
+        options: [{
+          value: 1,
+          label: '是'
+        }, {
+          value: 2,
+          label: '否'
+        }],
+        value: '',
+        radio: '1',
+        rules: {
+          project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur' }],
+          //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+          //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+          price: [{ required: true, message: '请填写价格', trigger: 'change' }],
+          team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
         },
-        getProjectTeamDetail(id){
-           getProjectTeamDetail(id).then(response=>{
-              if(response.data.state == 1){
-                 var projectTeamDetail =  response.data.data.projectTeamDetail
-                 console.log("projectTeamDetail",projectTeamDetail)
-                 var str  = projectTeamDetail.project_id
-                 var arr = str.split(",")
-                 console.log("Arr33333",arr)
-                 var list = response.data.data.list
-                 console.log("list",list)
-                 var hisList = response.data.data.hisList
-                 console.log("histList",hisList)
-                 for(let i=0;i<list.length;i++){
-                   for(let j=0;j<hisList.length;j++){
-                       if(list[i].id == hisList[j].project_id){
-                           list[i].number = hisList[j].number
-                       }
-                   }
-                 }
-                
-                 var strArr = []
-                 for(let i=0;i<arr.length;i++){
-                   for(let j=0;j<list.length;j++){
-                      if((arr[i]== list[j].id)){
-                          strArr.push(list[j])
-                      }
-                   }
-                 }
-                 console.log("数据222222",strArr)
-                 this.tableData = strArr
-               
-               
-                 this.form.id = projectTeamDetail.id
-                 this.form.project_team = projectTeamDetail.project_team
-                 this.form.price = projectTeamDetail.price
-                 this.form.pinyin = projectTeamDetail.pinyin
-                 this.form.wubi  = projectTeamDetail.wubi
-                 this.form.tube_color = projectTeamDetail.tube_color
-                 if(projectTeamDetail.tube_color == 0){
-                    this.form.tube_color = ""
-                 }
-                 this.form.team_type = projectTeamDetail.team_type
-                 if(projectTeamDetail.team_type == 0){
-                    this.form.team_type = ""
-                 }     
-                 this.form.remark = projectTeamDetail.remark
-                 this.form.item_id = projectTeamDetail.item_id
-                //  console.log("project",projectTeamDetail)
+        tableData: [],
+        item_id: [],
+        projectList: []
+      }
+    },
+    methods: {
+      getDataConfig(module, filed_name) {
+        return getDataConfig(module, filed_name)
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      _close: function(done) {
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show(id) {
+        this.visible = true
+        this.formTitle = '编辑'
+        this.getlist(id)
+        this.getProjectTeamDetail(id)
+
+      }, getlist(id) {
+
+        getAllProjectList().then(response => {
+          if (response.data.state == 1) {
+            console.log(id)
+            console.log('!~~~~')
+
+            var projectList = response.data.data.projectList
+            var goodInfos = response.data.data.good_info
+
+            for (let i = 0; i < projectList.length; i++) {
+              let obj = {
+                id: projectList[i].id,
+                statistical_classification: projectList[i].statistical_classification,
+                number: '1',
+                project_name: projectList[i].project_name,
+                unit: projectList[i].unit,
+                price: projectList[i].price,
+                type: 2,
+                m_id: 0
               }
-           }) 
-        },
-        submitAction(formName){
-           this.$refs[formName].validate((valid)=>{
-               var arr = []
-                for(let i=0;i<this.tableData.length;i++){
-                    arr.push(this.tableData[i].id)
-                }
-             
-               var ids = arr.join(",")
-               var item_id = this.form.item_id + "," + this.item_id.join(",") 
-               console.log("item_id",item_id)
-               
-               if(valid){
-                var params = {
-                    id:this.form.id,
-                    project_team:this.form.project_team,
-                    price:this.form.price,
-                    pinyin:this.form.pinyin,
-                    wubi:this.form.wubi,
-                    tube_color:this.form.tube_color,
-                    team_type:this.form.team_type,
-                    remark:this.form.remark,
-                    ids:ids,
-                    item_id:item_id
-                }
-                // console.log("params",params)
-                 updatedProjectTeam(params).then(response=>{
-                   if(response.data.state == 1){
-                     var projectTeam = response.data.data.projectTeam
-                     this.$message.success("保存成功")
-                     this.visible = false
-                     this.$parent.getlist()
-                   }
-                 })
+              this.projectList.push(obj)
+
+            }
+
+            for (let i = 0; i < goodInfos.length; i++) {
+              let obj = {
+                id: goodInfos[i].id,
+                statistical_classification: goodInfos[i].statistical_classification,
+                number: '1',
+                project_name: goodInfos[i].good_name,
+                unit: goodInfos[i].good_unit,
+                price: goodInfos[i].retail_price,
+                type: 3,
+                m_id: 0
+
               }
-           })  
-        
-        },
-       getlist(){
-          getAllProjectList().then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               console.log('projectlist33333',projectList)
-               this.projectList = projectList
-               var hisprojectlist = response.data.data.hisprojectlist
-             console.log("hisprojectlist",hisprojectlist)
-            //    this.tableData = hisprojectlist
-             }
-          })   
-        },
-        getId(id){
-          console.log("id",id)
-          var name = ""
-          var statistics_category =  getDictionaryDataConfig('system','statistics_category') 
-          console.log("statics",statistics_category)
-          for(let i=0;i<statistics_category.length;i++){
-             if(id == statistics_category[i].id){
-                 name = statistics_category[i].name
-             }
+              this.projectList.push(obj)
+            }
+
           }
-          return name
-        },
-       addProjectList(){
-           
-           console.log("表格",this.tableData)
-            const params = {
-              id:this.form.project_detail,
-              number:parseInt(this.form.number)
+        })
+      },
+
+      hide() {
+        this.visible = false
+      },
+      getProjectTeamDetail(id) {
+        getProjectTeamDetail(id).then(response => {
+          if (response.data.state == 1) {
+            this.tableData = []
+            var projectTeamDetail = response.data.data.projectTeamDetail
+            var hisList = response.data.data.hisList
+
+            console.log(this.projectList)
+            console.log(hisList)
+
+            for (let i = 0; i < hisList.length; i++) {
+
+              let obj = {
+                m_id: hisList[i].id,
+                id: hisList[i].project_id,
+                number: hisList[i].number,
+                type: hisList[i].type
+              }
+              if (hisList[i].type == 2) {
+                obj['statistical_classification'] = hisList[i].project.statistical_classification
+                obj['project_name'] = hisList[i].project.project_name
+                obj['unit'] = hisList[i].project.unit
+                obj['price'] = hisList[i].project.price
+
+              } else {
+                obj['project_name'] = hisList[i].good_info.good_name
+                obj['unit'] = hisList[i].good_info.good_unit
+                obj['price'] = hisList[i].good_info.retail_price
+              }
+              this.tableData.push(obj)
             }
-           console.log("params",params)
-          addProjectList(params).then(response=>{
-             if(response.data.state == 1){
-               var projectList = response.data.data.projectList
-               projectList.number = parseInt(this.form.number)
-               this.tableData.push(projectList)
-               console.log("23333",this.tableData)
-               var item = response.data.data.item
-               this.item_id.push(item.id)
-               this.$message.success("保存成功")
-               this.form.project_detail = ""
-               this.form.number = ""
-               this.getlist()
-             }
-          })
-        },
-        DeleteProject(id,index){
+            this.form.id = projectTeamDetail.id
+            this.form.project_team = projectTeamDetail.project_team
+            this.form.price = projectTeamDetail.price
+            this.form.pinyin = projectTeamDetail.pinyin
+            this.form.wubi = projectTeamDetail.wubi
+            this.form.tube_color = projectTeamDetail.tube_color
+            if (projectTeamDetail.tube_color == 0) {
+              this.form.tube_color = ''
+            }
+            this.form.team_type = projectTeamDetail.team_type
+            if (projectTeamDetail.team_type == 0) {
+              this.form.team_type = ''
+            }
+            this.form.remark = projectTeamDetail.remark
+            // this.form.item_id = projectTeamDetail.item_id
+            //  console.log("project",projectTeamDetail)
+          }
+        })
+      },
+      submitAction(formName) {
+        this.$refs[formName].validate((valid) => {
+          var arr = []
+          for (let i = 0; i < this.tableData.length; i++) {
+            if (this.tableData[i].m_id == 0) {
+              arr.push(this.tableData[i])
+            }
+          }
 
-           this.$confirm("确认删除此项目吗?", "删除", {
-            confirmButtonText: "确 定",
-            cancelButtonText: "取 消",
-            type: "warning"
-         }).then(() => {
-          DeleteProject(id).then(response => {
-            if (response.data.state == 1) {
-               this.tableData.splice(index, 1);
-               
-            } else {
-             
+          if (valid) {
+            var params = {
+              id: this.form.id,
+              project_team: this.form.project_team,
+              price: this.form.price,
+              pinyin: this.form.pinyin,
+              wubi: this.form.wubi,
+              tube_color: this.form.tube_color,
+              team_type: this.form.team_type,
+              remark: this.form.remark
             }
-          });
+            let data = {
+              'info': arr
+            }            // console.log("params",params)
+            editTeam(params, data).then(response => {
+              if (response.data.state == 1) {
+                // var projectTeam = response.data.data.projectTeam
+                this.$message.success('保存成功')
+                this.visible = false
+                // this.$parent.getlist()
+              }
+            })
+          }
         })
-        .catch(() => {});
+
+      },
+      getId(id) {
+        console.log('id', id)
+        var name = ''
+        var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
+        console.log('statics', statistics_category)
+        for (let i = 0; i < statistics_category.length; i++) {
+          if (id == statistics_category[i].id) {
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+      addProjectList() {
+        for (let i = 0; i < this.projectList.length; i++) {
+          if (this.form.project_detail == this.projectList[i].id) {
+            this.projectList[i].number = this.form.number
+            this.projectList[i].number = this.projectList[i].number.toString()
+            this.tableData.push(this.projectList[i])
+            this.form.project_detail = ''
+            this.form.number = ''
+          }
         }
+
+      },
+      DeleteProject(id, index) {
+
+        if (id == 0) {
+          this.$confirm('确认删除此项目吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            this.tableData.splice(index, 1)
+
+          })
+            .catch(() => {
+            })
+
+        } else {
+          this.$confirm('确认删除此项目吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+          }).then(() => {
+            DeleteProject(id).then(response => {
+              if (response.data.state == 1) {
+                this.tableData.splice(index, 1)
+
+              } else {
+
+              }
+            })
+          })
+            .catch(() => {
+            })
+
+        }
+
+      }
     },
-    created(){
-       this.getlist()   
+    created() {
+      this.getlist()
     }
-}
+  }
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -2049,10 +2049,18 @@ export default {
 
 
           for (const index in this.records) {
+            for(const index2 in this.records[index].his_project){
+              if(this.records[index].his_project[index2].type == 2){
+                this.records[index].his_project[index2]['advice_name'] = this.records[index].his_project[index2].project.project_name
+              }else if(this.records[index].his_project[index2].type == 3){
+                this.records[index].his_project[index2]['advice_name'] =this.records[index].his_project[index2].good_info.good_name
+              }
+              this.records[index].his_project[index2]['advice_doctor'] = this.records[index].his_project[index2].doctor
+            }
             this.records[index].advices = this.records[index].advices.concat(this.records[index].his_advices)
+            this.records[index].advices = this.records[index].advices.concat(this.records[index].his_project)
           }
 
-
           for (const recordIndex in this.records) {
             var dlegh = 0;
             if (

src/xt_pages/hospitalStation/allListPrint.vue

@@ -168,21 +168,26 @@
 
         if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
           for (let i = 0; i < new_project_ids.length; i++) {
-            let obj = {};
-            let count = 0;
+            let obj = {}
+            let count = 0
             for (let a = 0; a < details.length; a++) {
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
-                obj['name'] = details[a].project.project.project_name;
-                obj['spec'] = '1';
-                obj['unit'] = details[a].project.project.unit;
-                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type);
-                obj['price'] = parseFloat(details[a].pric);
-                obj['is_total'] = 2;
+                if( details[a].project.type == 2){
+                  obj['name'] = details[a].project.project.project_name
+                }else if(details[a].project.type == 3){
+                  obj['name'] = details[a].project.good_info.good_name
+                }
+                obj['unit'] = details[a].project.unit
+
+                obj['spec'] = '1'
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
 
                 count = count + details[a].cnt
               }
             }
-            obj['count'] = count;
+            obj['count'] = count
             list.push(obj)
           }
         }

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

@@ -61,7 +61,7 @@
         <template slot-scope="scope">{{ scope.row.project_name }}</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">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):'耗材'}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>

src/xt_pages/hospitalStation/components/callPrescription.vue

@@ -1,36 +1,36 @@
 <template>
   <el-dialog
-    :title="name"
-    :visible.sync="isLastOrNextVisible"
-    @close="hide"
-    width="1010px"
-    class="callPrescription"
-    :modal-append-to-body="false"
+          :title="name"
+          :visible.sync="isLastOrNextVisible"
+          @close="hide"
+          width="1010px"
+          class="callPrescription"
+          :modal-append-to-body="false"
   >
     <el-date-picker
-      v-model="start_time"
-      prefix-icon="el-icon-date"
-      @change="changeTime"
-      :editable="false"
-      style="width: 150px;"
-      type="date"
-      placeholder="选择日期时间"
-      align="right"
-      format="yyyy-MM-dd"
-      value-format="yyyy-MM-dd"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            @change="changeTime"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
     ></el-date-picker>
     <span class>-</span>
     <el-date-picker
-      v-model="end_time"
-      prefix-icon="el-icon-date"
-      @change="changeEndTime"
-      :editable="false"
-      style="width: 150px;"
-      type="date"
-      placeholder="选择日期时间"
-      align="right"
-      format="yyyy-MM-dd"
-      value-format="yyyy-MM-dd"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            @change="changeEndTime"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
     ></el-date-picker>
 
 
@@ -93,11 +93,11 @@
             <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
-                <span>{{ scope.row.project.project_name }}</span>
+                <span>{{ scope.row.type == 2?scope.row.project.project_name:scope.row.good_info.good_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">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
@@ -190,7 +190,6 @@
           start_time: this.start_time,
           end_time:this.end_time,
           p_type:1,
-
         };
         this.GetCallHisPrescription(params)
       },changeEndTime(){
@@ -261,13 +260,15 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
               };
               tempAdvice.push(obj)
 
             }
 
 
+
             for (let b = 0; b < prescription.project.length; b++) {
               let obj = {
                 id: 0,
@@ -281,8 +282,26 @@
                 total:prescription.project[b].count,
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
-                medical_code:prescription.project[b].project.medical_code,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type,
+
+
+                // medical_code:prescription.project[b].project.medical_code,
               };
+              console.log(prescription.project[b].type)
+              if(prescription.project[b].type == 2){
+
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+
+              }else if(prescription.project[b].type == 3){
+
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+              }
+
               tempProject.push(obj)
             }
             let obj = {
@@ -347,7 +366,7 @@
 </script>
 
 <style lang="scss">
-.callPrescription{
+  .callPrescription{
   .el-dialog__body{
     padding:0px 20px 30px;
   }
@@ -355,5 +374,5 @@
     margin-top: 10px;
     font-size: 14px;
   }
-}
+  }
 </style>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -577,7 +577,6 @@
       }
     },
     methods: {
-
       changeClass(id) {
         this.tabProject = [];
         if (id == 0) {
@@ -591,6 +590,9 @@
         }
       },
       setMonthPrescription(month_prescriptions) {
+
+
+
         this.month_prescriptions = [];
 
         let drug_month_prescriptions = {
@@ -663,12 +665,6 @@
           return cur
         }, []); // 设置cur默认类型为数组，并且初始值为空的数组
 
-        console.log(drug_ids);
-        console.log(project_ids);
-        console.log(additions_ids);
-
-        console.log(additions_ids);
-
         let drugs = [];
         let projects = [];
         let additions = [];
@@ -689,7 +685,10 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id;
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price);
-              count = count + drug_month_prescriptions.advices[a].prescribing_number
+              obj['drug'] = drug_month_prescriptions.advices[a].drug;
+
+
+                      count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
           }
@@ -702,19 +701,35 @@
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
               obj['number_days'] = project_month_prescriptions.project[a].day;
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
+              // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
               obj['unit'] = project_month_prescriptions.project[a].unit;
               obj['project_id'] = project_month_prescriptions.project[a].project_id;
               count = count + project_month_prescriptions.project[a].count;
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 
+
+              if (project_month_prescriptions.project[a].type == 2) {
+                console.log("~~~~~~~????????")
+
+                obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+
+              } else if (project_month_prescriptions.project[a].type == 3) {
+                console.log("~~~~~~~????????2222222")
+
+                obj['statistical_classification'] = ''
+                obj['medical_code'] = project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] = project_month_prescriptions.project[a].good_info.good_name
+              }
+
             }
           }
           obj['total'] = count;
@@ -767,6 +782,12 @@
 
         this.curMonthPrescriptions = this.month_prescriptions[0]
 
+        console.log("~~~~~~~~~")
+
+        console.log(this.curMonthPrescriptions)
+        console.log("~~~~~~~~~")
+
+
       },
 
       // setMonthPrescription(month_prescriptions) {
@@ -999,7 +1020,10 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -1019,8 +1043,18 @@
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit
+                      unit: prescription.project[b].unit
                     };
+                    if (prescription.project[b].type == 2) {
+                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['medical_code'] = prescription.project[b].project.medical_code
+                      obj['project_name'] = prescription.project[b].project.project_name
+
+                    } else if (prescription.project[b].type == 3) {
+                      obj['statistical_classification'] = ''
+                      obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] = prescription.project[b].good_info.good_name
+                    }
                     tempProject.push(obj)
                   }
 
@@ -1104,7 +1138,9 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -1124,8 +1160,18 @@
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit
+                      unit: prescription.project[b].unit
                     };
+                    if (prescription.project[b].type == 2) {
+                      obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                      obj['medical_code'] = prescription.project[b].project.medical_code
+                      obj['project_name'] = prescription.project[b].project.project_name
+
+                    } else if (prescription.project[b].type == 3) {
+                      obj['statistical_classification'] = ''
+                      obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] = prescription.project[b].good_info.good_name
+                    }
                     tempProject.push(obj)
                   }
 
@@ -2377,7 +2423,8 @@
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
-                  medical_insurance_number: temp[b].medical_insurance_number
+                  medical_insurance_number: temp[b].medical_insurance_number,
+                  drug: temp[b],
 
                 };
 
@@ -2389,20 +2436,19 @@
               this.curStatus = 1
             }
 
-           if(this.activeName == 2){
-
-              for(let i = 0; i<temp2.length;i++){
-               for(let j=0;j<this.hisList.length;j++){
-                   if(temp2[i].id == this.hisList[j].project_id){
-                      temp2[i].total =  this.hisList[j].number
-                   }
-               }
-              }
-            }
+           // if(this.activeName == 2){
+           //
+           //  //   for(let i = 0; i<temp2.length;i++){
+           //  //    for(let j=0;j<this.hisList.length;j++){
+           //  //        if(temp2[i].id == this.hisList[j].project_id){
+           //  //           temp2[i].total =  this.hisList[j].number
+           //  //        }
+           //  //    }
+           //  //   }
+           //  // }
 
 
             if (temp2.length > 0) {
-              console.log("temp2222222222",temp2);
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {
                   id: 0,
@@ -2417,19 +2463,21 @@
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
-                  unit: temp2[b].unit
-                };
+                  unit: temp2[b].unit,
+                  type: temp2[b].type
+                }
                 if (obj.total == 0) {
                   obj.total = 1
                 }
+                if (obj.type == 3) {
+                  obj.single_dose = 1
+                }
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
             }
 
             this.curPrescriptions = this.prescriptions[i];
-            console.log("~~~~~~~~~");
-            console.log("~~~~~~~~~");
 
             this.$refs.multipleTable.clearSelection();
             this.$refs.tables.clearSelection()
@@ -2449,12 +2497,49 @@
       getlist() {
         getHisProject().then(response => {
           if (response.data.state == 1) {
-            var project = response.data.data.project;
-            this.tabProject = project;
-            this.allProject = project
+            var project = response.data.data.project
+            for (let i = 0; i < project.length; i++) {
+              let obj = {
+                id: project[i].id,
+                project_name: project[i].project_name,
+                statistical_classification: project[i].statistical_classification,
+                single_dose: project[i].single_dose,
+                delivery_way: project[i].delivery_way,
+                execution_frequency: project[i].execution_frequency,
+                number_days: project[i].number_days,
+                price: project[i].price,
+                medical_code: project[i].medical_code,
+                unit: project[i].unit,
+                type: 2
+              }
+
+              this.tabProject.push(obj)
+            }
+
+            var good_info = response.data.data.good_info
+
+            for (let i = 0; i < good_info.length; i++) {
+              let obj = {
+                id: good_info[i].id,
+                project_name: good_info[i].good_name,
+                statistical_classification: 0,
+                single_dose: 1,
+                delivery_way: '',
+                execution_frequency: '',
+                number_days: 1,
+                price: good_info[i].retail_price,
+                medical_code: good_info[i].medical_insurance_number,
+                unit: this.getGoodUnit(good_info[i].good_unit),
+                type: 3
+              }
+              this.tabProject.push(obj)
+            }
+
+            this.allProject = this.tabProject
 
           }
         })
+
       }, deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
@@ -2477,12 +2562,19 @@
             this.tabPrjectTeam = team
           }
         })
+      }, getGoodUnit(id) {
+        var goodUnit = this.$store.getters.good_unit
+        for (let i = 0; i < goodUnit.length; i++) {
+          if (goodUnit[i].id == id) {
+            return goodUnit[i].name
+          }
+        }
       },
       selectTeam(row) {
         console.log("row",row);
         var arr = [];
         for (let i = 0; i < row.length; i++) {
-          arr.push(row[i].project_id)
+          arr.push(row[i].item_id)
         }
         var ids = arr.join(',');
         var strArr = ids.split(',');
@@ -2507,11 +2599,61 @@
         };
         getPojectListById(params).then(response => {
           if (response.data.state == 1) {
-            var project = response.data.data.project;
-            this.teamList = [];
-            this.teamList = project
+            this.teamList = []
+            var project = response.data.data.project
+            for (let i = 0; i < project.length; i++) {
+              if (project[i].type == 2) {
+
+                let obj = {
+                  id: project[i].project_id,
+                  project_name: project[i].project.project_name,
+                  statistical_classification: project[i].project.statistical_classification,
+                  single_dose: project[i].project.single_dose,
+                  delivery_way: project[i].project.delivery_way,
+                  execution_frequency: project[i].project.execution_frequency,
+                  number_days: project[i].project.number_days,
+                  total: project[i].number,
+                  price: project[i].project.price,
+                  remark: '',
+                  medical_code: project[i].project.medical_code,
+                  unit: project[i].project.unit,
+                  type: project[i].type
+                }
+                if (obj.total == 0) {
+                  obj.total = 1
+                }
+
+                this.teamList.push(obj)
+              } else if (project[i].type == 3) {
+                let obj = {
+                  id: project[i].project_id,
+                  project_name: project[i].good_info.good_name,
+                  statistical_classification: "",
+                  single_dose: "",
+                  delivery_way: "",
+                  execution_frequency:"",
+                  number_days:"",
+                  total: project[i].number,
+                  price: project[i].good_info.retail_price,
+                  remark: '',
+                  medical_code: project[i].good_info.medical_insurance_number,
+                  unit: project[i].good_info.unit,
+                  type: project[i].type
+                }
+                if (obj.total == 0) {
+                  obj.total = 1
+                }
+                this.teamList.push(obj)
+
+                console.log( this.teamList)
+
+              }
+            }
+
+
           }
         })
+
       }, changeDoctor(val) {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.doctorValue) {

src/xt_pages/hospitalStation/components/inquiriesDetail.vue

@@ -295,8 +295,25 @@
                   medical_code: prescription.project[b].project.medical_code,
                   unit:prescription.project[b].project.unit,
                 };
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+                  obj['type'] =  2
+
+
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                  obj['type'] =  3
+
+                }
                 tempProject.push(obj)
               }
+
+              console.log(tempProject)
               let index = i + 1;
               let obj = {
                 id: prescription.id,
@@ -306,9 +323,11 @@
                 type: response.data.data.prescription[i].type
               };
               this.prescriptions.push(obj);
-              console.log(this.prescriptions);
 
               this.curPrescriptions = this.prescriptions[0]
+
+
+
             }
           }
         });

src/xt_pages/hospitalStation/components/newPrescriptionTable.vue

@@ -63,7 +63,7 @@
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
-          <div>{{getGroup(scope.row.statistical_classification)}}</div>
+          <div>{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="100" label="单次用量">

src/xt_pages/hospitalStation/components/nextOrLastPrescription.vue

@@ -1,23 +1,23 @@
 <template>
   <el-dialog
-    :title="name"
-    :visible.sync="isLastOrNextVisible"
-    @close="hide"
-    width="1010px"
-    :modal-append-to-body="false"
-    class="isLastOrNext"
+          :title="name"
+          :visible.sync="isLastOrNextVisible"
+          @close="hide"
+          width="1010px"
+          :modal-append-to-body="false"
+          class="isLastOrNext"
   >
     <div class="txsj" style="text-align:center;">
       <el-button
-        round
+              round
 
-        @click="openLast(3)"
+              @click="openLast(3)"
       >上一方
       </el-button>
 
       <el-button
-        round
-        @click="openNext(4)"
+              round
+              @click="openNext(4)"
       >下一方
       </el-button>
     </div>
@@ -39,7 +39,7 @@
 
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
-                  <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
+                <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="100" label="用法">
@@ -81,11 +81,11 @@
             <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
-                <span>{{ scope.row.project.project_name }}</span>
+                <span>{{ scope.row.type == 2 ?scope.row.project.project_name:scope.row.good_info.good_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">{{ scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
@@ -117,7 +117,7 @@
             </el-table-column>
             <el-table-column align="center" prop="total" width="70" label="总量">
               <template slot-scope="scope">
-                  <div>{{ scope.row.total }}{{scope.row.unit}}</div>
+                <div>{{ scope.row.total }}{{scope.row.unit}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="name" width="60" label="单价">
@@ -165,7 +165,7 @@
         name:"",
         request_record_date:'',
         patient_id:0,
-         allPrescription: [
+        allPrescription: [
           {
             check_group: [],
             prescriptions: [
@@ -235,11 +235,12 @@
       }
     }, methods: {
       openLast(val) {
-       if (val == 3) {
+        if (val == 3) {
           let params = {
             patient_id: this.patient_id,
             record_time: this.request_record_date,
-            type: 1
+            type: 1,
+            p_type:1,
           };
 
           this.GetNextOrLastHisPrescription(params)
@@ -251,7 +252,9 @@
           let params = {
             patient_id: this.patient_id,
             record_time: this.request_record_date,
-            type: 2
+            type: 2,
+            p_type:1,
+
           };
           this.GetNextOrLastHisPrescription(params)
         }
@@ -314,7 +317,8 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
               };
               tempAdvice.push(obj)
 
@@ -325,8 +329,8 @@
               let obj = {
                 id: 0,
                 project_id: prescription.project[b].project_id,
-                project_name: prescription.project[b].project.project_name,
-                statistical_classification: prescription.project[b].project.statistical_classification,
+                // project_name: prescription.project[b].project.project_name,
+                // statistical_classification: prescription.project[b].project.statistical_classification,
                 single_dose: prescription.project[b].single_dose,
                 delivery_way: prescription.project[b].delivery_way,
                 execution_frequency: prescription.project[b].execution_frequency,
@@ -334,8 +338,23 @@
                 total:prescription.project[b].count.toString(),
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
-                medical_code:prescription.project[b].project.medical_code,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type,
+
+                // medical_code:prescription.project[b].project.medical_code,
               };
+
+              if(prescription.project[b].type == 2){
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+
+              }else if(prescription.project[b].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+              }
+
               tempProject.push(obj)
             }
             let obj = {
@@ -405,7 +424,7 @@
 </script>
 
 <style lang="scss">
-.isLastOrNext{
+  .isLastOrNext{
   .el-dialog__body{
     padding:0px 20px 30px;
   }
@@ -413,5 +432,5 @@
     margin-top: 10px;
     font-size: 14px;
   }
-}
+  }
 </style>

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -75,15 +75,14 @@
         </template>
       </el-table-column>
     </el-table>
-
     <el-table v-if="activeType == 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" type="index" width="40" label="序号"></el-table-column>
+      <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"><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">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
@@ -95,11 +94,11 @@
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
         <template slot-scope="scope">
           <el-autocomplete
-            style="width:100%;"
-            class="inline-input"
-            v-model="scope.row.delivery_way"
-            :fetch-suggestions="querySearch2"
-            placeholder="请输入内容"
+                  style="width:100%;"
+                  class="inline-input"
+                  v-model="scope.row.delivery_way"
+                  :fetch-suggestions="querySearch2"
+                  placeholder="请输入内容"
           ></el-autocomplete>
         </template>
       </el-table-column>
@@ -108,10 +107,12 @@
           <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="50" label="天数">
+      <el-table-column align="center" prop="number_days" width="70" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+            <div>{{'天'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">
@@ -132,7 +133,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" :title="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="操作">

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -463,6 +463,8 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id;
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price);
+              obj['drug'] = drug_month_prescriptions.advices[a].drug
+
               count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
@@ -476,6 +478,21 @@
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+
+              }
+              obj['type'] = project_month_prescriptions.project[a].type
+
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
@@ -776,7 +793,6 @@
             this.patientInfo = response.data.data.xt_info;
             this.hisPatientInfo = response.data.data.his_info;
             this.case_history = response.data.data.case_history;
-            console.log("病历222222",this.case_history);
             this.info = response.data.data.info;
             this.doctors = response.data.data.doctors;
             this.department = response.data.data.department;
@@ -833,6 +849,9 @@
             //处方相关
             this.prescriptionList = response.data.data.prescription;
 
+
+
+
             if (response.data.data.prescription.length > 0) {
               for (let i = 0; i < response.data.data.prescription.length; i++) {
                 var prescription = response.data.data.prescription[i];
@@ -856,7 +875,8 @@
                     single_dose_unit: prescription.advices[b].single_dose_unit,
                     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                     medical_insurance_number: prescription.advices[b].med_list_codg,
-                    id: prescription.advices[b].drug_id
+                    id: prescription.advices[b].drug_id,
+                    drug:prescription.advices[b].drug,
                   };
                   tempAdvice.push(obj)
                 }
@@ -878,7 +898,19 @@
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
+                    type: prescription.project[b].type
                   };
+
+                  if(prescription.project[b].type == 2){
+                    obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                    obj['medical_code'] =  prescription.project[b].project.medical_code
+                    obj['project_name'] =  prescription.project[b].project.project_name
+
+                  }else if(prescription.project[b].type == 3){
+                    obj['statistical_classification'] = ""
+                    obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                    obj['project_name'] =  prescription.project[b].good_info.good_name
+                  }
                   tempProject.push(obj)
                 }
 
@@ -916,13 +948,16 @@
                 this.prescriptions.push(obj)
               }
             } else {
+
+
+
               let obj = {
                 id: 0,
                 name: '处方' + 1,
                 advices: [],
                 project: [],
                 addition: [],
-                orderStatus: 0,
+                order_status: 0,
                 pre_time: nowTime,
 
               };
@@ -1046,7 +1081,8 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
                         };
                         tempAdvice.push(obj)
                       }
@@ -1064,8 +1100,19 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type: prescription.project[b].type,
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1106,7 +1153,7 @@
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
@@ -1215,7 +1262,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1233,8 +1282,22 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type:prescription.project[b].type,
+
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
+
+
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1275,7 +1338,7 @@
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
@@ -1385,7 +1448,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1403,8 +1468,21 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].unit
+                          unit: prescription.project[b].unit,
+                          type:prescription.project[b].type,
+
                         };
+                        if(prescription.project[b].type == 2){
+                          obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                          obj['medical_code'] =  prescription.project[b].project.medical_code
+                          obj['project_name'] =  prescription.project[b].project.project_name
+
+                        }else if(prescription.project[b].type == 3){
+                          obj['statistical_classification'] = ""
+                          obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] =  prescription.project[b].good_info.good_name
+                        }
+
                         tempProject.push(obj)
                       }
                       for (let b = 0; b < prescription.addition.length; b++) {
@@ -1445,7 +1523,7 @@
                       advices: [],
                       project: [],
                       addition: [],
-                      orderStatus: 0,
+                      order_status: 0,
                       pre_time: nowTime,
                     };
                     this.prescriptions.push(obj)
@@ -1607,7 +1685,9 @@
                         single_dose_unit: prescription.advices[b].single_dose_unit,
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
-                        id: prescription.advices[b].drug_id
+                        id: prescription.advices[b].drug_id,
+                        drug:prescription.advices[b].drug,
+
                       };
                       tempAdvice.push(obj)
                     }
@@ -1625,8 +1705,21 @@
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].unit
+                        unit: prescription.project[b].unit,
+                        type:prescription.project[b].type,
+
                       };
+                      if(prescription.project[b].type == 2){
+                        obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                        obj['medical_code'] =  prescription.project[b].project.medical_code
+                        obj['project_name'] =  prescription.project[b].project.project_name
+
+                      }else if(prescription.project[b].type == 3){
+                        obj['statistical_classification'] = ""
+                        obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] =  prescription.project[b].good_info.good_name
+                      }
+
                       tempProject.push(obj)
                     }
                     for (let b = 0; b < prescription.addition.length; b++) {
@@ -1669,7 +1762,7 @@
                     advices: [],
                     project: [],
                     addition: [],
-                    orderStatus: 0,
+                    order_status: 0,
                     pre_time: nowTime
 
                   };
@@ -1782,7 +1875,9 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -1800,8 +1895,21 @@
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
+                      type:prescription.project[b].type,
+
                       unit: prescription.project[b].unit
                     };
+                    if(prescription.project[b].type == 2){
+                      obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                      obj['medical_code'] =  prescription.project[b].project.medical_code
+                      obj['project_name'] =  prescription.project[b].project.project_name
+
+                    }else if(prescription.project[b].type == 3){
+                      obj['statistical_classification'] = ""
+                      obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                      obj['project_name'] =  prescription.project[b].good_info.good_name
+                    }
+
                     tempProject.push(obj)
                   }
                   for (let b = 0; b < prescription.addition.length; b++) {
@@ -1842,7 +1950,7 @@
                   advices: [],
                   project: [],
                   addition: [],
-                  orderStatus: 0,
+                  order_status: 0,
                   pre_time: nowTime,
                 };
                 this.prescriptions.push(obj)

src/xt_pages/hospitalStation/listPrint.vue

@@ -51,41 +51,50 @@
       getInfo(order_id) {
         let params = {
           id: order_id
-        };
+        }
         getHisOrderDetail(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
+            this.$message.error(response.data.msg)
             return false
           } else {
-            this.order = response.data.data.order;
-            this.patient = response.data.data.patient;
-            console.log(this.patient);
-            this.admin = response.data.data.admin_info;
+            this.order = response.data.data.order
+            this.patient = response.data.data.patient
+            console.log(this.patient)
+            this.admin = response.data.data.admin_info
 
 
             for (let i = 0; i < response.data.data.order_info.length; i++) {
-              var infos = response.data.data.order_info[i];
+              var infos = response.data.data.order_info[i]
               let obj = {
                 med_chrgitm_type: this.getType(infos.med_chrgitm_type),
                 price: infos.pric,
                 count: infos.cnt
-              };
+              }
+              console.log(infos)
               if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
-                obj['p_time'] = this.getTimes(infos.project.prescription.ctime);
-                obj['name'] = infos.project.project.project_name;
-                obj['spec'] = 1;
-                obj['unit'] = infos.project.project.unit
+                obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
+                if(infos.project.type == 2){
+                  obj['name'] = infos.project.project.project_name
+
+
+                }else if (infos.project.type == 3){
+
+                  obj['name'] = infos.project.good_info.good_name
+
+                }
+                obj['spec'] = 1
+                obj['unit'] = infos.project.unit
 
               }
 
               if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
-                obj['p_time'] = this.getTimes(infos.advice.prescription.ctime);
-                obj['name'] = infos.advice.advice_name;
-                obj['spec'] = infos.advice.drug.drug_spec;
+                obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
+                obj['name'] = infos.advice.advice_name
+                obj['spec'] = infos.advice.drug.drug_spec
                 obj['unit'] = infos.advice.drug.max_unit
 
               }
-              this.list.push(obj);
+              this.list.push(obj)
               this.list.sort(function(a, b) {
                 return b.p_time < a.p_time ? 1 : -1
               })
@@ -94,6 +103,7 @@
           }
         })
       },
+
       getType(med_chrgitm_type) {
         switch (med_chrgitm_type) {
           case '01':

src/xt_pages/hospitalStation/newStatementPrint.vue

@@ -147,6 +147,8 @@
         //       console.log("doctorporject",doctorPorject)
         //     }
         // })
+      },  getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
       },
       searchAction(){
 
@@ -221,7 +223,11 @@
                 that.info['treat_cost_total'] = response.data.data.treatCostTotal;
                 that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
                 that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
-                console.log(this.info)
+
+                if(that.paramsObj.settle_type != 1){
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
+                }
               }
             })
             .catch(function (error) {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -1028,12 +1028,9 @@
               }
 
               for (let b = 0; b < prescription.project.length; b++) {
-                console.log(prescription.project[b].project.project_name);
                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
@@ -1041,9 +1038,22 @@
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].unit
+                  // medical_code: prescription.project[b].project.medical_code,
+                  unit: prescription.project[b].unit,
+                  type:prescription.project[b].type,
+
                 };
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                }
+
 
                 tempProject.push(obj)
               }
@@ -2606,13 +2616,29 @@
           let count = 0;
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
             if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
-              obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
-              obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
+
+              if(project_month_prescriptions.project[a].type == 2){
+                obj['statistical_classification'] =  project_month_prescriptions.project[a].project.statistical_classification
+                obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+                obj['project_name'] =  project_month_prescriptions.project[a].project.project_name
+                obj['type'] = 2
+
+              }else if(project_month_prescriptions.project[a].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  project_month_prescriptions.project[a].good_info.medical_insurance_number
+                obj['project_name'] =  project_month_prescriptions.project[a].good_info.good_name
+                obj['type'] = 3
+
+              }
+
+
+              // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
+              // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
               obj['number_days'] = project_month_prescriptions.project[a].day;
-              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
+              // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code;
               obj['unit'] = project_month_prescriptions.project[a].unit;
               obj['project_id'] = project_month_prescriptions.project[a].project_id;
               count = count + project_month_prescriptions.project[a].count;
@@ -2800,12 +2826,11 @@
               }
 
               for (let b = 0; b < prescription.project.length; b++) {
-                console.log(prescription.project[b].project.project_name);
                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
+                  // project_name: prescription.project[b].project.project_name,
+                  // statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
@@ -2813,9 +2838,25 @@
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].project.unit
+                  // medical_code: prescription.project[b].project.medical_code,
+                  unit: prescription.project[b].project.unit,
+                  type:prescription.project[b].type,
+
                 };
+
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
+                }
+
+
+
                 tempProject.push(obj)
               }
 

src/xt_pages/hospitalStation/summary.vue

@@ -505,13 +505,18 @@
             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
-            admin_user_id: this.$store.getters.xt_user.user.id
+            admin_user_id: this.$store.getters.xt_user.user.id,
+
+
           };
           this.orderObj9504 = obj
         } else {
           this.statementVisible = true;
           let obj = {
-            order_id: row.id
+            order_id: row.id,
+            settle_type:row.settle_type,
+            start_time:row.settle_start_time,
+            end_time:row.settle_end_time,
           };
           this.orderObj = obj
         }

src/xt_pages/hospitalStation/summaryDetail.vue

@@ -3,99 +3,99 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-      <el-popover
-        placement="bottom"
-        width="210"
-        trigger="click">
-        <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-        <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-        <el-button  slot="reference" style="margin:10px 10px;float: right" type="primary" size="small" >打印</el-button>
-
-      </el-popover>
+        <el-popover
+                placement="bottom"
+                width="210"
+                trigger="click">
+            <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+            <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+            <el-button  slot="reference" style="margin:10px 10px;float: right" type="primary" size="small" >打印</el-button>
+
+        </el-popover>
         <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
             <div class="mainCenter">
                 <div class="centerLeft">
                     <div class="tabsBox">
-                      <el-table  :data="tableData" border 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" prop="project_name" label="名称">
-                          <template slot-scope="scope">{{ scope.row.name }}</template>
-                        </el-table-column>
-
-                        <el-table-column align="center" prop="project_name" label="分类" width="100">
-                          <template slot-scope="scope">{{ scope.row.type == 1?'药品':'项目' }}</template>
-                        </el-table-column>
-
-
-                        <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-                          <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
-
-                        </el-table-column>
-                        <el-table-column align="center" prop="delivery_way" width="90" label="用法">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
-                            {{scope.row.delivery_way}}
-
-                          </template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="execution_frequency" width="90" label="频率">
-                          <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="number_days" width="60" label="天数">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-                            {{scope.row.day}}天
-
-                          </template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="total" width="60" label="总量">
-                          <template slot-scope="scope">{{scope.row.count}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" width="60" label="单价">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                            {{scope.row.price}}元
-
-                          </template>
-                        </el-table-column>
-
-                          <el-table-column align="center" prop="name" width="60" label="总价">
-                              <template slot-scope="scope">
-                                  <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                                  {{scope.row.price}}元
-
-                              </template>
-                          </el-table-column>
-
-
-                        <el-table-column align="center" prop="name" width="80" label="备注">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
-                            {{scope.row.remark}}
-
-                          </template>
-                        </el-table-column>
-                      </el-table>
-
-                      <div class="additionalBox">
-                        <div class="additionalOne" v-for="(item,index) in additions" :key="index">
-                          <span :title="item.item_name">{{item.item_name}}</span>
-                          <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
-                          共
-                          <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
-                          次
-                          <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+                        <el-table  :data="tableData" border 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" prop="project_name" label="名称">
+                                <template slot-scope="scope">{{ scope.row.name }}</template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="project_name" label="分类" width="100">
+                                <template slot-scope="scope">{{ scope.row.type == 1?'药品': scope.row.project_type == 2? '项目':'耗材'}}</template>
+                            </el-table-column>
+
+
+                            <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+                                <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
+
+                            </el-table-column>
+                            <el-table-column align="center" prop="delivery_way" width="90" label="用法">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+                                    {{scope.row.delivery_way}}
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="execution_frequency" width="90" label="频率">
+                                <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="number_days" width="60" label="天数">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
+                                    {{scope.row.day}}天
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="total" width="60" label="总量">
+                                <template slot-scope="scope">{{scope.row.count}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="name" width="60" label="单价">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                                    {{scope.row.price}}元
+
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="name" width="60" label="总价">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                                    {{scope.row.price}}元
+
+                                </template>
+                            </el-table-column>
+
+
+                            <el-table-column align="center" prop="name" width="80" label="备注">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+                                    {{scope.row.remark}}
+
+                                </template>
+                            </el-table-column>
+                        </el-table>
+
+                        <div class="additionalBox">
+                            <div class="additionalOne" v-for="(item,index) in additions" :key="index">
+                                <span :title="item.item_name">{{item.item_name}}</span>
+                                <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+                                共
+                                <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+                                次
+                                <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+                            </div>
                         </div>
-                      </div>
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
-                      <span v-if="order.order_status == 1">待结算</span>
-                      <span v-if="order.order_status == 2">已结算</span>
-                      <span v-if="order.order_status == 3">已退费</span>
+                        <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
+                        <span v-if="order.order_status == 1">待结算</span>
+                        <span v-if="order.order_status == 2">已结算</span>
+                        <span v-if="order.order_status == 3">已退费</span>
 
 
                     </div>
@@ -121,37 +121,36 @@
                     </ul>
                     <!--<p class="centerRightTitle">发票费用</p>-->
                     <!--<ul class="basicUl">-->
-                        <!--<li style="width:100%;">西药费：0.00元</li>-->
+                    <!--<li style="width:100%;">西药费：0.00元</li>-->
                     <!--</ul>-->
                 </div>
             </div>
         </div>
 
-      <div v-if="listVisible">
-      <el-dialog
-        class="centerDialog"
-        width="900px"
-        title="打印"
-        :visible.sync="listVisible">
-        <list-print  :paramsObj='paramsObj'></list-print>
-      </el-dialog>
-      </div>
-
-      <div v-if="allListVisible">
-      <el-dialog
-        class="centerDialog"
-        width="900px"
-        title="打印"
-        :visible.sync="allListVisible">
-        <all-list-print :paramsObj='paramsObj'></all-list-print>
-      </el-dialog>
-      </div>
+        <div v-if="listVisible">
+            <el-dialog
+                    class="centerDialog"
+                    width="900px"
+                    title="打印"
+                    :visible.sync="listVisible">
+                <list-print  :paramsObj='paramsObj'></list-print>
+            </el-dialog>
+        </div>
+
+        <div v-if="allListVisible">
+            <el-dialog
+                    class="centerDialog"
+                    width="900px"
+                    title="打印"
+                    :visible.sync="allListVisible">
+                <all-list-print :paramsObj='paramsObj'></all-list-print>
+            </el-dialog>
+        </div>
 
 
     </div>
 </template>
 
-
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getHisOrder } from '@/api/his/his'
@@ -161,65 +160,65 @@ import ListPrint from './listPrint'
 import AllListPrint from './allListPrint'
 
 export default {
-    components:{
-      AllListPrint,
-      ListPrint,
-        BreadCrumb,
-      prescriptionTable,
-
-    },
-    data(){
-        return{
-          listVisible:false,
-          allListVisible:false,
-          paramsObj:{
-            id:this.$route.query.id
-          },
-            crumbs: [
-                { path: false, name: '门诊收费' },
-                { path: false, name: '项目消费明细汇总详情' }
-            ],
-          info: {},
-          curPrescriptions: {},
-          prescriptions: [],
-          record_date: '',
-          tableData: [],
-          additions:[],
-          editableTabsValue: '1',
-          loadingone: false,
-          editableTabs: [{
-            title: '处方1',
-            name: '1'
-          }],
-          tabIndex: 1,
-          hisPatientInfo: {},
-          loadingtwo: false,
-          patientTableData: [{
-            name: '杨美英',
-            mdtrt_id: '1709946'
-          }],
-          patientInfo: { id: 0 },
-          doctor: {},
-          total: 0,
-          state: '未收费',
-          radio: 1,
-          radioStatus: 1,
-          search_input: '',
-          order:{},
-        }
-    },created(){
-      this.GetOrderDetail()
-  },methods:{
-      open(val){
-        if(val == 1){
-          this.paramsObj.id == this.$route.query.id;
-          this.listVisible = true
-
-        }else if(val == 2){
-          this.paramsObj.id == this.$route.query.id;
-          this.allListVisible = true
-        }
+  components:{
+    AllListPrint,
+    ListPrint,
+    BreadCrumb,
+    prescriptionTable,
+
+  },
+  data(){
+    return{
+      listVisible:false,
+      allListVisible:false,
+      paramsObj:{
+        id:this.$route.query.id
       },
+      crumbs: [
+        { path: false, name: '门诊收费' },
+        { path: false, name: '项目消费明细汇总详情' }
+      ],
+      info: {},
+      curPrescriptions: {},
+      prescriptions: [],
+      record_date: '',
+      tableData: [],
+      additions:[],
+      editableTabsValue: '1',
+      loadingone: false,
+      editableTabs: [{
+        title: '处方1',
+        name: '1'
+      }],
+      tabIndex: 1,
+      hisPatientInfo: {},
+      loadingtwo: false,
+      patientTableData: [{
+        name: '杨美英',
+        mdtrt_id: '1709946'
+      }],
+      patientInfo: { id: 0 },
+      doctor: {},
+      total: 0,
+      state: '未收费',
+      radio: 1,
+      radioStatus: 1,
+      search_input: '',
+      order:{},
+    }
+  },created(){
+    this.GetOrderDetail()
+  },methods:{
+    open(val){
+      if(val == 1){
+        this.paramsObj.id == this.$route.query.id
+        this.listVisible = true
+
+      }else if(val == 2){
+        this.paramsObj.id == this.$route.query.id
+        this.allListVisible = true
+      }
+    },
     // getTotal() {
     //   var total = 0
     //   for (let i = 0; i < this.prescriptions.length; i++) {
@@ -253,8 +252,8 @@ export default {
     tabclickEvent(val) {
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].name == val.name) {
-          this.curPrescriptions = {};
-          var temp = this.deepClone(this.prescriptions[i]);
+          this.curPrescriptions = {}
+          var temp = this.deepClone(this.prescriptions[i])
           this.curPrescriptions = temp
         }
       }
@@ -263,18 +262,18 @@ export default {
       if (!source && typeof source !== 'object') {
         throw new Error('error arguments', 'shallowClone')
       }
-      const targetObj = source.constructor === Array ? [] : {};
+      const targetObj = source.constructor === Array ? [] : {}
       Object.keys(source).forEach((keys) => {
         if (source[keys] && typeof source[keys] === 'object') {
           targetObj[keys] = this.deepClone(source[keys])
         } else {
           targetObj[keys] = source[keys]
         }
-      });
+      })
       return targetObj
     },  getGroup(id){
-      var name = "";
-      var statistics_category =  getDictionaryDataConfig('system','statistics_category');
+      var name = ""
+      var statistics_category =  getDictionaryDataConfig('system','statistics_category')
       for(let i=0;i<statistics_category.length;i++){
         if(id == statistics_category[i].id){
           name = statistics_category[i].name
@@ -283,7 +282,7 @@ export default {
       return name
     },
     getTotal() {
-      var total = 0;
+      var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {
           for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
@@ -304,7 +303,7 @@ export default {
       }
     },  unique(array) {
       // res用来存储结果
-      var res = [];
+      var res = []
       for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
         for (var j = 0, resLen = res.length; j < resLen; j++) {
           if (array[i].id === res[j].id && array[i].price === res[j].price) {
@@ -319,22 +318,22 @@ export default {
       return res
     },
     setMonthPrescription(month_prescriptions) {
-      console.log(month_prescriptions);
+      console.log(month_prescriptions)
       let drug_month_prescriptions = {
         advices: []
-      };
-      let drug_ids = [];
+      }
+      let drug_ids = []
       let project_month_prescriptions = {
         project: []
 
-      };
-      let project_ids = [];
+      }
+      let project_ids = []
 
       let addition_month_prescriptions = {
         addition: []
 
-      };
-      let additions_ids = [];
+      }
+      let additions_ids = []
 
       for (let i = 0; i < month_prescriptions.length; i++) {
         if (month_prescriptions[i].type == 1) { //药品
@@ -343,8 +342,8 @@ export default {
               id: month_prescriptions[i].advices[a].drug_id,
               price: month_prescriptions[i].advices[a].price
 
-            };
-            drug_ids.push(obj);
+            }
+            drug_ids.push(obj)
             drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
           }
 
@@ -354,8 +353,8 @@ export default {
               id: month_prescriptions[i].project[a].project_id,
               price: month_prescriptions[i].project[a].price
 
-            };
-            project_ids.push(obj);
+            }
+            project_ids.push(obj)
             project_month_prescriptions.project.push(month_prescriptions[i].project[a])
           }
         }
@@ -365,84 +364,94 @@ export default {
             id: month_prescriptions[i].addition[a].item_id,
             price: month_prescriptions[i].addition[a].price
 
-          };
-          additions_ids.push(obj);
+          }
+          additions_ids.push(obj)
           addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
 
         }
 
       }
 
-      drug_ids = this.unique(drug_ids);
-      project_ids= this.unique(project_ids);
-      additions_ids= this.unique(additions_ids);
+      drug_ids = this.unique(drug_ids)
+      project_ids= this.unique(project_ids)
+      additions_ids= this.unique(additions_ids)
 
 
 
 
 
       for (let i = 0; i < drug_ids.length; i++) {
-        let obj = {};
-        let count = 0;
+        let obj = {}
+        let count = 0
         for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
           if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id ==  drug_month_prescriptions.advices[a].drug_id) {
-            obj['name'] = drug_month_prescriptions.advices[a].advice_name;
-            obj['statistical_classification'] = '';
-            obj['type'] = 1;
-            obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose;
-            obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way;
-            obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency;
-            obj['day'] = drug_month_prescriptions.advices[a].day;
-            obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit;
-            obj['remark'] = drug_month_prescriptions.advices[a].remark;
-            obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price);
+            obj['name'] = drug_month_prescriptions.advices[a].advice_name
+            obj['statistical_classification'] = ''
+            obj['type'] = 1
+            obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
+            obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
+            obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
+            obj['day'] = drug_month_prescriptions.advices[a].day
+            obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+            obj['remark'] = drug_month_prescriptions.advices[a].remark
+            obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price)
             count = count + drug_month_prescriptions.advices[a].prescribing_number
 
           }
         }
-        obj['count'] = count;
+        obj['count'] = count
         this.tableData.push(obj)
       }
 
       for (let i = 0; i < project_ids.length; i++) {
-        let obj = {};
-        let count = 0;
+        let obj = {}
+        let count = 0
         for (let a = 0; a < project_month_prescriptions.project.length; a++) {
           if (project_ids[i].price == project_month_prescriptions.project[a].price &&project_ids[i].id == project_month_prescriptions.project[a].project_id ) {
-            obj['name'] = project_month_prescriptions.project[a].project.project_name;
-            obj['statistical_classification'] = '';
-            obj['single_dose'] = project_month_prescriptions.project[a].single_dose;
-            obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way;
-            obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency;
-            obj['day'] = project_month_prescriptions.project[a].day;
-            obj['single_dose_unit'] = project_month_prescriptions.project[a].unit;
-            obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit;
-            count = count + project_month_prescriptions.project[a].count;
-            obj['price'] = parseFloat(project_month_prescriptions.project[a].price);
-            obj['remark'] = project_month_prescriptions.project[a].remark;
+
+            if(project_month_prescriptions.project[a].type == 2){
+              obj['name'] = project_month_prescriptions.project[a].project.project_name
+              obj['statistical_classification'] = ''
+              obj['project_type'] = 2
+
+
+            }else if (project_month_prescriptions.project[a].type == 3){
+              obj['name'] = project_month_prescriptions.project[a].good_info.good_name
+              obj['statistical_classification'] = ''
+              obj['project_type'] = 3
+            }
+            obj['single_dose'] = project_month_prescriptions.project[a].single_dose
+            obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
+            obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
+            obj['day'] = project_month_prescriptions.project[a].day
+            obj['single_dose_unit'] = project_month_prescriptions.project[a].unit
+            obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit
+            count = count + project_month_prescriptions.project[a].count
+            obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+            obj['remark'] = project_month_prescriptions.project[a].remark
             obj['type'] = 2
 
 
           }
         }
-        obj['count'] = count;
+        obj['count'] = count
         this.tableData.push(obj)
 
       }
 
       for (let i = 0; i < additions_ids.length; i++) {
-        let obj = {};
-        let count = 0;
-        console.log(addition_month_prescriptions.addition);
+        let obj = {}
+        let count = 0
+        console.log(addition_month_prescriptions.addition)
         if (addition_month_prescriptions.addition) {
           for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
             if (additions_ids[i].price == addition_month_prescriptions.addition[a].price &&additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
-              obj['item_name'] = addition_month_prescriptions.addition[a].item_name;
-              count = count + addition_month_prescriptions.addition[a].count;
+              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+              count = count + addition_month_prescriptions.addition[a].count
               obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
             }
           }
-          obj['count'] = count;
+          obj['count'] = count
           this.additions.push(obj)
 
         }
@@ -454,23 +463,23 @@ export default {
       let params={
         number:this.$route.query.number,
         patient_id:this.$route.query.patient_id,
-      };
+      }
       getHisOrder(params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
+          this.$message.error(response.data.msg)
           return false
         } else {
-          this.patientInfo = response.data.data.order.patient;
-          this.hisPatientInfo = response.data.data.order.his_patient;
-          this.info = response.data.data.p_info;
-          this.order = response.data.data.order;
+          this.patientInfo = response.data.data.order.patient
+          this.hisPatientInfo = response.data.data.order.his_patient
+          this.info = response.data.data.p_info
+          this.order = response.data.data.order
 
-          this.prescriptions = [];
-          this.tableData = [];
+          this.prescriptions = []
+          this.tableData = []
 
 
-          var prescription = response.data.data.prescription;
-          this.prescriptions = prescription;
+          var prescription = response.data.data.prescription
+          this.prescriptions = prescription
           this.setMonthPrescription(prescription)
 
 
@@ -478,59 +487,59 @@ export default {
           //   var prescription = response.data.data.prescription[i]
 
 
-            // for (let b = 0; b < prescription.advices.length; b++) {
-            //   let obj = {
-            //     name: prescription.advices[b].advice_name,
-            //     statistical_classification:"",
-            //     type:1,
-            //     single_dose: prescription.advices[b].single_dose,
-            //     delivery_way: prescription.advices[b].delivery_way,
-            //     execution_frequency: prescription.advices[b].execution_frequency,
-            //     price: prescription.advices[b].price.toString(),
-            //     day: prescription.advices[b].day,
-            //     count:prescription.advices[b].prescribing_number.toString(),
-            //     remark: prescription.advices[b].remark,
-            //     single_dose_unit: prescription.advices[b].single_dose_unit,
-            //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-            //
-            //   }
-            //   this.tableData.push(obj)
-            // }
-            //
-            // for (let b = 0; b < prescription.project.length; b++) {
-            //   let obj = {
-            //     name: prescription.project[b].project.project_name,
-            //     statistical_classification: prescription.project[b].project.statistical_classification,
-            //     single_dose: prescription.project[b].single_dose,
-            //     delivery_way: prescription.project[b].delivery_way,
-            //     execution_frequency: prescription.project[b].execution_frequency,
-            //     price: prescription.project[b].price,
-            //     day: prescription.project[b].day,
-            //     count: prescription.project[b].count.toString(),
-            //     remark: prescription.project[b].remark,
-            //     single_dose_unit:prescription.project[b].project.unit,
-            //     prescribing_number_unit:prescription.project[b].project.unit,
-            //     type:2,
-            //   }
-            //   this.tableData.push(obj)
-            // }
-            //
-            // for (let b = 0; b < prescription.addition.length; b++) {
-            //     this.additions.push( prescription.addition[b])
-            // }
-
-
-
-            // let index = i + 1
-            // let obj = {
-            //   id: prescription.id,
-            //   name: '处方' + index,
-            //   advices: tempAdvice,
-            //   project: tempProject,
-            //   type: response.data.data.prescription[i].type
-            // }
-            // this.prescriptions.push(obj)
-            // this.curPrescriptions = this.prescriptions[0]
+          // for (let b = 0; b < prescription.advices.length; b++) {
+          //   let obj = {
+          //     name: prescription.advices[b].advice_name,
+          //     statistical_classification:"",
+          //     type:1,
+          //     single_dose: prescription.advices[b].single_dose,
+          //     delivery_way: prescription.advices[b].delivery_way,
+          //     execution_frequency: prescription.advices[b].execution_frequency,
+          //     price: prescription.advices[b].price.toString(),
+          //     day: prescription.advices[b].day,
+          //     count:prescription.advices[b].prescribing_number.toString(),
+          //     remark: prescription.advices[b].remark,
+          //     single_dose_unit: prescription.advices[b].single_dose_unit,
+          //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+          //
+          //   }
+          //   this.tableData.push(obj)
+          // }
+          //
+          // for (let b = 0; b < prescription.project.length; b++) {
+          //   let obj = {
+          //     name: prescription.project[b].project.project_name,
+          //     statistical_classification: prescription.project[b].project.statistical_classification,
+          //     single_dose: prescription.project[b].single_dose,
+          //     delivery_way: prescription.project[b].delivery_way,
+          //     execution_frequency: prescription.project[b].execution_frequency,
+          //     price: prescription.project[b].price,
+          //     day: prescription.project[b].day,
+          //     count: prescription.project[b].count.toString(),
+          //     remark: prescription.project[b].remark,
+          //     single_dose_unit:prescription.project[b].project.unit,
+          //     prescribing_number_unit:prescription.project[b].project.unit,
+          //     type:2,
+          //   }
+          //   this.tableData.push(obj)
+          // }
+          //
+          // for (let b = 0; b < prescription.addition.length; b++) {
+          //     this.additions.push( prescription.addition[b])
+          // }
+
+
+
+          // let index = i + 1
+          // let obj = {
+          //   id: prescription.id,
+          //   name: '处方' + index,
+          //   advices: tempAdvice,
+          //   project: tempProject,
+          //   type: response.data.data.prescription[i].type
+          // }
+          // this.prescriptions.push(obj)
+          // this.curPrescriptions = this.prescriptions[0]
 
           // }
           // this.tableData = response.data.data.order
@@ -540,6 +549,7 @@ export default {
     }
   }
 }
+
 </script>
 
 <style lang="scss" scoped>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -172,9 +172,14 @@
             let count = 0
             for (let a = 0; a < details.length; a++) {
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
-                obj['name'] = details[a].project.project.project_name
+               if( details[a].project.type == 2){
+                 obj['name'] = details[a].project.project.project_name
+               }else if(details[a].project.type == 3){
+                 obj['name'] = details[a].project.good_info.good_name
+               }
+                obj['unit'] = details[a].project.unit
+
                 obj['spec'] = '1'
-                obj['unit'] = details[a].project.project.unit
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2

src/xt_pages/outpatientCharges/components/chargeMonthPrescriptionTable.vue

@@ -61,7 +61,7 @@
         <template slot-scope="scope">{{ scope.row.project_name }}</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">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -61,7 +61,7 @@
         <template slot-scope="scope">{{ scope.row.project_name }}</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">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -1,192 +1,192 @@
 <template>
-  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
-             :close-on-click-modal="isClose"
-             :close-on-press-escape="isClose">
-
-    <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
-      <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
-        <el-autocomplete
-          class="checkSearch"
-          popper-class="my-autocomplete"
-          v-model="form.name"
-          :fetch-suggestions="querySearchAsync"
-          :trigger-on-focus="false"
-          placeholder="请输入病人名字"
-          @select="handleSelect"
-          style="width:160px;"
-        >
-          <i class="el-icon-search el-input__icon" slot="suffix"></i>
-          <template slot-scope="{ item }">
-            <div class="name">{{ item.name }}</div>
-          </template>
-        </el-autocomplete>
-      </el-form-item>
-
-      <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
-        <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in sex"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-
-
-      </el-form-item>
-
-      <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
-        <el-input v-model="form.age"></el-input>
-      </el-form-item>
-
-
-      <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-        <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="手机号码：" prop="phone">
-        <el-input v-model="form.phone"></el-input>
-      </el-form-item>
-
-
-      <el-form-item label="医疗类别：">
-        <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="(item,index) in medical_care"
-            :key="index"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
-        <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in certificates"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
-        <el-input v-model="form.id_card"></el-input>
-      </el-form-item>
-
-      <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
-        >
-          <el-option
-            v-for="(item,index) in registers"
-            :key="index"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">
-          <el-option
-            v-for="(item,index) in sick"
-            :key="index"
-            :label="item.class_name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">
-          <el-option
-            v-for="(item,index) in diagnoses"
-            :key="index"
-            :label="item.class_name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="结算类型：">
-        <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in settlement"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="社保类型：">
-        <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in medicalCare"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
-        <el-select v-model="form.id_card_type" placeholder="请选择">
-          <el-option
-            v-for="item in IDCardTypes"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item class="specialFormItem" label="医保卡号：">
-        <div style="display:flex;">
-          <el-input v-model="form.medical_insurance_card"></el-input>
-          <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
-
-        </div>
-      </el-form-item>
-
-      <el-form-item label="挂号类型："  >
-        <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in register"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="挂号费：">
-        <el-input v-model="form.registration_fee"></el-input>
-      </el-form-item>
-      <el-form-item label="诊疗费：">
-        <el-input v-model="form.medical_expenses"></el-input>
-      </el-form-item>
-    </el-form>
-
-    <span slot="footer" class="dialog-footer">
+    <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
+               :close-on-click-modal="isClose"
+               :close-on-press-escape="isClose">
+
+        <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
+            <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
+                <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="false"
+                        placeholder="请输入病人名字"
+                        @select="handleSelect"
+                        style="width:160px;"
+                >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.name }}</div>
+                    </template>
+                </el-autocomplete>
+            </el-form-item>
+
+            <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
+                <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in sex"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+
+
+            </el-form-item>
+
+            <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
+                <el-input v-model="form.age"></el-input>
+            </el-form-item>
+
+
+            <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
+                <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="手机号码：" prop="phone">
+                <el-input v-model="form.phone"></el-input>
+            </el-form-item>
+
+
+            <el-form-item label="医疗类别：">
+                <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="(item,index) in medical_care"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
+                <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in certificates"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
+                <el-input v-model="form.id_card"></el-input>
+            </el-form-item>
+
+            <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
+                <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
+                >
+                    <el-option
+                            v-for="(item,index) in registers"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+                <el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">
+                    <el-option
+                            v-for="(item,index) in sick"
+                            :key="index"
+                            :label="item.class_name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+                <el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">
+                    <el-option
+                            v-for="(item,index) in diagnoses"
+                            :key="index"
+                            :label="item.class_name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="结算类型：">
+                <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in settlement"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="社保类型：">
+                <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in medicalCare"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
+                <el-select v-model="form.id_card_type" placeholder="请选择">
+                    <el-option
+                            v-for="item in IDCardTypes"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item class="specialFormItem" label="医保卡号：">
+                <div style="display:flex;">
+                    <el-input v-model="form.medical_insurance_card"></el-input>
+                    <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+
+                </div>
+            </el-form-item>
+
+            <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+                <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in register"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="挂号费：">
+                <el-input v-model="form.registration_fee"></el-input>
+            </el-form-item>
+            <el-form-item label="诊疗费：">
+                <el-input v-model="form.medical_expenses"></el-input>
+            </el-form-item>
+        </el-form>
+
+        <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
     <el-button type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
-  </el-dialog>
+    </el-dialog>
 
 </template>
 
 <script>
-  import {jsGetAge, uParseTime} from "@/utils/tools";
+  import { jsGetAge, uParseTime } from '@/utils/tools'
   import axios from 'axios'
-  import {PostSearch} from '@/api/patient'
+  import { PostSearch } from '@/api/patient'
 
-  import {getDictionaryDataConfig} from '@/utils/data'
+  import { getDictionaryDataConfig } from '@/utils/data'
 
   export default {
 
@@ -196,28 +196,27 @@
 
       return {
         registers: [
-          {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
-          {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          { value: 11, label: '普通门诊' },
+          { value: 12, label: '门诊挂号' },
+          { value: 13, label: '急诊' },
+          { value: 14, label: '门诊特殊病' },
+          { value: 15, label: '门诊统筹' },
+          { value: 16, label: '门诊慢性病' },
+          { value: 21, label: '普通住院' }
         ],
         medical_care: [
-          {value: 11, label: "普通门诊"},
-          {value: 12, label: '家庭通道'},
-          {value: 13, label: "门诊大病"},
-          {value: 14, label: "重疾特药"},
-          {value: 15, label: "门诊慢病"},
-          {value: 16, label: "门诊特检"},
-          {value: 17, label: "健康体检"},
-          {value: 18, label: "预防接种"},
-          {value: 19, label: "门诊输血"},
-          {value: 91, label: "新冠肺炎门诊"},
+          { value: 11, label: '普通门诊' },
+          { value: 12, label: '家庭通道' },
+          { value: 13, label: '门诊大病' },
+          { value: 14, label: '重疾特药' },
+          { value: 15, label: '门诊慢病' },
+          { value: 16, label: '门诊特检' },
+          { value: 17, label: '健康体检' },
+          { value: 18, label: '预防接种' },
+          { value: 19, label: '门诊输血' },
+          { value: 91, label: '新冠肺炎门诊' }
         ],
 
-
         form: {
           id: '',
           settlement_value: '',
@@ -236,29 +235,29 @@
           doctor: '',
           id_card_type: 1,
           department: '',
-          registration_fee: 0,
-          medical_expenses: 0,
+          registration_fee: '',
+          medical_expenses: '',
           cost: '',
           phone: '',
-          social_type: '',
+          social_type: ''
         }, IDCardTypes: [{
           value: 1,
           label: '社保卡'
         }, {
           value: 2,
-          label: "身份证"
+          label: '身份证'
         }, {
           value: 3,
-          label: "电子凭证"
-        },],
+          label: '电子凭证'
+        }],
         settlement: [
-          {value: 1, label: '医保'},
-          {value: 2, label: '自费'},
-          {value: 3, label: '公费'},
-          {value: 4, label: '农保'},
-          {value: 5, label: '会员'},
-          {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          { value: 1, label: '医保' },
+          { value: 2, label: '自费' },
+          { value: 3, label: '公费' },
+          { value: 4, label: '农保' },
+          { value: 5, label: '会员' },
+          { value: 6, label: '职工' },
+          { value: 7, label: '合同' }
         ],
         sex: [{
           value: 1,
@@ -272,72 +271,72 @@
           label: '内地身份证'
         }, {
           value: 2,
-          label: "社保卡"
+          label: '社保卡'
         }, {
           value: 3,
-          label: "护照"
+          label: '护照'
         }, {
           value: 4,
-          label: "军官证"
+          label: '军官证'
         }, {
           value: 5,
-          label: "台胞证"
+          label: '台胞证'
         }, {
           value: 6,
-          label: "港澳地区身份证"
+          label: '港澳地区身份证'
         }],
         medicalCare: [{
           value: 1,
           label: '职工基本医疗保险'
         }, {
           value: 2,
-          label: "公务员医疗补助"
+          label: '公务员医疗补助'
         }, {
           value: 3,
-          label: "大额医疗费用补助"
+          label: '大额医疗费用补助'
         }, {
           value: 4,
-          label: "离休人员医疗"
+          label: '离休人员医疗'
         }, {
           value: 5,
-          label: "城乡居民基本医疗保险"
+          label: '城乡居民基本医疗保险'
         }, {
           value: 6,
-          label: "城乡居民大病医疗保险"
+          label: '城乡居民大病医疗保险'
         }, {
           value: 7,
-          label: "生育保险"
+          label: '生育保险'
         }],
         register: [{
           value: 1,
           label: '普通'
         }, {
           value: 2,
-          label: "主治"
+          label: '主治'
         }, {
           value: 3,
-          label: "主任"
+          label: '主任'
         }, {
           value: 4,
-          label: "免收诊金"
+          label: '免收诊金'
         }, {
           value: 5,
-          label: "专家"
+          label: '专家'
         }],
         rules: {
-          name: [{required: true, message: "患者姓名不能为空", trigger: 'blur'}],
-          gender: [{required: true, message: "患者性别不能为空", trigger: 'blur'}],
-          id_card: [{required: true, message: '证件号码不能为空', trigger: 'blur'}],
-          register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
-          doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
-          department: [{required: true, message: '请填写科室', trigger: 'blur'}],
-          age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],
-          birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
-          certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
-          id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
-          p_type: [{required: true, message: "处方类型不能为空", trigger: 'change'}],
-          sick_type: [{required: true, message: "大病类别不能为空", trigger: 'change'}],
-          diagnosis: [{required: true, message: "诊断不能为空", trigger: 'change'}],
+          name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
+          gender: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
+          id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
+          register: [{ required: true, message: '请选择挂号类型', trigger: 'blur' }],
+          doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
+          department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
+          age: [{ required: true, message: '患者年龄不能为空', trigger: 'blur' }],
+          birthday: [{ required: true, message: '患者出生日期不能为空', trigger: 'blur' }],
+          certificates: [{ required: true, message: '证件类型不能为空', trigger: 'change' }],
+          id_card_type: [{ required: true, message: '读卡类型不能为空', trigger: 'change' }],
+          p_type: [{ required: true, message: '处方类型不能为空', trigger: 'change' }],
+          sick_type: [{ required: true, message: '大病类别不能为空', trigger: 'change' }],
+          diagnosis: [{ required: true, message: '诊断不能为空', trigger: 'change' }]
         },
         visibility: false,
         labelPosition: 'right',
@@ -360,8 +359,8 @@
           medical_expenses: '',
           cost: '',
           phone: '',
-          social_type: '',
-        },
+          social_type: ''
+        }
 
       }
     },
@@ -385,40 +384,40 @@
 
       },
       sick: Array,
-      diagnoses: Array,
+      diagnoses: Array
     },
     methods: {
       handleSelect(val) {
-        this.form.id = val.id;
-        this.form.name = val.name;
-        this.form.gender = val.gender;
-        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}');
-        this.form.phone = val.phone;
-        this.form.id_card = val.id_card_no;
-        var thisLen = this.form.id_card.length;
-        var birth = "";
+        this.form.id = val.id
+        this.form.name = val.name
+        this.form.gender = val.gender
+        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
+        this.form.phone = val.phone
+        this.form.id_card = val.id_card_no
+        var thisLen = this.form.id_card.length
+        var birth = ''
         if (thisLen == 15) {
-          birth = "19" + this.form.id_card.substr(6, 6);
+          birth = '19' + this.form.id_card.substr(6, 6)
         } else {
-          birth = this.form.id_card.substr(6, 8);
+          birth = this.form.id_card.substr(6, 8)
         }
         var births =
           birth.substr(0, 4) +
-          "-" +
+          '-' +
           birth.substr(4, 2) +
-          "-" +
-          birth.substr(6, 2);
-        this.form.age = jsGetAge(births, "-");
+          '-' +
+          birth.substr(6, 2)
+        this.form.age = jsGetAge(births, '-')
       },
       querySearchAsync(keyword, cb) {
-        let key = '';
+        let key = ''
         if (keyword != undefined) {
           key = keyword
         }
-        let searchArray = [];
+        let searchArray = []
         PostSearch(key).then(response => {
           if (response.data.state == 1) {
-            searchArray = response.data.data.patient;
+            searchArray = response.data.data.patient
             cb(searchArray)
           } else {
             cb([])
@@ -426,84 +425,83 @@
         })
       },
       reading(medicalInsuranceCard) {
-        var that = this;
+        var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
-          this.$message.error("请先选择读卡类型");
+          this.$message.error('请先选择读卡类型')
           return
         }
         let params = {
           'id_card_type': this.form.id_card_type,
-          'admin_user_id': this.$store.getters.xt_user.user.id,
+          'admin_user_id': this.$store.getters.xt_user.user.id
 
-        };
+        }
         axios.get('http://127.0.0.1:9532/api/sscard', {
           params: params
         })
-          .then(function (response) {
+          .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg);
+              that.$message.error(response.data.msg)
               return false
             } else {
-              var patient = response.data.data.patient;
+              var patient = response.data.data.patient
 
               if (that.form.id_card_type == 1) {
-                this.form.id = patient.id;
-                that.form.name = patient.name;
-                that.form.sex = patient.gender;
-                that.form.age = patient.age;
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
-                that.form.phone = patient.phone;
-                that.form.idCard = patient.id_card_no;
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
                 that.form.medicalInsuranceCard = response.data.data.number
 
               } else if (that.form.id_card_type == 2) {
-                this.form.id = patient.id;
-                that.form.name = patient.name;
-                that.form.sex = patient.gender;
-                that.form.age = patient.age;
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
-                that.form.phone = patient.phone;
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
                 that.form.idCard = patient.id_card_no
               }
-              that.$message({message: '读卡成功', type: 'success'})
+              that.$message({ message: '读卡成功', type: 'success' })
             }
           })
-          .catch(function (error) {
-
-          });
+          .catch(function(error) {
 
+          })
 
       },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      show: function () {
-        this.visibility = true;
+      show: function() {
+        this.visibility = true
         // this.form = Object.assign({}, this.resetForm)
-        this.form.id = 0;
-        this.form.settlement_value = '';
-        this.form.medical_insurance_card = '';
-        this.form.name = '';
-        this.form.gender = '';
-        this.form.medical_care = '';
-        this.form.birthda = '';
-        this.form.age = '';
-        this.form.id_card = '';
-        this.form.register = '';
-        this.form.doctor = '';
-        this.form.department = '';
-        this.form.registration_fee = 0;
-        this.form.medical_expenses = 0;
-        this.form.cost = '';
-        this.form.phone = '';
-        this.form.social_type = '';
-
-        this.form.p_type = 14;
-        this.form.sick_type = this.sick[0].id;
-        this.form.diagnosis = this.diagnoses[0].id;
-        this.form.id_card_type = 2;
-        this.form.certificates = 1;
-        this.form.settlement_value = 1
+        this.form.id = 0
+        this.form.settlement_value = ''
+        this.form.medical_insurance_card = ''
+        this.form.name = ''
+        this.form.gender = ''
+        this.form.medical_care = ''
+        this.form.birthda = ''
+        this.form.age = ''
+        this.form.id_card = ''
+        this.form.register = ''
+        this.form.doctor = ''
+        this.form.department = ''
+        this.form.registration_fee = ''
+        this.form.medical_expenses = ''
+        this.form.cost = ''
+        this.form.phone = ''
+        this.form.social_type = ''
+
+        this.form.p_type = 14
+        this.form.sick_type = this.sick[0].id
+        this.form.diagnosis = this.diagnoses[0].id
+        this.form.id_card_type = 2
+        this.form.certificates = 1
+
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -519,24 +517,24 @@
       },
 
       hide: function () {
-        this.visibility = false;
+        this.visibility = false
         this.$refs['formValue'].resetFields()
-      }, cancel: function (formName) {
-        this.$emit('cancel', this.getValue());
+      }, cancel: function(formName) {
+        this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
       },
-      confirm: function (formName) {
+      confirm: function(formName) {
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
-            let value = {};
-            value = this.getValue();
+            let value = {}
+            value = this.getValue()
             this.$emit('confirm', value)
           }
         })
       },
-      getValue: function () {
-        let form = {};
-        form = this.form;
+      getValue: function() {
+        let form = {}
+        form = this.form
         return form
       }
     }
@@ -545,16 +543,16 @@
 </script>
 
 <style lang="scss" scoped>
-  .registerDialog {
+    .registerDialog {
 
-  .el-form {
-    display: flex;
-    flex-wrap: wrap;
-  }
+    .el-form {
+        display: flex;
+        flex-wrap: wrap;
+    }
 
-  .el-form-item {
-    width: 50%;
-  }
+    .el-form-item {
+        width: 50%;
+    }
 
-  }
+    }
 </style>

src/xt_pages/outpatientCharges/costComparison.vue

@@ -158,7 +158,7 @@
                 <el-form :model="form" label-width="100px">
                     <el-form-item label="时间" label-width="100px">
                         <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
-                                        @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                        :editable="false" :clearable="false"
                                         style="width: 200px;" type="date" placeholder="选择开始日期"
                                         format="yyyy-MM-dd"
                                         value-format="yyyy-MM-dd"
@@ -166,7 +166,7 @@
                         -
 
                         <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
-                                        @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                       :editable="false" :clearable="false"
                                         style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
                                         format="yyyy-MM-dd"
                                         value-format="yyyy-MM-dd"
@@ -458,7 +458,7 @@
                   that.$alert(result_desc, '对账结果', {
                     confirmButtonText: '确定',
                     callback: action => {
-                      this.dialogFormVisible = false
+                      that.dialogFormVisible = false
                     }
                   })
 

src/xt_pages/outpatientCharges/incomeStatistics.vue

@@ -11,18 +11,7 @@
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
-          <el-select size="small" v-model="admin_user_id" placeholder="请选择" style="width:150px;margin-left:10px;" @change="changeDoctor">
-            <el-option
-              label="全部"
-              value="0">
-            </el-option>
-            <el-option
-              v-for="(item,index) in type"
-              :key="index"
-              :label="item.user_name"
-              :value="item.admin_user_id">
-            </el-option>
-          </el-select>
+
           <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
                           @change="handleStartTimeChange" :editable="false" :clearable="false"
                           style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
@@ -36,13 +25,13 @@
                           format="yyyy-MM-dd"
                           value-format="yyyy-MM-dd"
                           align="right"></el-date-picker>
-          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+          <el-radio v-model="radio" label="1" @change="changeType">汇总</el-radio>
+          <el-radio v-model="radio" label="2"  @change="changeType">明细</el-radio>
         </div>
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
       <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row  v-if="radio == '1'">
         <el-table-column
           prop="date"
           label="序号"
@@ -52,51 +41,164 @@
         >
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope">{{ scope.row.selt_time }}</template>
+          <template slot-scope="scope" >{{ scope.row.settle_accounts_date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="总金额">
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="医保统筹金额">
+          <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="大额基金金额">
+          <template slot-scope="scope">{{scope.row.hifob_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="大病基金金额">
+          <template slot-scope="scope">{{scope.row.hifmi_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="补充保险基金金额">
+          <template slot-scope="scope">{{scope.row.hifes_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="医疗救助基金金额">
+          <template slot-scope="scope">{{scope.row.maf_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="公务员基金">
+          <template slot-scope="scope">{{scope.row.cvlserv_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人支付基金">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
         </el-table-column>
+        <el-table-column align="center" prop="name" label="折扣金额">
+          <template slot-scope="scope">{{scope.row.discount_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="优惠金额">
+          <template slot-scope="scope">{{scope.row.preferential_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人账户支付金额">
+          <template slot-scope="scope">{{scope.row.acct_pay}}</template>
+        </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="预交金">-->
+          <!--<template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>-->
+        <!--</el-table-column>-->
 
+        <!--<el-table-column align="center" prop="name" label="现金">-->
+          <!--<template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>-->
+        <!--</el-table-column>-->
 
-        <el-table-column align="center" prop="name" label="患者名字">
-          <template slot-scope="scope">{{ scope.row.psn_name }}</template>
-        </el-table-column>
-        <!--<el-table-column align="center" prop="name" label="患者类型">-->
-          <!--<template slot-scope="scope"></template>-->
+        <!--<el-table-column align="center" prop="name" label="微信">-->
+          <!--<template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>-->
         <!--</el-table-column>-->
-        <el-table-column align="center" prop="name" label="总金额">
-          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+
+        <!--<el-table-column align="center" prop="name" label="操作">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      </el-table>
+
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"  v-if="radio == '2'"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column
+                prop="date"
+                label="序号"
+                width="60"
+                align="center"
+                type="index"
+        >
         </el-table-column>
 
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope" >{{ scope.row.setl_time }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="姓名">
+          <template slot-scope="scope" >{{ scope.row.psn_name }}</template>
+        </el-table-column>
         <el-table-column align="center" prop="name" label="总金额">
           <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
+        <el-table-column align="center" prop="name" label="基金支付">
+          <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人支付基金">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
 
+        <el-table-column align="center" prop="name" label="床位费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'01')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="诊察费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'02')}}</template>
+        </el-table-column>
 
 
-        <el-table-column align="center" prop="name" label="实收金额">
-          <template slot-scope="scope">{{scope.row.reality_price}}</template>
+        <el-table-column align="center" prop="name" label="检查费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'03')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="科室">
-          <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>
+
+        <el-table-column align="center" prop="name" label="化验费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'04')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
+
+        <el-table-column align="center" prop="name" label="治疗费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'05')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="收费员">
-          <template slot-scope="scope">{{ scope.row.p_info.doctor }}</template>
+
+
+        <el-table-column align="center" prop="name" label="手术费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'06')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="状态">
-          <template slot-scope="scope">
-            <div v-if="scope.row.order_status == 1">待结算</div>
-            <div v-if="scope.row.order_status == 2">已结算</div>
-            <div v-if="scope.row.order_status == 3">已退费</div>
-          </template>
+
+        <el-table-column align="center" prop="name" label="护理费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'07')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="操作">
-          <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-          </template>
+
+
+        <el-table-column align="center" prop="name" label="卫生材料费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'08')}}</template>
         </el-table-column>
+
+        <el-table-column align="center" prop="name" label="西药费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'09')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="中药饮片费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'10')}}</template>
+        </el-table-column>
+
+
+        <el-table-column align="center" prop="name" label="中成药费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'11')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="一般诊疗费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'12')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="挂号费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'13')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="其他费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'14')}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="医保支付">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="现金">
+        <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="微信">
+        <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="支付宝">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="银行卡">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+
       </el-table>
+
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -118,7 +220,7 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { getIncomeStatisticsDataList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
 
   export default {
@@ -132,6 +234,7 @@
           { path: false, name: '项目消费明细汇总' }
         ],
         tableData: [],
+        radio:'1',
         limit:10,
         page:1,
         keywords:"",
@@ -144,6 +247,35 @@
       }
     },
     methods: {
+      getPrice(order_info, number){
+
+
+
+
+
+      },
+      changeType(val){
+
+        let params= {
+          page : this.page,
+          limit: this.limit,
+          keywords:this.keywords,
+          start_time:this.start_time,
+          end_time: this.end_time,
+          statistics_type: this.radio
+        }
+        getIncomeStatisticsDataList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+
+      },
       export_detail(){
         let params= {
           start_time:this.start_time,
@@ -248,33 +380,29 @@
       },  formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
-      changeDoctor(){
-        this.page = 1
-        this.keywords=""
-        this.getHisOrderList()
-      },
+
       handleSizeChange(limit){
         this.limit = limit;
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
 
       },handleCurrentChange(page){
         this.page = page;
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
 
 
       },
       handleStartTimeChange(){
         this.page = 1
         this.keywords=""
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
       },handleEndTimeChange(){
         this.page = 1
         this.keywords=""
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
       },
       searchAction(){
         this.page = 1
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
 
 
       },
@@ -288,21 +416,21 @@
           return uParseTime(value, temp)
         }
         return ''
-      },getHisOrderList(){
+      },getIncomeStatisticsDataList(){
         let params= {
           page : this.page,
           limit: this.limit,
           keywords:this.keywords,
           start_time:this.start_time,
           end_time: this.end_time,
-          type: this.admin_user_id
+          statistics_type: this.radio
         }
-        getHisOrderList(params).then(response => {
+        getIncomeStatisticsDataList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.tableData = response.data.data.order
+            this.tableData = response.data.data.list
             this.total = response.data.data.total
           }
         })
@@ -321,7 +449,7 @@
       }
     }, created() {
      this.getDoctorList()
-     this.getHisOrderList()
+     this.getIncomeStatisticsDataList()
 
 
     }

src/xt_pages/outpatientCharges/listPrint.vue

@@ -56,7 +56,7 @@
       if(this.org_id == 10106){
         this.getInfo10106(this.paramsObj.id)
       }
-      
+
     },
 
     methods: {
@@ -85,11 +85,16 @@
                 price: infos.pric,
                 count: infos.cnt
               }
+              console.log(infos)
               if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
                 obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
-                obj['name'] = infos.project.project.project_name
+                if(infos.project.type == 2){
+                  obj['name'] = infos.project.project.project_name
+                }else if (infos.project.type == 3){
+                  obj['name'] = infos.project.good_info.good_name
+                }
                 obj['spec'] = 1
-                obj['unit'] = infos.project.project.unit
+                obj['unit'] = infos.project.unit
 
               }
 
@@ -189,7 +194,7 @@
             scanStyles: false
           });
         }
-        
+
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({
@@ -464,4 +469,4 @@
   .newContainer::-webkit-scrollbar {
     height: 15px !important;
   }
-</style>
+</style>

src/xt_pages/outpatientCharges/listTemplate/printTwo.vue

@@ -84,9 +84,9 @@
         <div>
             <div v-if="Object.values(obj)[index].length > 0" v-for="(item,itemIndex) in Object.values(obj)[index]" :key="itemIndex" style="border-bottom:1px solid #000;padding:10px 0;display:flex;" >
                 <div style="width:20%;text-align:center;" v-if="item.advice_id > 0">{{ item.advice.drug.medical_insurance_number }}</div>
-                <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{ item.project.project.medical_code }}</div>
+                <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.type == 2?item.project.project.medical_code: item.project.good_info.medical_insurance_number}}</div>
                 <div style="width:20%;text-align:center;" v-if="item.advice_id > 0">{{item.advice.drug.drug_name}}</div>
-                <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.project.project_name}}</div>
+                <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.type == 2?item.project.project.project_name:item.project.good_info.good_name}}</div>
 
                 <div style="width:10%;text-align:center;">{{item.pric}}</div>
                 <div style="width:10%;text-align:center;">{{item.cnt}}</div>
@@ -97,7 +97,7 @@
             </div>
         </div>
     </div>
-    
+
     <div style="display:flex;border-bottom:1px solid #000;padding:20px 0 10px;">
       <div style="width:70%;">合计：</div>
       <div style="width:10%;text-align:center;">{{info.medfee_sumamt}}</div>
@@ -135,13 +135,13 @@ export default {
         default: function () {
           return {}
         }
-      }, 
+      },
       order_infos: {
         type: Object,
         default: function () {
           return {}
         }
-      }, 
+      },
       p_admin: {
         type: Object,
         default: function () {
@@ -153,7 +153,7 @@ export default {
           return {}
         }
       }
-    }, 
+    },
     data(){
         return{
             obj:{},
@@ -224,9 +224,9 @@ export default {
                     'med_chrgitm_type11':[],
                     'med_chrgitm_type14':[],
                 }
-                
+
                 newVal.map(item => {
-                    
+
                     if(item.med_chrgitm_type == '01'){
                         obj.med_chrgitm_type01.push(item)
                         this.price01 += item.det_item_fee_sumamt
@@ -255,7 +255,7 @@ export default {
                         obj.med_chrgitm_type14.push(item)
                         this.price14 += item.det_item_fee_sumamt
                     }
-                    
+
                 })
                 this.obj = obj
                 console.log('this.obj',this.obj)
@@ -264,7 +264,7 @@ export default {
         }
     }
 }
-    
+
 
 
 </script>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -1,106 +1,106 @@
 <template>
   <div>
-    <template>
-      <el-button
-        style="position:fixed;right:25px;z-index:999"
-        :loading="loading"
-        size="small"
-        icon="el-icon-printer"
-        @click="printThisPage"
-        type="primary"
-      >打印</el-button
-      >
-    </template>
-
-    <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :info="info" v-if="org_id != 9990"></printOne>
-      <printTwo  :info="info" v-if="org_id == 9990"></printTwo>
-    </div>
+       <template>
+        <el-button
+          style="position:fixed;right:25px;z-index:999"
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+
+      <div class='dialysisPage' style="padding-top:40px;">
+        <printOne :info="info" v-if="org_id != 9990"></printOne>
+        <printTwo  :info="info" v-if="org_id == 9990"></printTwo>
+      </div>
   </div>
 </template>
 
 <script>
 
 
-  import { parseTime } from "@/utils";
-  import { getDialysisRecord } from "@/api/dialysis";
-  import { getDataConfig } from "@/utils/data";
-  import { jsGetAge, uParseTime } from "@/utils/tools";
-  import axios from 'axios'
-
-  import BreadCrumb from "@/xt_pages/components/bread-crumb";
-  import print from "print-js";
-  import printOne from "./statementTemplate/printOne"
-  import printTwo from "./statementTemplate/printTwo"
-  import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
-  export default {
-    name: "dialysisPrintOrder",
-    components: {
-      BreadCrumb,
-      printOne,
-      printTwo
-    },
-    props:{
-      paramsObj:Object
-    },
-    data() {
-      return {
-        crumbs: [
-          { path: false, name: '门诊医生站' },
-          { path: false, name: '打印' }
-        ],
-        record_date:"",
-        patientTableData:[],
-        advicePrint:[],
-        hisPatient:{},
-        patient:{},
-        search_input:"",
-        loading:false,
-        patient_id:0,
-        prescription_id:0,
-        ids:'',
-        info:null,
-        org_id:""
-      };
-    },
-    methods:{
-      printThisPage() {
-        var ptime = Math.round(new Date().getTime() / 1000);
-        this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
-
-        const style =
-          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+import { parseTime } from "@/utils";
+import { getDialysisRecord } from "@/api/dialysis";
+import { getDataConfig } from "@/utils/data";
+import { jsGetAge, uParseTime } from "@/utils/tools";
+import axios from 'axios'
+
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import print from "print-js";
+import printOne from "./statementTemplate/printOne"
+import printTwo from "./statementTemplate/printTwo"
+import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
+export default {
+  name: "dialysisPrintOrder",
+  components: {
+    BreadCrumb,
+    printOne,
+    printTwo
+  },
+  props:{
+    paramsObj:Object
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: '门诊医生站' },
+        { path: false, name: '打印' }
+      ],
+      record_date:"",
+      patientTableData:[],
+      advicePrint:[],
+      hisPatient:{},
+      patient:{},
+      search_input:"",
+      loading:false,
+      patient_id:0,
+      prescription_id:0,
+      ids:'',
+      info:null,
+      org_id:""
+    };
+  },
+  methods:{
+    printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000);
+      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+      const style =
+        '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
         printJS({
-          printable: "statement-print",
-          type: "html",
-          style: style,
-          scanStyles: false
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false
         });
 
-        // if (this.org_template_info.template_id == 1) {
-        //   printJS({
-        //     printable: "dialysis-print-box",
-        //     type: "html",
-        //     style: style,
-        //     scanStyles: false
-        //   });
-        // }
-      },
-      getAllDoctorList(){
-        getAllDoctorList().then(response=>{
-          if(response.data.state == 1){
-            var doctor =  response.data.data.doctor;
-
-            this.doctorList = doctor
-          }
-        })
-      },
-      getAllHisPatientList(){
-        const params = {
-          record_date:this.record_date
-        };
-        getAllHisPatientList(params).then(response=>{
-          if(response.data.state == 1){
+      // if (this.org_template_info.template_id == 1) {
+      //   printJS({
+      //     printable: "dialysis-print-box",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false
+      //   });
+      // }
+    },
+    getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor;
+
+               this.doctorList = doctor
+             }
+         })
+     },
+    getAllHisPatientList(){
+         const params = {
+           record_date:this.record_date
+         };
+      getAllHisPatientList(params).then(response=>{
+         if(response.data.state == 1){
             this.patientTableData = response.data.data.list;
             this.patientTableDataTwo = response.data.data.list;
 
@@ -120,163 +120,163 @@
             // this.choosePatient(this.patientTableData[0])
             this.cal_one = cal_one;
             this.cal_two = cal_two
-          }
-        })
-      },
-
-      changePatient(row){
-        console.log("row",row);
-        this.patient_id = row.patient_id;
-        this.record_date = this.record_date;
-        this.prescription_id = this.prescription_id
-        //   var params = {
-        //     patient_id:row.patient_id,
-        //     record_date:this.record_date,
-        //     prescription_id:this.prescription_id,
-        //   }
-        // getPrescriptionPrint(params).then(response=>{
-        //     if(response.data.state == 1){
-        //       var advicePrint =  response.data.data.advicePrint
-        //       console.log("adviceprint",advicePrint)
-        //       this.advicePrint = advicePrint
-        //       // var hisPatient =  response.data.data.hisPatient
-        //       // console.log("hispatient",hisPatient)
-        //       // this.hisPatient = hisPatient
-        //       var patient =  response.data.data.patient
-        //       console.log("patient",patient)
-        //       this.patient = patient
-        //       var doctorPorject = response.data.data.doctorPorject
-        //       console.log("doctorporject",doctorPorject)
-        //     }
-        // })
-      }, getTimes(time) {
-        return uParseTime(time, '{y}-{m}-{d}')
-      },
-      searchAction(){
+         }
+      })
+    },
 
-      },
-      getInfo(order_id) {
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990) {
+    changePatient(row){
+      console.log("row",row);
+      this.patient_id = row.patient_id;
+      this.record_date = this.record_date;
+      this.prescription_id = this.prescription_id
+      //   var params = {
+      //     patient_id:row.patient_id,
+      //     record_date:this.record_date,
+      //     prescription_id:this.prescription_id,
+      //   }
+      // getPrescriptionPrint(params).then(response=>{
+      //     if(response.data.state == 1){
+      //       var advicePrint =  response.data.data.advicePrint
+      //       console.log("adviceprint",advicePrint)
+      //       this.advicePrint = advicePrint
+      //       // var hisPatient =  response.data.data.hisPatient
+      //       // console.log("hispatient",hisPatient)
+      //       // this.hisPatient = hisPatient
+      //       var patient =  response.data.data.patient
+      //       console.log("patient",patient)
+      //       this.patient = patient
+      //       var doctorPorject = response.data.data.doctorPorject
+      //       console.log("doctorporject",doctorPorject)
+      //     }
+      // })
+    }, getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    },
+    searchAction(){
 
-          var that = this;
+    },
+    getInfo(order_id) {
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990) {
 
-          axios.get('http://127.0.0.1:9532/api/settle/query', {
-            params: {
-              order_id: order_id,
-              admin_user_id:this.$store.getters.xt_user.user.id,
+        var that = this;
 
-            }
-          })
-            .then(function (response) {
-              if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
-                return false
-              } else {
-                console.log("logloglog");
+        axios.get('http://127.0.0.1:9532/api/settle/query', {
+          params: {
+            order_id: order_id,
+            admin_user_id:this.$store.getters.xt_user.user.id,
 
-                console.log(response.data.data.info);
-                that.info = response.data.data.info;
-                console.log(that.info);
-                that.p_admin = response.data.data.printor_admin;
-                that.charge_admin = response.data.data.charge_admin;
+          }
+        })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false
+            } else {
+              console.log("logloglog");
 
-                that.info['p_admin'] =  that.p_admin;
-                that.info['charge_admin'] =  that.charge_admin;
+              console.log(response.data.data.info);
+              that.info = response.data.data.info;
+              console.log(that.info);
+              that.p_admin = response.data.data.printor_admin;
+              that.charge_admin = response.data.data.charge_admin;
 
-                that.info['date'] =  response.data.data.date;
-                that.info['number'] =  response.data.data.number;
-                that.info['order_infos'] =  response.data.data.order_infos;
-                that.info['diagnosis'] =  response.data.data.diagnosis;
+              that.info['p_admin'] =  that.p_admin;
+              that.info['charge_admin'] =  that.charge_admin;
 
+              that.info['date'] =  response.data.data.date;
+              that.info['number'] =  response.data.data.number;
+              that.info['order_infos'] =  response.data.data.order_infos;
+              that.info['diagnosis'] =  response.data.data.diagnosis;
 
-                that.info['bed_cost_total'] = response.data.data.bedCostTotal;
-                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
-                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
 
-                that.info['operation_cost_total'] = response.data.data.operationCostTotal;
-                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal;
-                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal;
+              that.info['bed_cost_total'] = response.data.data.bedCostTotal;
+              that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
+              that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
 
-                that.info['other_cost_total'] = response.data.data.otherCostTotal;
-                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal;
-                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal;
+              that.info['operation_cost_total'] = response.data.data.operationCostTotal;
+              that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal;
+              that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal;
 
-                that.info['material_cost_total'] = response.data.data.materialCostTotal;
-                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal;
-                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal;
+              that.info['other_cost_total'] = response.data.data.otherCostTotal;
+              that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal;
+              that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal;
 
-                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal;
-                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal;
-                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal;
+              that.info['material_cost_total'] = response.data.data.materialCostTotal;
+              that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal;
+              that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal;
 
-                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal;
-                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal;
-                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+              that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal;
+              that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal;
+              that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal;
 
+              that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal;
+              that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal;
+              that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
 
-                that.info['check_cost_total'] = response.data.data.checkCostTotal;
-                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal;
-                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal;
 
+              that.info['check_cost_total'] = response.data.data.checkCostTotal;
+              that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal;
+              that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal;
 
-                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal;
-                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal;
-                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal;
 
-                that.info['treat_cost_total'] = response.data.data.treatCostTotal;
-                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
-                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
-                that.info['date'] =  response.data.data.date;
-                that.info['number'] =  response.data.data.number;
-                that.info['order_infos'] =  response.data.data.order_infos;
-                that.info['diagnosis'] =  response.data.data.diagnosis
+              that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal;
+              that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal;
+              that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal;
 
-                if(that.paramsObj.settle_type != 1){
-                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
-                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
-                }
+              that.info['treat_cost_total'] = response.data.data.treatCostTotal;
+              that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
+              that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
+              that.info['date'] =  response.data.data.date;
+              that.info['number'] =  response.data.data.number;
+              that.info['order_infos'] =  response.data.data.order_infos;
+              that.info['diagnosis'] =  response.data.data.diagnosis
 
+              if(that.paramsObj.settle_type != 1){
+                that.info.begndate = that.getTimes(that.paramsObj.start_time)
+                that.info.enddate = that.getTimes(that.paramsObj.end_time)
               }
-            })
-            .catch(function (error) {
 
-            });
-        }
+            }
+          })
+          .catch(function (error) {
+
+          });
       }
+    }
 
-    },
+  },
 
-    created() {
-      this.getInfo(this.paramsObj.order_id);
-      this.org_id = this.$store.getters.xt_user.org_id;
-      console.log("this.org_id",this.org_id)
-    },
-    watch:{
-      paramsObj:{//深度监听，可监听到对象、数组的变化
-        handler(val, oldVal){
-          this.paramsObj = val;
-          this.getInfo(this.paramsObj.order_id)
-
-        },
-        deep:true
-      }
+  created() {
+    this.getInfo(this.paramsObj.order_id);
+    this.org_id = this.$store.getters.xt_user.org_id;
+    console.log("this.org_id",this.org_id)
+  },
+  watch:{
+    paramsObj:{//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal){
+        this.paramsObj = val;
+        this.getInfo(this.paramsObj.order_id)
+
+      },
+      deep:true
     }
+  }
 
-  };
+};
 </script>
 
 <style>
-  .dialysis-print-order {
-    width: 960px;
-    margin: 0 auto;
-  }
-
-  .dialysis-print-order .order-yy-name {
-    margin: auto;
-    text-align: center;
-    font-size: 20px;
-    letter-spacing: 5px;
-  }
+.dialysis-print-order {
+  width: 960px;
+  margin: 0 auto;
+}
+
+.dialysis-print-order .order-yy-name {
+  margin: auto;
+  text-align: center;
+  font-size: 20px;
+  letter-spacing: 5px;
+}
 
   .dialysis-print-order .order-title {
     margin: auto;

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -25,7 +25,7 @@
                         </el-table-column>
 
                         <el-table-column align="center" prop="project_name" label="分类" width="100">
-                          <template slot-scope="scope">{{ scope.row.type == 1?'药品':'项目' }}</template>
+                          <template slot-scope="scope">{{ scope.row.type == 1?'药品': scope.row.project_type == 2? '项目':'耗材'}}</template>
                         </el-table-column>
 
 
@@ -409,8 +409,18 @@ export default {
         let count = 0
         for (let a = 0; a < project_month_prescriptions.project.length; a++) {
           if (project_ids[i].price == project_month_prescriptions.project[a].price &&project_ids[i].id == project_month_prescriptions.project[a].project_id ) {
-            obj['name'] = project_month_prescriptions.project[a].project.project_name
-            obj['statistical_classification'] = ''
+
+            if(project_month_prescriptions.project[a].type == 2){
+              obj['name'] = project_month_prescriptions.project[a].project.project_name
+              obj['statistical_classification'] = ''
+              obj['project_type'] = 2
+
+
+            }else if (project_month_prescriptions.project[a].type == 3){
+              obj['name'] = project_month_prescriptions.project[a].good_info.good_name
+              obj['statistical_classification'] = ''
+              obj['project_type'] = 3
+            }
             obj['single_dose'] = project_month_prescriptions.project[a].single_dose
             obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
             obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -93,11 +93,11 @@
             <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
-                <span>{{ scope.row.project.project_name }}</span>
+                <span>{{ scope.row.type == 2?scope.row.project.project_name:scope.row.good_info.good_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">{{scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
@@ -260,13 +260,16 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
+
               };
               tempAdvice.push(obj)
 
             }
 
 
+
             for (let b = 0; b < prescription.project.length; b++) {
               let obj = {
                 id: 0,
@@ -280,8 +283,27 @@
                 total:prescription.project[b].count,
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
-                medical_code:prescription.project[b].project.medical_code,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type
+
+                // medical_code:prescription.project[b].project.medical_code,
               };
+              console.log(prescription.project[b].type)
+              if(prescription.project[b].type == 2){
+                console.log("pre")
+
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+
+              }else if(prescription.project[b].type == 3){
+                console.log("pre2")
+
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+              }
+
               tempProject.push(obj)
             }
             let obj = {

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -285,8 +285,8 @@
                 let obj = {
                   id: prescription.project[b].id,
                   project_id: prescription.project[b].project.id,
-                  project_name: prescription.project[b].project.project_name,
-                  statistical_classification: prescription.project[b].project.statistical_classification,
+                  // project_name: prescription.project[b].project.project_name,
+                  // statistical_classification: prescription.project[b].project.statistical_classification,
                   single_dose: prescription.project[b].single_dose,
                   delivery_way: prescription.project[b].delivery_way,
                   execution_frequency: prescription.project[b].execution_frequency,
@@ -294,8 +294,20 @@
                   total: prescription.project[b].count.toString(),
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
-                  medical_code: prescription.project[b].project.medical_code,
+                  // medical_code: prescription.project[b].project.medical_code,
                   unit:prescription.project[b].project.unit,
+                  type:prescription.project[b].type,
+
+                }
+                if(prescription.project[b].type == 2){
+                  obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                  obj['medical_code'] =  prescription.project[b].project.medical_code
+                  obj['project_name'] =  prescription.project[b].project.project_name
+
+                }else if(prescription.project[b].type == 3){
+                  obj['statistical_classification'] = ""
+                  obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                  obj['project_name'] =  prescription.project[b].good_info.good_name
                 }
                 tempProject.push(obj)
               }

src/xt_pages/outpatientDoctorStation/components/newPrescriptionTable.vue

@@ -63,7 +63,7 @@
       </el-table-column>
       <el-table-column align="center" prop="statistical_classification" width="100" label="组">
         <template slot-scope="scope">
-          <div>{{getGroup(scope.row.statistical_classification)}}</div>
+          <div>{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="100" label="单次用量">

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -81,11 +81,11 @@
             <el-table-column align="center" type="index" width="60" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" width="160" label="名称">
               <template slot-scope="scope">
-                <span>{{ scope.row.project.project_name }}</span>
+                <span>{{ scope.row.type == 2 ?scope.row.project.project_name:scope.row.good_info.good_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">{{ scope.row.type == 2 ?getGroup(scope.row.statistical_classification):"耗材"}}</template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
               <template slot-scope="scope">
@@ -317,7 +317,8 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
               };
               tempAdvice.push(obj)
 
@@ -328,8 +329,8 @@
               let obj = {
                 id: 0,
                 project_id: prescription.project[b].project_id,
-                project_name: prescription.project[b].project.project_name,
-                statistical_classification: prescription.project[b].project.statistical_classification,
+                // project_name: prescription.project[b].project.project_name,
+                // statistical_classification: prescription.project[b].project.statistical_classification,
                 single_dose: prescription.project[b].single_dose,
                 delivery_way: prescription.project[b].delivery_way,
                 execution_frequency: prescription.project[b].execution_frequency,
@@ -337,8 +338,23 @@
                 total:prescription.project[b].count.toString(),
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
-                medical_code:prescription.project[b].project.medical_code,
+                unit: prescription.project[b].unit,
+                type: prescription.project[b].type
+
+                // medical_code:prescription.project[b].project.medical_code,
               };
+
+              if(prescription.project[b].type == 2){
+                obj['statistical_classification'] =  prescription.project[b].project.statistical_classification
+                obj['medical_code'] =  prescription.project[b].project.medical_code
+                obj['project_name'] =  prescription.project[b].project.project_name
+
+              }else if(prescription.project[b].type == 3){
+                obj['statistical_classification'] = ""
+                obj['medical_code'] =  prescription.project[b].good_info.medical_insurance_number
+                obj['project_name'] =  prescription.project[b].good_info.good_name
+              }
+
               tempProject.push(obj)
             }
             let obj = {
@@ -353,7 +369,6 @@
           }
         }
 
-        console.log(this.srcPrescriptions);
 
         if(this.srcPrescriptions.length == 1){
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -85,7 +85,7 @@
         <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">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
       </el-table-column>
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
         <template slot-scope="scope">
@@ -208,7 +208,7 @@
         input: 1,
       }
     },
-    
+
    methods:{
      createFilter(queryString) {
        return (restaurant) => {
@@ -401,7 +401,7 @@
       }
     },mounted(){
       this.getInitData()
-     
+
     },
     watch:{
       // "prescription.advices":{
@@ -411,8 +411,8 @@
       //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
       //         item.total = item.single_dose * item.number_days
       //       }
-            
-            
+
+
       //     })
       //   },
       //   deep:true
@@ -423,13 +423,13 @@
       //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
       //         item.total = item.single_dose * item.number_days
       //       }
-            
+
       //     })
       //   },
       //   deep:true
       // }
     }
-    
+
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -0,0 +1,468 @@
+<template>
+    <div class="prescriptionTable">
+        <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" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" prop="drug_name" label="名称">
+                <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="90" label="单次用量">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)" style="width:65%;"></el-input>
+                        <div>{{scope.row.single_dose_unit}}</div>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+                <template slot-scope="scope">
+                    <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+                        <el-option
+                                v-for="(item,index) in drugways"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+                <template slot-scope="scope">
+                    <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+                        <el-option
+                                v-for="item,index in efs"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.name">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-table-column>
+
+
+            <el-table-column align="center" prop="day" width="70" label="天数">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>{{'天'}}
+                    </div>
+                </template>
+            </el-table-column>
+
+            <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
+                        <div> {{scope.row.prescribing_number_unit}}</div>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="retail_price" width="80" label="单价">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+                        <div>{{'元'}}</div>
+                    </div>
+
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="remark" width="50" label="备注">
+                <template slot-scope="scope">
+                    <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="操作">
+                <template slot-scope="scope">
+                    <i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-table v-if="activeType == 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" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" prop="project_name" label="名称">
+                <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">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
+            </el-table-column>
+            <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+                <template slot-scope="scope">
+                    <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
+                    <div>{{scope.row.unit}}</div>
+
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+                <template slot-scope="scope">
+                    <el-autocomplete
+                            style="width:100%;"
+                            class="inline-input"
+                            v-model="scope.row.delivery_way"
+                            :fetch-suggestions="querySearch2"
+                            placeholder="请输入内容"
+                    ></el-autocomplete>
+                </template>
+            </el-table-column>
+            <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>
+            </el-table-column>
+            <el-table-column align="center" prop="number_days" width="70" label="天数">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+                        <div>{{'天'}}</div>
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" prop="total" width="70" label="总量">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.total" style="width:60%" placeholder=""></el-input>
+                        <div>{{scope.row.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.price" placeholder="" readonly></el-input>
+                    <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.remark" :title="scope.row.remark"></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column align="center" width="40" prop="name" label="操作">
+                <template slot-scope="scope">
+                    <i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <div class="additionalBox">
+            <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+                <span :title="item.item_name">{{item.item_name}}</span>
+                <el-input v-model="item.price" placeholder="" style="width:50px;"></el-input>
+                共
+                <el-input v-model="item.count" placeholder="" style="width:50px;"></el-input>
+                次
+                <i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>
+            </div>
+        </div>
+
+
+
+    </div>
+</template>
+
+<script>
+  import { getDictionaryDataConfig} from "@/utils/data";
+  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
+  import { delHisPrescriptionAdviceTemplate,delHisPrescriptionProjectTemplate } from '@/api/his/his_config'
+
+  export default {
+    props: {
+      preDrugs: Array,
+      activeType: Number,
+      addtions_charge:Array,
+      prescription:{
+        type:Object,
+        default: function () {
+          return {
+            name:"",
+            advices:[],
+            project:[],
+            drugways:[],
+            efs:[],
+          };
+        }
+      },
+    },
+    data() {
+      return {
+        advices:[],
+        tableData: [],
+        newoptions: [{
+          value: '1',
+          label: '1'
+        }, {
+          value: '2',
+          label: '2'
+        }, {
+          value: '3',
+          label: '3'
+        }, {
+          value: '4',
+          label: '4'
+        }, {
+          value: '5',
+          label: '5'
+        }],
+        value: '1',
+        input: 1,
+      }
+    },
+
+    methods:{
+      createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+      querySearch2(queryString, cb) {
+        var restaurants = this.getDictionaryDataConfig("system","project_use")
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
+      delAddition(index, addition){
+        this.$confirm("附加费删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          this.$nextTick(function(){
+            if(addition.id == 0){
+              this.prescription.addition.splice(index, 1)
+            }else{
+              let params = {
+                'id': addition.id,
+              }
+              delHisAddition(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.addition)
+                  temp2.splice(index, 1)
+                  this.prescription.addition = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+            }
+          });
+
+        })
+          .catch(() => {});
+
+      },
+      getInitData(){
+        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
+          }
+        })
+
+      },deleteDrug:function(index, row){
+
+        this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          this.$nextTick(function(){
+            if(row.advice_id == 0){
+              this.prescription.advices.splice(index, 1)
+            }else{
+              let params = {
+                'id': row.advice_id,
+              }
+              delHisPrescriptionAdviceTemplate(params).then(response => {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg)
+                  return false
+                } else {
+                  var temp2 = this.deepClone(this.prescription.advices)
+                  temp2.splice(index, 1)
+                  this.prescription.advices = temp2
+                  this.$message.success(response.data.data.msg)
+                }
+              })
+
+
+            }
+
+          });
+
+
+        })
+          .catch(() => {});
+
+
+
+
+
+      },deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
+
+      setNewData:function(data){
+        this.prescription = data
+
+        // this.prescription.advices = data.advices
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      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
+      },
+      deleteProject(row,i){
+        if(this.prescription.order_status == 2){
+          this.$message.error('该处方已经结算，无法删除')
+          return
+        }
+        this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        }).then(() => {
+          if(row.id == 0){
+            this.prescription.project.splice(i, 1)
+
+          }else{
+            let params = {
+              'id': row.id,
+            }
+            delHisPrescriptionProjectTemplate(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                for (let i = 0; i < this.prescription.project.length; i++){
+                  if(this.prescription.project[i].id == row.id){
+                    this.prescription.project.splice(i, 1)
+                  }
+                }
+                this.$message.success(response.data.data.msg)
+              }
+            })
+          }
+        })
+          .catch(() => {});
+
+      },
+      getSingleDose(scope){
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+      },
+      getDay(scope){
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+      },
+      getProjectSingleDose(scope){
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        if(this.prescription.project[scope.$index].total == 0){
+          this.prescription.project[scope.$index].total = 1
+        }
+      },
+      getProjectDay(scope){
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        if(this.prescription.project[scope.$index].total == 0){
+          this.prescription.project[scope.$index].total = 1
+        }
+      }
+    },mounted(){
+      this.getInitData()
+
+    },
+    watch:{
+      // "prescription.advices":{
+      //   handler(newVal,oldVal){
+      //     newVal.map(item => {
+      //       item.prescribing_number = item.single_dose * item.day
+      //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
+      //         item.total = item.single_dose * item.number_days
+      //       }
+
+
+      //     })
+      //   },
+      //   deep:true
+      // },
+      // "prescription.project":{
+      //   handler(newVal,oldVal){
+      //     newVal.map((item,index) => {
+      //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
+      //         item.total = item.single_dose * item.number_days
+      //       }
+
+      //     })
+      //   },
+      //   deep:true
+      // }
+    }
+
+  }
+</script>
+
+<style lang="scss">
+    .prescriptionTable {
+    .el-input__inner{
+        padding: 0 5px;
+    }
+    .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:80px;
+        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>

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -1,89 +1,272 @@
 <template>
     <el-dialog
-        title="模板信息"
-        width="600px"
-        :visible.sync="visible"
-        :before-close="_close"
+            title="长期处方模版"
+            width="600px"
+            :visible.sync="visible"
+            :before-close="_close"
     >
         <div>
-            <el-form :model="form"  class="adviceForm" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
-                <el-form-item label="创建人 : " style="width: 100%;margin-bottom:0;">
-                    医生
-                </el-form-item>
-                <el-form-item label="处方类型 : " style="width: 100%;margin-bottom:0;">
-                    药品模板
-                </el-form-item>
-                <el-form-item label="模板类型 : " style="width: 100%;margin-bottom:0;">
-                    <el-radio v-model="radio" label="1">临时</el-radio>
-                    <el-radio v-model="radio" label="2">长期</el-radio>
+            <el-form :model="form" class="adviceForm" ref="form" label-width="100px"
+                     style="display: flex;flex-wrap: wrap;justify-content: space-between;">
+
+                <!--<el-form-item label="处方模板类别 : " style="width: 100%;margin-bottom:0;">-->
+                <!--<el-radio v-model="radio" label="1">临时</el-radio>-->
+                <!--<el-radio v-model="radio" label="2">长期</el-radio>-->
+                <!--</el-form-item>-->
+                <el-form-item label="处方模板名称:" style="width: 100%;margin-bottom:0;">
+                    <el-input v-model="form.name" placeholder=""></el-input>
                 </el-form-item>
-                <el-form-item label="科室 : " style="width: 100%;">
-                    <el-select v-model="value" style="width:100%;" placeholder="请选择">
+                <el-form-item label="透析模式 : " style="width: 100%;">
+                    <el-select v-model="form.mode" style="width:100%;" placeholder="请选择">
                         <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
+                                v-for="item in modeOptions"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="模板名称 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="模板说明 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="诊断信息 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="医嘱说明 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
-                <el-form-item label="备注说明 : " style="width: 100%;">
-                    <el-input v-model="form.name" placeholder=""></el-input>
-                </el-form-item>
             </el-form>
+
+
+            <div v-for="(item,index) in allPrescription" :key="index">
+                <el-checkbox-group v-model="item.check_group">
+                    <div v-for="(subItem,index2) in item.prescriptions" :key="index2">
+                        <el-checkbox style="margin:10px 0;" :label="subItem.id">{{'处方' + (index2+ 1)}}</el-checkbox>
+                        <el-table v-if="subItem.advices.length > 0" :data="subItem.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" type="index" width="60" label="序号"></el-table-column>
+                            <el-table-column align="center" prop="drug_name" width="160" label="名称">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.drug_name }}</span>
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+                                <template slot-scope="scope">
+                                    <div>{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+                                <template slot-scope="scope">
+                                    {{scope.row.delivery_way}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+                                <template slot-scope="scope">
+                                    {{scope.row.execution_frequency}}
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="day" width="60" label="天数">
+                                <template slot-scope="scope">
+                                    {{scope.row.day}}
+                                </template>
+                            </el-table-column>
+
+                            <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
+                                <template slot-scope="scope">
+                                    <div>{{scope.row.prescribing_number}} {{scope.row.prescribing_number_unit}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="retail_price" width="80" label="单价">
+                                <template slot-scope="scope">
+                                    <div>{{scope.row.retail_price}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="remark" label="备注">
+                                <template slot-scope="scope">
+                                    <div>{{scope.row.remark}}</div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <el-table v-if="subItem.project.length > 0" :data="subItem.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" type="index" width="60" label="序号"></el-table-column>
+                            <el-table-column align="center" prop="project_name" width="160" label="名称">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.project_name}}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+                                <template slot-scope="scope">{{ scope.row.type == 2
+                                    ?getGroup(scope.row.statistical_classification):'耗材'}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.single_dose" placeholder=""></el-input>-->
+                                    <span>{{ scope.row.single_dose }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="delivery_way" width="100" label="用法">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.delivery_way" placeholder=""></el-input>-->
+                                    <span>{{ scope.row.delivery_way }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>-->
+                                    <span>{{ scope.row.execution_frequency }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="number_days" width="70" label="天数">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.number_days" placeholder=""></el-input>-->
+                                    <span>{{ scope.row.number_days }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="total" width="70" label="总量">
+                                <template slot-scope="scope">
+                                    <div>{{ scope.row.total }}{{scope.row.unit}}</div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="name" width="60" label="单价">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                                    <span>{{ scope.row.price }}</span>
+
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" prop="name" label="备注">
+                                <template slot-scope="scope">
+                                    <!--<el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>-->
+                                    <span>{{ scope.row.remark }}</span>
+
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </el-checkbox-group>
+            </div>
+
+
         </div>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
             <el-button type="primary" @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>
-export default {
-    data(){
-        return{
-            visible:false,
-            form:{
-                name:''
-            },
-            radio:"1",
-            options:[],
-            value:''
-        }
-    },
-    methods:{
-        _close: function(done) {
-            // this.clear()
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show() {
-            // this.clear()
-            this.visible = true
-        },
-        hide() {
-            // this.clear()
-            this.visible = false
+  import { getDictionaryDataConfig } from '@/utils/data'
+
+  export default {
+    data() {
+      return {
+        visible: false,
+        modeOptions: {},
+        allPrescription: [],
+
+        form: {
+          name: '',
+          mode: ''
         },
+        radio: '1',
+        options: [],
+        value: ''
+      }
+    },
+    methods: {
+      getGroup(id) {
+        var name = ''
+        var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
+        for (let i = 0; i < statistics_category.length; i++) {
+          if (id == statistics_category[i].id) {
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+      _close: function(done) {
+        // this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      }, submitAction() {
+
+        let checkGroup = []
+        let allPrescriptions = []
+        let targetPrescriptions = []
+        let prescriptions = []
+        for (let i = 0; i < this.allPrescription.length; i++) {
+          for (let a = 0; a < this.allPrescription[i].check_group.length; a++) {
+            checkGroup.push(this.allPrescription[i].check_group[a])
+          }
+          for (let a = 0; a < this.allPrescription[i].prescriptions.length; a++) {
+            allPrescriptions.push(this.allPrescription[i].prescriptions[a])
+          }
+        }
+        for (let i = 0; i < allPrescriptions.length; i++) {
+          for (let a = 0; a < checkGroup.length; a++) {
+            if (allPrescriptions[i].id == checkGroup[a]) {
+              targetPrescriptions.push(allPrescriptions[i])
+            }
+          }
+        }
+
+
+        for(let i = 0; i < targetPrescriptions.length; i++){
+          if(targetPrescriptions[i].advices.length > 0 && targetPrescriptions[i].project.length == 0){
+            targetPrescriptions[i]["type"] = 1
+          } else if(targetPrescriptions[i].advices.length == 0 && targetPrescriptions[i].project.length > 0){
+            targetPrescriptions[i]["type"] = 2
+          }
+          for (let b = 0; b < targetPrescriptions[i].advices.length; b++) {
+            targetPrescriptions[i].advices[b].single_dose = targetPrescriptions[i].advices[b].single_dose.toString()
+            targetPrescriptions[i].advices[b].prescribing_number =targetPrescriptions[i].advices[b].prescribing_number.toString()
+            targetPrescriptions[i].advices[b].retail_price = targetPrescriptions[i].advices[b].retail_price.toString()
+            targetPrescriptions[i].advices[b].day = parseInt(targetPrescriptions[i].advices[b].day)
+          }
+          for (let b = 0; b < targetPrescriptions[i].project.length; b++) {
+            targetPrescriptions[i].project[b].price =targetPrescriptions[i].project[b].price.toString()
+            targetPrescriptions[i].project[b].total =targetPrescriptions[i].project[b].total.toString()
+            targetPrescriptions[i].project[b].delivery_way =targetPrescriptions[i].project[b].delivery_way.toString()
+          }
+        }
+
+        let params = {
+          name: this.form.name,
+          mode: this.form.mode,
+          prescriptions: targetPrescriptions,
+        }
+        this.$emit('save_template', params)
+      },
+      show(prescriptions) {
+        for (let i = 0; i < prescriptions.length; i++) {
+          if (prescriptions[i].id == 0) {
+            prescriptions[i].id = Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+          }
+        }
+
+        this.allPrescription = []
+        this.modeOptions = this.$store.getters.treatment_mode
+        let obj = {
+          check_group: [],
+          prescriptions: prescriptions
+        }
+        this.allPrescription.push(obj)
+        this.visible = true
+      },
+      hide() {
+        // this.clear()
+        this.visible = false
+      }
     }
-}
+  }
 </script>
 
 

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -22,24 +22,24 @@
           <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="处方日期" width="200">
-          <template slot-scope="scope"> {{scope.row.info?getTimes(scope.row.info.ctime):''}}</template>
+          <template slot-scope="scope"> {{getTimes(scope.row.ctime)}}</template>
 
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
           <!--<template slot-scope="scope">{{}}</template>-->
         <!--</el-table-column>-->
         <el-table-column align="center" prop="name" label="处方号">
-          <template slot-scope="scope">{{scope.row.info?scope.row.info.prescription_number:''}}</template>
+          <template slot-scope="scope">{{scope.row.prescription_number}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开立医生">
-          <template slot-scope="scope">{{scope.row.info?scope.row.info.doctor:''}}</template>
+          <template slot-scope="scope">{{scope.row.doctor}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{getDiagnosis(scope.row.info.diagnosis)}}</template>
+          <template slot-scope="scope">{{getDiagnosis(scope.row.diagnosis)}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态" width="100">
           <template slot-scope="scope">
-            <div v-if=" scope.row.info && scope.row.info.id > 0">已就诊</div>
+            <div v-if="scope.row.id > 0">已就诊</div>
             <div v-else>未就诊</div>
           </template>
         </el-table-column>
@@ -121,11 +121,11 @@
         return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       },
       handerShowDetail(row) {
-        if(row.info.id == 0){
+        if(row.id == 0){
           this.$message.error("未就诊")
           return
         }
-        this.$refs.inquiriesDetail.show(row.info.id)
+        this.$refs.inquiriesDetail.show(row.id)
       }, getHisPrescriptionList() {
         let params = {
           record_date:this.record_date,

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -0,0 +1,485 @@
+<template>
+    <div class="main-contain new-main-contain">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+            <el-button type="primary" @click="add">新增</el-button>
+
+        </div>
+        <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
+            <div class="mainLeft">
+                <div class="mainCell" style="margin-bottom:10px;">
+                    <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>
+                </div>
+                <div>
+                    <el-table :data="data" :height="tableHeight" @row-click='choosePatient'
+                              @current-change='currentChange' border style="width: 100%;"
+                              :row-style="{ color: '#303133' }"
+                              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                              highlight-current-row
+                              ref="tab">
+                        <el-table-column prop="name" label="姓名">
+                            <template slot-scope="scope">{{scope.row.name}}</template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+            <div class="mainRight">
+                <el-table :data="templates" :height="tableHeight" @row-click='choosePatient'
+                          @current-change='currentChange' border style="width: 100%;"
+                          :row-style="{ color: '#303133' }"
+                          :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                          highlight-current-row
+                          ref="tab"
+                >
+                    <el-table-column prop="name" label="模版名称" >
+                        <template slot-scope="scope">{{scope.row.name}}</template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="透析模式" >
+                        <template slot-scope="scope">{{getMode(scope.row.mode)}}</template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="操作">
+                        <template slot-scope="scope">
+                            <el-button size="mini" type="primary" @click="jumpDetail(scope.row)">编辑</el-button>
+                            <el-button size="mini" type="danger" @click="deleteTemplate(scope.row)">删除</el-button>
+                        </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>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getPatientList, getPrescriptiontemplateList,delHisPrescriptionTemplate } from '@/api/his/his_config'
+  import { uParseTime } from '@/utils/tools'
+
+  const moment = require('moment')
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        templates: [],
+        tableHeight: '',
+        fullHeight: document.documentElement.clientHeight,
+        isloading: false,
+        data: [],
+        page: 1,
+        limit: 10,
+        patient_id: 0
+      }
+    },
+    methods: {
+      jumpDetail(row){
+        this.$router.push("/outpatientDoctorStation/prescriptionTemplatedetail?id="+row.id+"&patient_id="+this.patient_id)
+      },
+      deleteTemplate(row){
+        this.$confirm('处方模版删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id:row.id
+          }
+          delHisPrescriptionTemplate(params).then(response => {
+            if (response.data.state == 1) {
+              this.GetPrescriptiontemplateList()
+            }
+          })
+
+        }).catch(() => {
+
+        })
+
+
+      },
+      getMode(id){
+        let name = ''
+        this.treatment_mode = Object.values(this.$store.getters.treatment_mode)
+        this.treatment_mode.map(item => {
+          if(item.id == id){
+            name = item.name
+          }
+        })
+        return name
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.GetPrescriptiontemplateList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.GetPrescriptiontemplateList()
+      },
+      GetPrescriptiontemplateList() {
+        let params = {
+          patient_id: this.patient_id,
+          page: this.page,
+          limit: this.limit
+        }
+        getPrescriptiontemplateList(params).then(response => {
+          if (response.data.state == 1) {
+            this.templates = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+      },
+      searchAction() {
+
+      },choosePatient(val) {
+         this.page = 1,
+         this.limit = 10
+        let params = {
+          patient_id: val.id,
+          page: this.page,
+          limit: this.limit
+        }
+        getPrescriptiontemplateList(params).then(response => {
+          if (response.data.state == 1) {
+            this.templates = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+      },
+      getList(id) {
+        getPatientList().then(response => {
+          if (response.data.state == 1) {
+            this.data = response.data.data.list
+            this.$refs.tab.setCurrentRow(this.data[0])
+            this.patient_id = this.data[0].id
+            this.GetPrescriptiontemplateList()
+
+          }
+        })
+      },
+      getTime(val, temp) {
+        if (val != 0) {
+          return uParseTime(val, temp)
+        } else {
+          return ''
+        }
+      },add(){
+        if(this.patient_id == 0){
+          this.$message.error("请选择病人")
+          return
+        }
+        this.$router.push("/outpatientDoctorStation/prescriptionTemplatedetail?id="+0+"&patient_id="+this.patient_id)
+
+      }
+    },
+    created() {
+      var nowDate = new Date()
+      var nowYear = nowDate.getFullYear()
+      var nowMonth = nowDate.getMonth() + 1
+      var nowDay = nowDate.getDate()
+      this.record_date =
+        nowYear +
+        '-' +
+        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+        '-' +
+        (nowDay < 10 ? '0' + nowDay : nowDay)
+      this.getList()
+      let tableHeight = document.body.clientHeight - 263
+      this.tableHeight = tableHeight
+
+    },
+
+    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>
+
+<style lang="scss" scoped>
+    .new-main-contain {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .app-container {
+        height: 100%;
+    }
+
+    .mainCell {
+        height: 36px;
+        display: flex;
+        align-items: center;
+    }
+
+    .mainLeft {
+        width: 200px;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+    .el-radio {
+        margin-right: 5px;
+    }
+
+    }
+    .mainRight {
+        margin-left: 10px;
+        flex: 1;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        overflow-y: auto;
+
+    .cellSpan {
+        min-width: 80px;
+        display: inline-block;
+        margin-right: 10px;
+    }
+
+    }
+    .mainCenter {
+        display: flex;
+        flex: 1;
+    }
+
+    .centerLeft {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+
+    .el-form-item {
+        width: 32%;
+        margin-right: 1%;
+        float: left;
+    }
+
+    .el-form-item__label {
+        text-align: left;
+    }
+
+    }
+    .backColor {
+        background: #f6f8f9;
+        height: 5px;
+        margin-bottom: 5px;
+    }
+
+    .tabsBox {
+        position: relative;
+        height: 76%;
+        overflow-y: auto;
+        margin-bottom: 60px;
+
+    .el-tabs__item {
+        padding: 0 10px;
+    }
+
+    }
+    .preTabs {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+
+    .el-tabs__content {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    }
+
+    .costBox {
+        width: 100%;
+        height: 60px;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+    }
+
+    .addTab {
+        position: absolute;
+        right: 0;
+        top: 14px;
+        z-index: 20;
+    }
+
+    .centerRight {
+        width: 300px;
+        margin-left: 10px;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+    }
+
+    .rightTab {
+        height: 40px;
+        width: 100%;
+        border: 1px solid #d2d2d2;
+        box-sizing: border-box;
+
+    p {
+        width: 50%;
+        height: 40px;
+        line-height: 40px;
+        text-align: center;
+        background: #eee;
+        float: left;
+    }
+
+    > p:last-child {
+        border-left: 1px solid #d2d2d2;
+        float: right;
+    }
+
+    .activeP {
+        background: #409EFF;
+        color: #fff;
+    }
+
+    }
+    .comfirmBox {
+        width: 100%;
+        height: 60px;
+        background: #fff;
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .mainHeader {
+        width: 100%;
+        background: #fff;
+        position: fixed;
+        z-index: 100;
+        height: 36px;
+    }
+
+    .titleBox {
+        position: fixed;
+        z-index: 99;
+        background: #fff;
+    }
+
+    .fixedCell {
+        position: fixed;
+        z-index: 99;
+        right: 30px;
+        background: #fff;
+        width: 300px;
+        display: flex;
+        justify-content: space-between;
+    }
+</style>
+
+<style lang="scss">
+    .centerLeft {
+
+    .el-form-item__label {
+        text-align: left;
+    }
+
+    }
+    .tabsBox {
+
+    .el-tabs__item {
+        padding: 0 10px;
+    }
+
+    .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:nth-child(2), .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:nth-child(2) {
+        padding: 0 10px;
+    }
+
+    .el-tabs--bottom .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--bottom.el-tabs--card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--left > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top .el-tabs--right > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--border-card > .el-tabs__header .el-tabs__item:last-child, .el-tabs--top.el-tabs--card > .el-tabs__header .el-tabs__item:last-child {
+        padding: 0 10px;
+    }
+
+    .el-tabs--card > .el-tabs__header .el-tabs__item.is-active.is-closable {
+        padding: 0 10px;
+    }
+
+    }
+    .centerRight {
+
+    .el-tabs__nav-scroll {
+        display: flex;
+    }
+
+    .el-tabs__nav {
+        margin: 0 auto;
+    }
+
+    .el-table th .cell, .el-table td .cell {
+        padding: 0 2px;
+    }
+
+    }
+    .preTabs {
+
+    .el-tabs__content {
+
+    }
+
+    }
+    .rightTabs {
+        height: 100%;
+
+
+    .el-tabs__content {
+
+    }
+
+    }
+    .centerDialog {
+
+    .el-dialog__body {
+        max-height: calc(100vh - 100px) !important;
+        padding: 0 20px;
+    }
+
+    }
+</style>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -29,9 +29,9 @@
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
                </div>
-               
+
               <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.type == 2?getProjectName(it.project_id)?getProjectName(it.project_id):"":it.good_info.good_name}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
@@ -60,10 +60,10 @@
           <div style="page-break-after:always"></div>
       </div>
     </div>
-    
+
   </div>
 
-    
+
 </template>
 <script>
 import { jsGetAge, uParseTime } from '@/utils/tools'
@@ -75,7 +75,7 @@ export default {
       record_date:String,
       prescription_id:Number,
       ids:String
-    }, 
+    },
     data(){
       return {
         doctorList:[],
@@ -92,15 +92,15 @@ export default {
       }
     },
    methods:{
-     
+
      getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
@@ -194,7 +194,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -204,7 +204,7 @@ export default {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -216,7 +216,7 @@ export default {
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
@@ -245,7 +245,7 @@ export default {
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
-     
+
    },
    watch:{
      ids:function(val){
@@ -260,7 +260,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
@@ -320,7 +320,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -50,7 +50,7 @@
                 </tr>
                 <tr v-for="(it,index) in item.project" :key="index">
                     <td>{{index+1}}</td>
-                    <td>{{getProjectName(it.project_id)}}</td>
+                    <td>{{it.type == 2 ?getProjectName(it.project_id):it.good_info.good_name}}</td>
                     <td>{{it.single_dose}}</td>
                     <td>{{getUnit(it.unit)}}</td>
                     <td>{{it.price}}</td>
@@ -481,4 +481,4 @@ export default {
 .actionBar div{
     width:150px;
 }
-</style>
+</style>

src/xt_pages/outpatientRegistration/index.vue

@@ -649,16 +649,16 @@
         }
       },
       handleSelect(val) {
-        this.form.id = val.id;
-        this.form.name = val.name;
-        this.form.sex = val.gender;
-        this.form.age = val.age;
-        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}');
-        this.form.phone = val.phone;
-        this.form.idCard = val.id_card_no;
-
-        var thisLen = this.form.idCard.length;
-        var birth = '';
+        this.form.id = val.id
+        this.form.name = val.name
+        this.form.sex = val.gender
+        this.form.age = val.age
+        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
+        this.form.phone = val.phone
+        this.form.idCard = val.id_card_no
+
+        var thisLen = this.form.idCard.length
+        var birth = ''
         if (thisLen == 15) {
           birth = '19' + this.form.idCard.substr(6, 6)
         } else {
@@ -669,18 +669,18 @@
           '-' +
           birth.substr(4, 2) +
           '-' +
-          birth.substr(6, 2);
+          birth.substr(6, 2)
         this.form.age = jsGetAge(births, '-')
       },
       querySearchAsync(keyword, cb) {
-        let key = '';
+        let key = ''
         if (keyword != undefined) {
           key = keyword
         }
-        let searchArray = [];
+        let searchArray = []
         PostSearch(key).then(response => {
           if (response.data.state == 1) {
-            searchArray = response.data.data.patient;
+            searchArray = response.data.data.patient
             cb(searchArray)
           } else {
             cb([])
@@ -688,45 +688,45 @@
         })
       },
       readingSZ() {
-        var that = this;
+        var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
-          this.$message.error('请先选择读卡类型');
+          this.$message.error('请先选择读卡类型')
           return
         }
-        this.read_loading = true;
+        this.read_loading = true
         let params = {
           'id_card_type': this.form.id_card_type
 
-        };
+        }
         axios.get('http://127.0.0.1:9532/sz/api/readcard', {
           params: params
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.read_loading = false;
+              that.read_loading = false
 
-              that.$message.error(response.data.msg);
+              that.$message.error(response.data.msg)
               return false
             } else {
-              that.read_loading = false;
+              that.read_loading = false
 
-              var patient = response.data.data.patient;
+              var patient = response.data.data.patient
               if (that.form.id_card_type == 1) {
-                that.form.id = patient.id;
-                that.form.name = patient.name;
-                that.form.sex = patient.gender;
-                that.form.age = patient.age;
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
-                that.form.phone = patient.phone;
-                that.form.idCard = patient.id_card_no;
+                that.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
                 that.form.medicalInsuranceCard = response.data.data.health_card_no
               } else if (that.form.id_card_type == 2) {
-                this.form.id = patient.id;
-                that.form.name = patient.name;
-                that.form.sex = patient.gender;
-                that.form.age = patient.age;
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
-                that.form.phone = patient.phone;
+                this.form.id = patient.id
+                that.form.name = patient.name
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
                 that.form.idCard = patient.id_card_no
               }
               that.$message({ message: '读卡成功', type: 'success' })
@@ -739,39 +739,39 @@
       },
 
       reading(medicalInsuranceCard) {
-        var that = this;
+        var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
-          this.$message.error('请先选择读卡类型');
+          this.$message.error('请先选择读卡类型')
           return
         }
         let params = {
           'id_card_type': this.form.id_card_type
-        };
+        }
         axios.get('http://127.0.0.1:9532/api/sscard', {
           params: params
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg);
+              that.$message.error(response.data.msg)
               return false
             } else {
-              var patient = response.data.data.patient;
+              var patient = response.data.data.patient
 
               if (that.form.id_card_type == 1) {
-                that.form.name = patient.ID;
-                that.form.sex = patient.gender;
-                that.form.age = patient.age;
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
-                that.form.phone = patient.phone;
-                that.form.idCard = patient.id_card_no;
+                that.form.name = patient.ID
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
+                that.form.idCard = patient.id_card_no
                 that.form.medicalInsuranceCard = response.data.data.number
 
               } else if (that.form.id_card_type == 2) {
-                that.form.name = patient.ID;
-                that.form.sex = patient.gender;
-                that.form.age = patient.age;
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
-                that.form.phone = patient.phone;
+                that.form.name = patient.ID
+                that.form.sex = patient.gender
+                that.form.age = patient.age
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+                that.form.phone = patient.phone
                 that.form.idCard = patient.id_card_no
               }
               that.$message({ message: '读卡成功', type: 'success' })
@@ -783,39 +783,39 @@
 
       },
       getBirthday(date) {
-        console.log(date);
-        let curTime = moment(new Date(date)).format('YYYY-MM-DD');
-        console.log('curTime22222', curTime);
+        console.log(date)
+        let curTime = moment(new Date(date)).format('YYYY-MM-DD')
+        console.log('curTime22222', curTime)
 
-        console.log(this.jsGetAge(curTime));
+        console.log(this.jsGetAge(curTime))
 
         this.form.age = this.jsGetAge(curTime)
       },
       jsGetAge(strBirthday) { //传入形式yyyy-MM-dd
         //strBirthday = util.formatTime(strBirthday);转换成yyyy-MM-dd形式
-        var returnAge;
-        var strBirthdayArr = strBirthday.split('-');
-        var birthYear = strBirthdayArr[0];
-        var birthMonth = strBirthdayArr[1];
-        var birthDay = strBirthdayArr[2];
-        var d = new Date();
-        var nowYear = d.getFullYear();
-        var nowMonth = d.getMonth() + 1;
-        var nowDay = d.getDate();
+        var returnAge
+        var strBirthdayArr = strBirthday.split('-')
+        var birthYear = strBirthdayArr[0]
+        var birthMonth = strBirthdayArr[1]
+        var birthDay = strBirthdayArr[2]
+        var d = new Date()
+        var nowYear = d.getFullYear()
+        var nowMonth = d.getMonth() + 1
+        var nowDay = d.getDate()
         if (nowYear == birthYear) {
           returnAge = 0 //同年 则为0岁
         } else {
-          var ageDiff = nowYear - birthYear; //年之差
+          var ageDiff = nowYear - birthYear //年之差
           if (ageDiff > 0) {
             if (nowMonth == birthMonth) {
-              var dayDiff = nowDay - birthDay; //日之差
+              var dayDiff = nowDay - birthDay //日之差
               if (dayDiff < 0) {
                 returnAge = ageDiff - 1
               } else {
                 returnAge = ageDiff
               }
             } else {
-              var monthDiff = nowMonth - birthMonth; //月之差
+              var monthDiff = nowMonth - birthMonth //月之差
               if (monthDiff < 0) {
                 returnAge = ageDiff - 1
               } else {
@@ -829,28 +829,28 @@
         return returnAge //返回周岁年龄
       },
       getForm() {
-        this.form.total = this.total;
+        this.form.total = this.total
         if (localStorage.getItem('temp')) {
-          let a = JSON.parse(localStorage.getItem('temp'));
+          let a = JSON.parse(localStorage.getItem('temp'))
           // let arr = []
-          this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000;
-          this.form.org_id = this.$store.getters.xt_user.org_id;
-          a.push(this.form);
-          console.log(111, a);
-          localStorage.setItem('temp', JSON.stringify(a));
+          this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000
+          this.form.org_id = this.$store.getters.xt_user.org_id
+          a.push(this.form)
+          console.log(111, a)
+          localStorage.setItem('temp', JSON.stringify(a))
           Object.keys(this.form).forEach((key) => {
             this.form[key] = ''
-          });
+          })
           this.$message({ message: '添加成功', type: 'success' })
         } else {
-          let arr = [];
-          this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000;
-          this.form.org_id = this.$store.getters.xt_user.org_id;
-          arr.push(this.form);
-          localStorage.setItem('temp', JSON.stringify(arr));
+          let arr = []
+          this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000
+          this.form.org_id = this.$store.getters.xt_user.org_id
+          arr.push(this.form)
+          localStorage.setItem('temp', JSON.stringify(arr))
           Object.keys(this.form).forEach((key) => {
             this.form[key] = ''
-          });
+          })
           this.$message({ message: '添加成功', type: 'success' })
         }
       },
@@ -858,18 +858,18 @@
       getAllDoctorList() {
         getAllDoctorList().then(response => {
           if (response.data.state == 1) {
-            var doctor = response.data.data.doctor;
-            console.log('doctor-----', doctor);
-            this.doctorList = doctor;
-            var department = response.data.data.department;
-            console.log('department', department);
+            var doctor = response.data.data.doctor
+            console.log('doctor-----', doctor)
+            this.doctorList = doctor
+            var department = response.data.data.department
+            console.log('department', department)
             this.departmentList = department
           }
         })
       }, saveHisPatient9504(formName) {
         if (this.form.name == '') {
-          this.$message.error('患者姓名不能为空');
-          this.is_Name = true;
+          this.$message.error('患者姓名不能为空')
+          this.is_Name = true
           return
         }
 
@@ -878,8 +878,8 @@
         }
 
         if (this.form.register == '') {
-          this.$message.error('挂号类型不能为空');
-          this.is_Name = true;
+          this.$message.error('挂号类型不能为空')
+          this.is_Name = true
           return
         }
 
@@ -890,29 +890,29 @@
         // }
 
         if (this.form.department == '') {
-          this.$message.error('科室不能为空');
-          this.is_Name = true;
+          this.$message.error('科室不能为空')
+          this.is_Name = true
           return
         }
         if (this.form.age == '') {
-          this.$message.error('患者年龄不能为空');
-          this.is_Name = true;
+          this.$message.error('患者年龄不能为空')
+          this.is_Name = true
           return
         }
         if (this.form.birthday == '') {
-          this.$message.error('出生日期不能为空');
-          this.is_Name = true;
+          this.$message.error('出生日期不能为空')
+          this.is_Name = true
           return
         }
         if (this.form.id_card_type == '') {
-          this.$message.error('读卡类型不能为空');
-          this.is_Name = true;
+          this.$message.error('读卡类型不能为空')
+          this.is_Name = true
           return
         }
 
         if (this.form.idCard == '') {
-          this.$message.error('证件号码不能为空');
-          this.is_Name = true;
+          this.$message.error('证件号码不能为空')
+          this.is_Name = true
           return
         }
 
@@ -943,13 +943,13 @@
               p_type: this.form.p_type,
               diagnosis: this.form.diagnosis,
               sick_type: this.form.sick_type
-            };
-            params['record_time'] = this.record_date;
-            params['admin_user_id'] = this.$store.getters.xt_user.user.id;
-            this.loadingone = true;
+            }
+            params['record_time'] = this.record_date
+            params['admin_user_id'] = this.$store.getters.xt_user.user.id
+            this.loadingone = true
 
             if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
-              var that = this;
+              var that = this
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {
                 params: params,
                 headers: {
@@ -958,8 +958,8 @@
               })
                 .then(function(response) {
                   if (response.data.state == 0) {
-                    that.$message.error(response.data.msg);
-                    that.loadingone = false;
+                    that.$message.error(response.data.msg)
+                    that.loadingone = false
                     return false
                   } else {
                     if (response.data.data.failed_code == -10) {
@@ -972,31 +972,31 @@
                       }).catch(() => {
                       })
                     } else {
-                      that.$message({ message: '挂号成功', type: 'success' });
-                      that.form.settlementValue = '';
-                      that.form.medicalInsuranceCard = '';
-                      that.form.name = '';
-                      that.form.sex = '';
-                      that.form.certificates = '';
-                      that.form.medicalCare = '';
-                      that.form.birthday = '';
-                      that.form.age = '';
-                      that.form.idCard = '';
-                      that.form.register = '';
-                      that.form.doctor = '';
-                      that.form.department = '';
-                      that.form.costChecked = false;
-                      that.form.registrationFee = '';
-                      that.form.medicalExpenses = '';
-                      that.form.cost = '';
-                      that.form.total = '';
-                      that.form.phone = '';
-                      that.form.social_type = '';
-                      that.loadingone = false;
-
-
-                      that.form.p_type = 14;
-                      that.form.sick_type = that.sick[0].id;
+                      that.$message({ message: '挂号成功', type: 'success' })
+                      that.form.settlementValue = ''
+                      that.form.medicalInsuranceCard = ''
+                      that.form.name = ''
+                      that.form.sex = ''
+                      that.form.certificates = ''
+                      that.form.medicalCare = ''
+                      that.form.birthday = ''
+                      that.form.age = ''
+                      that.form.idCard = ''
+                      that.form.register = ''
+                      that.form.doctor = ''
+                      that.form.department = ''
+                      that.form.costChecked = false
+                      that.form.registrationFee = ''
+                      that.form.medicalExpenses = ''
+                      that.form.cost = ''
+                      that.form.total = ''
+                      that.form.phone = ''
+                      that.form.social_type = ''
+                      that.loadingone = false
+
+
+                      that.form.p_type = 14
+                      that.form.sick_type = that.sick[0].id
                       that.form.diagnosis = that.diagnoses[0].id
 
                     }

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -454,13 +454,14 @@
 </template>
 
 <script>
-  const moment = require('moment');
+  const moment = require('moment')
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { changePatient, getHisPatient, getHisPatientHistory } from '@/api/project/project'
   import { uParseTime } from '@/utils/tools'
   import { getDictionaryDataConfig } from '@/utils/data'
   import axios from 'axios'
 
+
   export default {
     components: {
       BreadCrumb
@@ -604,12 +605,12 @@
       // this.tableData = arr
       //获取所有挂号号的患者
 
-      this.creator = this.$store.getters.xt_user.user.user_name;
-      var today = moment().startOf('day').format('YYYY-MM-DD');
-      var todayUnix = Date.parse(today) / 1000;
-      this.startUnix = todayUnix - 28800;
+      this.creator = this.$store.getters.xt_user.user.user_name
+      var today = moment().startOf('day').format('YYYY-MM-DD')
+      var todayUnix = Date.parse(today) / 1000
+      this.startUnix = todayUnix - 28800
 
-      this.getlist();
+      this.getlist()
       this.getDictionaryDataConfig()
     },
     methods: {
@@ -634,22 +635,22 @@
       //     this.tableData = a
       // },
       changeStart(val) {
-        this.start_time = val;
+        this.start_time = val
         this.getlist()
       },
       changeEnd(val) {
-        this.end_time = val;
+        this.end_time = val
         this.getlist()
       },
       changeRegister(val) {
         this.getlist()
       },
       handleSizeChange(val) {
-        this.limit = val;
+        this.limit = val
         this.getlist()
       },
       handleCurrentChange(val) {
-        this.page = val;
+        this.page = val
         this.getlist()
       },
       getlist() {
@@ -660,29 +661,29 @@
           register_type: this.register_type,
           limit: this.limit,
           page: this.page
-        };
-        console.log('params', params);
+        }
+        console.log('params', params)
         getHisPatientHistory(params).then(response => {
           if (response.data.state == 1) {
-            var history = response.data.data.history;
-
-            console.log('history', history);
-            this.tableData = history;
-            var total = response.data.data.total;
-            console.log('total', total);
-            this.total = total;
-            var department = response.data.data.department;
-            console.log('department', department);
-            this.departMent = department;
-            var doctor = response.data.data.doctor;
-            console.log('doctor', doctor);
+            var history = response.data.data.history
+
+            console.log('history', history)
+            this.tableData = history
+            var total = response.data.data.total
+            console.log('total', total)
+            this.total = total
+            var department = response.data.data.department
+            console.log('department', department)
+            this.departMent = department
+            var doctor = response.data.data.doctor
+            console.log('doctor', doctor)
             this.doctorList = doctor
           }
         })
 
       },
       getDepartMent(id) {
-        var name = '';
+        var name = ''
         for (let i = 0; i < this.departMent.length; i++) {
           if (id == this.departMent[i].id) {
             name = this.departMent[i].name
@@ -691,7 +692,7 @@
         return name
       },
       getDoctor(id) {
-        var user_name = '';
+        var user_name = ''
         for (let i = 0; i < this.doctorList.length; i++) {
           if (id == this.doctorList[i].admin_user_id) {
             user_name = this.doctorList[i].user_name
@@ -700,7 +701,7 @@
         return user_name
       },
       getMedicalTreatment(id) {
-        var name = '';
+        var name = ''
         for (let i = 0; i < this.medicalCare.length; i++) {
           if (this.medicalCare[i].id == id) {
             name = this.medicalCare[i].name
@@ -714,7 +715,7 @@
         }
         return ''
       }, toReturnSZPatient(val) {
-        var that = this;
+        var that = this
         this.$confirm('是否退号', '退号', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
@@ -730,7 +731,7 @@
           })
             .then(function(response) {
               if (response.data.state == 0) {
-                that.$message.error(response.data.msg);
+                that.$message.error(response.data.msg)
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
@@ -744,7 +745,7 @@
                   // that.$message.error(response.data.data.msg)
 
                 } else {
-                  that.getlist();
+                  that.getlist()
                   that.$message({ message: '退号成功', type: 'success' })
                 }
               }
@@ -755,7 +756,7 @@
         })
       },
       toReturnPatient(row) {
-        var that = this;
+        var that = this
         this.$confirm('确认退号吗?', '退号', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
@@ -765,15 +766,15 @@
           let params = {
             'id':row.id,
             'patient_id': row.patient_id,
-            'record_time': this.getTime(row.record_date, '{y}-{m}-{d}'),
+            'record_time': that.getTimes(row.record_date),
             'admin_user_id': this.$store.getters.xt_user.user.id
-          };
+          }
           axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
             params: params
           })
             .then(function(response) {
               if (response.data.state == 0) {
-                that.$message.error(response.data.msg);
+                that.$message.error(response.data.msg)
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {
@@ -806,6 +807,8 @@
         })
           .catch(() => {
           })
+      }, getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
       },
 
       querySearchAsync(keyword, cb) {
@@ -813,97 +816,97 @@
         if (keyword != undefined) {
           key = keyword
         }
-        let searchArray = [];
+        let searchArray = []
 
         var params = {
           keyword: key
-        };
-        console.log('params', params);
+        }
+        console.log('params', params)
         getHisPatient(params).then(response => {
           if (response.data.state == 1) {
-            searchArray = response.data.data.patient;
-            console.log('searcharrya', searchArray);
+            searchArray = response.data.data.patient
+            console.log('searcharrya', searchArray)
             cb(searchArray)
           }
-        });
+        })
         return searchArray
       },
 
       handleSelect(val) {
-        this.search_input = val.name;
+        this.search_input = val.name
         this.getlist()
       },
       handleClose(done) {
         done()
       },
       open(obj) {
-        this.dialogVisible = true;
-        this.form = obj;
+        this.dialogVisible = true
+        this.form = obj
         console.log(obj)
       },
       getDictionaryDataConfig(type) {
-        let arr = getDictionaryDataConfig('system', 'social_type');
-        let str = '';
+        let arr = getDictionaryDataConfig('system', 'social_type')
+        let str = ''
         arr.map(item => {
           if (item.id == type) {
             str = item.name
           }
-        });
+        })
         return str
       },
       getCertificates(type) {
-        let arr = this.certificates;
-        let str = '';
+        let arr = this.certificates
+        let str = ''
         arr.map(item => {
           if (item.value == type) {
             str = item.label
           }
-        });
+        })
         return str
       },
       getSettlement(type) {
-        let arr = this.settlement;
-        let str = '';
+        let arr = this.settlement
+        let str = ''
         arr.map(item => {
           if (item.value == type) {
             str = item.label
           }
-        });
+        })
         return str
       },
       getMedicalCare(type) {
-        let arr = this.medicalCare;
-        let str = '';
+        let arr = this.medicalCare
+        let str = ''
         arr.map(item => {
           if (item.id == type) {
             str = item.name
           }
-        });
+        })
         return str
       },
       getRegister(type) {
-        let arr = this.newRegister;
-        let str = '';
+        let arr = this.newRegister
+        let str = ''
         arr.map(item => {
           if (item.value == type) {
             str = item.label
           }
-        });
+        })
         return str
       },
       getDepartMent(type) {
-        let arr = this.departMent;
-        let str = '';
+        let arr = this.departMent
+        let str = ''
         arr.map(item => {
           if (item.id == type) {
             str = item.name
           }
-        });
+        })
         return str
       },
 
       getBanlance(id) {
-        var label = '';
+        var label = ''
         for (let i = 0; i < this.settlement.length; i++) {
           if (id == this.settlement[i].value) {
             label = this.settlement[i].label

src/xt_pages/qcd/dialysisTotal.vue

@@ -72,7 +72,7 @@
         >
           <el-option label="全部" value></el-option>
           <el-option
-            v-for="item in modeOptions"
+            v-for="item in "
             :key="item.id"
             :label="item.name"
             :value="item.id"