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

src/api/his/his.js

@@ -532,3 +532,59 @@ export function GetLabelInfo(params) {
     params: params
   })
 }
+
+
+
+
+
+export function createFaPiao(params) {
+  return request({
+    url: '/api/fapiao/create',
+    method: 'post',
+    params: params
+  })
+}
+
+export function modifyFaPiao(params) {
+  return request({
+    url: '/api/fapiao/modify',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getFaPiaoList(params) {
+  return request({
+    url: '/api/fapiao/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteFaPiao(params) {
+  return request({
+    url: '/api/fapiao/delete',
+    method: 'post',
+    params: params
+  })
+}
+
+export function GetFaPiao(params) {
+  return request({
+    url: '/api/fapiao',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function postFaPiaoIsUse(params) {
+  return request({
+    url: '/api/fapiao/is_use',
+    method: 'post',
+    params: params
+  })
+}
+
+
+

src/lang/zh.js

@@ -261,6 +261,7 @@ export default {
 
     summary_tool:'项目消费明细汇总',
     labelPrint:'标签打印',
+    faPiao:"发票设置",
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/hisTool.js

@@ -47,5 +47,12 @@ export default {
       meta: { title: 'labelPrint', noCache: true }
     },
 
+    {
+      path: '/hisTool/faPiao',
+      component: () => import('@/xt_pages/outpatientTool/fapiao'),
+      name: 'faPiao',
+      meta: { title: 'faPiao', noCache: true }
+    },
+
   ]
 }

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

@@ -46,6 +46,68 @@
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="医保编码">
+        <template slot-scope="scope">
+          <div> {{scope.row.code}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="规格/型号">
+        <template slot-scope="scope">
+          <div> {{scope.row.spec}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.det_item_fee_sumamt}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="生产厂家">
+        <template slot-scope="scope">
+          <div> {{getName(scope.row.name_id)}}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.overlmt_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.preselfpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.inscp_scp_amt}}元</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" placeholder="" readonly></el-input>-->
@@ -107,6 +169,69 @@
 
         </template>
       </el-table-column>
+
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="医保编码">
+        <template slot-scope="scope">
+          <div> {{scope.row.medical_code}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="规格/型号">
+        <template slot-scope="scope">
+          <div> {{scope.row.spec}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.det_item_fee_sumamt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="生产厂家">
+        <template slot-scope="scope">
+          <div> {{getName(scope.row.name_id)}}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.overlmt_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.preselfpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.inscp_scp_amt}}元</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" readonly></el-input>-->
@@ -135,7 +260,9 @@
 
   export default {
     props: {
-      prescription: Object
+      prescription: Object,
+      manufacturers:Array,
+
     },
     data() {
       return {
@@ -154,7 +281,20 @@
       })
     }, methods:  {
 
+      getName(id){
+        console.log("!!!!!!!!!")
+
+        let  name = ""
+        for(let i = 0; i  < this.manufacturers.length; i++){
+          console.log(this.manufacturers[i].manufacturer_name)
+          if(id == this.manufacturers[i].id){
+            console.log("!!!!!!!!!")
+            name =  this.manufacturers[i].manufacturer_name
+          }
+        }
+        return name
 
+      },
       getGroup(id){
         var name = "";
         var statistics_category =  getDictionaryDataConfig('system','statistics_category');

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -803,7 +803,7 @@
               // 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
+              count = count + parseFloat(project_month_prescriptions.project[a].count)
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -745,7 +745,7 @@
               // obj['medical_c/**/ode'] = 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
+              count = count + parseFloat(project_month_prescriptions.project[a].count)
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -213,6 +213,7 @@
                                             <!--:prescription="curPrescriptions"></charge-prescription-table>-->
                                             <!--<charge-prescription-table ref="prescription_tables" :prescription="curPrescriptions"></charge-prescription-table>-->
                                             <charge-prescription-table ref="prescription_tables"
+                                                                       :manufacturers = "manufacturers"
                                                                        :prescription="curPrescriptions"></charge-prescription-table>
 
                                         </el-tabs>
@@ -535,7 +536,7 @@
         prescription_id: 0,
         all_table_data: [],
         all_charge_table_data: [],
-
+        manufacturers:[],
         hisPatientDatas: [],
         order: {},
         addtions_charge: [],
@@ -776,6 +777,8 @@
               let tempProject = []
 
               for (let b = 0; b < prescription.advices.length; b++) {
+                let spec =  prescription.advices[b].drug.dose + prescription.advices[b].drug.dose_unit + '*' + prescription.advices[b].drug.min_number +prescription.advices[b].drug.min_unit + '/' + prescription.advices[b].drug.max_unit
+
                 let obj = {
                   advice_id: prescription.advices[b].id,
                   drug_name: prescription.advices[b].advice_name,
@@ -788,7 +791,18 @@
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
                   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
+                  medical_insurance_number: prescription.advices[b].med_list_codg,
+
+
+                  code: prescription.advices[b].drug.medical_insurance_number,
+                  spec: spec,
+                  det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
+                  name_id: prescription.advices[b].drug.manufacturer,
+                  fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
+                  overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
+                  preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
+                  inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+
 
                 }
                 tempAdvice.push(obj)
@@ -807,18 +821,30 @@
                   remark: prescription.project[b].remark,
                   // medical_code: prescription.project[b].project.medical_code,
                   unit: prescription.project[b].unit,
-                  type: prescription.project[b].type
+
+                  type: prescription.project[b].type,
+                  det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
+                  fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
+                  overlmt_amt: prescription.project[b].order_info.overlmt_amt,
+                  preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
+                  inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+
 
                 }
                 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['spec'] = ""
+                  obj['name_id'] = 0
 
                 } 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['spec'] = prescription.project[b].good_info.specification_name
+                  obj['name_id'] = prescription.project[b].good_info.manufacturer
+
                 }
 
                 tempProject.push(obj)
@@ -852,6 +878,8 @@
             this.department = response.data.data.department
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
+            this.manufacturers = response.data.data.manufacturers
+
 
           }
         })
@@ -2576,7 +2604,7 @@
               // 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
+              count = count + parseFloat(project_month_prescriptions.project[a].count)
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 
@@ -2730,6 +2758,8 @@
               let tempProject = []
               let tempAddition = []
               for (let b = 0; b < prescription.advices.length; b++) {
+                let spec =  prescription.advices[b].drug.dose + prescription.advices[b].drug.dose_unit + '*' + prescription.advices[b].drug.min_number +prescription.advices[b].drug.min_unit + '/' + prescription.advices[b].drug.max_unit
+
                 let obj = {
                   advice_id: prescription.advices[b].id,
                   drug_name: prescription.advices[b].advice_name,
@@ -2742,7 +2772,17 @@
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
                   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
+                  medical_insurance_number: prescription.advices[b].med_list_codg,
+
+
+                  code: prescription.advices[b].drug.medical_insurance_number,
+                  spec: spec,
+                  det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
+                  name_id: prescription.advices[b].drug.manufacturer,
+                  fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
+                  overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
+                  preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
+                  inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
 
                 }
                 tempAdvice.push(obj)
@@ -2763,7 +2803,13 @@
                   remark: prescription.project[b].remark,
                   // medical_code: prescription.project[b].project.medical_code,
                   unit: prescription.project[b].project.unit,
-                  type: prescription.project[b].type
+                  type: prescription.project[b].type,
+                  det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
+                  fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
+                  overlmt_amt: prescription.project[b].order_info.overlmt_amt,
+                  preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
+                  inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+
 
                 }
 
@@ -2771,11 +2817,17 @@
                   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['spec'] = ""
+                  obj['name_id'] = 0
+
 
                 } 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['spec'] = prescription.project[b].good_info.specification_name
+                  obj['name_id'] = prescription.project[b].good_info.manufacturer
+
                 }
 
                 tempProject.push(obj)

src/xt_pages/hospitalStation/summaryDetail.vue

@@ -426,7 +426,7 @@ export default {
             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
+            count = count + parseFloat(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

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -46,6 +46,70 @@
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="医保编码">
+        <template slot-scope="scope">
+          <div> {{scope.row.code}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="规格/型号">
+        <template slot-scope="scope">
+          <div> {{scope.row.spec}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.det_item_fee_sumamt}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="生产厂家">
+        <template slot-scope="scope">
+          <div> {{getName(scope.row.name_id)}}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.overlmt_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.preselfpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.inscp_scp_amt}}元</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" placeholder="" readonly></el-input>-->
@@ -85,6 +149,68 @@
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">{{scope.row.price}}元</template>
       </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="医保编码">
+        <template slot-scope="scope">
+          <div> {{scope.row.medical_code}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="规格/型号">
+        <template slot-scope="scope">
+          <div> {{scope.row.spec}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.det_item_fee_sumamt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="生产厂家">
+        <template slot-scope="scope">
+          <div> {{getName(scope.row.name_id)}}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.overlmt_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.preselfpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.inscp_scp_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">{{scope.row.remark}}</template>
       </el-table-column>
@@ -109,12 +235,13 @@
 
   export default {
     props: {
-      prescription: Object
+      prescription: Object,
+      manufacturers:Array,
     },
     data() {
       return {
         drugways: [],
-        efs: []
+        efs: [],
       }
     }, mounted() {
       // getInitData().then(response => {
@@ -128,7 +255,20 @@
       // })
     }, methods:  {
 
+      getName(id){
+        console.log("!!!!!!!!!")
+
+        let  name = ""
+        for(let i = 0; i  < this.manufacturers.length; i++){
+          console.log(this.manufacturers[i].manufacturer_name)
+          if(id == this.manufacturers[i].id){
+            console.log("!!!!!!!!!")
+            name =  this.manufacturers[i].manufacturer_name
+          }
+        }
+        return name
 
+      },
       getGroup(id){
         var name = ""
         var statistics_category =  getDictionaryDataConfig('system','statistics_category')

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -154,7 +154,7 @@
 
 
                                                     <prescription-table ref="prescription_tables"
-                                                                        :prescription="items.curPrescriptions"></prescription-table>
+                                                                        :prescription="items.curPrescriptions" :manufacturers="manufacturers"></prescription-table>
                                                     <!--</el-radio-group>-->
                                                 </el-tabs>
                                             </div>
@@ -687,6 +687,7 @@
 
         sick: [],
         diagnoses: [],
+        manufacturers:[],
 
         department: [],
         all_patient: [],
@@ -1119,6 +1120,8 @@
               let tempProject = []
 
               for (let b = 0; b < prescription.advices.length; b++) {
+                let spec =  prescription.advices[b].drug.dose + prescription.advices[b].drug.dose_unit + '*' + prescription.advices[b].drug.min_number +prescription.advices[b].drug.min_unit + '/' + prescription.advices[b].drug.max_unit
+
                 let obj = {
                   advice_id: prescription.advices[b].id,
                   drug_name: prescription.advices[b].advice_name,
@@ -1131,7 +1134,17 @@
                   prescribing_number: prescription.advices[b].prescribing_number.toString(),
                   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
+                  medical_insurance_number: prescription.advices[b].med_list_codg,
+
+                  code: prescription.advices[b].drug.medical_insurance_number,
+                  spec: spec,
+                  det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
+                  name_id: prescription.advices[b].drug.manufacturer,
+                  fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
+                  overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
+                  preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
+                  inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+
 
                 }
                 tempAdvice.push(obj)
@@ -1153,7 +1166,14 @@
                   remark: prescription.project[b].remark,
                   // medical_code: prescription.project[b].project.medical_code,
                   unit: prescription.project[b].unit,
-                  type: prescription.project[b].type
+                  type: prescription.project[b].type,
+
+                  det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
+                  fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
+                  overlmt_amt: prescription.project[b].order_info.overlmt_amt,
+                  preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
+                  inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+
 
                 }
 
@@ -1161,13 +1181,19 @@
                   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['spec'] = ""
+                  obj['name_id'] = 0
+
 
                 } 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['spec'] = prescription.project[b].good_info.specification_name
+                  obj['name_id'] = prescription.project[b].good_info.manufacturer
 
+
+                }
                 tempProject.push(obj)
               }
               let index = i + 1
@@ -1199,6 +1225,11 @@
             this.department = response.data.data.department
             this.sick = response.data.data.sick
             this.diagnoses = response.data.data.diagnose
+            this.manufacturers = response.data.data.manufacturers
+            console.log("生产厂家")
+
+            console.log(this.manufacturers)
+
 
           }
         })
@@ -3166,7 +3197,7 @@
                 // obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
                 obj['unit'] = big_prescriptions[y].project_month_prescriptions.project[a].unit
                 obj['project_id'] = big_prescriptions[y].project_month_prescriptions.project[a].project_id
-                count = count + big_prescriptions[y].project_month_prescriptions.project[a].count
+                count = count + parseFloat(big_prescriptions[y].project_month_prescriptions.project[a].count)
                 // price = price + project_month_prescriptions.project[a].price
                 obj['price'] = parseFloat(big_prescriptions[y].project_month_prescriptions.project[a].price)
                 obj['type'] = big_prescriptions[y].project_month_prescriptions.project[a].type
@@ -3435,7 +3466,11 @@
                     const tempAdvice = []
                     const tempProject = []
                     const tempAddition = []
+
+
                     for (let b = 0; b < prescription.advices.length; b++) {
+                      let spec =  prescription.advices[b].drug.dose + prescription.advices[b].drug.dose_unit + '*' + prescription.advices[b].drug.min_number +prescription.advices[b].drug.min_unit + '/' + prescription.advices[b].drug.max_unit
+
                       const obj = {
                         advice_id: prescription.advices[b].id,
                         drug_name: prescription.advices[b].advice_name,
@@ -3448,13 +3483,23 @@
                         prescribing_number: prescription.advices[b].prescribing_number.toString(),
                         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
+                        code: prescription.advices[b].drug.medical_insurance_number,
+                        spec: spec,
+                        det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
+                        name_id: prescription.advices[b].drug.manufacturer,
+                        fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
+                        overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
+                        preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
+                        inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+
+
 
                       }
                       tempAdvice.push(obj)
                     }
 
                     for (let b = 0; b < prescription.project.length; b++) {
+
                       const obj = {
                         id: prescription.project[b].id,
                         project_id: prescription.project[b].project.id,
@@ -3469,18 +3514,35 @@
                         remark: prescription.project[b].remark,
                         // medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+
+                        det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
+                        fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
+                        overlmt_amt: prescription.project[b].order_info.overlmt_amt,
+                        preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
+                        inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+
                       }
 
                       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['spec'] = ""
+                        obj['name_id'] = 0
+
+
+
+
 
                       } 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['spec'] = prescription.project[b].good_info.specification_name
+                        obj['name_id'] = prescription.project[b].good_info.manufacturer
+
+
                       }
 
                       tempProject.push(obj)

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -431,7 +431,7 @@ export default {
             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
+            count = count + parseFloat(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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -801,7 +801,7 @@
               // 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
+              count = count + parseFloat(project_month_prescriptions.project[a].count)
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -966,7 +966,7 @@
               // obj['medical_c/**/ode'] = 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
+              count = count + parseFloat(project_month_prescriptions.project[a].count)
               // price = price + project_month_prescriptions.project[a].price
               obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 

src/xt_pages/outpatientTool/components/faPiaoDialog.vue

@@ -0,0 +1,124 @@
+<template>
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <el-form :model="formValue" :rules="rules" ref="formValue" class="demo-form-inline"
+             :label-position="labelPosition"
+             label-width="100px">
+
+      <el-row>
+
+
+        <el-col :span="8">
+          <el-form-item label="发票编号" prop="fapiao_number">
+            <el-input v-model="formValue.fapiao_number"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="发票号码" prop="fapiao_code">
+            <el-input v-model="formValue.fapiao_code"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+    <el-button v-if="isCreated == 3" @click="cancle('formValue')">取 消</el-button>
+    <el-button v-if="isCreated != 3 " @click="cancle('formValue')">取 消</el-button>
+    <el-button v-if="isCreated != 3" type="primary" @click="comfirm('formValue')">保 存</el-button>
+  </span>
+  </el-dialog>
+
+</template>
+
+<script>
+  export default {
+    name: 'faPiaoDialog',
+
+    data() {
+
+      return {
+        visibility: false,
+        labelPosition: 'right',
+        isClose: false,
+        form: {
+          fapiao_number: '',
+          fapiao_code: '',
+
+        },
+        resetForm: {
+          fapiao_number: '',
+          fapiao_code: '',
+        },
+        rules: {
+          fapiao_number: [
+            { required: true, message: '请输入发票编号', trigger: 'blur' }
+          ],
+          fapiao_code: [
+            { required: true, message: '请输入发票号码', trigger: 'blur' }
+          ]
+
+        }
+      }
+    },
+    props: {
+
+      titles: {
+        type: String,
+        default: ''
+      },
+      formValue: {
+        type: Object
+      },
+      type: {
+        type: Number,
+        default: 1
+
+      },
+      isCreated: {
+        type: Number,
+        default: 1
+
+      }
+    },
+    methods: {
+      show: function() {
+        this.visibility = true
+
+      }, hide: function() {
+        this.visibility = false
+      },
+      cancle: function(formName) {
+        this.$emit('dialog-cancle', this.getValue())
+        this.$refs['formValue'].resetFields()
+      },
+      comfirm: function(formName) {
+        this.$refs['formValue'].validate((valid) => {
+          if (valid) {
+            let value = {}
+            value = this.getValue()
+            this.$emit('dialog-comfirm', value)
+            this.form = Object.assign({}, this.resetForm)
+
+          }
+        })
+      },
+      getValue: function() {
+        let form = {}
+        form = this.formValue
+        form['title'] = this.titles
+        form['type'] = this.type
+        form['isCreated'] = this.isCreated
+        return form
+      }
+    }
+
+  }
+</script>
+
+<style scoped>
+
+</style>

src/xt_pages/outpatientTool/fapiao.vue

@@ -0,0 +1,365 @@
+<template>
+    <div class="main-contain outpatientChargesManagement">
+        <div class="position">
+            <bread-crumb :crumbs='crumbs'></bread-crumb>
+        </div>
+        <div class=" sign-and-weigh-box" style="background: white">
+            <fa-piao-dialog
+                    ref="dialog"
+                    :titles="Dialog.titles"
+                    :formValue="Dialog.formValue"
+                    :visibility="Dialog.isVisibility"
+                    :type="Dialog.type"
+                    :isCreated="Dialog.isCreated"
+                    v-on:dialog-comfirm="dialogComfirm"
+                    v-on:dialog-cancle="dialogCancle"
+
+            >
+
+            </fa-piao-dialog>
+            <el-row :gutter="15">
+                <el-col>
+                    <div>
+                        <el-button
+                                size="small"
+                                icon="el-icon-circle-plus-outline"
+                                style="float: right;margin-bottom: 15px"
+                                type="primary"
+                                @click="showDialog"
+                        >新增
+                        </el-button>
+                    </div>
+
+                    <el-table
+                            :row-style="{ color: '#303133' }"
+                            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
+                            :data="faPiaoData"
+                            style="width: 100%"
+                            border
+                            v-loading="loading"
+                    >
+                        <el-table-column label="发票编码" align="center">
+                            <template slot-scope="scope">
+                                {{ scope.row.fapiao_number }}
+                            </template>
+                        </el-table-column>
+
+                        <el-table-column label="发票号码" align="center">
+                            <template slot-scope="scope">
+                                {{ scope.row.fapiao_code }}
+                            </template>
+                        </el-table-column>
+
+
+                        <el-table-column label="操作" align="center">
+                            <template slot-scope="scope">
+                                <el-tooltip
+                                        class="item"
+                                        effect="dark"
+                                        content="编辑"
+                                        placement="top"
+                                >
+                                    <el-button
+                                            size="small"
+                                            type="primary"
+                                            icon="el-icon-edit-outline"
+                                            @click="handleEdit(scope.$index, scope.row)"
+                                    >
+                                    </el-button>
+                                </el-tooltip>
+                                <el-tooltip
+                                        class="item"
+                                        effect="dark"
+                                        content="删除"
+                                        placement="top"
+                                >
+                                    <el-button
+                                            size="small"
+                                            type="danger"
+                                            icon="el-icon-delete"
+                                            @click="handleDelete(scope.$index, scope.row)"
+                                    >
+                                    </el-button>
+                                </el-tooltip>
+
+
+                                <el-button
+                                        size="small"
+                                        type="primary"
+                                        v-if=" scope.row.is_use == 0"
+                                        @click="handleIsUse(scope.$index, scope.row,0)"
+                                >未开启
+                                </el-button>
+
+                                <el-button
+                                        size="small"
+                                        type="primary"
+                                        v-if=" scope.row.is_use == 1"
+                                >已开启
+                                </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>
+                </el-col>
+            </el-row>
+        </div>
+    </div>
+</template>
+
+<script>
+  import { createFaPiao, deleteFaPiao, GetFaPiao, getFaPiaoList, modifyFaPiao, postFaPiaoIsUse } from '@/api/his/his'
+  import FaPiaoDialog from './components/faPiaoDialog'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
+  export default {
+    components: {
+      FaPiaoDialog,
+      BreadCrumb
+    },
+    name: 'diagnosis',
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: 'HIS工具' },
+          { path: false, name: '发票设置' }
+        ],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        faPiaoData: [],
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+
+        page: 1,
+        limit: 10,
+        loading: false,
+
+        manufacturer_code: '',
+        editId: '',
+        editIndex: '',
+        Dialog: {
+          titles: '新增',
+          isVisibility: false,
+          isCreated: 1, //1.创建 2.编辑 3.查看详情
+          formValue: {
+            fapiao_number: '',
+            fapiao_code: '',
+            is_use: 0
+
+          },
+          resetForm: {
+            fapiao_number: '',
+            fapiao_code: '',
+            is_use: 0
+          }
+        }
+      }
+    },
+    methods: {
+      handleEdit: function(index, row) {
+        this.editId = row.id
+        this.editIndex = index
+        let params = {
+          id: row.id
+        }
+        GetFaPiao(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.fapiao_number =
+              response.data.data.fapiao_record.fapiao_number
+            this.Dialog.formValue.fapiao_code =
+              response.data.data.fapiao_record.fapiao_code
+
+            this.Dialog.isCreated = 2
+            this.$refs.dialog.show()
+
+          }
+        })
+      },
+      handleDelete: function(index, row) {
+        this.$confirm('确认删除这条记录?', '删除记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id
+            }
+            deleteFaPiao(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                this.faPiaoData.splice(index, 1)
+                this.$message.success('发票已经删除')
+              }
+            })
+          })
+          .catch(() => {
+          })
+      },
+
+      handleIsUse: function(index, row) {
+        this.$confirm('是否开启?', '开启', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            let params = {
+              id: row.id,
+              is_use: 1
+            }
+            postFaPiaoIsUse(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                for (let i =0; i < this.faPiaoData.length; i++){
+                  this.faPiaoData[i].is_use = 0
+                }
+                this.faPiaoData[index].is_use = 1
+              }
+            })
+          })
+          .catch(() => {
+          })
+
+      },
+
+      showDetails: function(index, row) {
+        let params = {
+          id: row.id
+        }
+        GetFaPiao(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Dialog.formValue.fapiao_number =
+              response.data.data.fapiao_record.fapiao_number
+            this.Dialog.formValue.fapiao_code =
+              response.data.data.fapiao_record.fapiao_code
+
+            this.Dialog.isCreated = 3
+            this.Dialog.isVisibility = true
+          }
+        })
+      },
+      dialogComfirm: function(val) {
+        this.$refs.dialog.hide()
+        if (val.isCreated == 2) {
+          //修改
+          let params = {
+            fapiao_code: val.fapiao_code,
+            fapiao_number: val.fapiao_number,
+            id: this.editId
+
+          }
+          modifyFaPiao(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.faPiaoData[this.editIndex].fapiao_code =
+                response.data.data.fapiao_record.fapiao_code
+              this.faPiaoData[this.editIndex].content_code =
+                response.data.data.fapiao_record.fapiao_number
+              this.faPiaoData[this.editIndex].is_use =
+                response.data.data.fapiao_record.is_use
+
+              this.$message.success('修改成功')
+            }
+          })
+        } else if (val.isCreated == 1) {
+          //新增
+          createFaPiao(val).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.faPiaoData.unshift(response.data.data.fapiao_record)
+              this.$message.success('新增成功')
+            }
+          })
+        }
+      },
+      dialogCancle: function() {
+        this.$refs.dialog.hide()
+      },
+      showDialog: function() {
+        this.Dialog.formValue = Object.assign(
+          {},
+          this.Dialog.resetForm
+        )
+        this.$refs.dialog.show()
+        this.Dialog.isCreated = 1
+      },
+      handleSizeChange(val) {
+        this.limit = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.getList()
+      },
+      getList() {
+        let params = {
+          page: this.page,
+          limit: this.limit
+        }
+        this.loading = true
+        getFaPiaoList(params).then(response => {
+          if (response.data.state == 0) {
+            this.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.loading = false
+            this.total = response.data.data.total
+            this.faPiaoData = []
+            for (let i = 0; i < response.data.data.fapiao_record.length; i++) {
+              this.faPiaoData.push(response.data.data.fapiao_record[i])
+            }
+          }
+        })
+      }
+    },
+    created() {
+      this.getList()
+    }
+  }
+</script>
+
+<style lang="scss">
+    .el-table td,
+    .el-table th.is-leaf,
+    .el-table--border,
+    .el-table--group {
+        border-color: #d0d3da;
+    }
+
+    .el-table--border::after,
+    .el-table--group::after,
+    .el-table::before {
+        background-color: #d0d3da;
+    }
+</style>