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

src/api/stock.js

@@ -970,3 +970,11 @@ export function getDamageDetailByGoodId(params) {
     params: params
   })
 }
+
+export function getInventoryExportList(params) {
+  return request({
+    url: '/api/stock/getinventoryexportlist',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/drugs.js

@@ -30,12 +30,12 @@ export default {
       name: 'drugsStockOut',
       meta: { title: 'drugsStockOut', noCache: true }
     },
-    {
-      path: '/stock/drugs/drugModifyPrice',
-      component: () => import('@/xt_pages/stock/drugs/drugModifyPrice'),
-      name: 'drugModifyPrice',
-      meta: { title: 'drugModifyPrice', noCache: true }
-    },
+    // {
+    //   path: '/stock/drugs/drugModifyPrice',
+    //   component: () => import('@/xt_pages/stock/drugs/drugModifyPrice'),
+    //   name: 'drugModifyPrice',
+    //   meta: { title: 'drugModifyPrice', noCache: true }
+    // },
     {
       path: '/stock/drugs/drugModifyPricePrint',
       component: () => import('@/xt_pages/stock/drugs/drugModifyPricePrint'),
@@ -50,18 +50,18 @@ export default {
     //   name: 'drugDamaged',
     //   meta: { title: 'drugDamaged', noCache: true }
     // },
-    {
-      path: '/stock/drugs/drugDamagePrint',
-      component: () => import('@/xt_pages/stock/drugs/drugDamagePrint'),
-      name: 'drugDamaged',
-      meta: { title: 'drugDamaged', noCache: true }
-    },
-    {
-      path: '/stock/drugs/drugWarning',
-      component: () => import('@/xt_pages/stock/drugs/drugWarning'),
-      name: 'drugWarning',
-      meta: { title: 'drugWarning', noCache: true }
-    },
+    // {
+    //   path: '/stock/drugs/drugDamagePrint',
+    //   component: () => import('@/xt_pages/stock/drugs/drugDamagePrint'),
+    //   name: 'drugDamaged',
+    //   meta: { title: 'drugDamaged', noCache: true }
+    // },
+    // {
+    //   path: '/stock/drugs/drugWarning',
+    //   component: () => import('@/xt_pages/stock/drugs/drugWarning'),
+    //   name: 'drugWarning',
+    //   meta: { title: 'drugWarning', noCache: true }
+    // },
     {
       path: '/stock/drugs/drugInventory',
       component: () => import('@/xt_pages/stock/drugs/drugInventory'),

src/router/modules/stock.js

@@ -42,12 +42,12 @@ export default {
       name: 'cancelStockOrder',
       meta: { title: 'cancelStockOrder', noCache: true }
     },
-    {
-      path: '/stock/stockModifyPrice',
-      component: () => import('@/xt_pages/stock/stockModifyPrice'),
-      name: 'stockModifyPrice',
-      meta: { title: 'stockModifyPrice', noCache: true }
-    },
+    // {
+    //   path: '/stock/stockModifyPrice',
+    //   component: () => import('@/xt_pages/stock/stockModifyPrice'),
+    //   name: 'stockModifyPrice',
+    //   meta: { title: 'stockModifyPrice', noCache: true }
+    // },
     {
       path: '/stock/stockModifyPricePrint',
       component: () => import('@/xt_pages/stock/stockModifyPricePrint'),
@@ -56,12 +56,12 @@ export default {
       is_menu: false,
       meta: { title: 'stockModifyPricePrint', noCache: true }
     },
-    {
-      path: '/stock/stockDamaged',
-      component: () => import('@/xt_pages/stock/stockDamaged'),
-      name: 'stockDamaged',
-      meta: { title: 'stockDamaged', noCache: true }
-    },
+    // {
+    //   path: '/stock/stockDamaged',
+    //   component: () => import('@/xt_pages/stock/stockDamaged'),
+    //   name: 'stockDamaged',
+    //   meta: { title: 'stockDamaged', noCache: true }
+    // },
     {
       path: '/stock/stockDamagePrint',
       component: () => import('@/xt_pages/stock/stockDamagePrint'),
@@ -70,12 +70,12 @@ export default {
       is_menu: false,
       meta: { title: 'stockModifyPricePrint', noCache: true }
     },
-    {
-      path: '/stock/stockWarning',
-      component: () => import('@/xt_pages/stock/stockWarning'),
-      name: 'stockWarning',
-      meta: { title: 'stockWarning', noCache: true }
-    },
+    // {
+    //   path: '/stock/stockWarning',
+    //   component: () => import('@/xt_pages/stock/stockWarning'),
+    //   name: 'stockWarning',
+    //   meta: { title: 'stockWarning', noCache: true }
+    // },
     {
       path: '/stock/stockInventory',
       component: () => import('@/xt_pages/stock/stockInventory'),

src/xt_pages/data/components/addInspection.vue

@@ -79,7 +79,11 @@
                         <template slot-scope="scope">{{scope.row.number}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单位" width="120">
-                        <template slot-scope="scope">{{scope.row.unit}}</template>
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
+                            <div v-if="scope.row.type == 3">{{getUnit(scope.row.unit)}}</div>
+
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
                         <template slot-scope="scope">{{scope.row.price}}</template>
@@ -163,6 +167,14 @@
       }
     },
     methods: {
+      getUnit(id){
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i = 0;i < arr.length; i++){
+          if(id == arr[i].id){
+            return arr[i].name
+          }
+        }
+      },
       changeProject() {
         this.form.number = 1
 

src/xt_pages/data/components/editInspection.vue

@@ -78,7 +78,10 @@
                         <template slot-scope="scope">{{scope.row.number}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单位" width="120">
-                        <template slot-scope="scope">{{scope.row.unit}}</template>
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
+                            <div v-if="scope.row.type == 3">{{getUnit(scope.row.unit)}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
                         <template slot-scope="scope">{{scope.row.price}}</template>
@@ -166,6 +169,14 @@
       }
     },
     methods: {
+      getUnit(id){
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i = 0;i < arr.length; i++){
+          if(id == arr[i].id){
+            return arr[i].name
+          }
+        }
+      },
       changeProject() {
         this.form.number = 1
 

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -59,7 +59,7 @@
 
         <!-- <el-button type="primary" :disabled="selecting_schs.length == 0" @click="batchPrintAction">打印</el-button> -->
       </div>
-     
+
       <div class="cell clearfix">
         <label class="title"> <span class="name">排班班次</span> : </label>
         <div class="time">
@@ -90,7 +90,7 @@
           </ul>
         </div>
       </div>
-     
+
      <div class="cell clearfix">
         <label class="title"> <span class="name">给药途径</span> : </label>
         <div class="time">
@@ -106,8 +106,8 @@
           </ul>
         </div>
       </div>
-    
-      <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+
+      <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
         :span-method="objectSpanMethod"
@@ -236,7 +236,7 @@
           </template>
         </el-table-column>
       </el-table>
-         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
         :span-method="objectSpanMethod"
@@ -441,7 +441,7 @@ export default {
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
-  
+
   },
   methods: {
     getTemplateInfo() {
@@ -467,7 +467,7 @@ export default {
     },
 
     selectSchedulType(scheduleType) {
-     
+
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
       console.log("班次",this.listQuery.schedul_type)
@@ -479,7 +479,7 @@ export default {
       console.log("分区",this.listQuery.partition_type)
       this.requestSchedualDoctors(this.time);
     },
-    
+
     selectDeliveryWay(val){
        this.delivery_way = val
        this.requestSchedualDoctors(this.time)
@@ -506,7 +506,7 @@ export default {
       });
     },
     requestSchedualDoctors (time) {
-        
+
         var name = ""
         for(let i=0;i<this.deliveryWay.length;i++){
             if(this.delivery_way == this.deliveryWay[i].id){
@@ -518,10 +518,10 @@ export default {
         }
 
         let newTime =  moment(time).format('YYYY-MM-DD')
-       
+
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
-        
+
         console.log("班次",schedule_type,"分区",partition_type)
         getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id}).then(rs => {
         var resp = rs.data
@@ -542,16 +542,17 @@ export default {
                     projectArr.push(item)
                   }
                 })
-                
               })
-              
+
+              console.log(projectArr)
+
               resp.data.hisAdvices.map((item,index) => {
-                if(projectArr[index].project.length > 0){
+                if(projectArr[index].project && projectArr[index].project.length > 0){
                   projectArr[index].project.map(it => {
                     let obj = {
                       advice_doctor: it.doctor,
                       start_time:it.start_time,
-                      advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                      advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
                       execution_time:it.execution_time,
                       execution_state:it.execution_state,
                       execution_staff:it.execution_staff,
@@ -614,7 +615,7 @@ export default {
                     }
                 })
             }
-            
+
             console.log("分区",this.partitionType)
             if(this.partitionType == 0){
                 this.scheduleMap = newSchedules
@@ -677,8 +678,8 @@ export default {
                     }
                 })
             }
-            
-            
+
+
             if(this.partitionType == 0){
                 this.scheduleMap = newSchedules
             }else {
@@ -752,7 +753,7 @@ export default {
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].patient_id);
       }
-  
+
       this.$store.dispatch("SetAdviceIDs", sch_ids);
        var name = ""
         for(let i=0;i<this.deliveryWay.length;i++){
@@ -777,7 +778,7 @@ export default {
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].patient_id);
       }
-  
+
       this.$store.dispatch("SetAdviceIDs", sch_ids);
        var name = ""
         for(let i=0;i<this.deliveryWay.length;i++){
@@ -868,7 +869,7 @@ export default {
                 }
             }
         }
-        
+
         if (columnIndex === 1) {
             let index = this.indexInfoList.findIndex(item => {  //遍历数组
                 return item.firstIndex === rowIndex
@@ -956,7 +957,7 @@ export default {
         }
 
         if (isChild == 1) {
-          // 不是子药 
+          // 不是子药
           // console.log(tempDrugSpecDesc)
           // console.log(tempPrescribingNumberDesc)
           // console.log(tempSingleDoseDesc)
@@ -989,6 +990,7 @@ export default {
         // console.log('val',val)
         this.selecting_schs = val;
     },
+
     querySearchAsync(keyword, cb) {
         let key = '';
         if (keyword != undefined) {

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1653,8 +1653,8 @@
             total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
           }
           return total.toFixed(2)
-        }
 
+        }
       },
       getTotal() {
         var total = 0
@@ -1699,7 +1699,7 @@
           }
         }
 
-        return total.toFixed(2)
+        return total.toFixed(24)
       },
       createFilter(queryString) {
         return (restaurant) => {

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -475,7 +475,7 @@
       },
       getPrescribingNumberUnit(scope) {
 
-        // console.log('scope',scope)
+        console.log('scope9999999',scope)
         // if(scope.row.drug.min_unit == scope.row.single_dose_unit){
         //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
@@ -494,13 +494,13 @@
         // }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           scope.row.retail_price = scope.row.drug.min_price
-          if (scope.row.prescribing_number > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+          // if (scope.row.prescribing_number > scope.row.drug.total) {
+          //   this.$message.error(scope.row.drug_name + '库存不足')
+          // }
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+          // if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+          //   this.$message.error(scope.row.drug_name + '库存不足')
+          // }
           scope.row.retail_price = scope.row.drug.retail_price
         }
       },

src/xt_pages/hospitalStation/summary.vue

@@ -74,10 +74,10 @@
                 <!--<template slot-scope="scope"></template>-->
                 <!--</el-table-column>-->
                 <el-table-column align="center" prop="name" label="应收金额">
-                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+                    <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="实收金额">
-                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
+                    <template slot-scope="scope">{{scope.row.reality_price.toFixed(2)}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="科室">
                     <template slot-scope="scope">{{scope.row.department_name}}</template>

src/xt_pages/hospitalStation/summaryDetail.vue

@@ -56,7 +56,7 @@
                             <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}}元
+                                    {{scope.row.price.toFixed(2)}}元
 
                                 </template>
                             </el-table-column>
@@ -64,7 +64,7 @@
                             <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}}元
+                                    {{scope.row.price.toFixed(2)}}元
 
                                 </template>
                             </el-table-column>
@@ -112,12 +112,12 @@
                     </ul>
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
                     <ul class="basicUl">
-                        <li style="width:50%;">应收金额：{{order.medfee_sumamt }}元</li>
-                        <li style="width:50%;">实收金额：{{order.reality_price}}元</li>
-                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt - order.reality_price}}元</li>
-                        <li style="width:50%;">优惠金额：{{order.preferential_price}}元</li>
+                        <li style="width:50%;">应收金额：{{order.medfee_sumamt.toFixed(2) }}元</li>
+                        <li style="width:50%;">实收金额：{{order.reality_price.toFixed(2)}}元</li>
+                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt.toFixed(2) - order.reality_price.toFixed(2)}}元</li>
+                        <li style="width:50%;">优惠金额：{{order.preferential_price.toFixed(2)}}元</li>
                         <li style="width:50%;">总金额</li>
-                        <li style="width:50%;">{{order.medfee_sumamt}}元</li>
+                        <li style="width:50%;">{{order.medfee_sumamt.toFixed(2)}}元</li>
                     </ul>
                     <!--<p class="centerRightTitle">发票费用</p>-->
                     <!--<ul class="basicUl">-->

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -193,8 +193,8 @@
                 scanStyles: false
               });
             }
-            
-            
+
+
           },500)
         }else{
           const style =
@@ -232,7 +232,7 @@
 
               return false
             } else {
-              
+
               this.balanceAccounts = response.data.data
               let arr = []
               let obj = {
@@ -250,18 +250,32 @@
                 details: [],
                 total: 0
               }
+
+              let obj4 = {
+                type:4,
+                details: [],
+                total: 0
+              }
               let num = 0
               this.balanceAccounts.order_info.map(item => {
-                
+
                 if(item.advice_id > 0){
                   obj.details.push(item)
                   obj.total += (item.pric * item.advice.prescribing_number)
                   num++
                 }else{
                   if(item.project.type == 2){
-                    obj2.details.push(item)
-                    obj2.total += (item.pric * item.project.count)
-                    num++
+                    if (item.project.team_id > 0) {
+                      obj2.details.push(item)
+                      obj2.total += (item.pric * item.project.count)
+                      num++
+                    }else{
+                      obj2.details.push(item)
+                      obj2.total += (item.pric * item.project.count)
+                      num++
+
+                    }
+
                   }else{
                     obj3.details.push(item)
                     obj3.total += (item.pric * item.project.count)
@@ -343,8 +357,7 @@
                       price_arr.push(that.info.transBody.outputlist1[i].akc225);
                       total_arr.push(that.info.transBody.outputlist1[i].akc264)
                     }
-
-                    console.log("～～～" + that.info);
+                    
 
                     that.info['name_arr'] = name_arr;
                     that.info['spec_arr'] = spec_arr;
@@ -353,7 +366,6 @@
                     that.info['total_arr'] = total_arr;
                     that.info['record_date'] = obj.record_time;
 
-                    console.log("～～" + that.info)
 
                     let type_arr = []
                     for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
@@ -378,7 +390,7 @@
                         }
                       }
                       that.info.new_detail_list.push(obj)
-                      
+
                     }
                     let num = 0
                     that.info.new_detail_list.map(item => {
@@ -419,7 +431,7 @@
                     }
                     console.log('that.info.transBody.outputlist2',that.info.transBody.outputlist2)
                     console.log('this.num222',that.num)
-                    
+
                   }
                 }
               })
@@ -450,7 +462,7 @@
 
     created() {
       this.org_id = this.$store.getters.xt_user.org_id
-      
+
       this.getInfo(this.paramsObj)
     },
     watch:{

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -162,15 +162,15 @@
                                                 <span>当前处方总费用：<span style="color:red;">{{items.total}}元</span></span>
 
 
-                                                <span>医疗费总额：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt:getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
-                                                <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.hifp_pay?items.curPrescriptions.order.hifp_pay:''}}元</span></span>
-                                                <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay:''}}元</span></span>
+                                                <span>医疗费总额：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt.toFixed(2):getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
+                                                <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.hifp_pay?items.curPrescriptions.order.hifp_pay.toFixed(2):''}}元</span></span>
+                                                <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay.toFixed(2):''}}元</span></span>
                                                 <span v-if="hisPatientInfo.balance_accounts_type != 2">个人支付金额：<span
-                                                        style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>
+                                                        style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay.toFixed(2):''}}元</span></span>
                                                 <span v-if="hisPatientInfo.balance_accounts_type == 2">个人支付金额：<span
-                                                        style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt}}元</span></span>
+                                                        style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt.toFixed(2)}}元</span></span>
 
-                                                <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.balc?items.curPrescriptions.order.balc:''}}元</span></span>
+                                                <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.balc?items.curPrescriptions.order.balc.toFixed(2):''}}元</span></span>
 
                                                 <span v-if="items.curPrescriptions.order_status  == 1">待结算</span>
                                                 <span v-if="items.curPrescriptions.order_status  == 2">已结算</span>
@@ -326,18 +326,18 @@
                                           <span>当前处方总费用：<span
                                                   style="color:red;">{{ items.month_total }}元</span></span>
 
-                                                <span>医疗费总额：<span style="color:red;">{{ items.curMonthPrescriptions.order.medfee_sumamt ?  items.curMonthPrescriptions.order.medfee_sumamt:getTotalFour(items.month_prescriptions)?getTotalFour(items.month_prescriptions):'' }}元</span></span>
-                                                <span>基金支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.hifp_pay?items.curMonthPrescriptions.order.hifp_pay:''}}元</span></span>
-                                                <span>个人账户支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.acct_pay?items.curMonthPrescriptions.order.acct_pay:''}}元</span></span>
+                                                <span>医疗费总额：<span style="color:red;">{{ items.curMonthPrescriptions.order.medfee_sumamt?  items.curMonthPrescriptions.order.medfee_sumamt.toFixed(2) :getTotalFour(items.month_prescriptions)?getTotalFour(items.month_prescriptions):'' }}元</span></span>
+                                                <span>基金支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.hifp_pay?items.curMonthPrescriptions.order.hifp_pay.toFixed(2) :''}}元</span></span>
+                                                <span>个人账户支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.acct_pay?items.curMonthPrescriptions.order.acct_pay.toFixed(2) :''}}元</span></span>
                                                 <!--<span>个人支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.psn_cash_pay?items.curMonthPrescriptions.order.psn_cash_pay:''}}元</span></span>-->
 
                                                 <span v-if="hisPatientInfo.balance_accounts_type != 2">个人支付金额：<span
-                                                        style="color:red;">{{ items.curMonthPrescriptions.order.psn_cash_pay?items.curMonthPrescriptions.order.psn_cash_pay:''}}元</span></span>
+                                                        style="color:red;">{{ items.curMonthPrescriptions.order.psn_cash_pay ?items.curMonthPrescriptions.order.psn_cash_pay.toFixed(2) :''}}元</span></span>
                                                 <span v-if="hisPatientInfo.balance_accounts_type == 2">个人支付金额：<span
-                                                        style="color:red;">{{ items.curMonthPrescriptions.order.medfee_sumamt}}元</span></span>
+                                                        style="color:red;">{{ items.curMonthPrescriptions.order.medfee_sumamt.toFixed(2) }}元</span></span>
 
 
-                                                <span>个人账户金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.account_price?items.curMonthPrescriptions.order.account_price:''}}元</span></span>
+                                                <span>个人账户金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.account_price?items.curMonthPrescriptions.order.account_price.toFixed(2) :''}}元</span></span>
 
                                             </div>
 

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -13,9 +13,9 @@
       </template>
 
       <div class='dialysisPage' style="padding-top:40px;">
-        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0">
+        <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4">
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
-          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138"></printThree>
+          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4"></printThree>
           <printFour v-if="org_id == 9504 || org_id == 10028 || org_id == 0" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
         </div>
         <printOne :info="info" v-else></printOne>
@@ -79,7 +79,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
 
-      if(this.$store.getters.xt_user.org_id == 10138){
+      if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 4){
         setTimeout(() => {
           const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}';
@@ -301,7 +301,7 @@ export default {
           id: obj.order_id,
 
         }
-        if(this.org_id == 10138){
+        if(this.org_id == 10138 || this.org_id == 0 || this.$store.getters.xt_user.org_id == 4){
           getPrivateExpenses(params).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
@@ -327,8 +327,13 @@ export default {
                 total: 0
               }
               let num = 0
-              this.balanceAccounts.order_info.map(item => {
 
+              let obj4 = {
+                type:4,
+                details: [],
+                total: 0
+              }
+              this.balanceAccounts.order_info.map(item => {
                 if(item.advice_id > 0){
                   obj.details.push(item)
                   obj.total += (item.pric * item.advice.prescribing_number)
@@ -345,10 +350,21 @@ export default {
                   }
                 }
               })
+              if(this.balanceAccounts.new_order_info != null) {
+                this.balanceAccounts.new_order_info.map(item => {
+                  obj4.total = obj4.total + item.Total
+                  obj4.details.push(item)
+                  num++
+
+                })
+              }
+
               this.balanceAccounts.new_detail_list = []
               this.balanceAccounts.new_detail_list.push(obj)
               this.balanceAccounts.new_detail_list.push(obj2)
               this.balanceAccounts.new_detail_list.push(obj3)
+              this.balanceAccounts.new_detail_list.push(obj4)
+
               console.log(111,this.balanceAccounts)
               this.num = num
               console.log('this.num',this.num)
@@ -500,6 +516,12 @@ export default {
                 details: [],
                 total: 0
               }
+
+              let obj4 = {
+                type:4,
+                details: [],
+                total: 0
+              }
               let num = 0
               that.info.order_infos.map(item => {
                 if(item.advice_id > 0){
@@ -519,11 +541,20 @@ export default {
                 }
               })
 
+
+              // this.info.order_infos.map(item => {
+              //   obj4.total = item.Total
+              //   obj4.details.push(item)
+              //   num++
+              //
+              // })
+
               that.info.new_detail_list = []
               that.info.new_detail_list.push(obj)
               that.info.new_detail_list.push(obj2)
               that.info.new_detail_list.push(obj3)
-              console.log('123',that.info.new_detail_list)
+              // that.info.new_detail_list.push(obj4)
+
               that.num = num
 
               if(that.paramsObj.settle_type != 1){

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -1,216 +1,286 @@
 <template>
     <div>
-        <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print" style="position: relative;">
+        <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print"
+             style="position: relative;">
             <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
-                <div>单据号：<span style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span></div>
-                <div>透析号：<span style="display:inline-block;width:200px;">{{info.patient.dialysis_no ? info.patient.dialysis_no : ''}}</span></div>
-                <div style="margin-left:2px;">电脑号：<span style="display:inline-block;">{{info.psn_no ? info.psn_no : ''}}</span></div>
+                <div>单据号：<span
+                        style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span>
+                </div>
+                <div>透析号：<span style="display:inline-block;width:200px;">{{info.patient.dialysis_no ? info.patient.dialysis_no : ''}}</span>
+                </div>
+                <div style="margin-left:2px;">电脑号：<span
+                        style="display:inline-block;">{{info.psn_no ? info.psn_no : ''}}</span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
-                  <div>姓名：<span style="display:inline-block;width:50px;">{{info.patient.name ? info.patient.name.indexOf("（") > -1 ? info.patient.name.substring(0,info.patient.name.indexOf("（")) : info.patient.name : ''}}</span></div>
-                  <div>性别：<span style="display:inline-block;width:30px;">{{info.patient.gender == '1' ? '男' : '女'}}</span></div>
-                  <div>年龄：<span style="display:inline-block;width:50px;">{{info.patient.age ? info.patient.age : ''}}岁</span></div>
-                  <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
-                  </div>
-                  <div>收费日期：<span style="display:inline-block;width:100px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span></div>
+                    <div>姓名：<span style="display:inline-block;width:50px;">{{info.patient.name ? info.patient.name.indexOf('（') > -1 ? info.patient.name.substring(0,info.patient.name.indexOf('（')) : info.patient.name : ''}}</span>
+                    </div>
+                    <div>性别：<span
+                            style="display:inline-block;width:30px;">{{info.patient.gender == '1' ? '男' : '女'}}</span>
+                    </div>
+                    <div>年龄：<span
+                            style="display:inline-block;width:50px;">{{info.patient.age ? info.patient.age : ''}}岁</span>
+                    </div>
+                    <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
+                    </div>
+                    <div>收费日期：<span style="display:inline-block;width:100px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
+                    </div>
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>
             <div style="min-height: 300px;">
-              <table border='1' style="width:100%;" cellspacing="0">
-                  <tr>
-                      <td width="70">类别</td>
-                      <td>项目</td>
-                      <td min-width="180" style="min-width:60px;">规格</td>
-                      <td width="40">单位</td>
-                      <td width="40">数量</td>
-                      <td width="60">单价</td>
-                      <td width="70">总额</td>
-                      <td width="130">小计</td>
-                  </tr>
-                  <div v-for="(item,i) in info.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
-                      <tr v-for="(subItem,index) in item.details" :key="index">
-                        <td>
-                          <span v-if="item.type == 1">药品费</span>
-                          <span v-if="item.type == 2">治疗费</span>
-                          <span v-if="item.type == 3">耗材费</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1"><span v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
-                          <span v-if="item.type == 2"></span>
-                          <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                <table border='1' style="width:100%;" cellspacing="0">
+                    <tr>
+                        <td width="70">类别</td>
+                        <td>项目</td>
+                        <td min-width="180" style="min-width:60px;">规格</td>
+                        <td width="40">单位</td>
+                        <td width="40">数量</td>
+                        <td width="60">单价</td>
+                        <td width="70">总额</td>
+                        <td width="130">小计</td>
+                    </tr>
+                    <div v-for="(item,i) in info.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
+                        <tr v-for="(subItem,index) in item.details" :key="index">
+                            <td>
+                                <span v-if="item.type == 1">药品费</span>
+                                <span v-if="item.type == 2">治疗费</span>
+                                <span v-if="item.type == 3">耗材费</span>
+                                <span v-if="item.type == 4">检验费</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
+                                <span v-if="item.type == 4">{{ subItem.project.project.team_name }}</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1"><span
+                                        v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
+                                <span v-if="item.type == 2"></span>
+                                <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.count }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 2">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 3">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 4">{{subItem.Total}}</span>
+
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 4">{{subItem.Total}}</span>
+
+                                <!--<span v-if="item.type == 4"></span>-->
+
+                            </td>
+                            <td :rowspan="item.details.length" v-if="index == 0"
+                                style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}
+                            </td>
+                        </tr>
+                    </div>
+                    <tr>
+                        <td colspan="7">
+                            <div style="display:flex;flez-wrap:wrap;">
+                                <div style="width:33%;" v-for="(item,index) in info.new_detail_list" :key="index">
+                                    <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>
+
+                                    <!--<span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>-->
+
+                                </div>
+                            </div>
                         </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.count }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                        <td>合计: {{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
+                    </tr>
+                    <tr>
+                        <td colspan="7">
+                            <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
+                                <div style="width:33%;">医疗费总额：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</div>
+                                <div style="width:33%;">基金支付金额：{{info.hifp_pay?info.hifp_pay:0}}元</div>
+                                <div style="width:33%;">个人账户支付金额：{{info.acct_pay?info.acct_pay:0}}元</div>
+
+                            </div>
+                            <div style="display:flex;flez-wrap:wrap;font-size:16px;">
+                                <div style="width:33%;">个人支付金额：{{ info.psn_pay?info.psn_pay:0 }}元</div>
+                                <div style="width:33%;">个人账户金额：{{info.balc >= 0 ? info.balc : 0 }}元</div>
+                            </div>
                         </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.pric }}</span>
-                          <span v-if="item.type == 2">{{ subItem.pric }}</span>
-                          <span v-if="item.type == 3">{{ subItem.pric }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
-                          <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                          <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                        </td>
-                        <td :rowspan="item.details.length" v-if="index == 0" style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}</td>
-                      </tr>
-                  </div>
-                  <tr>
-                    <td colspan="7">
-                      <div style="display:flex;flez-wrap:wrap;">
-                        <div style="width:33%;" v-for="(item,index) in info.new_detail_list" :key="index">
-                          <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
-                          <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
-                          <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
-                        </div>
-                      </div>
-                    </td>
-                    <td>合计: {{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
-                  </tr>
-                  <tr>
-                      <td colspan="7">
-                          <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
-                              <div style="width:33%;">医疗费总额：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</div>
-                              <div style="width:33%;">基金支付金额：{{info.hifp_pay?info.hifp_pay:0}}元</div>
-                              <div style="width:33%;">个人账户支付金额：{{info.acct_pay?info.acct_pay:0}}元</div>
-
-                          </div>
-                          <div style="display:flex;flez-wrap:wrap;font-size:16px;">
-                              <div style="width:33%;">个人支付金额：{{ info.psn_pay?info.psn_pay:0 }}元</div>
-                              <div style="width:33%;">个人账户金额：{{info.balc >= 0 ? info.balc : 0 }}元</div>
-                          </div>
-                      </td>
-                      <td style="font-size:16px;">合计：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
-                  </tr>
-
-              </table>
+                        <td style="font-size:16px;">合计：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
+                    </tr>
+
+                </table>
             </div>
             <div style="float:right;margin:10px 0;display:flex;">
                 <div>操作人：<span style="width:100px;display:inline-block;">{{info.p_admin.user_name}}</span></div>
-                <div>操作日期：<span style="width:100px;display:inline-block;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span></div>
+                <div>操作日期：<span style="width:100px;display:inline-block;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
+                </div>
             </div>
             <img style="width:100%;" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
         <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
-          <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
+            <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
-                <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span></div>
-                <div>透析号：<span style="display:inline-block;width:200px;">{{balanceAccounts.patient ? balanceAccounts.patient.dialysis_no : ''}}</span></div>
+                <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span>
+                </div>
+                <div>透析号：<span style="display:inline-block;width:200px;">{{balanceAccounts.patient ? balanceAccounts.patient.dialysis_no : ''}}</span>
+                </div>
                 <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
-                  <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name.indexOf("（") > -1 ? balanceAccounts.patient.name.substring(0,balanceAccounts.patient.name.indexOf("（")) : balanceAccounts.patient.name : ''}}</span></div>
-                  <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient.gender == '1' ? '男' : '女'}}</span></div>
-                  <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span></div>
-                  <div>费别：<span style="display:inline-block;width:80px;">自费</span>
-                  </div>
-                  <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
+                    <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name.indexOf('（') > -1 ? balanceAccounts.patient.name.substring(0,balanceAccounts.patient.name.indexOf('（')) : balanceAccounts.patient.name : ''}}</span>
+                    </div>
+                    <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient.gender == '1' ? '男' : '女'}}</span>
+                    </div>
+                    <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span>
+                    </div>
+                    <div>费别：<span style="display:inline-block;width:80px;">自费</span>
+                    </div>
+                    <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),'{y}-{m}-{d}')?getTime(new Date(),'{y}-{m}-{d}'):''}}</span>
+                    </div>
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>
             <div style="min-height: 300px;">
-              <table border='1' style="width:100%;" cellspacing="0">
-                  <tr>
-                      <td width="70">类别</td>
-                      <td>项目</td>
-                      <td min-width="180" style="min-width:60px;">规格</td>
-                      <td width="40">单位</td>
-                      <td width="40">数量</td>
-                      <td width="60">单价</td>
-                      <td width="70">总额</td>
-                      <td width="130">小计</td>
-                  </tr>
-                  <div v-for="(item,i) in balanceAccounts.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
-                      <tr v-for="(subItem,index) in item.details" :key="index">
-                        <td>
-                          <span v-if="item.type == 1">药品费</span>
-                          <span v-if="item.type == 2">治疗费</span>
-                          <span v-if="item.type == 3">耗材费</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1"><span v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
-                          <span v-if="item.type == 2"></span>
-                          <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                <table border='1' style="width:100%;" cellspacing="0">
+                    <tr>
+                        <td width="70">类别</td>
+                        <td>项目</td>
+                        <td min-width="180" style="min-width:60px;">规格</td>
+                        <td width="40">单位</td>
+                        <td width="40">数量</td>
+                        <td width="60">单价</td>
+                        <td width="70">总额</td>
+                        <td width="130">小计</td>
+                    </tr>
+                    <div v-for="(item,i) in balanceAccounts.new_detail_list" :key="i"
+                         style="width:100%;display: table-row-group;">
+                        <tr v-for="(subItem,index) in item.details" :key="index">
+                            <td>
+                                <span v-if="item.type == 1">药品费</span>
+                                <span v-if="item.type == 2">治疗费</span>
+                                <span v-if="item.type == 3">耗材费</span>
+                                <span v-if="item.type == 4">检验费</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
+                                <span v-if="item.type == 4">{{ subItem.Name }}</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1"><span
+                                        v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
+                                <span v-if="item.type == 2"></span>
+                                <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.count }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                                <span v-if="item.type == 4">1</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 2">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 3">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 4">{{subItem.Total}}</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 4">{{subItem.Total}}</span>
+
+                            </td>
+                            <td :rowspan="item.details.length" v-if="index == 0"
+                                style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}
+                            </td>
+                        </tr>
+                    </div>
+                    <tr>
+                        <td colspan="7">
+                            <div style="display:flex;flez-wrap:wrap;">
+                                <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list"
+                                     :key="index">
+                                    <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>
+
+                                </div>
+                            </div>
                         </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.count }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                        <td>合计: {{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
+                    </tr>
+                    <tr>
+                        <td colspan="7">
+                            <div style="display:flex;flez-wrap:wrap;">
+                                <div style="width:33%;">
+                                    医疗费总额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元
+                                </div>
+                                <div style="width:33%;">基金支付金额：0元</div>
+                                <div style="width:33%;">个人账户支付金额：0元</div>
+
+                            </div>
+                            <div style="display:flex;flez-wrap:wrap;">
+                                <div style="width:33%;">
+                                    个人支付金额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元
+                                </div>
+                                <div style="width:33%;">个人账户金额：0元</div>
+                            </div>
                         </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.pric }}</span>
-                          <span v-if="item.type == 2">{{ subItem.pric }}</span>
-                          <span v-if="item.type == 3">{{ subItem.pric }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
-                          <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                          <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                        </td>
-                        <td :rowspan="item.details.length" v-if="index == 0" style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}</td>
-                      </tr>
-                  </div>
-                  <tr>
-                    <td colspan="7">
-                      <div style="display:flex;flez-wrap:wrap;">
-                        <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list" :key="index">
-                          <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
-                          <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
-                          <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
-                        </div>
-                      </div>
-                    </td>
-                    <td>合计: {{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
-                  </tr>
-                  <tr>
-                      <td colspan="7">
-                          <div style="display:flex;flez-wrap:wrap;">
-                              <div style="width:33%;">医疗费总额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</div>
-                              <div style="width:33%;">基金支付金额：0元</div>
-                              <div style="width:33%;">个人账户支付金额：0元</div>
-
-                          </div>
-                          <div style="display:flex;flez-wrap:wrap;">
-                              <div style="width:33%;">个人支付金额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</div>
-                              <div style="width:33%;">个人账户金额：0元</div>
-                          </div>
-                      </td>
-                      <td>合计：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
-                  </tr>
-
-              </table>
+                        <td>合计：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
+                    </tr>
+
+                </table>
             </div>
             <div style="float:right;margin:10px 0;display:flex;">
-                <div>操作人：<span style="width:100px;display:inline-block;">{{balanceAccounts.current_admin.user_name}}</span></div>
-                <div>操作日期：<span style="width:100px;display:inline-block;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
+                <div>操作人：<span
+                        style="width:100px;display:inline-block;">{{balanceAccounts.current_admin.user_name}}</span>
+                </div>
+                <div>操作日期：<span style="width:100px;display:inline-block;">{{getTime(new Date(),'{y}-{m}-{d}')?getTime(new Date(),'{y}-{m}-{d}'):''}}</span>
+                </div>
             </div>
             <img style="width:100%;" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
@@ -246,7 +316,7 @@
     props: {
       paramsObj: Object,
       info: Object,
-      balanceAccounts:Object
+      balanceAccounts: Object
     },
     methods: {
       getName(list) {
@@ -258,62 +328,62 @@
         }
 
         switch (new_list[0].bcc334) {
-          case "A31001":
-            return "深圳医保1档"
+          case 'A31001':
+            return '深圳医保1档'
             break
-          case "A31002":
-            return "深圳医保2档"
+          case 'A31002':
+            return '深圳医保2档'
 
             break
-          case "A31003":
-            return "深圳医保3档"
+          case 'A31003':
+            return '深圳医保3档'
 
             break
-          case "A31004":
-            return "二档（少儿）"
+          case 'A31004':
+            return '二档（少儿）'
 
             break
-          case "A31005":
-            return "学生二档"
+          case 'A31005':
+            return '学生二档'
 
             break
-          case "A31006":
-            return "大学生二档"
+          case 'A31006':
+            return '大学生二档'
 
             break
-          case "A32001":
-            return "在职公务员"
+          case 'A32001':
+            return '在职公务员'
             break
-          case "A32002":
-            return "在职驻深公务员"
+          case 'A32002':
+            return '在职驻深公务员'
 
             break
-          case "A39301":
-            return "家属统筹医疗"
+          case 'A39301':
+            return '家属统筹医疗'
 
             break
-          case "A41001":
-            return "工伤在职"
+          case 'A41001':
+            return '工伤在职'
 
             break
-          case "A51001":
-            return "生育在职"
+          case 'A51001':
+            return '生育在职'
 
             break
-          case "A52001":
-            return "生育医疗一档"
+          case 'A52001':
+            return '生育医疗一档'
 
             break
-          case "A52002":
-            return "生育医疗一档"
+          case 'A52002':
+            return '生育医疗一档'
 
             break
-          case "C31001":
-            return "一档医疗退休"
+          case 'C31001':
+            return '一档医疗退休'
 
             break
-          case "C31002":
-            return "二档医疗退休"
+          case 'C31002':
+            return '二档医疗退休'
             break
 
         }

src/xt_pages/outpatientCharges/summary.vue

@@ -81,10 +81,10 @@
                 <!--</el-table-column>-->
 
                 <el-table-column align="center" width="90" prop="name" label="应收金额">
-                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+                    <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
                 </el-table-column>
                 <el-table-column align="center" width="90" prop="name" label="实收金额">
-                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
+                    <template slot-scope="scope">{{scope.row.reality_price.toFixed(2)}}</template>
                 </el-table-column>
                 <el-table-column align="center" width="90" prop="name" label="科室">
                     <template slot-scope="scope">{{scope.row.department_name}}</template>

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -64,7 +64,7 @@
                           <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}}元
+                                  {{scope.row.price.toFixed(2)}}元
 
                               </template>
                           </el-table-column>
@@ -92,7 +92,7 @@
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
+                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt.toFixed(2)}}元</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>
@@ -112,12 +112,12 @@
                     </ul>
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
                     <ul class="basicUl">
-                        <li style="width:50%;">应收金额：{{order.medfee_sumamt }}元</li>
-                        <li style="width:50%;">实收金额：{{order.reality_price}}元</li>
-                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt - order.reality_price}}元</li>
-                        <li style="width:50%;">优惠金额：{{order.preferential_price}}元</li>
+                        <li style="width:50%;">应收金额：{{order.medfee_sumamt.toFixed(2) }}元</li>
+                        <li style="width:50%;">实收金额：{{order.reality_price.toFixed(2)}}元</li>
+                        <li style="width:50%;">舍入金额：{{order.medfee_sumamt.toFixed(2) - order.reality_price.toFixed(2)}}元</li>
+                        <li style="width:50%;">优惠金额：{{order.preferential_price.toFixed(2)}}元</li>
                         <li style="width:50%;">总金额</li>
-                        <li style="width:50%;">{{order.medfee_sumamt}}元</li>
+                        <li style="width:50%;">{{order.medfee_sumamt.toFixed(2)}}元</li>
                     </ul>
                     <!--<p class="centerRightTitle">发票费用</p>-->
                     <!--<ul class="basicUl">-->

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -1613,7 +1613,7 @@
               }
             }
 
-            total = Math.floor(total * 100) / 100
+            total = total.toFixed(2)
           }
         }
         return total
@@ -1640,7 +1640,7 @@
                 total = total + this.month_prescriptions[i].addition[b].price * this.month_prescriptions[i].addition[b].count
               }
             }
-            total = Math.floor(total * 100) / 100
+            total = total.toFixed(2)
           }
         }
         return total
@@ -1653,12 +1653,12 @@
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
             total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
           }
-          return Math.floor(total * 100) / 100
+          return total.toFixed(2)
         } else {
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
             total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
           }
-          return Math.floor(total * 100) / 100
+          return total.toFixed(2)
         }
 
       },
@@ -1683,7 +1683,7 @@
           }
         }
 
-        return Math.floor(total * 100) / 100
+        return total.toFixed(2)
       }, getMonthTotal() {
         var total = 0
         for (let i = 0; i < this.month_prescriptions.length; i++) {
@@ -1705,7 +1705,7 @@
           }
         }
 
-        return Math.floor(total * 100) / 100
+        return total.toFixed(2)
       },
       createFilter(queryString) {
         return (restaurant) => {
@@ -2223,7 +2223,7 @@
             for (let i = 0; i < this.prescriptions.length; i++) {
               for(let b = 0; b < this.prescriptions[i].advices.length; b++){
                 if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
-                  this.$message.error(this.prescriptions[i].name.toString() +"属于特病类型处方，开非特病类型的药")
+                  this.$message.error(this.prescriptions[i].name.toString() +"属于特病类型处方，不能开非特病类型的药")
                   return
                 }
               }
@@ -2658,7 +2658,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2933,7 +2933,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 ){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 ){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -463,7 +463,7 @@
       },
       getPrescribingNumberUnit(scope) {
 
-        // console.log('scope',scope)
+         console.log('scope',scope)
         // if(scope.row.drug.min_unit == scope.row.single_dose_unit){
         //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
@@ -482,13 +482,13 @@
         // }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           scope.row.retail_price = scope.row.drug.min_price
-          if (scope.row.prescribing_number > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+          // if (scope.row.prescribing_number > scope.row.drug.total) {
+          //   this.$message.error(scope.row.drug_name + '库存不足')
+          // }
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-          }
+          // if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+          //   this.$message.error(scope.row.drug_name + '库存不足')
+          // }
           scope.row.retail_price = scope.row.drug.retail_price
         }
       },

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -416,7 +416,9 @@
         for (let i = 0; i < this.prescriptions.length; i++) {
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
             if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
-              this.$message.error('处方' + (i + 1).toString() + '属于特病类型处方，开非特病类型的药')
+              this.$message.error('处方' + (i + 1).toString() + '属于特病类型处方，不能开非特病类型的药')
+
+
               return
             }
 

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -35,7 +35,7 @@
                   <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
                </div>
                <div style="text-align:center;" >(以下空白)</div>
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -35,7 +35,7 @@
                   <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">
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
                </div>
                <div style="text-align:center;" >(以下空白)</div>
 

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -43,7 +43,7 @@
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <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 class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price.toFixed(2)}}元/{{it.count}}次</div>
               </div>
 
               <!-- <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
@@ -129,7 +129,7 @@ export default {
       //   age++
       // }
       // return age
-      var nowTime = new Date().getTime(); 
+      var nowTime = new Date().getTime();
       //一年毫秒数(365 * 86400000 = 31536000000)
       return Math.ceil((nowTime-(birthday * 1000))/31536000000);
     },

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -35,7 +35,7 @@
             <p>配对:</p>
             <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
             <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
-            <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>
+            <p>药费：{{advicePrint[0].price.toFixed(2)?advicePrint[0].price.toFixed(2):""}}</p>
         </div>
     </div>
 </template>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -54,7 +54,7 @@
                         <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
                         <td>{{it.count}}</td>
                         <td>{{getUnit(it.unit)}}</td>
-                        <td>{{it.price}}</td>
+                        <td>{{it.price.toFixed(2)}}</td>
                         <td></td>
                         <td>{{it.remark}}</td>
                         <td>{{it.day}}</td>
@@ -66,7 +66,7 @@
                         <td>{{it.advice_name?it.advice_name:''}}</td>
                         <td>{{it.single_dose?it.single_dose:''}}</td>
                         <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
-                        <td>{{it.price}}</td>
+                        <td>{{it.price.toFixed(2)}}</td>
                         <td></td>
                         <td>{{it.remark}}</td>
                         <td>{{it.day}}</td>

src/xt_pages/outpatientTool/components/detail.vue

@@ -72,6 +72,9 @@
             <el-table-column align="center" prop="name" label="项目名称">
                 <template slot-scope="scope">{{scope.row.item_name}}</template>
             </el-table-column>
+            <el-table-column align="center" prop="name" label="规格">
+                <template slot-scope="scope">{{scope.row.item_spec}}</template>
+            </el-table-column>
             <el-table-column align="center" prop="name" label="数量">
                 <template slot-scope="scope">{{scope.row.count}}</template>
             </el-table-column>
@@ -214,14 +217,14 @@
                   newObj['price'] = orders[b].order_info[c].pric
                   if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
                     newObj['type'] = 1
-                    // newObj['item_name'] = orders[b].order_info[c].advice.advice_name
+                    newObj['item_name'] = orders[b].order_info[c].advice.advice_name
                     newObj['item_id'] = orders[b].order_info[c].advice.drug_id
 
                     if (orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
-                      newObj['item_name'] = orders[b].order_info[c].advice.advice_name + '（ ' + orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + '*' + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + '/' + orders[b].order_info[c].advice.drug.max_unit + ' ）'
+                      newObj['item_spec'] =  orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + '*' + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + '/' + orders[b].order_info[c].advice.drug.max_unit
                     } else {
 
-                      newObj['item_name'] = ''
+                      newObj['item_spec'] = ''
                     }
 
                   }
@@ -230,10 +233,14 @@
                     newObj['item_id'] = orders[b].order_info[c].project.project_id
 
                     if (orders[b].order_info[c].project.type == 2) {
+                      newObj['item_spec'] =""
                       newObj['item_name'] = orders[b].order_info[c].project.project.project_name
 
+
                     } else if (orders[b].order_info[c].project.type == 3) {
-                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name + '（ ' + orders[b].order_info[c].project.good_info.specification_name + ' ）'
+                      newObj['item_spec'] =    orders[b].order_info[c].project.good_info.specification_name
+                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name
+
 
                     }
                   }
@@ -271,6 +278,8 @@
                 obj['price'] = project[i].price
                 obj['type'] = project[i].type
                 obj['item_name'] = project[i].item_name
+                obj['item_spec'] = project[i].item_spec
+
                 obj['item_id'] = project[i].item_id
                 obj['name'] = tempPatientsTwo[d].name
                 obj['patient_id'] = tempPatientsTwo[d].patient_id
@@ -290,6 +299,7 @@
                 obj['price'] = advice[i].price
                 obj['type'] = advice[i].type
                 obj['item_name'] = advice[i].item_name
+                obj['item_spec'] = advice[i].item_spec
                 obj['item_id'] = advice[i].item_id
                 obj['name'] = tempPatientsTwo[d].name
                 obj['patient_id'] = tempPatientsTwo[d].patient_id
@@ -303,11 +313,23 @@
               let total = 0
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
                 let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                new_name = new_name.replace('（ ', '')
-                new_name = new_name.replace(' ）', '')
-                if (new_name.length != 0) {
-                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
+                // console.log('3 ' + new_name)
+                if (new_name != undefined){
+                  // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].patient_id)
+                  // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].price)
+                  // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].count)
+                  //
+                  // new_name = new_name.replace('（ ', '')
+                  // new_name = new_name.replace(' ）', '')
+                  if (new_name.length != 0) {
+                    total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
+                  }
+
+
+
                 }
+
+
               }
               tempPatientsTwo[i]['total'] = total
             }
@@ -317,13 +339,12 @@
               if (tempPatientsTwo[i].new_order_info.length > 0) {
 
                 for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                  let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                  console.log('2 ' + new_name)
+                  // let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                  // console.log('2 ' + new_name)
+                  //
+                  // new_name = new_name.replace('（ ', '')
+                  // new_name = new_name.replace(' ）', '')
 
-                  new_name = new_name.replace('（ ', '')
-                  new_name = new_name.replace(' ）', '')
-
-                  if (new_name.length != 0) {
                     let obj = {
                       name: tempPatientsTwo[i].name,
                       patient_id: tempPatientsTwo[i].patient_id,
@@ -331,17 +352,18 @@
                       type: tempPatientsTwo[i].new_order_info[b].type,
                       item_name: tempPatientsTwo[i].new_order_info[b].item_name,
                       item_id: tempPatientsTwo[i].new_order_info[b].item_id,
-                      count: tempPatientsTwo[i].new_order_info[b].count
-
+                      count: tempPatientsTwo[i].new_order_info[b].count,
+                      item_spec: tempPatientsTwo[i].new_order_info[b].item_spec
                     }
 
+
                     // if(b == 0){
                     obj['total'] = tempPatientsTwo[i].total
                     // }else{
                     //   obj['total'] = 0
                     // }
                     this.tableData.push(obj)
-                  }
+
 
                 }
               }
@@ -471,7 +493,7 @@
         })
         this.sameRowArr = sameRowArr
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 5) {
+        if (columnIndex === 0 || columnIndex === 6) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {

src/xt_pages/outpatientTool/components/settle.vue

@@ -80,16 +80,16 @@
               </template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="医疗费总额">
-              <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+              <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="基金支付金额">
-              <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
+              <template slot-scope="scope">{{scope.row.fund_pay_sumamt.toFixed(2)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="个人账户支付金额">
-              <template slot-scope="scope">{{scope.row.acct_pay}}</template>
+              <template slot-scope="scope">{{scope.row.acct_pay.toFixed(2)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="个人支付金额">
-              <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+              <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(2)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="total" label="费用总额">
               <template slot-scope="scope">

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -115,7 +115,7 @@
                   v-model="scope.row.return_count"
                 ></el-input>      
               </el-form-item>
-              <!-- {{scope.row.packing_unit}} -->
+            
             </template>
           </el-table-column>
           <el-table-column width="150" align="center">
@@ -154,7 +154,7 @@
               >
                <el-select v-model="scope.row.number" filterable placeholder="请选择">
                   <el-option
-                    v-for="(item,index) in numberList"
+                    v-for="(item,index) in scope.row.xt_warehouse_info"
                     :key="index"
                     :label="item.number"
                     :value="item.id">
@@ -439,6 +439,7 @@ export default {
       tempObj["price"] = ""
       tempObj["total"] = ""
       tempObj["warehouse_info_id"] =  0
+      tempObj["xt_warehouse_info"] = []
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -546,27 +547,26 @@ export default {
             this.$message.success("请添加退库商品");
             return;
           }
-          console.log("hhhhh2h332",this.recordInfo.recordData)
+   
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             if(this.recordInfo.recordData[i].good_id == 0){
                this.$message.error("耗材规格不能为空")
                return
             }
-
-            for(let j=0;j<this.numberList.length;j++){
-              if(this.recordInfo.recordData[i].number == this.numberList[j].id){
-                this.recordInfo.recordData[i].number = this.numberList[j].number
-                this.recordInfo.recordData[i].warehouse_info_id = this.numberList[j].id
-              }
-            }
-            
+            for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+               if(this.recordInfo.recordData[i].number == this.recordInfo.recordData[i].xt_warehouse_info[j].id){
+                  this.recordInfo.recordData[i].number = this.recordInfo.recordData[i].xt_warehouse_info[j].number
+                  this.recordInfo.recordData[i].warehouse_info_id = this.recordInfo.recordData[i].xt_warehouse_info[j].id
+               }
+            }     
           }
 
           const params = {
             cancelStock: this.recordInfo.recordData
           };
-          console.log("params",params)
-         
+        
+          console.log("parasm23233222332323",params)
+          
           postCancelStock(
             params,
             this.return_time,
@@ -622,9 +622,8 @@ export default {
       }
     postSearchGoodList(key).then(response => {
         if (response.data.state == 1) {
-          
             var list = response.data.data.list
-            
+           
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
@@ -656,17 +655,16 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-      //获取当前耗材的批号
-      this.getStockBatchNumber(val.id)
+      console.log("列表23323232332",this.recordInfo.recordData)
       for(let i=0;i<this.recordInfo.recordData.length;i++){
         if(this.currentIndex == i){
-          this.recordInfo.recordData[i].good_type_id = val.id
           this.recordInfo.recordData[i].good_name = val.good_name
           this.recordInfo.recordData[i].good_type_id = val.good_type_id
           this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
-          this.recordInfo.recordData[i].number =  val.number
+          this.recordInfo.recordData[i].number =  ""
           this.recordInfo.recordData[i].manufacturer = val.manufacturer
           this.recordInfo.recordData[i].remark = val.remark
+          this.recordInfo.recordData[i].xt_warehouse_info = val.xt_warehouse_info
           if(val.buy_price == 0){
             this.recordInfo.recordData[i].price = ""
           }else{
@@ -693,6 +691,8 @@ export default {
         if(response.data.state == 1){
           var list = response.data.data.list
           console.log("list2243444",list)
+
+          this.numberList = []
           this.numberList = list
         }
      })
@@ -722,6 +722,7 @@ export default {
     tempObj["price"] = ""
     tempObj["total"] = ""
     tempObj["warehouse_info_id"] = 0
+    tempObj["xt_warehouse_info"] = []
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -114,7 +114,7 @@
               >
                <el-select v-model="scope.row.number" filterable placeholder="请选择" >
                   <el-option
-                    v-for="(item,index) in numberList"
+                    v-for="(item,index) in scope.row.xt_warehouse_info"
                     :key="index"
                     :label="item.number"
                     :value="item.id">
@@ -400,6 +400,7 @@
         tempObj["remark"] = ""
         tempObj["price"] = 0
         tempObj["warehouse_info_id"] = 0
+        tempObj["xt_warehouse_info"] = []
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {
@@ -513,18 +514,18 @@
               }
               array[i].price = array[i].price.toString()
             }
-
+            console.log("hh2332322323",this.recordInfo.recordData)
             for(let i=0;i<this.recordInfo.recordData.length;i++){
                if(this.recordInfo.recordData[i].good_id == 0){
                   this.$message.error("耗材规格不能为空")
                   return
                }
-             for(let j=0;j<this.numberList.length;j++){
-                if(this.recordInfo.recordData[i].number == this.numberList[j].id){
-                  this.recordInfo.recordData[i].number = this.numberList[j].number
-                  this.recordInfo.recordData[i].warehouse_info_id = this.numberList[j].id
+              for(let j=0;j<this.recordInfo.recordData[i].xt_warehouse_info.length;j++){
+                if(this.recordInfo.recordData[i].number == this.recordInfo.recordData[i].xt_warehouse_info[j].id){
+                    this.recordInfo.recordData[i].number = this.recordInfo.recordData[i].xt_warehouse_info[j].number
+                    this.recordInfo.recordData[i].warehouse_info_id = this.recordInfo.recordData[i].xt_warehouse_info[j].id
                 }
-             }
+              }     
             }
 
             const params = {
@@ -586,6 +587,7 @@
               response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{m}-{d}")
               response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{m}-{d}")
               response.data.data.list[i].return_count = response.data.data.list[i].count
+              response.data.data.list[i].xt_warehouse_info = response.data.data.list[i].xt_warehouse_info
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.cancelStock = response.data.data.info
@@ -655,9 +657,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
-        console.log("val",val)
         //获取当前耗材的批号
-         this.getStockBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].good_type_id = val.id
@@ -667,6 +667,7 @@
               this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
+              this.recordInfo.recordData[i].xt_warehouse_info = val.xt_warehouse_info
               if(val.buy_price == 0){
                this.recordInfo.recordData[i].price = ""
               }else{

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -402,7 +402,7 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+      
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -581,18 +581,20 @@ export default {
       this.getCancelStockDetail(val.id)
     },
     getCancelStockDetail(id){
+      console.log("id232233223",id)
         var params = {
           id:id
         }
       getCancelStockDetail(params).then(response=>{
        if(response.data.state == 1){
          var list =  response.data.data.list
+         console.log("hhhh23233323223",list)
          for(let i=0;i<list.length;i++){
            list[i].product_date = this.getTime(list[i].product_date,"{y}-{h}-{d}")
            list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{h}-{d}")
          }
          this.tableList = list
-         console.log("list23232",list)
+        //  console.log("list23232",list)
          this.showTable = true
        }
       })
@@ -621,7 +623,7 @@ export default {
      getDrugCancelExportList(params).then(response=>{
         if(response.data.state == 1){
          var list = response.data.data.list
-         console.log("导出数据222",list)
+        //  console.log("导出数据222",list)
          this.exportList = list
         }
      })
@@ -632,8 +634,7 @@ export default {
         return
       }
      import('@/vendor/Export2Excel').then(excel => {
-      console.log("23232323",this.exportList)
-      return
+     
       for(let i=0;i<this.exportList.length;i++){
         this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
         this.exportList[i].drug_name = this.exportList[i].BaseDrugLib.drug_name
@@ -650,7 +651,7 @@ export default {
       }
       const tHeader = ['药品名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
       const filterVal = ['drug_name', 'unit','count','price','batch_number','register_account','manufacturer','product_date','expiry_date','remark']
-      console.log("table",this.exportList)
+      // console.log("table",this.exportList)
     
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -172,7 +172,7 @@
               >
                <el-select v-model="scope.row.batch_number" filterable placeholder="请选择">
                   <el-option
-                    v-for="(item,index) in numberList"
+                    v-for="(item,index) in scope.row.drug_warehouse_info"
                     :key="index"
                     :label="item.batch_number"
                     :value="item.id">
@@ -463,6 +463,7 @@ export default {
       tempObj["batch_number"] = ""
       tempObj["max_unit"] = ""
       tempObj["batch_number_id"] = 0
+      tempObj["drug_warehouse_info"] = []
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -546,6 +547,7 @@ export default {
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;
+          console.log("列表23323232323232",array)
           let total = 0;
           for (let i = 0; i < array.length; i++) {
 
@@ -562,19 +564,18 @@ export default {
           }
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
-            console.log("批次列表",this.numberList)
-             for(let j=0;j<this.numberList.length;j++){
-                if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
-                   this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number
-                   this.recordInfo.recordData[i].batch_number_id = this.numberList[j].id
-                 
-                }
-             }
+            for(let j=0;j<this.recordInfo.recordData[i].drug_warehouse_info.length;j++){
+               
+               if(this.recordInfo.recordData[i].batch_number == this.recordInfo.recordData[i].drug_warehouse_info[j].id){
+                  this.recordInfo.recordData[i].batch_number = this.recordInfo.recordData[i].drug_warehouse_info[j].batch_number
+                  this.recordInfo.recordData[i].batch_number_id = this.recordInfo.recordData[i].drug_warehouse_info[j].id
+               }
+            }
           }
           const params = {
             cancelStock: this.recordInfo.recordData
           };
-          console.log("params2222",params,this.return_time)
+         console.log("params2222",params,this.return_time)
         
           postDrugCancelStock(
             params,
@@ -658,17 +659,17 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
+        console.log("val345555555555555555555",val)
          var arr = []
          for(let i=0;i<this.recordInfo.recordData.length;i++){
             arr.push(this.recordInfo.recordData[i].drug_id)
          }
          var str = arr.join(",")
-         console.log("str",str)
          if(str.indexOf(val.id)!=-1){
             this.$message.error("该药品已存在列表中")
             return
          }
-         this.getDrugBatchNumber(val.id)
+        //  this.getDrugBatchNumber(val.id)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id  = val.id
@@ -678,9 +679,10 @@ export default {
              this.recordInfo.recordData[i].last_price = val.last_price
              this.recordInfo.recordData[i].price = val.last_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
-             this.recordInfo.recordData[i].number =  val.number
+           
              this.recordInfo.recordData[i].max_unit = val.max_unit
              this.recordInfo.recordData[i].min_unit = val.min_unit
+             this.recordInfo.recordData[i].drug_warehouse_info = val.drug_warehouse_info
              if(val.dealer == 0){
                this.recordInfo.recordData[i].dealer = ""
              }else{
@@ -689,7 +691,7 @@ export default {
             
            }
         }
-        console.log("333333",this.recordInfo.recordData)
+        // console.log("333333",this.recordInfo.recordData)
       },
       getDrugBatchNumber(id){
           var params = {
@@ -698,7 +700,7 @@ export default {
         getDrugBatchNumber(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-             console.log("list2222",list)
+            //  console.log("list2222",list)
              for(let i=0;i<list.length;i++){
                this.numberList.push(list[i])
              }
@@ -736,8 +738,9 @@ export default {
     tempObj["batch_number"] = ""
     tempObj["batch_number_id"] = 0
     tempObj["max_unit"] = ""
+    tempObj["drug_warehouse_info"] = []
     this.unitList =  getDataConfig('hemodialysis','units')
-    console.log("单位",this.unitList)
+    // console.log("单位",this.unitList)
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -372,8 +372,9 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
-      },calculate: function(val) {
-        if (val == 0) {
+      },
+      calculate: function(val) {
+        if (val == 0 || val == "NaN") {
           return ''
         }
         return Math.round(parseFloat(val) * 100) / 100
@@ -433,7 +434,7 @@
         const tempObj = {}
         tempObj['id'] = 0
         tempObj["return_count"] = "";
-        tempObj["price"] = "";
+        tempObj["price"] = 0;
         tempObj["retail_price"] = "";
         tempObj["register_account"] = ""
         tempObj["dealer"] = ""
@@ -443,7 +444,7 @@
         tempObj["expiry_date"] = ""
         tempObj["batch_number"] = ""
         tempObj["batch_number_id"] = 0
-
+         tempObj["count"] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -96,7 +96,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="原因:">
-                  <el-select v-model="form.type" placeholder="请选择">
+                  <el-select v-model="form.type" placeholder="请选择" @change="changeReason">
                       <el-option
                         v-for="item in reasonList"
                         :key="item.id"
@@ -146,7 +146,7 @@
 
               <el-table-column prop="address" label="盘点原因" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.type == 0">默认</span> 
+                  <span v-if="scope.row.type == 6">默认</span> 
                   <span v-if="scope.row.type == 1">到期退货</span> 
                   <span v-if="scope.row.type == 2">异常退货</span> 
                   <span v-if="scope.row.type == 3">退货</span> 
@@ -243,7 +243,7 @@ export default {
             unitList:[],
             datamageList:[],
             reasonList:[
-              {id:0,name:"默认"},
+              {id:6,name:"默认"},
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
@@ -284,6 +284,10 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
         },
+      changeReason(val){
+        this.form.type = val
+        this.clickDetai(this.drug_id)
+      },
       getlist(){
         var params = {
           limit:this.limit,
@@ -292,14 +296,13 @@ export default {
           end_time:this.end_time,
           keyword:this.searchKey,
         }
-        console.log("博阿孙param232332232323",params)
+       
         getDrugDamageList(params).then(response=>{
            if(response.data.state == 1){
              this.tableList = response.data.data.list
              this.total = response.data.data.total
              this.doctorList = response.data.data.doctorList
              var datamagelist = response.data.data.damagelist
-             console.log("hhh233223",datamagelist)
              this.datamageList = datamagelist
            }
         })
@@ -355,6 +358,7 @@ export default {
            warehouseing_order:this.form.warehousing_order,
            type:this.form.type,
          }
+        
         this.dialogVisible = true
         getDamagedByDrugId(params).then(response=>{
            if(response.data.state ==1){
@@ -364,7 +368,7 @@ export default {
                list[i].min_number == list[i].XtBaseDrug.min_number
                list[i].total = 0
              }
-             console.log("list232232332",list)
+            
 
              for(let i=0;i<list.length;i++){
                this.drug_name = list[0].drug_name
@@ -423,10 +427,7 @@ export default {
        this.clickDetai(this.drug_id)
      },
      getDrugDamageRadio(count){
-
        var total_count =  this.getDamagedCountOne(this.total_count)
-       console.log("count888888888888",count)
-       console.log("hh23232数据列表23322323",total_count)
        var all_count = 0
        all_count =  total_count * this.min_number
       

src/xt_pages/stock/drugs/drugPrint.vue

@@ -40,7 +40,7 @@
               <td style="line-height: 50px">
                 <span>{{item.XtBaseDrug.min_unit}}</span>
               </td>
-            
+
               <td style="line-height: 50px">
                   {{getCount(item.drug_id)}}
               </td>
@@ -108,7 +108,7 @@
           { path: false, name: '打印单' }
         ],
         loading: false,
-        orgname: '',   
+        orgname: '',
         totalPrice: 0,
         stockDatas: [],
         goodUnit: [],
@@ -151,7 +151,7 @@
           scanStyles: false
         })
       },
-   
+
       getUnit(id){
         var name = ""
         for(let i=0;i<this.goodUnit.length;i++){
@@ -218,7 +218,7 @@
           var total = response.data.data.total
           this.total = total
         }
-      })  
+      })
       },
 
       getTotal(){
@@ -240,10 +240,10 @@
              var list = response.data.data.list
              console.log("入库单详情",list)
              this.cancelStockDate  = list
-           }   
+           }
         })
 
-        
+
       },
       getCount(drug_id){
         var total = 0
@@ -275,7 +275,7 @@
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       // this.getlist()
-     
+
 
       this.getDrugWarehouseInfoPrint()
        this.getDrugCountList()

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -45,10 +45,19 @@
               <td style="line-height: 50px">
                 <span> {{getManufacturerList(item.manufacturer)}}</span>
               </td>
-              <td><span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfo(item.drug_warehouse_info)}}{{item.max_unit}}</span ></td>
-              <td><span v-if="getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)!=0">{{getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)}}</span></td>
               <td>
-                <span v-if="getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)!=0">{{getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)}}</span>
+                <span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfo(item.drug_warehouse_info)}}{{item.max_unit}}</span >
+              </td>
+              <td>
+                <!-- <span v-if="getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)!=0">
+                  {{getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)}}
+                </span> -->
+                  {{getOutFlush(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number,item.drug_cancel_stock_info)}}
+              </td>
+              <td>
+              <span v-if="getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)!=0">
+                  {{getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)}}
+              </span>
              </td> 
             </tr>
             </tbody>
@@ -346,23 +355,6 @@
         }
         return count
       },
-      // getCount(drug_id,min_number,max_unit,min_unit){
-      //   var count= 0
-      //   var str = ""
-      //   var min_str = ""
-      //   for(let i=0;i<this.drugOutList.length;i++){
-      //     if(drug_id == this.drugOutList[i].drug_id){
-      //        count += parseInt(this.drugOutList[i].count)
-      //     }
-      //   }
-      //   if(parseInt(count/min_number)!=0){
-      //     str = parseInt(count/min_number)+ max_unit
-      //   }
-      //   if((count%min_number)!=0){
-      //     min_str =  count%min_number + min_unit
-      //   }
-      //   return str + min_str
-      // },
         getCount(drug_id,min_number,max_unit,min_unit){
         var total= 0
         var str = ""
@@ -506,6 +498,34 @@
          }
         return max_str + min_str
 
+      },
+      getOutFlush(info,max_unit,min_unit,min_number,cancel_info){
+        var str = ""
+        var str_min = ""
+        var total = 0
+        var out_count = 0
+        var over_count = 0
+        var cancel_count = 0
+        for(let i=0;i<info.length;i++){
+           total += (info[i].warehousing_count * min_number)
+        }
+        
+        for(let j=0;j<info.length;j++){
+           out_count += (info[j].stock_max_number + info[j].stock_min_number)
+        }
+       
+        for(let z=0;z<cancel_info.length;z++){
+           cancel_count += cancel_info[z].count
+        }
+        over_count = total - out_count + cancel_count
+    
+        if(parseInt(over_count/min_number)!=0){
+            str = parseInt(over_count/min_number)+ max_unit
+         }
+         if(over_count%min_number !=0){
+           str_min =  over_count%min_number + min_unit
+         }
+       return str+str_min
       }
     },
     created() {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -164,34 +164,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="生产厂家" width="140" align="center">
-            <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
-                <el-option
-                  v-for="(option, index) in manufacturerList"
-                  :key="index"
-                  :label="option.manufacturer_name"
-                  :value="option.id">
-                </el-option>
-               </el-select>
-            </template>
-          </el-table-column>
- 
-
-          <el-table-column label="生产日期" width="180" align="center">
-            <template slot-scope="scope">
-              <el-date-picker
-                prefix-icon="el-icon-date"
-                style="width: 145px"
-                v-model="scope.row.product_date"
-                type="date"
-                placeholder="选择日期时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
-            </template>
-          </el-table-column>
-          <el-table-column  width="180" align="center">
+           <el-table-column  width="180" align="center">
              <template slot="header" slot-scope="scope">
               <span>有效日期<span style="color: red">*</span></span>
             </template>
@@ -212,6 +185,34 @@
             </template>
           </el-table-column>
 
+      
+          <el-table-column label="生产日期" width="180" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+         
+         <el-table-column label="生产厂家" width="140" align="center">
+            <template slot-scope="scope">
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+ 
 
       <el-table-column label="经销商" width="140" align="center">
           <template slot-scope="scope">

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -29,6 +29,7 @@
               <td style="line-height:18px;" width="80">批号</td>
               <td style="line-height:18px;" width="120">生产日期</td>
               <td style="line-height:18px;" width="120">有效日期</td>
+              <td style="line-height:18px;" width="120">入库日期</td>
               <td style="line-height:18px;" width="60">质检<br>意见</td>
               <td style="line-height:18px;" width="60">验收<br>结论</td>
             </tr>
@@ -57,6 +58,7 @@
               <td style="line-height:18px">{{ item.batch_number }}</td>
               <td style="line-height:18px">{{ getTime(item.product_date,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">{{ getTime(item.expiry_date,'{y}-{m}-{d}')}}</td>
+              <td style="line-height:18px">{{ getTime(it.ctime,'{y}-{m}-{d}')}}</td>
               <td style="line-height:18px">正常<br>入库</td>
               <td style="line-height:18px">合格</td>
             </tr>

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -226,17 +226,26 @@
               {{ calculate(scope.row.last_price * scope.row.warehousing_count) }} 
             </template>
           </el-table-column>
-         
-          <el-table-column label="生产厂家" width="140" align="center">
+    
+
+         <el-table-column  width="180" align="center">
+             <template slot="header" slot-scope="scope">
+              <span>有效日期<span style="color: red">*</span></span>
+            </template>
             <template slot-scope="scope">
-               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
-                <el-option
-                  v-for="(option, index) in manufacturerList"
-                  :key="index"
-                  :label="option.manufacturer_name"
-                  :value="option.id">
-                </el-option>
-               </el-select>
+              <el-form-item   :prop="'recordData.' + scope.$index + '.expiry_date'"
+                :rules="tableRules.expiry_date"
+                style="padding-top: 20px">
+                <el-date-picker
+                  prefix-icon="el-icon-date"
+                  style="width: 145px"
+                  v-model="scope.row.expiry_date"
+                  type="date"
+                  placeholder="选择日期时间"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+              </el-form-item>
             </template>
           </el-table-column>
 
@@ -254,20 +263,20 @@
             </template>
           </el-table-column>
 
-
-         <el-table-column label="有效日期" width="180" align="center">
+             
+          <el-table-column label="生产厂家" width="140" align="center">
             <template slot-scope="scope">
-              <el-date-picker
-                prefix-icon="el-icon-date"
-                style="width: 145px"
-                v-model="scope.row.expiry_date"
-                type="date"
-                placeholder="选择日期时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
+               <el-select v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
             </template>
           </el-table-column>
+       
 
           <el-table-column label="经销商" width="140" align="center">
             <template slot-scope="scope">
@@ -399,8 +408,10 @@ export default {
         warehousing_count: [
           { required: true, message: "数量不能为空", trigge: "blur" }
         ],
-
-        good_id: [{ validator: checkGoodId, trigger: "blur" }]
+        good_id: [{ validator: checkGoodId, trigger: "blur" }],
+        expiry_date:[
+         {required:true,message:'有效日期不能为空',trigger:'blur'}
+        ],
       },
 
       total: "",

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -709,6 +709,10 @@ export default {
       }
       const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_sys == 1){
+          this.$message.error("自动出库数据不能删除!")
+          return false
+        }
         if(this.selectedTableData[i].is_sys == 0){
           ids.push(this.selectedTableData[i].id);
         }

src/xt_pages/stock/drugs/inventory.vue

@@ -186,7 +186,7 @@ export default {
             index:"",
             unitList:[],
             reasonList:[
-              {id:0,name:"默认"},
+              {id:6,name:"默认"},
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
@@ -293,7 +293,7 @@ export default {
                    list[i].last_stock_min_number = ""
                    list[i].min_number = list[i].XtBaseDrug.min_number
                    list[i].manufacturer_name  = ""
-                   list[i].type = 0
+                   list[i].type = 6
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){
                         list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name
@@ -530,8 +530,6 @@ export default {
            var params = {
               tableData:this.tableData
            }
-          //  console.log("parasm222",params)
-           
           saveDrugInventory(params).then(response=>{
             if(response.data.state == 1){
               var msg = response.data.data.msg
@@ -550,16 +548,14 @@ export default {
             start_time:this.start_time,
             end_time:this.end_time,
           }
-          // console.log("params2332332",params)
           getDrugInventoryList(params).then(response=>{
 
             if(response.data.state == 1){
               this.total =  response.data.data.total
               this.tableList = response.data.data.list
-              // console.log("09999999",this.tableList)
-              // console.log("表格",this.tableList)
+             
               this.doctorList =  response.data.data.doctorList
-              // console.log("医生",this.doctorList)
+              
 
             }
           })

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -139,7 +139,7 @@ export default {
               page:this.page,
               keyword:this.searchKey,
             }
-           console.log("parasm232332323",params)
+        
           getInventoryDetailList(params).then(response=>{
              if(response.data.state == 1){
               this.total =  response.data.data.total
@@ -150,7 +150,7 @@ export default {
           })   
         },
          getTime(val) {
-          console.log("val3233232322323",val)
+         
          if(val == undefined){
            return  ""
          }

src/xt_pages/stock/drugs/query.vue

@@ -112,22 +112,26 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+             <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
                 <span>
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
                 </span>
              </span>
-             <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
+             <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span> -->
+              <span>
+                 {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
+              </span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+               <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
                </span>
 
-               <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
+               <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span> -->
+                {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
             </div>
            </template>
         </el-table-column>
@@ -198,7 +202,7 @@ import { min } from 'moment'
       this.drugTypeList.push(...drugTypeList)
       this.org_id =  this.$store.getters.xt_user.org.id
       console.log("机构ID",this.org_id)
-      this.getDrugCountList()
+      // this.getDrugCountList()
 
 
     },
@@ -363,12 +367,10 @@ import { min } from 'moment'
       handleSizeChange(val) {
         this.limit = val
         this.getlist()
-        this.getDrugCountList()
       },
       handleCurrentChange(val) {
         this.page = val
         this.getlist()
-        this.getDrugCountList()
       },
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
@@ -429,7 +431,6 @@ import { min } from 'moment'
       },
       search: function() {
         this.getlist()
-        this.getDrugCountList()
       },
       setting: function() {
         this.$refs.dialog.show()
@@ -441,7 +442,7 @@ import { min } from 'moment'
            this.tableList[i].drug_type_name = this.getDrugType(this.tableList[i].drug_type)
            this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number+this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
            this.tableList[i].manufacturer_name = this.getManufacturerList(this.tableList[i].manufacturer)
-
+        
           this.tableList[i].inCount =  this.getWarehoseInfo(this.tableList[i].drug_warehouse_info)
           this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
@@ -804,16 +805,16 @@ import { min } from 'moment'
         for(let i=0;i<info.length;i++){
            total += (info[i].warehousing_count * min_number)
         }
-        console.log("total232323232332323223",total)
+        
         for(let j=0;j<info.length;j++){
            out_count += (info[j].stock_max_number + info[j].stock_min_number)
         }
-        console.log("剩余库存",out_count)
+       
         for(let z=0;z<cancel_info.length;z++){
            cancel_count += cancel_info[z].count
         }
         over_count = total - out_count + cancel_count
-        console.log("hh233223232322323232323322332",over_count)
+    
         if(parseInt(over_count/min_number)!=0){
             str = parseInt(over_count/min_number)+ max_unit
          }

src/xt_pages/stock/inventory.vue

@@ -181,7 +181,7 @@ export default {
          id:0,
          numberList:[],
          reasonList:[
-          {id:0,name:"默认"},
+          {id:6,name:"默认"},
           {id:1,name:"到期退货"},
           {id:2,name:"异常退货"},
           {id:3,name:"退货"},
@@ -420,7 +420,7 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            for(let i=0;i<list.length;i++){
-              list[i].type = 0
+              list[i].type = 6
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               for(let j=0;j<this.manufacturerList.length;j++){
@@ -549,7 +549,7 @@ export default {
         if(response.data.state == 1){
            var inventory = response.data.data.inventory
            this.$message.success("保存成功")
-           
+           this.WarehouseList = []
            this.tableData = []
         }
       })

src/xt_pages/stock/inventoryDetails.vue

@@ -16,6 +16,9 @@
                 icon="el-icon-search"
                 @click="search">搜索</el-button>
             </div>
+            <div>
+              <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
+            </div>
             <!-- <div>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary" @click="exportList">导出</el-button>
@@ -53,14 +56,14 @@
            
             <el-table-column prop="name" label="盘盈类型"  width="100" align="center">
                 <template slot-scope="scope">
-                   <span v-if="scope.row.count > scope.row.last_stock_count">盘盈</span>
-                   <span v-if="scope.row.count < scope.row.last_stock_count">盘亏</span>
+                   <span v-if="scope.row.stock_count > scope.row.last_stock_count">盘亏</span>
+                   <span v-if="scope.row.stock_count < scope.row.last_stock_count">盘盈</span>
                 </template>
             </el-table-column>
            
             <el-table-column prop="name" label="盘点原因" width="230" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.inventory_type ==0">默认</span>
+                <span v-if="scope.row.inventory_type ==6">默认</span>
                 <span v-if="scope.row.inventory_type ==1">到期退货</span>
                 <span v-if="scope.row.inventory_type ==2">异常退货</span>
                 <span v-if="scope.row.inventory_type ==3">退货</span>
@@ -87,6 +90,7 @@
 <script>
 import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/stock"
+
 export default {
     name: "inventory",
     data() {
@@ -182,6 +186,9 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
        },
+      inventoryExportList(){
+        this.$router.push({path:'/stock/inventoryPrint'})
+      }
     },
     created(){
       this.getlist()

src/xt_pages/stock/inventoryPrint.vue

@@ -10,41 +10,34 @@
         </div>
         <div class="app-container" style="background-color: white;">
             <div id="print_content">
-                <div class="printTitle">库存盘点核单数</div>
-                <div style="float:right;">调价日期：{{getTime(this.tableData[0].start_time)}}</div>
+              
                 <table class="printTable" border="1">
                     <tr>
                         <td>序号</td>
-                        <td>耗材名称</td>
+                        <td>名称</td>
                         <td>规格</td>
+                        <td>批号</td>
+                        <td>生产日期</td>
+                        <td>有效日期</td>
+                        <td>生产企业</td>
+                        <td>国药准字</td>
                         <td>单位</td>
-                        <td>零售价</td>
-                        <td>当前库存</td>
-                        <td>盘点数</td>
-                        <td>亏损金额</td>
+                        <td>库存量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
                         <td>{{index+1}}</td>
                         <td>{{item.good_name}}</td>
                         <td>{{item.specification_name}}</td>
+                        <td>{{item.number}}</td>
+                        <td>{{getTime(item.product_date)}}</td>
+                        <td>{{getTime(item.expiry_date)}}</td>
+                        <td>{{getManufacturerName(item.manufacturer)}}</td>
+                        <td>{{item.remark}}</td>
                         <td>{{item.warehousing_unit}}</td>
-                        <td>{{item.packing_price}}</td>
-                        <td></td>
-                        <td>{{item.count}}</td>
                         <td></td>
                     </tr>
                 </table>
-                <div style="margin-top:10px;">
-                    <span>合计：库存金额</span>
-                    <span>    库存盘点金额：亏损总计</span>
-                </div>
-                <div style="display:flex;float:right;margin-top:10px;border-top:1px solid #000;padding-top:10px;width:100%;">
-                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
-                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></div>
-                    <div style="width:50px;">会计：</div><div style="width:100px;"></div>
-                    <div style="width:50px;">审核：</div><div style="width:100px;"></div>
-                    <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
-                </div>
+               
             </div>
         </div>
     </div>
@@ -54,7 +47,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
-import { getInventoryPrintList } from "@/api/stock"
+import { getInventoryExportList } from "@/api/stock"
 export default {
     components:{
         BreadCrumb
@@ -68,6 +61,7 @@ export default {
           ],
           ids:"",
           tableData:[],
+          manufacturerList:[],
         }
     },
     methods:{
@@ -81,18 +75,6 @@ export default {
             scanStyles: false
             })
         },
-        
-        getInventoryPrintList(){
-            var params = {
-                ids:this.ids,
-            }
-         getInventoryPrintList(params).then(response=>{
-           if(response.data.state == 1){
-             var list = response.data.data.list
-             this.tableData = list
-           }
-         })
-        },
         getTime(val) {
          if(val < 0){
             return ""
@@ -103,11 +85,28 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
         },
-
+        getlist(){
+         getInventoryExportList().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list233233232323",list)
+             this.tableData = list
+             this.manufacturerList = response.data.data.manufacturerList
+           }
+         })
+        },
+        getManufacturerName(id){
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
+        }
     },
     created(){
-      this.ids  = this.$route.query.ids
-      this.getInventoryPrintList()
+      this.getlist()
     }
 }
 </script>

src/xt_pages/stock/stockDamaged.vue

@@ -348,7 +348,7 @@
 
               <el-table-column prop="address" label="盘点原因" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.inventory_type == 0">默认</span> 
+                  <span v-if="scope.row.inventory_type == 6">默认</span> 
                   <span v-if="scope.row.inventory_type == 1">到期退货</span> 
                   <span v-if="scope.row.inventory_type == 2">异常退货</span> 
                   <span v-if="scope.row.inventory_type == 3">退货</span> 
@@ -433,7 +433,7 @@ export default {
             damageList:[],
             modifyDialogVisible:false,
             reasonList:[
-              {id:0,name:"默认"},
+              {id:6,name:"默认"},
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
@@ -479,7 +479,7 @@ export default {
         if (response.data.state == 1) {
         
             var list = response.data.data.list
-            console.log("列表数据",list)
+           
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
@@ -584,8 +584,7 @@ export default {
               this.tableData[i].dealer = ""   
            }
          }
-         console.log("比阿哥",this.tableData)
-         console.log("numberlist",this.numberList)
+
          for(let i=0;i<this.tableData.length;i++){
            this.tableData[i].count =  parseInt(this.tableData[i].count)
            this.tableData[i].expiry_date = parseInt(this.tableData[i].expiry_date)
@@ -601,8 +600,7 @@ export default {
           var params = {
             tableData:this.tableData,
           }
-          console.log("params",params)
-       
+        
         saveReportStock(params).then(response=>{
            if(response.data.state == 1){
              var msg = response.data.data.msg
@@ -644,17 +642,16 @@ export default {
           limit:this.limit,
           page:this.page,
          }
-         console.log("param23223232322323",params)
        getReportStockList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("list",list)
+     
             this.total = response.data.data.total
             this.tableList = list
            var doctorlist = response.data.data.doctorlist
            this.doctorList = doctorlist
            var damageList =  response.data.data.damageList
-           console.log("datamagelist",damageList)
+          
           this.damageList = damageList
           }
        })   
@@ -697,7 +694,7 @@ export default {
       getStockBatchNumber(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("批号列表",list)
+         
           this.numberList = list
         }
       })
@@ -710,7 +707,7 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            this.form.total =  list.stock_count
-           console.log("list23232",list)
+          
          }
       })
      },
@@ -723,8 +720,7 @@ export default {
        this.getlist()
      },
      chageNumberlist(val){
-       console.log("val2323322",val)
-       
+      
        for(let i=0;i<this.numberList.length;i++){
          if(this.numberList[i].number == val){
             this.form.warehousing_info_id = this.numberList[i].id
@@ -739,7 +735,7 @@ export default {
         getWarehouseTotal(params).then(response=>{
           if(response.data.state == 1){
             var list =  response.data.data.list
-            console.log("档期批次库促",list)
+        
             this.form.total = list.stock_count
           }
         })
@@ -753,20 +749,22 @@ export default {
         }
         return count
       },
-      changeReason(){
-
+      changeReason(val){
+        this.form.type = val
+        this.toDamagedDetail(this.good_id)
       },
       toDamagedDetail(good_id){
+         this.good_id = good_id
           var params = {
             good_id:good_id,
             warehousing_order:this.form.warehousing_order,
             type:this.form.type,
           }
-          console.log("para2233232",params)
+    
          getDamageDetailByGoodId(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
-              console.log("list233232",list)
+             
               if (list.length>0){
                 this.modifyDialogVisible = true
                 this.good_name = list[0].good_name

src/xt_pages/stock/stockInOrderAdd.vue

@@ -128,29 +128,6 @@
               {{calculate(scope.row.price*scope.row.warehousing_count)}}
             </template>
           </el-table-column>
-          
-          <el-table-column label="生产厂家" align="center" width="150">
-             <template slot-scope="scope">
-               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
-                <el-option
-                  v-for="(option, index) in manufacturerList"
-                  :key="index"
-                  :label="option.manufacturer_name"
-                  :value="option.id">
-                </el-option>
-               </el-select>
-            </template>
-          </el-table-column>
-        
-          <el-table-column label="生产日期" align="center" width="180">
-            <template slot-scope="scope">
-              <el-date-picker prefix-icon="el-icon-date" v-model="scope.row.product_date" style="width: 145px"
-                              type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
-                              value-format="yyyy-MM-dd">
-              </el-date-picker>
-
-            </template>
-          </el-table-column>
           <el-table-column  align="center" width="180">
             <template slot="header" slot-scope="scope">
               <span>有效日期<span style="color: red">*</span></span>
@@ -165,6 +142,30 @@
              </el-form-item>
             </template>
           </el-table-column>
+        
+        
+          <el-table-column label="生产日期" align="center" width="180">
+            <template slot-scope="scope">
+              <el-date-picker prefix-icon="el-icon-date" v-model="scope.row.product_date" style="width: 145px"
+                              type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd">
+              </el-date-picker>
+
+            </template>
+          </el-table-column>
+       
+         <el-table-column label="生产厂家" align="center" width="150">
+             <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in manufacturerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
 
          <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -39,6 +39,7 @@
                                     <td style="line-height:18px;" width="80">批号</td>
                                     <td style="line-height:18px;" width="120">生产日期</td>
                                     <td style="line-height:18px;" width="120">有效日期</td>
+                                    <td style="line-height:18px;" width="120">入库日期</td>
                                     <td style="line-height:18px;" width="60">质检<br>意见</td>
                                     <td style="line-height:18px;" width="60">验收<br>结论</td>
                                 </tr>
@@ -56,6 +57,7 @@
                                     <td style="line-height:18px;">{{ item.number }}</td>
                                     <td style="line-height:18px;">{{ getTime(item.product_date) }}</td>
                                     <td style="line-height:18px;">{{ getTime(item.expiry_date) }}</td>
+                                    <td style="line-height:18px;">{{ getTime(item.ctime) }}</td>
                                     <td style="line-height:18px;">正常<br>入库</td>
                                     <td style="line-height:18px;">合格</td>
                                 </tr>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -212,7 +212,38 @@
               {{ calculate(scope.row.price * scope.row.warehousing_count) }}
             </template>
           </el-table-column>
-          <el-table-column label="生产厂家" align="center" width="150">
+
+         <el-table-column  align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <span>有效日期<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item  :prop="'recordData.' + scope.$index + '.expiry_date'"
+                :rules="tableRules.expiry_date">
+                <el-date-picker prefix-icon="el-icon-date" style="width: 145px" v-model="scope.row.expiry_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+             </el-form-item>
+            </template>
+          </el-table-column>
+         
+
+          <el-table-column label="生产日期" width="180" align="center">
+            <template slot-scope="scope">
+              <el-date-picker
+                prefix-icon="el-icon-date"
+                style="width: 145px"
+                v-model="scope.row.product_date"
+                type="date"
+                placeholder="选择日期时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </template>
+          </el-table-column>
+
+           <el-table-column label="生产厂家" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.manufacturer" filterable placeholder="请选择厂商">
                 <el-option
@@ -238,33 +269,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-
-          <el-table-column label="生产日期" width="180" align="center">
-            <template slot-scope="scope">
-              <el-date-picker
-                prefix-icon="el-icon-date"
-                style="width: 145px"
-                v-model="scope.row.product_date"
-                type="date"
-                placeholder="选择日期时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
-            </template>
-          </el-table-column>
-          <el-table-column label="有效日期" width="180" align="center">
-            <template slot-scope="scope">
-              <el-date-picker
-                prefix-icon="el-icon-date"
-                style="width: 145px"
-                v-model="scope.row.expiry_date"
-                type="date"
-                placeholder="选择日期时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
-            </template>
-          </el-table-column>
+        
            <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope">
               <span>批准文号</span>
@@ -394,7 +399,10 @@ export default {
           { required: true, message: "数量不能为空", trigge: "blur" }
         ],
 
-        good_id: [{ validator: checkGoodId, trigger: "blur" }]
+        good_id: [{ validator: checkGoodId, trigger: "blur" }],
+        expiry_date:[
+         { required: true, message: '有效日期不能为空', trigge: 'blur' }
+        ],
       },
 
       total: "",

src/xt_pages/stock/stockOutOrder.vue

@@ -1012,6 +1012,10 @@ export default {
       }
       const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_sys == 1){
+          this.$message.error("自动出库数据不能删除!")
+          return false
+        }
          if(this.selectedTableData[i].is_sys == 0){
            ids.push(this.selectedTableData[i].id);
          }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -118,24 +118,7 @@
             </template>
           </el-table-column>
           
-          <!-- <el-table-column  width="150" align="center">
-             <template slot="header" slot-scope="scope">
-              <span>批号<span style="color: red">*</span></span>
-            </template>
-            <template slot-scope="scope">
-              <el-form-item  
-                :rules="tableRules.number">
-                <el-select v-model="scope.row.number" filterable placeholder="请选择" @change="changeNumberList(scope.row,scope.$index)">
-                  <el-option
-                    v-for="(item,index) in numberList"
-                    :key="index"
-                    :label="item.number"
-                    :value="item.id">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column> -->
+      
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
@@ -463,7 +446,6 @@ export default {
       tempObj["product_date"] = ""
       tempObj["license_number"] = ""
       tempObj["warehouse_info_id"] = 0
-     
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -784,6 +766,7 @@ export default {
     tempObj["dealer"] = ""
     tempObj["license_number"] = ""
     tempObj["warehouse_info_id"] = 0
+    
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -222,13 +222,13 @@ export default {
             return false
           } else {
             this.list = [];
-        
+
             for (let i = 0; i < response.data.data.list.length; i++) {
 
-              
+
               this.list.push(response.data.data.list[i])
             }
-          
+
           }
         })
       },
@@ -256,7 +256,7 @@ export default {
          for(let i=0;i<this.orderList.length;i++){
           if(this.orderList[i].warehouse_out_id == warehouse_out_id && this.orderList[i].good_id == good_id){
              count += this.orderList[i].count
-          } 
+          }
          }
          return count
       },
@@ -308,7 +308,7 @@ export default {
           return uParseTime(val, '{y}-{m}-{d}')
          }
       },
-     
+
       GetOrderDetailOne(id){
         const params = {
           'id': id
@@ -334,7 +334,7 @@ export default {
         })
      },
      getAllPice(id){
-        var  total_price = 0 
+        var  total_price = 0
         for(let i=0;i<this.orderList.length;i++){
           if(id == this.orderList[i].warehouse_out_id){
              total_price += this.orderList[i].count * this.orderList[i].price

src/xt_pages/stock/stockPrint.vue

@@ -42,13 +42,18 @@
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
                                    <td>
-                                        {{getAutoCount(item.id) + getOutCount(item.id)}}
-                                       <!-- <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info) - getOverplus(item.xt_warehouse_info) - getCancelInfo(item.cancel_stock_info)}}{{item.packing_unit}}</span> -->
+                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245">
+                                        <span>
+                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info) }}
+                                          </span>
+                                        </span>
+                                        <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
                                    </td>
                                   
                                    <td>
-                                     <span v-if="getWareInfo(item.xt_warehouse_info) > 0">{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span> 
-                                     <!-- <span v-if="getOverplus(item.xt_warehouse_info)>0">{{getOverplus(item.xt_warehouse_info)}}{{item.packing_unit}}</span>   -->
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245">{{getOverFlushInfo(item.xt_warehouse_info)}}</span>
+                                     <span v-else>{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span>
+                                    
                                    </td>
                                 </tr>
                             </tbody>
@@ -97,6 +102,7 @@ export default {
           outCountList:[],
           autoCountList:[],
           cancelCountList:[],
+          org_id:0,
         }
     },
     methods:{
@@ -122,10 +128,10 @@ export default {
         getAllStockList(params).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("list22222",list)
+          //  console.log("list22222",list)
            this.tableList = list
            var total = response.data.data.total
-           console.log("total",total)
+          //  console.log("total",total)
            this.total = total
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
@@ -199,16 +205,16 @@ export default {
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var count = response.data.data.count
-           console.log("入库统计",count)
+          //  console.log("入库统计",count)
            this.countList = count
            var outlist = response.data.data.outList
-           console.log("出库数量",outlist)
+          //  console.log("出库数量",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-           console.log("autoCount",autoCount)
+          //  console.log("autoCount",autoCount)
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-           console.log("totalcount",totalCount)
+          //  console.log("totalcount",totalCount)
            this.cancelCountList = totalCount
          }
       })
@@ -290,9 +296,31 @@ export default {
        total = ""
      }
      return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+   getCancelSotckInfo(arr){
+     console.log("2332323232322332",arr)
+     var cancle_toal = 0
+     if(arr.length >0){
+      for(let z=0;z<arr.length;z++){
+        cancle_toal += arr[z].count
+      }
+     }
+     console.log("total",cancle_toal)
+     return cancle_toal
    }
-    },
+   },
     created(){
+      this.org_id =  this.$store.getters.xt_user.org_id
+      console.log("机构ID232323323233232",this.org_id)
       var starttime =  this.$route.query.start_time
       this.start_time = starttime
       var endtime =  this.$route.query.end_time

src/xt_pages/stock/stockQuery.vue

@@ -341,12 +341,19 @@ export default {
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
-           this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
-          if(this.getWareInfo(this.tableList[i].xt_warehouse_info) > 0){
-            this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
+
+        
+          if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
+             this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
           }else{
-             this.tableList[i].overplus = 0
+            this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
           }
+          
+           if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
+              this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
+           }else{
+             this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
+           }
 
          }
          const data = this.formatJson(filterVal, this.tableList)
@@ -406,7 +413,7 @@ export default {
     getAllStockList(params).then(response=>{
          if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("总库存数量",list)
+          // console.log("总库存数量",list)
           this.tableList = list
           var total = response.data.data.total
           this.total = total

src/xt_pages/user/doctorAdvice.vue

@@ -168,7 +168,7 @@
           align="center"
         >
           <template slot-scope="scope">
-            <span v-if="org_id == 10215">{{ scope.row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
+            <span v-if="org_id == 10215">{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
             <span v-else>{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
           </template>
         </el-table-column>
@@ -341,6 +341,17 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          label="医嘱状态"
+          width="180"
+          property="stop_time"
+          align="center"
+        >
+          <template slot-scope="scope">
+             <span v-if="scope.row.stop_state == 1">已停止</span>
+             <span v-if="scope.row.stop_state == 2">未停止</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="终止时间"
           width="180"
@@ -4344,14 +4355,16 @@ export default {
     },
     // 获取勾选中的行
     getPrintInfo(ids) {
-      getPrintInfo({ ids: ids }).then(response => {
+      getPrintInfo({ ids: ids}).then(response => {
         if (response.data.state === 1) {
           var doctoradvice = response.data.data.doctoradvice;
-          // console.log("doctoradvice", doctoradvice);
+          console.log("doctoradvice", doctoradvice);
+         
           this.dataAdvice = doctoradvice;
           if (this.adviceType === 3 || this.adviceType === 2 || this.adviceType == 4) {
+           
             this.lstableData = this.dataAdvice;
-            // console.log("---", this.multipleSelection);
+            
           } else if (this.adviceType === 1) {
             this.cqtableData = doctoradvice;
           }