Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/his/his_zuobiao.js

+import request from '@/utils/request'
+
+
+export function getZuoBiaoPatientList(params) {
+  return request({
+    url: "/api/zuobiaodetail/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getZuoBiaoPatientInfo(params) {
+  return request({
+    url: "/api/zuobiaodetail/info",
+    method: "get",
+    params:params
+  });
+}
+
+export function getZuoBiaoPatientMonthInfo(params) {
+  return request({
+    url: "/api/zuobiaomonthdetail/info",
+    method: "get",
+    params:params
+  });
+}
+
+
+
+
+
+
+

src/lang/zh.js

     objectRegistration:"医疗器械登记",
     Dialysisanalysis: '专业质控',
     queryData:"结算数据查询",
+    chargeDetailManagementTwo:"门诊明细上传"
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/outpatientCharges.js

         name: 'OutpatientChargesSummary',
         meta: { title: 'summary', noCache: true}
     },
+    {
+      path: '/outpatientCharges/chargeDetailManagement',
+      component: () => import('@/xt_pages/outpatientCharges/chargeDetailManagement'),
+      name: 'chargeDetailManagementTwo',
+      meta: { title: 'chargeDetailManagementTwo', noCache: true}
+    },
     {
         path: '/outpatientCharges/incomeStatistics',
         component: () => import('@/xt_pages/outpatientCharges/incomeStatistics'),

src/xt_pages/Pharmacy/PatientDispensing.vue

               </el-option>
             </el-select>
           </div>
+          
 
           <div>
             <el-button type="primary" @click="toExport" v-if="state == 2"
         if (res.data.state == 1) {
            var list = res.data.data.list;
            console.log("hhhhawoowowow",list)
-          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ){
+          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ||  this.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
             this.tableData = []
             if(list!=null && list.length >0){
               for(let i=0;i<list.length;i++){
             }
 
           }
-          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 10387){
+          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 10387 && this.$store.getters.xt_user.org.id != 0 && this.$store.getters.xt_user.org.id != 10480 ){
             this.tableData = []
             this.tableData = list
           }

src/xt_pages/data/components/addDrugs.vue

                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否项目:" prop="is_pharmacy">
+                        <el-select v-model="form.is_project" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="item in projectList"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="" style="visibility: hidden;">
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
           is_pharmacy:1,//是否通过药房发药
           bbx01:"",
           bby01:"",
+          is_project:"",
         },
 
         rules: {
           unval:[{required:true,message:"请填写拆零",trigger:'change'}],
           min_number:[{required:true,message:"请填写拆零",trigger:'change'}],
           packing_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
-          drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
+          // drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
           drug_stock_limit: [{ required: true, message: '请填写库存警戒', trigger: 'blur' }],
           // drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
-          drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
+          // drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
           medical_insurance_level: [{ required: true, message: '请选择医保等级', trigger: 'change' }],
 
           unit_matrixing: [{ required: true, message: '请填写单位换算', trigger: 'blur' }],
           packing_price:[{required:true,message:'请填写包装零售价',trigger:'blur'}],
           drug_classify: [{ required: true, message: '请选择药物分类', trigger: 'change' }],
           drug_dose: [{ required: true, message: '请填写剂量', trigger: 'blur' }],
-          manufacturer: [{ required: true, message: '请选择生产产商', trigger: 'change' }],
+          // manufacturer: [{ required: true, message: '请选择生产产商', trigger: 'change' }],
           dealer: [{ required: true, message: '请选择经销商', trigger: 'change' }],
           prescription_mark: [{ required: true, message: '请选择处方药标志' }],
           social_security_directory_code: [{ required: true, message: '请填写社保目录编码' }],
           id: "2",
           name: "否"
         }],
+        projectList:[{id:"1",name:"是"},{id:"2",name:"否"}]
       }
     },
     props: {
         form['is_pharmacy'] = this.form.is_pharmacy
         form['bbx01'] = this.form.bbx01
         form['bby01'] = this.form.bby01
+        form['is_project'] = this.form.is_project
 
         return form
       },

src/xt_pages/data/components/drugs.vue

               if(this.formValue.drug_classify == 0){
                  this.formValue.drug_classify = ""
               }
-
+           
+              if(this.formValue.is_project<=0){
+                  this.formValue.is_project = ''
+              }else{
+                this.formValue.is_project = this.formValue.is_project.toString()
+              }
 
 
               this.$refs.addDrugs.show(id, this.formValue)

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460">{{
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10567">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
           <div class="inline_block" v-if="org_id!=10460">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515 || org_id == 10567">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0

src/xt_pages/hospitalStation/components/deskPrescription.vue

         if (row.sum_count <= 0) {
           if (selection) {
             selection.forEach(row => {
-              if (row.sum_count <= 0) {
+              if(row.is_project!=1){
+              if ( row.sum_count <= 0) {
                 this.$refs.multipleTable.toggleRowSelection(row)
               }
+            }
             })
           } else {
             this.$refs.multipleTable.clearSelection()
           }
-          this.$message.error(row.drug_name + '库存不足')
-          return
+          if (row.is_project == 0 || row.is_project == 2){
+            this.$message.error(row.drug_name + '库存不足')
+            return 
+          }
+        
        }
       }
 

src/xt_pages/outpatientCharges/componenttwo/ChargePrescriptionTable.vue

+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称">
+        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+          <div>{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="频率">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_frequency}}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </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">
+          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
+          <div>{{scope.row.prescribing_number}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="60" label="单价">
+        <template slot-scope="scope">
+          <div> {{scope.row.retail_price}}元</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="总价">
+        <template slot-scope="scope">
+          <div> {{(scope.row.retail_price * scope.row.prescribing_number).toFixed(2)}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1?'已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="医保编码">
+        <template slot-scope="scope">
+          <div> {{scope.row.code}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="规格/型号">
+        <template slot-scope="scope">
+          <div> {{scope.row.spec}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.det_item_fee_sumamt}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="生产厂家">
+        <template slot-scope="scope">
+          <div> {{getName(scope.row.name_id)}}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.overlmt_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.preselfpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.inscp_scp_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{scope.row.statistical_classification}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" 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="80" label="频率">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+          {{scope.row.execution_frequency}}
+
+        </template>
+      </el-table-column>
+<!--      <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>-->
+
+<!--      </el-table-column>-->
+      <el-table-column align="center" prop="total" width="50" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;">
+            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+            {{scope.row.total}}
+
+            <div>{{scope.row.unit}}</div>
+
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+          {{scope.row.price}}元
+
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="总价">
+        <template slot-scope="scope">
+          <div> {{(scope.row.total * scope.row.price).toFixed(2)}}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1?'已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
+
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="医保编码">
+        <template slot-scope="scope">
+          <div> {{scope.row.medical_code}}</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="规格/型号">
+        <template slot-scope="scope">
+          <div> {{scope.row.spec}}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.det_item_fee_sumamt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="生产厂家">
+        <template slot-scope="scope">
+          <div> {{getName(scope.row.name_id)}}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.overlmt_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.preselfpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.inscp_scp_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+          {{scope.row.remark}}
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="additionalBox">
+      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
+        <span :title="item.item_name">{{item.item_name}}</span>
+        <el-input v-model="item.price" placeholder="" style="width:50px;" 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>
+</template>
+
+<script>
+  import { getInitData } from '@/api/his/his'
+  import { getDictionaryDataConfig} from "@/utils/data";
+
+  export default {
+    props: {
+      prescription: Object,
+      manufacturers:Array,
+
+    },
+    data() {
+      return {
+        drugways: [],
+        efs: []
+      }
+    }, mounted() {
+      getInitData().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false
+        } else {
+          this.drugways = response.data.data.drugways;
+          this.efs = response.data.data.efs
+        }
+      })
+    }, methods:  {
+
+      getName(id){
+        console.log("!!!!!!!!!")
+
+        let  name = ""
+        for(let i = 0; i  < this.manufacturers.length; i++){
+          console.log(this.manufacturers[i].manufacturer_name)
+          if(id == this.manufacturers[i].id){
+            console.log("!!!!!!!!!")
+            name =  this.manufacturers[i].manufacturer_name
+          }
+        }
+        return name
+
+      },
+      getGroup(id){
+        var name = "";
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category');
+        console.log("2235",statistics_category);
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable{
+  .additionalBox{
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+  .additionalOne{
+    margin-right:20px;
+    margin-bottom:10px;
+    display: flex;
+    align-items: center;
+  >span{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width:80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+  }
+  .deleteIcon{
+    color:red;
+    margin-left:5px;
+  }
+  }
+  .el-table th .cell, .el-table td .cell{
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+  .el-icon-delete{
+    color:red;
+  }
+  }
+</style>

src/xt_pages/outpatientCharges/componenttwo/chargeMonthPrescriptionTable.vue

+<template>
+  <div class="prescriptionTable">
+    <el-table v-if="prescription&&prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="name" label="名称">
+        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="单次用量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
+          <div>{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div> {{scope.row.delivery_way}}</div>
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="100" label="频率">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_frequency}}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </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">
+          <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
+          <div>{{scope.row.prescribing_number}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="60" label="单价">
+        <template slot-scope="scope">
+          <div> {{scope.row.retail_price}}元</div>
+
+          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div> {{scope.row.remark}}</div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table v-if="prescription&&prescription.type == 2" :data="prescription.project" border style="width: 99%;"
+              :row-style="{ color: '#303133' }"
+              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+      <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+      <el-table-column align="center" prop="project_name" label="名称">
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="statistical_classification" width="100" label="组">
+        <template slot-scope="scope">{{getGroup(scope.row.statistical_classification)}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
+        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="delivery_way" width="80" 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="80" label="频率">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
+          {{scope.row.execution_frequency}}
+
+        </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}}天
+
+        </template>
+
+      </el-table-column>
+      <el-table-column align="center" prop="total" width="50" label="总量">
+        <template slot-scope="scope">
+          <div style="display:flex;">
+            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
+            {{scope.row.total}} {{scope.row.unit}}
+
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
+          {{scope.row.price}}元
+
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="50" label="备注">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
+          {{scope.row.remark}}
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+  </div>
+</template>
+
+<script>
+  import { getInitData } from '@/api/his/his'
+  import { getDictionaryDataConfig} from "@/utils/data";
+
+  export default {
+    props: {
+      prescription: Object
+    },
+    data() {
+      return {
+        drugways: [],
+        efs: []
+      }
+    }, mounted() {
+      getInitData().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false
+        } else {
+          this.drugways = response.data.data.drugways;
+          this.efs = response.data.data.efs
+        }
+      })
+    }, methods:  {
+
+
+      getGroup(id){
+        var name = "";
+        var statistics_category =  getDictionaryDataConfig('system','statistics_category');
+        console.log("2235",statistics_category);
+        for(let i=0;i<statistics_category.length;i++){
+          if(id == statistics_category[i].id){
+            name = statistics_category[i].name
+          }
+        }
+        return name
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="scss">
+  .prescriptionTable{
+  .additionalBox{
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+  .additionalOne{
+    margin-right:20px;
+    margin-bottom:10px;
+    display: flex;
+    align-items: center;
+  >span{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width:80px;
+    display: inline-block;
+    font-size: 14px;
+  }
+  }
+  .deleteIcon{
+    color:red;
+    margin-left:5px;
+  }
+  }
+  .el-table th .cell, .el-table td .cell{
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+  .el-icon-delete{
+    color:red;
+  }
+  }
+</style>

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

         return uParseTime(time, '{y}-{m}-{d}')
       },
       getPage(){
-        if(this.list.length <= 15){
+        if(this.list.length <= 16){
             this.page = 1
             this.pageArr.push(this.list.length)
-        }else if(this.list.length > 15){
-            this.page = parseInt(this.list.length / 15)
-            let num = this.list.length % 15
+        }else if(this.list.length > 16){
+            this.page = parseInt(this.list.length / 16)
+            let num = this.list.length % 16
             for (var i=0;i<this.page;i++){
-                this.pageArr.push(15)
+                this.pageArr.push(16)
             }
             if(num != 0){
                 this.pageArr.push(num)

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

       <div class="mainRight">
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
-          <div v-if="org_id == 10454">
-            <el-button  size="small"
-                        @click="openZb(1)"
-                        v-if=" this.order.id == 0"
-                        type="primary">记账
-            </el-button>
-            <el-button   size="small"
-                         @click="openZb(2)"
-                         type="primary">撤销记账
-            </el-button>
-          </div>
 
-          <div v-if="org_id == 10206">
+
+          <div v-if="org_id == 10206  || org_id == 0">
             <el-button  size="small"
                         @click="openZb(1)"
                         v-if=" this.order.id == 0"
             </el-button>
           </div>
 
-          <div  v-if="org_id != 10206 && org_id != 10340 && org_id != 10454">
+          <div  v-if="org_id != 10206 && org_id != 10340 && org_id != 0">
             <!--            <el-button size="small"-->
             <!--                       @click="openZb(1)"-->
             <!--                       type="primary">登记-->
                                            v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3) && org_id != 10340"
                                            size="small"
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
-                                           type="primary">收费  
+                                           type="primary">收费
                                 </el-button>
                               </div>
                             </div>
                             <prescription-table ref="prescription_tables"
                                               :prescription="items.curPrescriptions"
                                               :manufacturers="manufacturers"></prescription-table>
-                          
+
                         </el-tabs>
 
                       <div class="costBox">
                   <div>
                     <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
-                      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+                      <el-form-item label="大病类别：" prop="sick_type" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+                      <el-form-item label="诊断：" prop="diagnosis" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
                     <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
 
-                      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+                      <el-form-item label="大病类别：" prop="sick_type" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+                      <el-form-item label="诊断：" prop="diagnosis" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
                   <div>
                     <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
-                      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+                      <el-form-item label="大病类别：" prop="sick_type" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+                      <el-form-item label="诊断：" prop="diagnosis" >
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
           let two_count = 0
 
           for (let i = 0; i < response.data.data.list.length; i++) {
-            if (response.data.data.list[i].his_patient.length > 0) {
-              let obj = {
-                id: response.data.data.list[i].id,
-                name: response.data.data.list[i].name,
-                number: response.data.data.list[i].his_patient[0].number,
-                order_status: 0,
-                his_patient_id: response.data.data.list[i].his_patient[0].id,
-                order_number: '',
-                order_id: 0,
-                prescription: response.data.data.list[i].prescription
+            if (this.org_id == 10206 || this.org_id == 0){
+                let obj = {
+                  id: response.data.data.list[i].id,
+                  name: response.data.data.list[i].name,
+                  order_status: 0,
+                  order_number: '',
+                  order_id: 0,
+                  prescription: response.data.data.list[i].prescription
+                }
+                if(response.data.data.list[i].his_patient&& response.data.data.list[i].his_patient.length > 0){
+                  obj["his_patient_id"] = response.data.data.list[i].his_patient[0].id
+                  obj["number"] = response.data.data.list[i].his_patient[0].number
+                }
+
+                this.all_table_data.push(obj)
+            }else{
+              if (response.data.data.list[i].his_patient.length > 0) {
+                let obj = {
+                  id: response.data.data.list[i].id,
+                  name: response.data.data.list[i].name,
+                  number: response.data.data.list[i].his_patient[0].number,
+                  order_status: 0,
+                  his_patient_id: response.data.data.list[i].his_patient[0].id,
+                  order_number: '',
+                  order_id: 0,
+                  prescription: response.data.data.list[i].prescription
+                }
+                this.all_table_data.push(obj)
               }
-              this.all_table_data.push(obj)
+
             }
 
           }
       if (this.big_month_prescriptions.length > 0) {
         this.editableTabsValue = this.big_month_prescriptions[0].curMonthPrescriptions.name
       }
-    }, getPName(med_type, index) {
+    },
+    getPName(med_type, index) {
       var med_type = parseInt(med_type)
 
       if(this.org_id == 10206){

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, 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 == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
       //     if (row.count <= 0) {
       //       if (selection) {
       //     }
       // }
 
-      if(row.is_user!=1 &&  this.org_id != 10206 && this.org_id != 0){
+      if(row.is_user!=1 &&  this.org_id != 10206){
+        console.log("row.sum_count",row)
         if (row.sum_count <= 0) {
         if (selection) {
           selection.forEach(row => {
-            if (row.sum_count <= 0) {
-              this.$refs.multipleTable.toggleRowSelection(row)
+            if(row.is_project!=1){
+              if ( row.sum_count <= 0) {
+                this.$refs.multipleTable.toggleRowSelection(row)
+              }
             }
+            
           })
         } else {
           this.$refs.multipleTable.clearSelection()
         }
-        this.$message.error(row.drug_name + '库存不足')
-        return
+        if (row.is_project == 0 || row.is_project == 2){
+          this.$message.error(row.drug_name + '库存不足')
+          return 
+        }
        }
       }
 
       this.teamList = row
     },
     selectChange(selection, 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 == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
       //    if (row.stock_count <= 0) {
       //     if (row.type == 3) {

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

         :editable="false"
         style="width: 150px;"
         type="date"
-        :picker-options="pickerOptions"
+       
         placeholder="选择日期时间"
         align="right"
         format="yyyy-MM-dd"
         prefix-icon="el-icon-date"
         @change="changeEndTime"
         :editable="false"
-        :picker-options="pickerOptions"
+        
         style="width: 150px;"
         type="date"
         placeholder="选择日期时间"
 
         pickerOptions: {
           disabledDate(time) {
-            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 2)).getTime() - 24 * 3600 * 1000
             return time.getTime() > Date.now() || time.getTime() < threeMonths
 
           }

src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue

         :editable="false"
         style="width: 150px;"
         type="date"
-        :picker-options="pickerOptions"
+       
         placeholder="选择日期时间"
         align="right"
         format="yyyy-MM-dd"
         prefix-icon="el-icon-date"
         @change="changeEndTime"
         :editable="false"
-        :picker-options="pickerOptions"
+      
         style="width: 150px;"
         type="date"
         placeholder="选择日期时间"
 
         pickerOptions: {
           disabledDate(time) {
-            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 2)).getTime() - 24 * 3600 * 1000
             return time.getTime() > Date.now() || time.getTime() < threeMonths
 
           }

src/xt_pages/stock/detail/stockOutDetail.vue

       size="small"
       @click="exportListDetail"
       type="primary"
+      v-if="orgId !=10480 && orgId!=0"
       >明细导出
+     
+    </el-button>
+    <el-button
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetailOne"
+      type="primary"
+      v-if="orgId ==10480 || orgId == 0"
+      >明细导出
+     
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     var org_id = this.$store.getters.xt_user.org.id
+   
     this.orgId = org_id
 
 
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
+    getTimeOne: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d} {h}:{i}");
+      }
+    },
     PrintAction: function() {
       window.sessionStorage.setItem('start',this.start_time)
       window.sessionStorage.setItem('end',this.end_time)
             total += this.tableDataList[i].count * this.tableDataList[i].price
           }
           this.tableDataList[i].in_price = this.tableDataList[i].WarehousingInfoNight.price
+
+          this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
         }
         obj.total_price = total.toFixed(2)
         console.log("WOHHAHHAHAH",this.tableDataList)
           this.downloadLoading = false
         })
      },
+
+     exportListDetailOne(){
+
+       console.log("hhahah",this.tableDataList)
+       var obj = {index:"合计",out_total_price:0,in_total_price:0}
+       var out_total = 0
+       var in_total =0
+       if(this.tableDataList!=null&&this.tableDataList.length>0){
+           for(let i=0;i<this.tableDataList.length;i++){
+              this.tableDataList[i].index = i+1
+              this.tableDataList[i].good_type_name = this.typeName(this.tableDataList[i].good_type_id)
+              this.tableDataList[i].good_name = this.typeNameOne(this.tableDataList[i].good_id)
+              this.tableDataList[i].specification_name = this.specificationName(this.tableDataList[i].good_id)
+              this.tableDataList[i].batch_number =this.tableDataList[i].WarehousingInfoNight.number
+              this.tableDataList[i].manufacturer_name = this.getManufacturerNameOne(this.tableDataList[i].GoodInfo.manufacturer)
+              this.tableDataList[i].in_price = this.tableDataList[i].WarehousingInfoNight.price
+              this.tableDataList[i].out_count = this.tableDataList[i].count
+              this.tableDataList[i].max_unit = this.tableDataList[i].GoodInfo.max_unit
+              this.tableDataList[i].out_total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
+              this.tableDataList[i].in_total_price = (this.tableDataList[i].count * this.tableDataList[i].WarehousingInfoNight.price).toFixed(2)
+              this.tableDataList[i].patient_name =  this.getPatientName(this.tableDataList[i].patient_id)
+              this.tableDataList[i].ctimeOne = this.getTime(this.tableDataList[i].ctime)
+              this.tableDataList[i].ctimeTwo = this.getTimeOne(this.tableDataList[i].ctime)
+              this.tableDataList[i].expiry_date = this.getTime(this.tableDataList[i].expiry_date)
+              this.tableDataList[i].project_name ="居民报销"
+            
+              out_total += this.tableDataList[i].count * this.tableDataList[i].price
+              in_total += this.tableDataList[i].count *this.tableDataList[i].WarehousingInfoNight.price
+
+           }
+       }
+       obj.out_total_price = out_total.toFixed(2)
+       obj.in_total_price = in_total.toFixed(2)
+       this.tableDataList.push(obj)
+
+      import('@/vendor/Export2Excel').then(excel => {
+       const tHeader = ['序号','耗材名称', '耗材规格', '批号','生成厂家','耗材类型','报销方式','入库单价','出库单价','出库数量','实际出库数量','单位','出库金额','实际出库金额','实际成本','出库对象','有效日期','出库日期','操作时间','出库单号','备注']
+       const filterVal = ['index','good_name', 'specification_name', 'batch_number','manufacturer_name','good_type_name','project_name','in_price','price','out_count','out_count','max_unit','out_total_price','out_total_price','in_total_price','patient_name','expiry_date','ctimeOne','ctimeTwo','warehouse_out_order_number','remark']
+
+       const data = this.formatJson(filterVal, this.tableDataList)
+
+
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材出库明细'
+         })
+          this.downloadLoading = false
+        })
+
+     },
      formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
      },

src/xt_pages/stock/drugs/components/drugOutDetail.vue

       >打印
     </el-button>
      <el-button
-      v-if="org_id != 10265"
+      v-if="org_id != 10265 && org_id!=0&&org_id!=10480"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetai"
       @click="exportListDetaiOne"
       type="primary"
       >明细导出
+    </el-button>
+    <el-button
+      v-if="org_id == 10480 || org_id == 0"
+      style="float: right;margin-right:10px"
+      size="small"
+      @click="exportListDetaiTwo"
+      type="primary"
+      >明细导出
     </el-button>
      <el-button
       style="float: right;margin-right:10px"
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
+    getTimeOne: function(val) {
+      if (val == 0) {
+        return "";
+      } else {
+        return uParseTime(val, "{y}-{m}-{d} {h}:{i}");
+      }
+    },
     PrintAction: function() {
       //  window.sessionStorage.setItem('start_out_time',this.start_time)
       //  window.sessionStorage.setItem('end_out_time',this.end_time)
 
           }
            console.log("toal_p3232332332233232",total_price)
-           order.push({
-            warehouse_out_order_number: "合计",
-            is_total: 1,
-            specification_name:"",
-            ctime:"",
-            total_price:total_price,
-          });
-
+           if(this.org_id!=0&&this.org_id!=10480){
+              order.push({
+              warehouse_out_order_number: "合计",
+              is_total: 1,
+              specification_name:"",
+              ctime:"",
+              total_price:total_price,
+            });
+           }
+          
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
        const data = this.formatJson(filterVal, this.tableData)
 
 
+       excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品出库明细'
+         })
+          this.downloadLoading = false
+      })
+    },
+
+    exportListDetaiTwo(){
+      var obj = {index:"合计",out_total_price:0,in_total_price:0}
+       var out_total = 0
+       var in_total =0
+      console.log("tatbledateawowowo",this.tableData)
+ 
+      for(let i=0;i<this.tableData.length;i++){
+         if(this.tableData[i].is_total == 0){
+            this.tableData[i].index = i+1
+            if(this.tableData[i].drug_type == 1){
+              this.tableData[i].drugtype = "西药"
+            }
+            if(this.tableData[i].drug_type == 2){
+              this.tableData[i].drugtype = "草药"
+            }
+            if(this.tableData[i].drug_type == 3){
+              this.tableData[i].drugtype = "成药"
+            }
+            this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
+            this.tableData[i].time = this.getTime(this.tableData[i].ctime)
+            this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+            this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
+            this.tableData[i].out_count = this.tableData[i].count
+            this.tableData[i].in_retail_price = (this.tableData[i].in_price/this.tableData[i].min_number).toFixed(2)
+            this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+            this.tableData[i].patient_name = this.getPatientName(this.tableData[i].patient_id) 
+            if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
+                this.tableData[i].out_total_price = (this.tableData[i].count * this.tableData[i].price)
+                this.tableData[i].in_total_price =  this.tableData[i].in_retail_price * this.tableData[i].count
+            }
+            if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit !=this.tableData[i].min_unit){
+              this.tableData[i].out_total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+              this.tableData[i].in_total_price =  this.tableData[i].min_number * (this.tableData[i].count * this.tableData[i].in_retail_price)
+            }
+            if(this.tableData[i].count_unit == this.tableData[i].max_unit && this.tableData[i].max_unit ==this.tableData[i].min_unit){
+              this.tableData[i].out_total_price = (this.tableData[i].count * this.tableData[i].price)*this.tableData[i].min_number
+
+              this.tableData[i].in_total_price =  this.tableData[i].min_number * (this.tableData[i].count * this.tableData[i].in_retail_price)
+            }
+
+            this.tableData[i].project_name = "居民医保"
+
+            this.tableData[i].expiry_date = this.getTime(this.tableData[i].expiry_date)
+
+            
+            this.tableData[i].ctimeOne = this.getTime(this.tableData[i].ctime)
+
+            this.tableData[i].ctimeTwo = this.getTimeOne(this.tableData[i].ctime)
+            
+            out_total += this.tableData[i].out_total_price 
+            in_total += this.tableData[i].in_total_price
+         }
+       }
+       obj.out_total_price = out_total.toFixed(2)
+       obj.in_total_price = in_total.toFixed(2)
+       this.tableData.push(obj)
+
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','药品名称', '药品规格', '批号','生成厂家','药品类型','报销方式','入库单价','出库单价','出库数量','实际出库数量','单位','出库金额','实际出库金额','实际成本','出库对象','有效日期','出库日期','操作时间','出库单号','备注']
+        const filterVal = ['index','drug_name', 'specification_name', 'batch_number','manufacturer_name','drug_type','project_name','in_price','price','out_count','out_count','max_unit','out_total_price','out_total_price','in_total_price','patient_name','expiry_date','ctimeOne','ctimeTwo','warehouse_out_order_number','remark']
+
+       console.log("hwhhwhwhwhwhw",this.tableData)
+        
+      
+      
+       const data = this.formatJson(filterVal, this.tableData)
+
+
        excel.export_json_to_excel({
            header: tHeader,
            data,