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

src/xt_pages/data/components/consumables.vue

@@ -153,8 +153,8 @@
           <!--</el-button>-->
 
           <el-button type="primary" size="small" >
-            <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
-            <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+            <span   @click="putOnRecord(scope.row.id)" >目录对照</span>
+            <span  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
           </el-button>
         </template>
       </el-table-column>

src/xt_pages/data/components/drugs.vue

@@ -165,8 +165,8 @@
 
 
           <el-button type="primary" size="small" icon="el-icon-refresh-left">
-            <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
-            <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+            <span  @click="putOnRecord(scope.row.id)" >目录对照</span>
+            <span  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
           </el-button>
         </template>
       </el-table-column>

src/xt_pages/data/components/project.vue

@@ -128,8 +128,8 @@
                     <!--</el-button>-->
 
                     <el-button type="primary" size="small" icon="el-icon-refresh-left">
-                        <span v-if="scope.row.is_mark == 0 || scope.row.is_mark == 2"  @click="putOnRecord(scope.row.id)" >目录对照</span>
-                        <span v-if="scope.row.is_mark == 1"  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
+                        <span  @click="putOnRecord(scope.row.id)" >目录对照</span>
+                        <span  @click="putOnUnRecord(scope.row.id)" >撤消对照</span>
                     </el-button>
                 </template>
             </el-table-column>
@@ -902,16 +902,16 @@ export default {
       },
       exportList(){
         import('@/vendor/Export2Excel').then(excel => {
-        
+
          for(let i=0;i<this.tableData.length;i++){
            for(let j=0;j<this.getDictionaryDataConfig('system','cost_classify').length;j++){
               if(this.tableData[i].cost_classify == this.getDictionaryDataConfig('system','cost_classify')[j].id){
-                 this.tableData[i].cost_classify_name = this.getDictionaryDataConfig('system','cost_classify')[j].name 
+                 this.tableData[i].cost_classify_name = this.getDictionaryDataConfig('system','cost_classify')[j].name
               }
            }
            for(let y=0;y<this.getDictionaryDataConfig('system','medical_insurance_level').length;y++){
               if(this.tableData[i].medical_coverage == this.getDictionaryDataConfig('system','medical_insurance_level')[y].id){
-                 this.tableData[i].medical_coverage_name = this.getDictionaryDataConfig('system','medical_insurance_level')[y].name 
+                 this.tableData[i].medical_coverage_name = this.getDictionaryDataConfig('system','medical_insurance_level')[y].name
               }
            }
            for(let a=0;a<this.departMentList.length;a++){
@@ -922,23 +922,23 @@ export default {
          }
           console.log("this.table",this.tableData)
          const tHeader = ['项目名称','零价','单位','费用类别','执行科室','医保等级','国家编码','社保目录编码']
-         const filterVal = ['project_name', 'price','unit','cost_classify_name','executive_section_name','medical_coverage_name','medical_code','social_security_directory_code'] 
-         
+         const filterVal = ['project_name', 'price','unit','cost_classify_name','executive_section_name','medical_coverage_name','medical_code','social_security_directory_code']
+
          const data = this.formatJson(filterVal,this.tableData)
-     
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '项目信息'
          })
           this.downloadLoading = false
-    
+
         })
        },
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
        },
-     
+
     },
     created(){
       this.getlist();

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -750,14 +750,14 @@
                         >
                          
 
-                          <span v-if="org_id==10223">
+                          <span v-if="org_id==10265">
                               {{
                             record.prescription.replacement_total
                               ? record.prescription.replacement_total
                               : "/"
                            }}
                           </span>
-                          <span v-if="org_id!=10223">
+                          <span v-if="org_id!=10265">
                             {{
                             record.prescription &&
                             record.prescription.displace_liqui_value

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -389,7 +389,7 @@
                       style="padding-left:5px;border-left:1px solid #000;padding-left:5px"
                     >
                       医师签名：
-                      <span
+                      <!-- <span
                           v-if="
                         setAdminUserES(
                         record.prescription,
@@ -409,7 +409,41 @@
                           srcset=""
                           v-else
                           style="height: 30px;"
-                        />
+                        /> -->
+                        <span
+                            v-if="
+                              !record.advices ||
+                                typeof record.advices[0] == 'undefined' ||
+                                typeof record.advices[0][0] == 'undefined'
+                            "
+                          ></span>
+                          <span
+                            v-else-if="
+                              setAdminUserES(
+                                record.advices[0][0],
+                                'advice_doctor'
+                              ) == ''
+                            "
+                            >{{
+                              getAdminUser(
+                                record.advices[0][0],
+                                "advice_doctor"
+                              )
+                            }}</span
+                          >
+                          <img
+                            :src="
+                              setAdminUserES(
+                                record.advices[0][0],
+                                'advice_doctor'
+                              )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                             style="height: 30px;"
+                          />
+                    </span>
                     </td>
                   </tr>
                   <tr style="text-align:left">

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2099,9 +2099,9 @@ export default {
         });
       }else if (this.org_template_info.template_id == 199 ) {
         printJS({
-          printable: "dialysis-print-box-64",
+          printable: "dialysis-print-box-1",
           type: "html",
-          style: style12,
+          style: style2,
           scanStyles: false,
         });
        

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -42,12 +42,12 @@
 
        
       </div>
-      <!-- <div class="filter-container">
+      <div class="filter-container" v-if="org_id == 0 || org_id ==10101">
       <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
        <el-button type="primary" @click="toSeachOne">搜索</el-button>
 
        
-      </div> -->
+      </div>
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询:</span>
@@ -1332,7 +1332,7 @@ export default {
          if(nameOne == '全部'){
           nameOne = ""
         }
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id} });
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id,keyword:this.keyword} });
 
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/signPrint.vue

@@ -134,6 +134,7 @@ export default {
             delivery_way:this.delivery_way,
             execution_frequency:this.execution_frequency,
             patient_id:this.$route.query.patient_id,
+            keyword:this.$route.query.keyword,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -762,13 +762,13 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                      <span v-if="org_id==10223"> {{
+                      <span v-if="org_id ==10265"> {{
                           prescription.replacement_total
                             ? prescription.replacement_total
                             : "/"
                         }}
                         </span> 
-                        <span v-if="org_id!=10223"> {{
+                        <span v-if="org_id!=10265"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -341,7 +341,7 @@
                 "
               >
                 医师签名：
-                <span v-if="setAdminUserES(prescription.creater) == ''">
+                <!-- <span v-if="setAdminUserES(prescription.creater) == ''">
                   {{ getAdminUser(prescription.creater) }}
                 </span>
                 <img
@@ -350,7 +350,18 @@
                   alt
                   srcset
                   v-else
-                />
+                /> -->
+                <span
+                style="display: inline-block; width: 100px; text-align: left"
+              >
+                &nbsp;
+                <span v-if="doctorForm.url === ''">{{
+                  doctorForm.doctor
+                }}</span>
+                <span v-if="doctorForm.url !== ''">
+                  <img class="es-img" :src="doctorForm.url" />
+                </span>
+              </span>
               </td>
             </tr>
             <tr style="text-align: left">

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2931,14 +2931,7 @@ export default {
             this.$message.error("请选择需要记账的患者")
             return
           }
-          if (this.prescriptions.length == 0) {
-            this.$message.error("处方不能为空")
-            return
-          }
-          if (this.form.diagnosis.length == 0) {
-            this.$message.error("诊断不能为空")
-            return
-          }
+
           var that = this
           let obj = {
             patient_id: this.patientInfo.id,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -305,9 +305,12 @@
                                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                             highlight-current-row>
                                       <el-table-column type="selection" width="40" align="center"></el-table-column>
-                                      <el-table-column label="名称">
-                                          <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+                                      <el-table-column label="名称"  v-if="org_id != 10206">
+                                          <template slot-scope="scope">{{ scope.row.drug_name}}</template>
                                       </el-table-column>
+                                    <el-table-column label="名称"  v-if="org_id == 10206">
+                                      <template slot-scope="scope">{{ scope.row.drug_name}} {{scope.row.number}}</template>
+                                    </el-table-column>
                                       <el-table-column label="规格" width="60" v-if="org_id == 10206 || org_id == 0">
                                           <template slot-scope="scope">
                                               <span>{{scope.row.drug_spec}}</span>
@@ -419,9 +422,12 @@
                                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                             highlight-current-row>
                                       <el-table-column type="selection" width="40" align="center"></el-table-column>
-                                      <el-table-column prop="name" label="名称">
+                                      <el-table-column prop="name" label="名称" v-if="org_id != 10206">
                                           <template slot-scope="scope">{{ scope.row.project_name }}</template>
                                       </el-table-column>
+                                    <el-table-column prop="name" label="名称" v-if="org_id == 10206">
+                                      <template slot-scope="scope">{{ scope.row.project_name }}{{scope.row.number}}</template>
+                                    </el-table-column>
                                       <el-table-column label="规格" width="60">
                                           <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                       </el-table-column>
@@ -433,7 +439,7 @@
                                             <span v-else> {{ scope.row.total }}</span> -->
                                             <span v-if="org_id != 10206 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
 <!--                                            //针对坐标系统的库存数据-->
-                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.good_info.zuobiao_stock_num}}</span>
+                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.zuobiao_stock_num}}</span>
 
                                           </template>
                                       </el-table-column>
@@ -531,13 +537,13 @@ import { uParseTime } from '@/utils/tools'
 import NextOrLastPrescription from './nextOrLastPrescription'
 import CallPrescription from './callPrescription'
 import DayPrescriptionTable from '../../outpatientCharges/components/dayPrescriptionTable'
+import axios from 'axios'
 
 const moment = require('moment')
 
 export default {
   props: {
     zuobiao_drug:Array,
-    zuobiao_project:Array,
     drugs:Array,
     allDrugs:Array,
     advices_template:Array,
@@ -575,6 +581,7 @@ export default {
   },
   data() {
     return {
+      zuobiao_project:[],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
       register10206: [
@@ -728,7 +735,41 @@ export default {
     }
   },
   methods: {
+    getzuobiao(){
+      if(this.org_id == 10206){
+        var that = this
+        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
+
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingtwo = false
+              return false
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
+
+              } else {
+                // that.zuobiao_drug  = response.data.data.drug
+                that.zuobiao_project  = response.data.data.project
+
+
+              }
+            }
+          })
+          .catch(function(error) {
+          })
+      }
+
 
+    },
     changeClass(id) {
       this.tabProject = []
       if (id == 0) {
@@ -3608,6 +3649,7 @@ export default {
               first_letter:project[i].first_letter,
               bbx01:project[i].bbx01,
               zuobiao_stock_num:0,
+              number:""
 
             }
             this.tabProject.push(obj)
@@ -3644,15 +3686,25 @@ export default {
               first_letter:good_info[i].first_letter,
               bbx01:good_info[i].bbx01,
               zuobiao_stock_num:0,
+              number: good_info[i].good_number
 
             }
             this.tabProject.push(obj)
           }
+
+          this.allProject = this.tabProject
+
           //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
           if(this.org_id == 10206 ) {
+            console.log("-=======")
+            console.log(this.zuobiao_project)
+            console.log(this.tabProject)
+            console.log("-=======")
             for (let i = 0; i < this.zuobiao_project.length; i++) {
               for (let b = 0; b < this.tabProject.length; b++) {
                 if (this.zuobiao_project[i].bbx01 == this.tabProject[b].bbx01){
+                  console.log( this.zuobiao_project[i].lsqty)
+                  console.log( this.tabProject[b].zuobiao_stock_num)
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
                 }
               }
@@ -3660,6 +3712,8 @@ export default {
           }
 
           this.allProject = this.tabProject
+
+
           // console.log('cccc',this.allProject);
         }
       })
@@ -3826,6 +3880,7 @@ export default {
     this.request_record_date = this.record_date
     // this.getInitData()
     //获取所有项目
+    this.getzuobiao()
     this.getlist()
     //获取所以项目组套
     this.getAllProjectTeam()

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -45,6 +45,8 @@
             highlight-current-row
             ref="tab"
           >
+            <el-table-column type="index" align="center" label="序号" width="60">
+            </el-table-column>
             <el-table-column prop="name" label="姓名">
               <template slot-scope="scope"
                 >{{ scope.row.name }}（{{ scope.row.dialysis_no }}）</template
@@ -106,7 +108,7 @@
         </el-pagination>
       </div>
     </div>
-    
+
   </div>
 </template>
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -137,9 +137,12 @@
                                                   highlight-current-row>
                                             <el-table-column type="selection" width="40"
                                                              align="center"></el-table-column>
-                                            <el-table-column label="名称">
-                                                <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+                                            <el-table-column label="名称" v-if="org_id == 10206  || org_id == 0">
+                                                <template slot-scope="scope">{{ scope.row.drug_name }}{{scope.row.number?"("+scope.row.number+")":""}}</template>
                                             </el-table-column>
+                                          <el-table-column label="名称" v-if="org_id != 10206 && org_id != 0">
+                                            <template slot-scope="scope">{{ scope.row.drug_name }}</template>
+                                          </el-table-column>
                                           <el-table-column label="规格" width="60" v-if="org_id != 10206 && org_id != 0">
                                             <template slot-scope="scope">
                                                    <span
@@ -196,9 +199,12 @@
                                                       highlight-current-row>
                                                 <el-table-column type="selection" width="40"
                                                                  align="center"></el-table-column>
-                                                <el-table-column prop="name" label="名称">
+                                                <el-table-column prop="name" label="名称" v-if="org_id != 10206 && org_id != 0">
                                                     <template slot-scope="scope">{{ scope.row.project_name }}</template>
                                                 </el-table-column>
+                                              <el-table-column prop="name" label="名称" v-if="org_id == 10206 || org_id == 0">
+                                                <template slot-scope="scope">{{ scope.row.project_name }}{{scope.row.number?"("+scope.row.number+")":""}}</template>
+                                              </el-table-column>
                                                 <el-table-column label="规格" width="60">
                                                     <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                                                 </el-table-column>
@@ -1164,8 +1170,13 @@
           // pre_time: nowTime
 
         }
+        if(this.org_id == 10206) {
+          obj.med_type = 12
+        }else{
+          obj.med_type = 14
 
-        obj.med_type = 14
+
+        }
 
         this.prescriptions.push(obj)
 
@@ -1680,44 +1691,84 @@
 
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
-                  if(prescription.project!=null && (prescription.project[b].good_info.good_status.startsWith('停用') == false && prescription.project[b].project.medical_status!=1)){
+                  if(prescription.project!=null && (prescription.project[b].good_info.good_status.startsWith('停用') == false )) {
+
+                    if (this.org_id == 10206 || this.org_id == 0) {
+                      let obj = {
+                        id: prescription.project[b].id,
+                        project_id: prescription.project[b].project_id,
+                        project_name: prescription.project[b].project.project_name,
+                        statistical_classification: prescription.project[b].project.statistical_classification,
+                        single_dose: prescription.project[b].single_dose,
+                        delivery_way: prescription.project[b].delivery_way,
+                        execution_frequency: prescription.project[b].execution_frequency,
+                        number_days: prescription.project[b].day,
+                        total: prescription.project[b].count.toString(),
+                        price: prescription.project[b].price,
+                        remark: prescription.project[b].remark,
+                        medical_code: prescription.project[b].project.medical_code,
+                        type: prescription.project[b].type,
+                        frequency_type: prescription.project[b].frequency_type,
+                        day_count: prescription.project[b].day_count,
+                        week_day: prescription.project[b].week_day
 
-                  let obj = {
-                    id: prescription.project[b].id,
-                    project_id: prescription.project[b].project_id,
-                    project_name: prescription.project[b].project.project_name,
-                    statistical_classification: prescription.project[b].project.statistical_classification,
-                    single_dose: prescription.project[b].single_dose,
-                    delivery_way: prescription.project[b].delivery_way,
-                    execution_frequency: prescription.project[b].execution_frequency,
-                    number_days: prescription.project[b].day,
-                    total: prescription.project[b].count.toString(),
-                    price: prescription.project[b].price,
-                    remark: prescription.project[b].remark,
-                    medical_code: prescription.project[b].project.medical_code,
-                    type: prescription.project[b].type,
-                    frequency_type: prescription.project[b].frequency_type,
-                    day_count: prescription.project[b].day_count,
-                    week_day: prescription.project[b].week_day
+                      }
 
-                  }
+                      if (prescription.project[b].type == 2) {
+                        obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                        obj['medical_code'] = prescription.project[b].project.medical_code
+                        obj['project_name'] = prescription.project[b].project.project_name
+                        obj['project'] = prescription.project[b].project
+                        obj['unit'] = prescription.project[b].unit
+                      } else if (prescription.project[b].type == 3) {
+                        obj['statistical_classification'] = ''
+                        obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                        obj['project_name'] = prescription.project[b].good_info.good_name
+                        obj['good_info'] = prescription.project[b].good_info
+                        obj['unit'] = prescription.project[b].good_info.packing_unit
+                      }
+                      tempProject.push(obj)
+                    }else{
+                      if( prescription.project[b].project.medical_status!=1){
+                        let obj = {
+                          id: prescription.project[b].id,
+                          project_id: prescription.project[b].project_id,
+                          project_name: prescription.project[b].project.project_name,
+                          statistical_classification: prescription.project[b].project.statistical_classification,
+                          single_dose: prescription.project[b].single_dose,
+                          delivery_way: prescription.project[b].delivery_way,
+                          execution_frequency: prescription.project[b].execution_frequency,
+                          number_days: prescription.project[b].day,
+                          total: prescription.project[b].count.toString(),
+                          price: prescription.project[b].price,
+                          remark: prescription.project[b].remark,
+                          medical_code: prescription.project[b].project.medical_code,
+                          type: prescription.project[b].type,
+                          frequency_type: prescription.project[b].frequency_type,
+                          day_count: prescription.project[b].day_count,
+                          week_day: prescription.project[b].week_day
+
+                        }
+
+                        if (prescription.project[b].type == 2) {
+                          obj['statistical_classification'] = prescription.project[b].project.statistical_classification
+                          obj['medical_code'] = prescription.project[b].project.medical_code
+                          obj['project_name'] = prescription.project[b].project.project_name
+                          obj['project'] = prescription.project[b].project
+                          obj['unit'] = prescription.project[b].unit
+                        } else if (prescription.project[b].type == 3) {
+                          obj['statistical_classification'] = ''
+                          obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
+                          obj['project_name'] = prescription.project[b].good_info.good_name
+                          obj['good_info'] = prescription.project[b].good_info
+                          obj['unit'] = prescription.project[b].good_info.packing_unit
+                        }
+                        tempProject.push(obj)
 
-                  if (prescription.project[b].type == 2) {
-                    obj['statistical_classification'] = prescription.project[b].project.statistical_classification
-                    obj['medical_code'] = prescription.project[b].project.medical_code
-                    obj['project_name'] = prescription.project[b].project.project_name
-                    obj['project'] = prescription.project[b].project
-                    obj['unit'] = prescription.project[b].unit
-                  } else if (prescription.project[b].type == 3) {
-                    obj['statistical_classification'] = ''
-                    obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
-                    obj['project_name'] = prescription.project[b].good_info.good_name
-                    obj['good_info'] = prescription.project[b].good_info
-                    obj['unit'] = prescription.project[b].good_info.packing_unit
-                  }
-                  tempProject.push(obj)
-                  }
+                      }
 
+                    }
+                  }
                 }
 
                 // var preTime = nowTime
@@ -1743,6 +1794,10 @@
                 }
 
                 this.prescriptions.push(obj)
+                console.log("!!!!!")
+                console.log(this.prescriptions)
+                console.log("!!!!!")
+
               }
               this.curPrescriptions = this.prescriptions[0]
 
@@ -1756,8 +1811,18 @@
                 order_status: 0,
                 med_type: ''
               }
-              obj.med_type = 14
+              if(this.org_id == 10206) {
+                obj.med_type = 12
+              }else{
+                obj.med_type = 14
+
+
+              }
               this.prescriptions.push(obj)
+              console.log("this.prescriptions")
+              console.log(this.prescriptions)
+              console.log("this.prescriptions")
+
               this.curPrescriptions = this.prescriptions[0]
             }
           }
@@ -1783,7 +1848,8 @@
                 type: 2,
                 is_special_diseases: project[i].disease_directory,
                 project: project[i],
-                first_letter:project[i].first_letter
+                first_letter:project[i].first_letter,
+                number: "",
               }
 
               this.tabProject.push(obj)
@@ -1806,7 +1872,9 @@
                 type: 3,
                 is_special_diseases: good_info[i].is_special_diseases,
                 good_info: good_info[i],
-                first_letter:good_info[i].first_letter
+                first_letter:good_info[i].first_letter,
+                number: good_info[i].good_number,
+
               }
               this.tabProject.push(obj)
             }
@@ -2018,7 +2086,8 @@
                     groupno: prescription.advices[b].groupno,
                     frequency_type: prescription.advices[b].frequency_type,
                     day_count: prescription.advices[b].day_count,
-                    week_day: prescription.advices[b].week_day
+                    week_day: prescription.advices[b].week_day,
+
 
                   }
                   tempAdvice.push(obj)
@@ -2100,7 +2169,13 @@
                 med_type: ''
               }
 
-              obj.med_type = 14
+              if(this.org_id == 10206) {
+                obj.med_type = 12
+              }else{
+                obj.med_type = 14
+
+
+              }
 
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]

src/xt_pages/role/admin.vue

@@ -25,13 +25,13 @@
         >医药师登记</el-button>
 
 
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toJiaBan">加班</el-button>
-       
+        -->
 
          <!-- <el-button
           type="primary"

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

@@ -588,8 +588,9 @@ export default {
     },
 
      exportList(){
-       
         
+        
+       
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
           this.tablePrint[i].ctime = this.getTime(this.tablePrint[i].ctime)
@@ -611,8 +612,10 @@ export default {
               this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
            }
         }
-
-
+        console.log("wowowoowowowowo",this.tablePrint)
+       
+       
+       
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
        if(this.org_id == 9919){
@@ -819,6 +822,7 @@ export default {
         if(response.data.state == 1){
             var list = response.data.data.list
             console.log("很粗扣扣我噢噢",list)
+           
             this.dealerList = response.data.data.dealerList
             this.manufacturerList = response.data.data.manufacturerList
             let objInfo = {}
@@ -882,6 +886,8 @@ export default {
                 }
               }
             }
+
+           console.log("newArrwowowowowoowowowowowowow",newArr)
            this.tablePrint = newArr
 
         }
@@ -893,11 +899,14 @@ export default {
         var min_str = ""
         for(let i=0;i<arr.length;i++){
           if(arr[i].count_unit == max_unit){
-            arr[i].count = arr[i].count * min_number
+            arr[i].count_one = 0
+            arr[i].count_one = arr[i].count * min_number
+          }else{
+            arr[i].count_one = arr[i].count
           }
         }
         for(let i=0;i<arr.length;i++){
-          total+= arr[i].count
+          total+= arr[i].count_one
         }
 
        if(total<min_number){
@@ -915,6 +924,8 @@ export default {
         return str + min_str
       },
       getTotalPrice(arr,max_unit,min_number,min_price){
+        console.log("arrwoowowow",arr)
+      
         var total = 0
         for(let i=0;i<arr.length;i++){
           if(arr[i].count_unit == max_unit){