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

src/api/supply.js

@@ -275,11 +275,12 @@ export function updatesupply(data) {
   })
 }
 
-// export function updatesupply(data) {
+
+// export function getsupplytype(params) {
 //   return request({
-//     url: '/api/supply/updatesupply' ,
-//     method: 'post',
-//     data: data
+//     url: '/api/supply/getsupplytype' ,
+//     method: 'get',
+//     params: params
 //   })
 // }
 

src/xt_pages/hospitalStation/allListPrint.vue

@@ -153,7 +153,7 @@
               if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
                 obj['name'] = details[a].advice.advice_name;
                 obj['spec'] = details[a].advice.drug.drug_spec;
-                obj['unit'] = details[a].advice.drug.max_unit;
+                obj['unit'] = details[a].advice.drug.min_unit;
 
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type);
                 obj['price'] = parseFloat(details[a].pric);

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

@@ -29,9 +29,9 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="day" width="50" label="天数">
-        <template slot-scope="scope">{{scope.row.day}}天</template>
-      </el-table-column>
+<!--      <el-table-column align="center" prop="day" width="50" label="天数">-->
+<!--        <template slot-scope="scope">{{scope.row.day}}天</template>-->
+<!--      </el-table-column>-->
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
@@ -150,14 +150,14 @@
 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="50" label="天数">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-          {{scope.row.number_days}}天
+<!--      <el-table-column align="center" prop="number_days" width="50" label="天数">-->
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash;<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>&ndash;&gt;-->
+<!--          {{scope.row.number_days}}天-->
 
-        </template>
+<!--        </template>-->
 
-      </el-table-column>
+<!--      </el-table-column>-->
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2752,11 +2752,21 @@ export default {
       //   return
       // }
 
+      let isAdd = true
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        if(this.prescriptions[i].order_status == 4 || this.prescriptions[i].order_status == 2){
+          isAdd = false
+        }
+      }
+      if(!isAdd){
+        this.$message.error("该患者已经上传明细或者已经结算,无法新增药品或耗材")
+        return
+      }
+
       if (this.curStatus == 1 && this.rightTab == 2) {
         this.$message.error('改处方是药品，无法添加项目')
         this.teamList = []
         this.$refs.tables.clearSelection()
-
         return
       }
 
@@ -2807,6 +2817,9 @@ export default {
       //   }
       // }
 
+
+
+
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].name == this.editableTabsValue) {
           var temp = this.deepClone(this.curDrugs)

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -142,11 +142,11 @@
             >撤销出院
             </el-button>
 
-            <el-button
+            <el-buttonsu
                 v-if="(this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
                 size="small" @click="open(7)" type="primary"
             >撤销入院
-            </el-button>
+            </el-buttonsu>
 
           </div>
 

src/xt_pages/hospitalStation/summary.vue

@@ -12,19 +12,15 @@
                                @click="searchAction">
                         搜索
                     </el-button>
-                    <el-select size="small" v-model="admin_user_id" placeholder="请选择"
-                               style="width:150px;margin-left:10px;" @change="changeDoctor">
-                        <el-option
-                                label="全部"
-                                value="0">
-                        </el-option>
-                        <el-option
-                                v-for="item,index in doctors"
-                                :key="index"
-                                :label="item.user_name"
-                                :value="item.admin_user_id">
-                        </el-option>
-                    </el-select>
+                  <el-select size="small" v-model="sort_type" placeholder="请选择"
+                             style="width:150px;margin-left:10px;" @change="changeSortType">
+                    <el-option
+                        v-for="(item,index) in sort_types"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                  </el-select>
                     <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
                                     @change="handleStartTimeChange" :editable="false" :clearable="false"
                                     style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
@@ -50,7 +46,7 @@
                       <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
                     </el-popover> -->
-                    <el-button size="small" type="primary" @click="export_detail" v-loading="loading">报表下载</el-button>
+                    <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
                 </div>
             </div>
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
@@ -104,35 +100,34 @@
                 <el-table-column align="center" prop="name" label="操作">
                     <template slot-scope="scope">
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-                        <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || ($store.getters.xt_user.org_id == 9990) ">
+                        <el-button size="mini" type="primary" @click="toPrint(scope.row)">
                             结算单
                         </el-button>
-                        <el-button size="mini" type="primary" @click="toRefund(scope.row)">
-                            退费
-                        </el-button>
+<!--                        <el-button size="mini" type="primary" @click="toRefund(scope.row)">-->
+<!--                            退费-->
+<!--                        </el-button>-->
                         <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
                                    v-if="scope.row.order_status == 2 && scope.row.result.id == 0">
                             上传结算清单
                         </el-button>
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>
 
-                        <el-button size="mini" type="primary" @click="refundOne(scope.row)">
-                            撤销出院
-                        </el-button>
+<!--                        <el-button size="mini" type="primary" @click="refundOne(scope.row)">-->
+<!--                            撤销出院-->
+<!--                        </el-button>-->
 
                         <!--<el-button size="mini" type="primary" @click="refundTwo(scope.row)" v-if="scope.row.his_hospital_patient.balance_accounts_type == 2">-->
                             <!--撤销明细-->
                         <!--</el-button>-->
 
-                        <el-button size="mini" type="primary" @click="refundTwo(scope.row)" v-if="scope.row.his_hospital_patient.balance_accounts_type != 2">
-                            撤销明细
-                        </el-button>
+<!--                        <el-button size="mini" type="primary" @click="refundTwo(scope.row)" v-if="scope.row.his_hospital_patient.balance_accounts_type != 2">-->
+<!--                            撤销明细-->
+<!--                        </el-button>-->
 
 
-                        <el-button size="mini" type="primary" @click="refundThee(scope.row)">
-                            撤销入院
-                        </el-button>
+<!--                        <el-button size="mini" type="primary" @click="refundThee(scope.row)">-->
+<!--                            撤销入院-->
+<!--                        </el-button>-->
                     </template>
                 </el-table-column>
             </el-table>
@@ -251,11 +246,21 @@
         invoiceVisible: false,
         paramsObj: {},
         invoiceParams: {},
-        settlementVisible: false
+        settlementVisible: false,
+        sort_type:1,
+        sort_types: [
+          { value: 1, label: '处方时间' },
+          { value: 2, label: '结算时间' }
+        ],
 
       }
     },
     methods: {
+      changeSortType(){
+        this.page = 1
+        this.keywords = ''
+        this.getHisOrderList()
+      },
       refundOne(row) {
         if(row.his_hospital_patient.balance_accounts_type == 2){
           var that = this
@@ -455,7 +460,7 @@
       },
       uploadInfo(row) {
         var that = this
-        axios.get('http://127.0.0.1:9532/api/settlelist/get', {
+        axios.get('http://127.0.0.1:9532/api/settlelisthosptial/get', {
           params: {
             order_id: row.id,
             admin_user_id: this.$store.getters.xt_user.user.id
@@ -611,7 +616,7 @@
               let department = ''
               let doctor_name = ''
               let balance_accounts = ''
-
+              let charge_name = ''
               let order_status = ''
 
               if (order.his_patient != null && order.his_patient.number.length > 0) {
@@ -751,7 +756,9 @@
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.admin_user_id,
-          p_type: 1
+          p_type: 1,
+          sort_type: this.sort_type
+
         }
         getHisOrderList(params).then(response => {
           if (response.data.state == 0) {

src/xt_pages/hospitalStation/summaryDetail.vue

@@ -43,13 +43,7 @@
                             <el-table-column align="center" prop="execution_frequency" width="90" label="频率">
                                 <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
                             </el-table-column>
-                            <el-table-column align="center" prop="number_days" width="60" label="天数">
-                                <template slot-scope="scope">
-                                    <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-                                    {{scope.row.day}}天
 
-                                </template>
-                            </el-table-column>
                             <el-table-column align="center" prop="total" width="60" label="总量">
                                 <template slot-scope="scope">{{scope.row.count}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</template>
                             </el-table-column>
@@ -111,18 +105,15 @@
                         <li style="width:50%;">电话：{{patientInfo.phone}}</li>
                     </ul>
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
-                    <ul class="basicUl">
-                        <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.toFixed(2)}}元</li>
+                    <ul >
+                      <li style="width:30%;">医疗费总额：{{order.medfee_sumamt.toFixed(2) }}元</li>
+                      <li style="width:30%;">基金支付总额：{{order.fund_pay_sumamt.toFixed(2)}}元</li>
+                      <li style="width:30%;">基本医疗保险统筹基金支出：{{order.hifp_pay}}元</li>
+                      <li style="width:30%;">医疗救助基金支出：{{order.maf_pay.toFixed(2)}}元</li>
+                      <li style="width:30%;">个人账户支付金额:{{ order.acct_pay}}</li>
+                      <li style="width:30%;">个人支付金额:{{order.psn_cash_pay.toFixed(2)}}元</li>
                     </ul>
-                    <!--<p class="centerRightTitle">发票费用</p>-->
-                    <!--<ul class="basicUl">-->
-                    <!--<li style="width:100%;">西药费：0.00元</li>-->
-                    <!--</ul>-->
+
                 </div>
             </div>
         </div>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -14,7 +14,7 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
     </div>
   </div>
 </template>
@@ -37,7 +37,8 @@
         list: [],
         patient: {},
         order: {},
-        admin: {}
+        admin: {},
+        his_hospital:{},
       }
     },
 
@@ -60,6 +61,7 @@
             this.order = response.data.data.order
             this.patient = response.data.data.patient
             this.admin = response.data.data.admin_info
+            this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
 
             //获取所有项目类型进行去重

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

@@ -1,174 +1,189 @@
 <template>
-    <div id="allList-print" class="allList-print">
-        <div v-for='(i,index) in pageArr.length' :key="index">
-            <div class="allListTitle">{{$store.getters.xt_user.org.org_name}}费用汇总</div>
-            <div class="allListInfo">
-            <div>患者姓名：{{patient.name}}</div>
-            <div>透析号：{{patient.dialysis_no}}</div>
-            <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
-            <div>年龄：{{patient.age}}  岁</div>
-            <div>日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
-
-            </div>
-            <table class="allListTable" border="1">
-                <tr>
-                    <td style="width:10%">类别</td>
-                    <td style="width:50%">项目名称</td>
-                    <td style="width:10%">规格</td>
-                    <td style="width:10%">单价(元)</td>
-                    <td style="width:10%">数量</td>
-                    <td style="width:10%">金额(元)</td>
-                </tr>
-                <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
-                    <tr v-if="item.is_total == 2">
-                        <td style="width:10%">{{item.med_chrgitm_type}}</td>
-                        <td style="width:50%">{{item.name}}</td>
-                        <td style="width:10%">{{item.spec}}</td>
-                        <td style="width:10%">{{(item.price).toFixed(2)}}</td>
-                        <td style="width:10%">{{item.count}}{{item.unit}}</td>
-                        <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
-                    </tr>
-                    <tr>
-                        <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{item.total}}元</td>
-                    </tr>
-                </template>
-            </table>
-            <div class="tableBottom">
-            <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
-            <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
-            <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
-            </div>
+  <div id="allList-print" class="allList-print">
+    <div v-for='(i,index) in pageArr.length' :key="index">
+      <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用汇总</div>
+      <div class="allListInfo">
+        <div>患者姓名：{{ patient.name }}</div>
+        <div>透析号：{{ patient.dialysis_no }}</div>
+        <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
+        <div>年龄：{{ patient.age }} 岁</div>
+        <div v-if="$store.getters.xt_user.org_id  == 0">日期：{{ hospital.in_hosptial_time }} 至
+          {{ hospital.out_hosptial_time }}
         </div>
+        <div v-else>日期：{{ getTimes(order.settle_start_time) }} 至 {{ getTimes(order.settle_end_time) }}</div>
+
+      </div>
+      <table class="allListTable" border="1">
+        <tr>
+          <td style="width:10%">类别</td>
+          <td style="width:50%">项目名称</td>
+          <td style="width:10%">规格</td>
+          <td style="width:10%">单价(元)</td>
+          <td style="width:10%">数量</td>
+          <td style="width:10%">金额(元)</td>
+        </tr>
+        <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
+          <tr v-if="item.is_total == 2">
+            <td style="width:10%">{{ item.med_chrgitm_type }}</td>
+            <td style="width:50%">{{ item.name }}</td>
+            <td style="width:10%">{{ item.spec }}</td>
+            <td style="width:10%">{{ (item.price).toFixed(2) }}</td>
+            <td style="width:10%">{{ item.count }}{{ item.unit }}</td>
+            <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
+          </tr>
+          <tr>
+            <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{ item.total }}元</td>
+          </tr>
+        </template>
+      </table>
+      <div class="tableBottom">
+        <div class="tableBottomOne">制表人：{{ admin.user_name }}</div>
+        <div class="tableBottomOne">制表日期：{{ getNowTime() }}</div>
+        <div class="tableBottomOne">总费用：{{ order.medfee_sumamt }}元</div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-  import { uParseTime } from '@/utils/tools'
+import { uParseTime } from '@/utils/tools'
 
-  export default {
-    props: {
-      list: {
-        type: Array,
-        default: function () {
-          return [];
-        }
-      }, patient: {
-        type: Object,
-        default: function () {
-          return {};
-        }
-      }, order: {
-        type: Object,
-        default: function () {
-          return {};
-        }
-      }, admin: {
-        type: Object,
-        default: function () {
-          return {};
-        }
-      },
-    },
-    data(){
-        return{
-            page:1,
-            pageArr:[],
-        }
-    },
-    methods:{
-      getNowTime: function () {
-        let dateTime
-        let yy = new Date().getFullYear()
-        let mm = new Date().getMonth() + 1
-        let dd = new Date().getDate()
-        let hh = new Date().getHours()
-        let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, patient: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, order: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, hospital: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+
+    }
+  },
+  data() {
+    return {
+      page: 1,
+      pageArr: []
+    }
+  },
+  methods: {
+    getNowTime: function() {
+      let dateTime
+      let yy = new Date().getFullYear()
+      let mm = new Date().getMonth() + 1
+      let dd = new Date().getDate()
+      let hh = new Date().getHours()
+      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
           :
           new Date().getMinutes()
-        let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
           :
           new Date().getSeconds()
-        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
-        return dateTime
-      },
-      getTimes(time) {
-        return uParseTime(time, '{y}-{m}-{d}')
-      },getTotal:function(items){
-        let total = 0
-        for(let i = 0; i < items.length; i++){
-          total = total + (items[i].count * items[i].price).toFixed(2)
-        }
-        return total
-
-      },
-      getPage(){
-        if(this.list.length <= 13){
-            this.page = 1
-            this.pageArr.push(this.list.length)
-        }else if(this.list.length > 13){
-            this.page = parseInt(this.list.length / 13)
-            let num = this.list.length % 13
-            for (var i=0;i<this.page;i++){
-                this.pageArr.push(13)
-            }
-            if(num != 0){
-                this.pageArr.push(num)
-            }
-        }
+      dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+      return dateTime
+    },
+    getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    }, getTotal: function(items) {
+      let total = 0
+      for (let i = 0; i < items.length; i++) {
+        total = total + (items[i].count * items[i].price).toFixed(2)
       }
+      return total
 
     },
-    watch:{
-        list: {
-            handler(newVal) {
-                this.getPage()
-            },
-            deep: true
+    getPage() {
+      if (this.list.length <= 13) {
+        this.page = 1
+        this.pageArr.push(this.list.length)
+      } else if (this.list.length > 13) {
+        this.page = parseInt(this.list.length / 13)
+        let num = this.list.length % 13
+        for (var i = 0; i < this.page; i++) {
+          this.pageArr.push(13)
+        }
+        if (num != 0) {
+          this.pageArr.push(num)
         }
+      }
+    }
+
+  },
+  watch: {
+    list: {
+      handler(newVal) {
+        this.getPage()
+      },
+      deep: true
     }
   }
+}
 
 
 </script>
 
 <style lang="scss" scoped>
-.allList-print{
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-    margin-bottom: 20px;
-    padding:20px 10px;
+.allList-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
 }
-.allListTitle{
-    font-size: 24px;
-    text-align: center;
-    font-weight: bold;
-    margin-bottom: 10px;
+
+.allListTitle {
+  font-size: 24px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
 }
-.allListInfo{
-    display: flex;
-    font-size: 16px;
-    justify-content: space-between;
-    margin: 10px 0;
+
+.allListInfo {
+  display: flex;
+  font-size: 16px;
+  justify-content: space-between;
+  margin: 10px 0;
 }
-.allListTable{
-    width: 100%;
-    text-align: center;
-    border-collapse: collapse;
-    line-height: 40px;
-    font-size: 14px;
-    border-color: #000;
-    text-align: left;
+
+.allListTable {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
 }
+
 .allListTable tr td {
-    padding: 0 5px;
+  padding: 0 5px;
 }
-.tableBottom{
-    font-size: 16px;
-    display: flex;
-    margin-top: 20px;
+
+.tableBottom {
+  font-size: 16px;
+  display: flex;
+  margin-top: 20px;
 }
-.tableBottomOne{
-    margin-right: 40px;
+
+.tableBottomOne {
+  margin-right: 40px;
 }
 </style>

src/xt_pages/outpatientCharges/invoiceTemplate/printThree.vue

@@ -12,7 +12,7 @@
                 <span style="position: absolute;left:80px;top:80px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
                 <!-- <span style="position: absolute;left:630px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(5,7) }}</span>
                 <span style="position: absolute;left:690px;top:40px;">{{ paramsObj.setl_time.split(' ')[0].slice(8,11) }}</span>-->
-            </div> 
+            </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:100px;left:80px;"> {{ paramsObj.name }}</div>
@@ -187,7 +187,7 @@ export default {
             }
 
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-            n += "00";  
+            n += "00";
 
             var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -1,157 +1,147 @@
 <template>
-    <div class="main-contain summaryDetail">
-        <div class="position">
-            <bread-crumb :crumbs='crumbs'></bread-crumb>
-        </div>
-      <el-popover
+  <div class="main-contain summaryDetail">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <el-popover
         placement="bottom"
         width="210"
         trigger="click">
-        <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-        <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-        <el-button  slot="reference" style="margin:10px 10px;float: right" type="primary" size="small" >打印</el-button>
-
-      </el-popover>
-        <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
-            <div class="mainCenter">
-                <div class="centerLeft">
-                    <div class="tabsBox">
-                      <el-table  :data="tableData" border style="width: 100%;"
-                                :row-style="{ color: '#303133' }"
-                                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-
-                        <el-table-column align="center" prop="project_name" label="名称">
-                          <template slot-scope="scope">{{ scope.row.name }}</template>
-                        </el-table-column>
-
-                        <el-table-column align="center" prop="project_name" label="分类" width="100">
-                          <template slot-scope="scope">{{ scope.row.type == 1?'药品': scope.row.project_type == 2? '项目':'耗材'}}</template>
-                        </el-table-column>
-
-
-                        <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
-                          <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
-
-                        </el-table-column>
-                        <el-table-column align="center" prop="delivery_way" width="90" label="用法">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
-                            {{scope.row.delivery_way}}
-
-                          </template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="execution_frequency" width="90" label="频率">
-                          <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="number_days" width="60" label="天数">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-                            {{scope.row.day}}天
-
-                          </template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="total" width="60" label="总量">
-                          <template slot-scope="scope">{{scope.row.count}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</template>
-                        </el-table-column>
-                        <el-table-column align="center" prop="name" width="60" label="单价">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                            {{scope.row.price}}元
-
-                          </template>
-                        </el-table-column>
-
-                          <el-table-column align="center" prop="name" width="60" label="总价">
-                              <template slot-scope="scope">
-                                  <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                                  {{scope.row.price.toFixed(2)}}元
-
-                              </template>
-                          </el-table-column>
-
-
-                        <el-table-column align="center" prop="name" width="80" label="备注">
-                          <template slot-scope="scope">
-                            <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
-                            {{scope.row.remark}}
-
-                          </template>
-                        </el-table-column>
-                      </el-table>
-
-                      <div class="additionalBox">
-                        <div class="additionalOne" v-for="(item,index) in additions" :key="index">
-                          <span :title="item.item_name">{{item.item_name}}</span>
-                          <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
-                          共
-                          <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
-                          次
-                          <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
-                        </div>
-                      </div>
-
-                    </div>
-                    <div class="costBox">
-                      <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>
-
-
-                    </div>
-                </div>
-                <div class="centerRight">
-                    <p class="centerRightTitle">人员信息</p>
-                    <ul class="basicUl">
-                        <li style="width:50%;">姓名：{{patientInfo.name}}</li>
-                        <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>
-                        <li style="width:50%;">年龄：{{patientInfo.age }}</li>
-                        <li style="width:50%;">身高：{{patientInfo.height?patientInfo.height:''}}</li>
-                        <li style="width:50%;">体重：{{patientInfo.weight?patientInfo.weight:''}}</li>
-                        <li style="width:50%;">电话：{{patientInfo.phone}}</li>
-                    </ul>
-                    <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
-                    <ul class="basicUl">
-                        <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.toFixed(2)}}元</li>
-                    </ul>
-                    <!--<p class="centerRightTitle">发票费用</p>-->
-                    <!--<ul class="basicUl">-->
-                        <!--<li style="width:100%;">西药费：0.00元</li>-->
-                    <!--</ul>-->
-                </div>
-            </div>
+      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+      <el-button  slot="reference" style="margin:10px 10px;float: right" type="primary" size="small" >打印</el-button>
+
+    </el-popover>
+    <div class="app-container" style="display:flex;flex: 1;padding: 20px 20px 0px 20px;">
+      <div class="mainCenter">
+        <div class="centerLeft">
+          <div class="tabsBox">
+            <el-table  :data="tableData" border style="width: 100%;"
+                       :row-style="{ color: '#303133' }"
+                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+
+              <el-table-column align="center" prop="project_name" label="名称">
+                <template slot-scope="scope">{{ scope.row.name }}</template>
+              </el-table-column>
+
+              <el-table-column align="center" prop="project_name" label="分类" width="100">
+                <template slot-scope="scope">{{ scope.row.type == 1?'药品': scope.row.project_type == 2? '项目':'耗材'}}</template>
+              </el-table-column>
+
+
+              <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+                <template slot-scope="scope">{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</template>
+
+              </el-table-column>
+              <el-table-column align="center" prop="delivery_way" width="90" label="用法">
+                <template slot-scope="scope">
+                  <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+                  {{scope.row.delivery_way}}
+
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="execution_frequency" width="90" label="频率">
+                <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
+              </el-table-column>
+
+              <el-table-column align="center" prop="total" width="60" label="总量">
+                <template slot-scope="scope">{{scope.row.count}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</template>
+              </el-table-column>
+              <el-table-column align="center" prop="name" width="60" label="单价">
+                <template slot-scope="scope">
+                  <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                  {{scope.row.price.toFixed(2)}}元
+
+                </template>
+              </el-table-column>
+
+              <el-table-column align="center" prop="name" width="60" label="总价">
+                <template slot-scope="scope">
+                  <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+                  {{scope.row.price.toFixed(2)}}元
+
+                </template>
+              </el-table-column>
+
+
+              <el-table-column align="center" prop="name" width="80" label="备注">
+                <template slot-scope="scope">
+                  <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+                  {{scope.row.remark}}
+
+                </template>
+              </el-table-column>
+            </el-table>
+
+<!--            <div class="additionalBox">-->
+<!--              <div class="additionalOne" v-for="(item,index) in additions" :key="index">-->
+<!--                <span :title="item.item_name">{{item.item_name}}</span>-->
+<!--                <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>-->
+<!--                共-->
+<!--                <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>-->
+<!--                次-->
+<!--                &lt;!&ndash;<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>&ndash;&gt;-->
+<!--              </div>-->
+<!--            </div>-->
+
+          </div>
+          <div class="costBox">
+            <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
+            <span v-if="order.order_status == 1">待结算</span>
+            <span v-if="order.order_status == 2">已结算</span>
+            <span v-if="order.order_status == 3">已退费</span>
+
+
+          </div>
         </div>
+        <div class="centerRight">
+          <p class="centerRightTitle">人员信息</p>
+          <ul class="basicUl">
+            <li style="width:50%;">姓名：{{patientInfo.name}}</li>
+            <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>
+            <li style="width:50%;">年龄：{{patientInfo.age }}</li>
+            <li style="width:50%;">身高：{{patientInfo.height?patientInfo.height:''}}</li>
+            <li style="width:50%;">体重：{{patientInfo.weight?patientInfo.weight:''}}</li>
+            <li style="width:50%;">电话：{{patientInfo.phone}}</li>
+          </ul>
+          <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
+          <ul >
+            <li style="width:30%;">医疗费总额：{{order.medfee_sumamt.toFixed(2) }}元</li>
+            <li style="width:30%;">基金支付总额：{{order.fund_pay_sumamt.toFixed(2)}}元</li>
+            <li style="width:30%;">基本医疗保险统筹基金支出：{{order.hifp_pay}}元</li>
+            <li style="width:30%;">医疗救助基金支出：{{order.maf_pay.toFixed(2)}}元</li>
+            <li style="width:30%;">个人账户支付金额:{{ order.acct_pay}}</li>
+            <li style="width:30%;">个人支付金额:{{order.psn_cash_pay.toFixed(2)}}元</li>
+          </ul>
 
-      <div v-if="listVisible">
+        </div>
+      </div>
+    </div>
+
+    <div v-if="listVisible">
       <el-dialog
-        class="centerDialog"
-        width="900px"
-        title="打印"
-        :visible.sync="listVisible">
+          class="centerDialog"
+          width="900px"
+          title="打印"
+          :visible.sync="listVisible">
         <list-print  :paramsObj='paramsObj'></list-print>
       </el-dialog>
-      </div>
+    </div>
 
-      <div v-if="allListVisible">
+    <div v-if="allListVisible">
       <el-dialog
-        class="centerDialog"
-        width="900px"
-        title="打印"
-        :visible.sync="allListVisible">
+          class="centerDialog"
+          width="900px"
+          title="打印"
+          :visible.sync="allListVisible">
         <all-list-print :paramsObj='paramsObj'></all-list-print>
       </el-dialog>
-      </div>
+    </div>
 
 
-    </div>
+  </div>
 </template>
 
-
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { getHisOrder } from '@/api/his/his'
@@ -161,69 +151,65 @@ import ListPrint from './listPrint'
 import AllListPrint from './allListPrint'
 
 export default {
-    components:{
-      AllListPrint,
-      ListPrint,
-        BreadCrumb,
-      prescriptionTable,
-
-    },
-    data(){
-        return{
-          listVisible:false,
-          allListVisible:false,
-          paramsObj:{
-            id:this.$route.query.id,
-            balance_accounts_type:0
-          },
-            crumbs: [
-                { path: false, name: '门诊收费' },
-                { path: false, name: '项目消费明细汇总详情' }
-            ],
-          info: {},
-          curPrescriptions: {},
-          prescriptions: [],
-          record_date: '',
-          tableData: [],
-          additions:[],
-          editableTabsValue: '1',
-          loadingone: false,
-          editableTabs: [{
-            title: '处方1',
-            name: '1'
-          }],
-          tabIndex: 1,
-          hisPatientInfo: {},
-          loadingtwo: false,
-          patientTableData: [{
-            name: '杨美英',
-            mdtrt_id: '1709946'
-          }],
-          patientInfo: { id: 0 },
-          doctor: {},
-          total: 0,
-          state: '未收费',
-          radio: 1,
-          radioStatus: 1,
-          search_input: '',
-          order:{},
-        }
-    },created(){
-      this.GetOrderDetail()
-  },methods:{
-      open(val){
-        if(val == 1){
-          this.paramsObj.id == this.$route.query.id
-          this.paramsObj.balance_accounts_type = this.hisPatientInfo.balance_accounts_type
-          this.listVisible = true
-
-        }else if(val == 2){
-          this.paramsObj.id == this.$route.query.id
-          this.paramsObj.balance_accounts_type = this.hisPatientInfo.balance_accounts_type
-
-          this.allListVisible = true
-        }
+  components:{
+    AllListPrint,
+    ListPrint,
+    BreadCrumb,
+    prescriptionTable,
+
+  },
+  data(){
+    return{
+      listVisible:false,
+      allListVisible:false,
+      paramsObj:{
+        id:this.$route.query.id
       },
+      crumbs: [
+        { path: false, name: '门诊收费' },
+        { path: false, name: '项目消费明细汇总详情' }
+      ],
+      info: {},
+      curPrescriptions: {},
+      prescriptions: [],
+      record_date: '',
+      tableData: [],
+      additions:[],
+      editableTabsValue: '1',
+      loadingone: false,
+      editableTabs: [{
+        title: '处方1',
+        name: '1'
+      }],
+      tabIndex: 1,
+      hisPatientInfo: {},
+      loadingtwo: false,
+      patientTableData: [{
+        name: '杨美英',
+        mdtrt_id: '1709946'
+      }],
+      patientInfo: { id: 0 },
+      doctor: {},
+      total: 0,
+      state: '未收费',
+      radio: 1,
+      radioStatus: 1,
+      search_input: '',
+      order:{},
+    }
+  },created(){
+    this.GetOrderDetail()
+  },methods:{
+    open(val){
+      if(val == 1){
+        this.paramsObj.id == this.$route.query.id
+        this.listVisible = true
+
+      }else if(val == 2){
+        this.paramsObj.id == this.$route.query.id
+        this.allListVisible = true
+      }
+    },
     // getTotal() {
     //   var total = 0
     //   for (let i = 0; i < this.prescriptions.length; i++) {
@@ -334,11 +320,11 @@ export default {
       }
       let project_ids = []
 
-      let addition_month_prescriptions = {
-        addition: []
-
-      }
-      let additions_ids = []
+      // let addition_month_prescriptions = {
+      //   addition: []
+      //
+      // }
+      // let additions_ids = []
 
       for (let i = 0; i < month_prescriptions.length; i++) {
         if (month_prescriptions[i].type == 1) { //药品
@@ -379,7 +365,7 @@ export default {
 
       drug_ids = this.unique(drug_ids)
       project_ids= this.unique(project_ids)
-      additions_ids= this.unique(additions_ids)
+      // additions_ids= this.unique(additions_ids)
 
 
 
@@ -492,59 +478,59 @@ export default {
           //   var prescription = response.data.data.prescription[i]
 
 
-            // for (let b = 0; b < prescription.advices.length; b++) {
-            //   let obj = {
-            //     name: prescription.advices[b].advice_name,
-            //     statistical_classification:"",
-            //     type:1,
-            //     single_dose: prescription.advices[b].single_dose,
-            //     delivery_way: prescription.advices[b].delivery_way,
-            //     execution_frequency: prescription.advices[b].execution_frequency,
-            //     price: prescription.advices[b].price.toString(),
-            //     day: prescription.advices[b].day,
-            //     count:prescription.advices[b].prescribing_number.toString(),
-            //     remark: prescription.advices[b].remark,
-            //     single_dose_unit: prescription.advices[b].single_dose_unit,
-            //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-            //
-            //   }
-            //   this.tableData.push(obj)
-            // }
-            //
-            // for (let b = 0; b < prescription.project.length; b++) {
-            //   let obj = {
-            //     name: prescription.project[b].project.project_name,
-            //     statistical_classification: prescription.project[b].project.statistical_classification,
-            //     single_dose: prescription.project[b].single_dose,
-            //     delivery_way: prescription.project[b].delivery_way,
-            //     execution_frequency: prescription.project[b].execution_frequency,
-            //     price: prescription.project[b].price,
-            //     day: prescription.project[b].day,
-            //     count: prescription.project[b].count.toString(),
-            //     remark: prescription.project[b].remark,
-            //     single_dose_unit:prescription.project[b].project.unit,
-            //     prescribing_number_unit:prescription.project[b].project.unit,
-            //     type:2,
-            //   }
-            //   this.tableData.push(obj)
-            // }
-            //
-            // for (let b = 0; b < prescription.addition.length; b++) {
-            //     this.additions.push( prescription.addition[b])
-            // }
-
-
-
-            // let index = i + 1
-            // let obj = {
-            //   id: prescription.id,
-            //   name: '处方' + index,
-            //   advices: tempAdvice,
-            //   project: tempProject,
-            //   type: response.data.data.prescription[i].type
-            // }
-            // this.prescriptions.push(obj)
-            // this.curPrescriptions = this.prescriptions[0]
+          // for (let b = 0; b < prescription.advices.length; b++) {
+          //   let obj = {
+          //     name: prescription.advices[b].advice_name,
+          //     statistical_classification:"",
+          //     type:1,
+          //     single_dose: prescription.advices[b].single_dose,
+          //     delivery_way: prescription.advices[b].delivery_way,
+          //     execution_frequency: prescription.advices[b].execution_frequency,
+          //     price: prescription.advices[b].price.toString(),
+          //     day: prescription.advices[b].day,
+          //     count:prescription.advices[b].prescribing_number.toString(),
+          //     remark: prescription.advices[b].remark,
+          //     single_dose_unit: prescription.advices[b].single_dose_unit,
+          //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+          //
+          //   }
+          //   this.tableData.push(obj)
+          // }
+          //
+          // for (let b = 0; b < prescription.project.length; b++) {
+          //   let obj = {
+          //     name: prescription.project[b].project.project_name,
+          //     statistical_classification: prescription.project[b].project.statistical_classification,
+          //     single_dose: prescription.project[b].single_dose,
+          //     delivery_way: prescription.project[b].delivery_way,
+          //     execution_frequency: prescription.project[b].execution_frequency,
+          //     price: prescription.project[b].price,
+          //     day: prescription.project[b].day,
+          //     count: prescription.project[b].count.toString(),
+          //     remark: prescription.project[b].remark,
+          //     single_dose_unit:prescription.project[b].project.unit,
+          //     prescribing_number_unit:prescription.project[b].project.unit,
+          //     type:2,
+          //   }
+          //   this.tableData.push(obj)
+          // }
+          //
+          // for (let b = 0; b < prescription.addition.length; b++) {
+          //     this.additions.push( prescription.addition[b])
+          // }
+
+
+
+          // let index = i + 1
+          // let obj = {
+          //   id: prescription.id,
+          //   name: '处方' + index,
+          //   advices: tempAdvice,
+          //   project: tempProject,
+          //   type: response.data.data.prescription[i].type
+          // }
+          // this.prescriptions.push(obj)
+          // this.curPrescriptions = this.prescriptions[0]
 
           // }
           // this.tableData = response.data.data.order
@@ -554,112 +540,113 @@ export default {
     }
   }
 }
+
 </script>
 
 <style lang="scss" scoped>
 .summaryDetail{
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    .tabsBox{
-        position: relative;
-        height: 90%;
-        overflow-y: auto;
-        margin-bottom: 60px;
-        .el-tabs__item{
-            padding: 0 10px;
-        }
-    }
-    .addTab{
-        position: absolute;
-        right: 0;
-        top: 6px;
-        z-index: 20;
-    }
-    .mainCenter{
-        display: flex;
-        flex:1;
-    }
-    .costBox{
-        width:100%;
-        height:60px;
-        background:#fff;
-        position: absolute;
-        bottom:0;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-    }
-    .centerLeft{
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        position: relative;
-    }
-    .centerRight{
-        width: 300px;
-        margin-left: 5px;
-        display: flex;
-        flex-direction: column;
-    }
-    .RP{
-        color:#409EFF;
-        font-size: 20px;
-        margin-bottom: 5px;
-    }
-    .centerRightTitle{
-        color:#409EFF;
-        padding:0 0 10px 0;
-    }
-    .basicUl{
-        border-top: 1px solid #e5e5e5;
-        border-left: 1px solid #e5e5e5;
-        display: flex;
-        flex-wrap: wrap;
-        li{
-            border-bottom: 1px solid #e5e5e5;
-            border-right: 1px solid #e5e5e5;
-            width: 100%;
-            height: 38px;
-            line-height: 38px;
-            text-indent: 5px;
-            font-size: 14px;
-        }
-    }
-    .additionalBox{
-      margin-top: 20px;
-      display: flex;
-      flex-wrap: wrap;
-      .additionalOne{
-        margin-right:20px;
-        margin-bottom:10px;
-        display: flex;
-        align-items: center;
-        >span{
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          width:80px;
-          display: inline-block;
-          font-size: 14px;
-        }
-      }
-      .deleteIcon{
-        color:red;
-        margin-left:5px;
-      }
-    }
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+.tabsBox{
+  position: relative;
+  height: 90%;
+  overflow-y: auto;
+  margin-bottom: 60px;
+.el-tabs__item{
+  padding: 0 10px;
+}
+}
+.addTab{
+  position: absolute;
+  right: 0;
+  top: 6px;
+  z-index: 20;
+}
+.mainCenter{
+  display: flex;
+  flex:1;
+}
+.costBox{
+  width:100%;
+  height:60px;
+  background:#fff;
+  position: absolute;
+  bottom:0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.centerLeft{
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+.centerRight{
+  width: 300px;
+  margin-left: 5px;
+  display: flex;
+  flex-direction: column;
+}
+.RP{
+  color:#409EFF;
+  font-size: 20px;
+  margin-bottom: 5px;
+}
+.centerRightTitle{
+  color:#409EFF;
+  padding:0 0 10px 0;
+}
+.basicUl{
+  border-top: 1px solid #e5e5e5;
+  border-left: 1px solid #e5e5e5;
+  display: flex;
+  flex-wrap: wrap;
+li{
+  border-bottom: 1px solid #e5e5e5;
+  border-right: 1px solid #e5e5e5;
+  width: 100%;
+  height: 38px;
+  line-height: 38px;
+  text-indent: 5px;
+  font-size: 14px;
+}
+}
+.additionalBox{
+  margin-top: 20px;
+  display: flex;
+  flex-wrap: wrap;
+.additionalOne{
+  margin-right:20px;
+  margin-bottom:10px;
+  display: flex;
+  align-items: center;
+>span{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width:80px;
+  display: inline-block;
+  font-size: 14px;
+}
+}
+.deleteIcon{
+  color:red;
+  margin-left:5px;
+}
+}
 }
 </style>
 
 <style lang="scss">
 .summaryDetail{
-    .el-table th .cell, .el-table td .cell{
-        padding: 0 2px;
-    }
-    .el-icon-delete{
-        color:red;
-    }
+.el-table th .cell, .el-table td .cell{
+  padding: 0 2px;
+}
+.el-icon-delete{
+  color:red;
+}
 }
 
 </style>

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -219,9 +219,9 @@
         return name
       },
       handleSelectionChange(val) {
-        
+
         this.selecting_schs = val;
-        
+
       },
       batchPrint(type){
         this.printType = type

src/xt_pages/supply/components/addSupply.vue

@@ -60,12 +60,7 @@
         </el-row>
       </el-form>
 
-      <el-form
-        :rules="tableRules"
-        :model="recordInfo"
-        ref="recordInfo"
-        class="tableclass"
-      >
+      <el-form :model="recordInfo" ref="recordInfo" class="tableclass">
         <el-table
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
@@ -83,10 +78,21 @@
             <template slot="header" slot-scope="scope">
               <span>联系人<span style="color: red">*</span></span>
             </template>
+            <!-- tableRules.name -->
             <template slot-scope="scope">
               <el-form-item
                 :prop="'contacts.' + scope.$index + '.name'"
-                :rules="tableRules.name"
+                :rules="
+                  scope.row.name != ''
+                    ? [
+                        {
+                          required: 'true',
+                          message: '请输入主要联系人',
+                          trigger: ['blur', 'change'],
+                        },
+                      ]
+                    : null
+                "
               >
                 <el-input
                   v-model="scope.row.name"
@@ -362,8 +368,17 @@ export default {
             this.$refs[formName].validate((valid) => {
               if (valid) {
                 let params = {
-                  ...this.supplier,
-                  ...this.recordInfo,
+                  suppliercode: this.supplier.supplierCode,
+                  suppliername: this.supplier.supplierName,
+                  // ...this.recordInfo
+                  id: parseInt(this.supplier_ids),
+                  // id:JSON.parse(this.supplier_ids),
+                  suppliertype: "",
+                  vatrate: "",
+                  number: "",
+                  bank: "",
+                  bankaccount: "",
+                  contacts: [...this.recordInfo.contacts],
                 };
                 console.log(params, "dhas");
                 savesupply(params).then((res) => {});
@@ -383,15 +398,20 @@ export default {
             this.$refs[formName].validate((valid) => {
               if (valid) {
                 let params = {
-                  suppliercode:this.supplier.supplierCode,
-                  suppliername:this.supplier.supplierName,
-                  tmp:"测试",
+                  suppliercode: this.supplier.supplierCode,
+                  suppliername: this.supplier.supplierName,
                   // ...this.recordInfo
-                  id:this.supplier_ids,
-                  contacts:[...this.recordInfo.contacts]
+                  id: parseInt(this.supplier_ids),
+                  // id:JSON.parse(this.supplier_ids),
+                  suppliertype: "",
+                  vatrate: "",
+                  number: "",
+                  bank: "",
+                  bankaccount: "",
+                  contacts: [...this.recordInfo.contacts],
                 };
                 console.log(this.recordInfo, "dhas");
-                console.log(typeof(this.supplier_ids),'oo')
+                console.log(typeof this.supplier_ids, "oo");
                 updatesupply(params).then((res) => {
                   console.log(res, "oo");
                 });

src/xt_pages/supply/goodOrderQuery.vue

@@ -267,11 +267,9 @@ export default {
           page:this.page,
           limit:this.limit,
         }
-       console.log("param2323322332",params)
        getAllGoodOrderList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list 
-            console.log("购货单列表",list)
             this.tableList = list
             var total = response.data.data.total
             this.total = total
@@ -341,7 +339,6 @@ export default {
        this.$router.push({path:"/good/order/edit?id="+val.id+"&warehousing_id="+val.warehousing_id})
      },
      toDelete(val,index){
-       console.log("val323223233223",val)
        if(val.is_check == 1){
          this.$message.error("已审核单据，不能删除!")
          return false

src/xt_pages/supply/supplyQuery.vue

@@ -15,52 +15,19 @@
         <div>
           <el-select
             v-model="type_name"
-            style="width: 140px; margin-right: 10px"
-            placeholder="请选择"
+            style="width: 170px; margin-right: 10px"
+            placeholder="请选择供应商类别"
             @change="changeTypeName"
           >
             <el-option
-              v-for="item in types"
+              v-for="item in sType"
               :key="item.id"
-              :label="item.type_name"
-              :value="item.id"
+              :label="item.name"
+              :value="item.value"
             >
             </el-option>
           </el-select>
-          <el-date-picker
-            size="small"
-            v-model="start_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="startTimeChange"
-          ></el-date-picker
-          >-
-          <el-date-picker
-            size="small"
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 196px"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-            @change="endTimeChange"
-          ></el-date-picker>
-          <el-input
-            size="small"
-            style="width: 200px; margin-left: 10px"
-            class="filter-item"
-            v-model.trim="keywords"
-            placeholder="耗材名称"
-          />
+
           <el-button
             size="small"
             class="filter-item"
@@ -90,7 +57,7 @@
       >
         <el-table-column prop="SupplierType" label="供应商类别" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.SupplierType }}</span>
+            <span>{{ scope.row.TypeName }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="SupplierCode" label="供应商编码" align="center">
@@ -175,13 +142,11 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import addSupply from "./components/addSupply.vue";
-import {
-  getexporthistory,
-  delsupplys
-} from "@/api/supply";
+import { getexporthistory, delsupplys, getsupplytype } from "@/api/supply";
 export default {
   name: "stockIn",
   created() {
+    this.getsupplytype();
     // this.initSupplierData()
     this.org_id = this.$store.getters.xt_user.org_id;
 
@@ -207,7 +172,7 @@ export default {
       page: 1,
       limit: 10,
 
-      type_name: "",
+      type_name: 0,
       crumbs: [
         { path: false, name: "采购管理" },
         { path: "/supply/good/order/query", name: "供应商管理" },
@@ -226,13 +191,16 @@ export default {
       types: [],
       tableList: [],
       tyep_name: "",
+      sType: [],
     };
   },
+
   methods: {
     initData() {
       let params = {
         limit: this.limit,
         page: this.page,
+        ctype: this.type_name,
       };
       getexporthistory(params).then((res) => {
         if (res.data.state == 1) {
@@ -242,6 +210,15 @@ export default {
       });
     },
 
+    getsupplytype() {
+      getsupplytype().then((res) => {
+        if (res.data.state == 1) {
+          this.sType = res.data.data.list;
+        }
+        console.log(res, "oo");
+      });
+    },
+
     toDelete(val, index) {
       delsupplys(val.ID)
         .then((res) => {
@@ -257,15 +234,15 @@ export default {
         });
     },
 
-   
-
     toAdd(val) {
       this.$refs.addSupply.show(1, val);
     },
     toClick(data, val) {
       this.$refs.addSupply.show(data, val);
     },
-    changeTypeName() {},
+    changeTypeName() {
+      this.initData();
+    },
     startTimeChange() {},
     endTimeChange() {},
     search() {},