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

src/xt_pages/data/components/addDrugs.vue

@@ -270,6 +270,14 @@
                       <el-form-item label="省编码 : " prop="provinces_code">
                         <el-input v-model="form.provinces_code" style="width:160px;" placeholder=""
                                   maxlength="30"></el-input>
+                      </el-form-item>
+                      <el-form-item label="bbx01 : " prop="bbx01">
+                        <el-input v-model="form.bbx01" style="width:160px;" placeholder=""
+                                  maxlength="30"></el-input>
+                      </el-form-item>
+                      <el-form-item label="bby01 : " prop="bbx01">
+                        <el-input v-model="form.bby01" style="width:160px;" placeholder=""
+                                  maxlength="30"></el-input>
                       </el-form-item>
                         <el-form-item label="生产厂商 : " prop="manufacturer">
 
@@ -622,6 +630,8 @@
           sum_count:"",
           sum_in_count:"",
           is_pharmacy:1,//是否通过药房发药
+          bbx01:"",
+          bby01:"",
         },
 
         rules: {
@@ -866,6 +876,8 @@
       hide() {
         // this.clear()
         this.form.social_security_directory_code = ''
+
+
         this.form.prescription_mark = ''
         this.form.record_date = ''
         this.form.drug_remark = ''
@@ -938,7 +950,7 @@
         form['total'] = this.form.total
         form['min_number'] = this.form.min_number
         form["drug_day"] = this.form.drug_day
-        form['dose'] = this.form.dose,
+        form['dose'] = this.form.dose
         form['dose_unit'] = this.form.dose_unit
         form['min_price'] = this.form.min_price
         form['prescribing_number_unit'] = this.form.prescribing_number_unit
@@ -947,6 +959,9 @@
         form['sum_count'] = this.form.sum_count
         form['sum_in_count'] = this.form.sum_in_count
         form['is_pharmacy'] = this.form.is_pharmacy
+        form['bbx01'] = this.form.bbx01
+        form['bby01'] = this.form.bby01
+
         return form
       },
       getlist() {

src/xt_pages/data/components/addProject.vue

@@ -149,6 +149,13 @@
                             <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
                          </el-form-item>
 
+                      <el-form-item label="bbx01" >
+                        <el-input v-model="form.bbx01" style="width:180px"></el-input>
+                      </el-form-item>
+                      <el-form-item label="bby01" >
+                        <el-input v-model="form.bby01" style="width:180px"></el-input>
+                      </el-form-item>
+
                         <el-form-item label="备案日期:" >
                             <el-date-picker
                                 value-format="yyyy-MM-dd"
@@ -305,6 +312,8 @@ export default {
               social_security_directory_code:"",
               record_date:"",
               is_print:"",
+              bbx01:"",
+              bby01:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -400,7 +409,9 @@ export default {
                     specail_project:this.form.specail_project,
                     social_security_directory_code:this.form.social_security_directory_code,
                     record_date:this.form.record_date,
-                    is_print:parseInt(this.form.is_print) 
+                    is_print:parseInt(this.form.is_print),
+                   bbx01:this.form.bbx01,
+                   bby01:this.form.bby01,
                }
              console.log("params222222",params)
               saveProject(params).then(response=>{
@@ -440,6 +451,9 @@ export default {
                    this.form.social_security_directory_code = ""
                    this.form.record_date = ""
                    this.form.specail_project = ""
+                   this.form.bbx01 = ""
+                   this.form.bby01 = ""
+
                  }else {
                     this.$message.error("项目名称已存在!")
                  }

src/xt_pages/data/components/consumables.vue

@@ -336,6 +336,8 @@
               is_user:"2",
               number:"",
               is_warehouse:"1",
+              bbx01:"",
+              bby01:""
             },
             isVisibility: false,
           }
@@ -713,6 +715,12 @@
 
             this.goodInfo.goodInfoDialog.formValue.social_security_directory_code = response.data.data.goodInfo.social_security_directory_code;
 
+
+            this.goodInfo.goodInfoDialog.formValue.bbx01 = response.data.data.goodInfo.bbx01;
+            this.goodInfo.goodInfoDialog.formValue.bby01 = response.data.data.goodInfo.bby01;
+
+
+
             if(response.data.data.production_type<=0){
                this.goodInfo.goodInfoDialog.production_type = ''
             }else{
@@ -731,6 +739,11 @@
             this.goodInfo.goodInfoDialog.formValue.default_count_unit = response.data.data.goodInfo.default_count_unit
             this.goodInfo.goodInfoDialog.formValue.register_number = response.data.data.goodInfo.register_number
 
+            this.goodInfo.goodInfoDialog.formValue.bbx01 = response.data.data.goodInfo.bbx01
+            this.goodInfo.goodInfoDialog.formValue.bby01 = response.data.data.goodInfo.bby01
+
+
+
             this.goodInfo.goodInfoDialog.formValue.number = response.data.data.goodInfo.number
 
             this.goodInfo.goodInfoDialog.formValue.is_user = response.data.data.goodInfo.is_user.toString()

src/xt_pages/data/components/drugs.vue

@@ -330,6 +330,8 @@
           drug_day:"",//默认开药天数,
           total:"",
           is_user:"",
+          bbx01:"",
+          bby01:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -390,6 +392,8 @@
           drug_day:"",//默认开药天数
           total:"",
           is_user:"",
+          bbx01:"",
+          bby01:"",
         },
 
         current_id: 0,

src/xt_pages/data/components/editProject.vue

@@ -149,6 +149,13 @@
                             <el-input v-model="form.social_security_directory_code" style="width:180px"></el-input>
                          </el-form-item>
 
+                      <el-form-item label="bbx01" >
+                        <el-input v-model="form.bbx01" style="width:180px"></el-input>
+                      </el-form-item>
+                      <el-form-item label="bby01" >
+                        <el-input v-model="form.bby01" style="width:180px"></el-input>
+                      </el-form-item>
+
                         <el-form-item label="备案日期:" >
                             <el-date-picker
                                 value-format="yyyy-MM-dd"
@@ -311,6 +318,8 @@ export default {
               social_security_directory_code:"",
               record_date:"",
               is_print:"",
+              bbx01:"",
+              bby01:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -429,13 +438,24 @@ export default {
               if(projecDetail.social_security_directory_code == 0){
                 this.form.social_security_directory_code = ""
               }
+
+              this.form.bbx01 = projecDetail.bbx01
+              if(projecDetail.bbx01 == 0){
+                this.form.bbx01 = ""
+              }
+
+              this.form.bby01 = projecDetail.bby01
+              if(projecDetail.bby01 == 0){
+                this.form.bby01 = ""
+              }
+
               this.form.record_date = this.getTime(projecDetail.record_date)
               if(projecDetail.is_print == 0){
                 this.form.is_print = ""
               }else{
                 this.form.is_print = projecDetail.is_print
               }
-             
+
             }
          })
        },
@@ -478,6 +498,8 @@ export default {
                      specail_project:this.form.specail_project,
                     social_security_directory_code:this.form.social_security_directory_code,
                     record_date:this.form.record_date,
+                    bbx01:this.form.bbx01,
+                    bby01: this.form.bby01,
                     is_print:parseInt(this.form.is_print)
                }
 

src/xt_pages/data/components/project.vue

@@ -111,6 +111,8 @@
                    {{scope.row.medical_code}}
                 </template>
             </el-table-column>
+
+
             <el-table-column label="状态" width="60" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.medical_status ==0"></span>

src/xt_pages/data/druguse.vue

@@ -449,6 +449,7 @@ export default {
       drugdics: [],
       adviceTemplates:[],
       drugways: [],
+
       executionFrequencyOptions: [],
       drugdicRules: {
         name: [{ required: true, message: "请填写医嘱名称" }]
@@ -483,7 +484,8 @@ export default {
       },
       drugwayForm: {
         name: "",
-        id: 0
+        id: 0,
+        code:"",
       },
       efForm: {
         name: "",
@@ -767,17 +769,20 @@ export default {
     handleCreateDrugWay() {
       this.drugwayForm = {
         name: "",
-        id: 0
+        id: 0,
+        code:"",
       };
       this.drugwayFormVisible = true;
       this.dialogTitle = "新增给药途径";
       this.isEdit = false;
     },
     handleUpdateDrugWay(row, index) {
+      console.log(row)
       this.currentIndex = index;
       this.drugwayForm = {
         name: row.name,
-        id: row.id
+        id: row.id,
+        code:row.code,
       };
 
       this.drugwayFormVisible = true;
@@ -804,8 +809,8 @@ export default {
                   this.resetForm(formName);
                   var drugway = response.data.data.drugway;
                   this.drugways[this.currentIndex].name = drugway.name;
-                  this.drugways[this.currentIndex].updated_time =
-                    drugway.updated_time;
+                  this.drugways[this.currentIndex].code = drugway.code;
+                  this.drugways[this.currentIndex].updated_time = drugway.updated_time;
                   this.currentIndex = -1;
                   return false;
                 }

src/xt_pages/data/druguseTemplate.vue

@@ -1181,6 +1181,9 @@
                 <el-form-item label="给药途径 :" required prop="name">
                   <el-input v-model="drugwayForm.name" placeholder="给药途径"></el-input>
                 </el-form-item>
+                <el-form-item label="编码 :" required prop="name">
+                  <el-input v-model="drugwayForm.code" placeholder="给药途径编码"></el-input>
+                </el-form-item>
               </el-form>
               <div slot="footer" class="dialog-footer">
                 <el-button @click="drugwayFormVisible = false">取消</el-button>
@@ -1442,7 +1445,8 @@
         },
         drugwayForm: {
           name: '',
-          id: 0
+          id: 0,
+          code:"",
         },
         efForm: {
           name: '',
@@ -1979,6 +1983,7 @@
       handleCreateDrugWay() {
         this.drugwayForm = {
           name: '',
+          code:'',
           id: 0
         }
         this.drugwayFormVisible = true
@@ -1987,10 +1992,12 @@
       },
 
       handleUpdateDrugWay(row, index) {
+        console.log(row.code)
         this.currentIndex = index
         this.drugwayForm = {
           name: row.name,
-          id: row.id
+          id: row.id,
+          code:row.code
         }
 
         this.drugwayFormVisible = true
@@ -2013,6 +2020,8 @@
                     this.resetForm(formName)
                     var drugway = response.data.data.drugway
                     this.drugways[this.currentIndex].name = drugway.name
+                    this.drugways[this.currentIndex].code = drugway.code
+
                     this.drugways[this.currentIndex].updated_time =
                       drugway.updated_time
                     this.currentIndex = -1

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

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

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 ==10265"> {{
+                      <span v-if="org_id ==10206"> {{
                           prescription.replacement_total
                             ? prescription.replacement_total
                             : "/"
                         }}
                         </span> 
-                        <span v-if="org_id!=10265"> {{
+                        <span v-if="org_id!=10206"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -885,6 +885,7 @@
         this.form.age = ''
         this.form.id_card = ''
         this.form.register = ''
+
         this.form.doctor = ''
         this.form.department = ''
         this.form.registration_fee = ''
@@ -905,8 +906,22 @@
         if (departments.length > 0) {
           this.form.department = departments[0].id
         }
+        console.log("11231231231223233432423dddd312")
         if (doctors.length > 0) {
-          this.form.doctor = doctors[0].admin_user_id
+          if(this.$store.getters.xt_user.org_id == 10318 || this.$store.getters.xt_user.org_id == 0){
+            console.log("~~~~~~~")
+            this.form.doctor = 3127
+
+          }else{
+            console.log("-----------")
+
+            this.form.doctor = doctors[0].admin_user_id
+
+          }
+        }else{
+          console.log("~~~~~~~")
+          this.form.doctor = 3127
+
         }
 
         // this.form.name = patientInfo.name

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -13,8 +13,8 @@
     <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 "><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0" >
-            <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
+            <printOne v-if="org_id != 10088 && org_id != 10510" :paramsObj="invoiceParams"></printOne>
+            <printThree v-if="org_id == 10088 || org_id == 10510 " :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -172,11 +172,11 @@
                 if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
                   obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
                   obj['feedetl_sn'] = infos.feedetl_sn
+                  obj['type'] = infos.chrgitm_lv
 
                   if(infos.project.type == 2){
                     obj['name'] = infos.project.project.project_name
                     obj['code'] = infos.project.project.medical_code
-
                     obj['spec'] = ''
                     obj['unit'] =  infos.project.project.unit
                     obj['is_total']= 0
@@ -193,6 +193,7 @@
 
                 }
                 if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
+                  obj['type'] = infos.chrgitm_lv
                   obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
                   obj['name'] = infos.advice.drug.drug_name
                   obj['code'] = infos.advice.drug.medical_insurance_number

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -25,6 +25,9 @@
                 <td style="width:10%">单价(元)</td>
                 <td style="width:6%">数量</td>
                 <td style="width:10%">金额(元)</td>
+              <td v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0 " style="width:10%">医保类型</td>
+
+
             </tr>
             <tr v-for="item in list.slice(index * 15,(index * 15) + pageArr[index])">
                 <td style="width:15%">{{item.p_time}}</td>
@@ -35,6 +38,8 @@
                 <td style="width:10%">{{item.price}}</td>
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
+              <td v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0 " style="width:10%">{{getMedicineInsuranceKind(item.type)}}</td>
+
             </tr>
         </table>
         <div class="tableBottom">
@@ -89,6 +94,18 @@
     //     this.getPage()
     // },
     methods:{
+      getMedicineInsuranceKind(type){
+        switch (type) {
+          case "01":
+            return '甲类';
+          case "02":
+            return '乙类';
+          case "03":
+            return '自费';
+            break;
+        }
+
+      },
       getNowTime: function () {
         let dateTime
         let yy = new Date().getFullYear()

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3211,7 +3211,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {
@@ -3306,7 +3306,7 @@ export default {
           })
         }
       } else if (index == 6) {
-        if (this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
           this.$refs.register9504.show()
         } else {
           this.$refs.register.show(this.doctors, this.department)

src/xt_pages/outpatientCharges/statementTemplate/print10191.vue

@@ -5,7 +5,8 @@
 
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10191">福建省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510">湖北省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -5,7 +5,9 @@
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10375">广西省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10191">福建省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510">湖北省社会医疗保险医疗费用结算单</div>
+
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/printSix.vue

@@ -2,7 +2,9 @@
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510">湖北省社会医疗保险医疗费用结算单</div>
+
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -2,10 +2,12 @@
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10510">湖北省社会医疗保险医疗费用结算单</div>
+
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10375">广西省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10515">湖南省社会医疗保险医疗费用结算单</div>
 
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10515 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10515 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/summary.vue

@@ -214,7 +214,7 @@
         </el-table-column>
         <el-table-column align="center" width="90" prop="name" label="实收金额">
           <template slot-scope="scope">{{
-              scope.row.reality_price.toFixed(2)
+              scope.row.medfee_sumamt.toFixed(2)
             }}
           </template>
         </el-table-column>
@@ -2819,6 +2819,7 @@ export default {
       });
 
 
+
     },
     export_detail_ten_three(){
       exportOrderInfo().then((response) => {

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1687,12 +1687,9 @@
                   }
 
                 }
-
-
                 //项目
                 for (let b = 0; b < prescription.project.length; b++) {
                   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,
@@ -1766,13 +1763,10 @@
                         tempProject.push(obj)
 
                       }
-
                     }
                   }
                 }
-
                 // var preTime = nowTime
-
                 let index = i + 1
                 let obj = {
                   id: prescription.id,

src/xt_pages/outpatientDoctorStation/print.vue

@@ -28,7 +28,7 @@
         </prinSeven>
 
         <printFour
-          v-if="org_id == 10088 || org_id == 0"
+          v-if="org_id == 10088 || org_id == 0 || org_id == 10510"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/role/admin.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
-     
+
        <div>
 
         <!-- <el-button
@@ -63,7 +63,7 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toTestFour">添加企业成员</el-button>
-         
+
           <el-button
           type="primary"
           size="small"
@@ -85,7 +85,7 @@
           style="float:left"
           @click="toTestSeven">添加合同签署人</el-button> -->
 
-        <!-- <el-button 
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -95,7 +95,7 @@
            短信验证码
           </el-button>  -->
 
-         
+
          <!-- <el-button
           type="primary"
           size="small"
@@ -144,7 +144,7 @@
           @click="toTestSeven">添加合同签署人</el-button>
 
 
-          <el-button 
+          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -182,17 +182,17 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toEnd">结束签署</el-button> -->
-           
 
-        
+
+
          <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toSendInformaton">发送短信验证码</el-button>  -->
-       
-          
+
+
           <!--<el-button
           type="primary"
           size="small"
@@ -208,12 +208,12 @@
           style="float:left"
           @click="toCheckPDFInformation">PDF验证</el-button> -->
 
-         
 
-        
+
+
      </div>
-    
-      
+
+
     </div>
     <div class="app-container">
       <el-table
@@ -228,19 +228,26 @@
         :data="admins"
         v-loading="is_loading_admins"
         @selection-change="handleSelectionChange"
-      > 
+      >
         <el-table-column
               align="center"
               type="selection"
               width="55">
-        </el-table-column>  
+        </el-table-column>
         <el-table-column
           label="用户名"
           prop="user_name"
           min-width="160"
           align="center"
         ></el-table-column>
-        <el-table-column label="医保医师编码" prop="doctor_number" min-width="160" align="center">
+        <el-table-column v-if="this.$store.getters.xt_user.org_id != 10206" label="医保医师编码" prop="doctor_number" min-width="160" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.doctor_number== 0"></span>
+            <span v-if="scope.row.doctor_number!= 0">{{scope.row.doctor_number}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column  v-if="this.$store.getters.xt_user.org_id == 10206" label="员工ID" prop="doctor_number" min-width="160" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.doctor_number== 0"></span>
             <span v-if="scope.row.doctor_number!= 0">{{scope.row.doctor_number}}</span>
@@ -287,8 +294,8 @@
         </el-table-column>
         <el-table-column label="操作" width="240" align="center">
           <template slot-scope="scope">
-           
-             
+
+
            <!-- <span>
               <el-button type="primary" size="small" @click="toRenZhen(scope.row.user_id,scope.row.user_name)">
                     <span>CA个人认证</span>
@@ -306,7 +313,7 @@
                     <span>创建个人印章</span>
               </el-button>
             </span>  -->
-<!-- 
+<!--
             <span>
               <el-button type="primary" size="small" @click="toShouQuan(scope.row.user_id,scope.row.user_name)">
                     <span>创建企业印章</span>
@@ -391,7 +398,7 @@
       :visible.sync="dialogVisible"
       width="50%">
       <span>
-        
+
         <el-form>
           <el-row>
             <el-col>
@@ -431,7 +438,7 @@
                </el-form-item>
             </el-col>
 
-           
+
             <el-col>
                <el-form-item label="法定代表人:">
                  <el-input style="width:200px" v-model="form.legal_person_name" placeholder="请输入统一社会信息代码"></el-input>
@@ -465,10 +472,10 @@
       :visible.sync="persionDialogVisible"
       width="50%">
       <span>
-        
+
         <el-form>
           <el-row>
-          
+
             <el-col>
                <el-form-item label="姓名:">
                  <el-input style="width:200px" v-model="personForm.display_name" placeholder="请输入姓名"></el-input>
@@ -487,7 +494,7 @@
                </el-form-item>
             </el-col>
 
-           
+
             <el-col>
                <el-form-item label="验证码:">
                  <el-input style="width:100px" v-model="form.code" placeholder="请输入验证码"></el-input>
@@ -566,7 +573,7 @@ export default {
     AdminInfoForm
   },
   created: function() {
-     
+
     this.local_user_id = this.$store.getters.xt_user.user.id;
     let page = 1;
     this.getRoles(page);
@@ -655,7 +662,7 @@ export default {
           console.log(resp);
           if (resp.state === 1) {
              var admindata = resp.data.admins
-          
+
             this.admins.push(...admindata);
             this.admin_total_count = resp.data.total_count;
           } else {
@@ -768,7 +775,7 @@ export default {
           ids.push(this.selectDrug[index].user_id);
           idMap[this.selectDrug[index].user_id] = this.selectDrug[index].user_id;
         }
-        
+
         var idss = ids.join(',')
         let params = {
           ids:idss,
@@ -802,13 +809,13 @@ export default {
            "is_mark":is_mark,
            "admin_user_id":this.$store.getters.xt_user.user.id
         }
-        
+
          axios.get('http://127.0.0.1:9532/sz/api/medical/get',{params:params}).then(function(response) {
           if (response.data.state == 0) {
                that.$message.error(response.data.data.msg)
                return false
             } else {
-             
+
               if(response.data.data.msg == ""){
                   that.$message.success("登记成功!")
                   that.adminMainView()
@@ -928,7 +935,7 @@ export default {
     },
 
     saveEnterprise(){
-      
+
         var params = {
           id:this.form.id,
           org_type:parseInt(this.form.org_type),
@@ -965,7 +972,7 @@ export default {
       })
     },
     toRenZhen(admin_user_id,user_name){
-       
+
       getPerseEnterPriseById(admin_user_id).then(response=>{
         if(response.data.state== 1){
           var lastPerson =  response.data.data.lastPerson
@@ -978,7 +985,7 @@ export default {
         }
       })
 
-   
+
     },
     getCode(){
         var params = {
@@ -991,7 +998,7 @@ export default {
           console.log("sign",sign)
           this.$message.success("发送成功!")
         }
-      }) 
+      })
     },
     savePersonEnterprise(){
         var params = {
@@ -1053,16 +1060,16 @@ export default {
         }
       })
     },
-   
+
     toQianShu(admin_user_id){
-       
+
       CreateQianshuUserName(admin_user_id).then(response=>{
          if(response.data.state==1){
           var sign =  response.data.data.sign
           var userId =  response.data.data.userId
           this.$message.success("签署成功!")
          }
-      }) 
+      })
     },
 
     toSendInformaton(){
@@ -1078,9 +1085,9 @@ export default {
       toSavePDFInformation().then(response=>{
          if(response.data.state == 1){
           var information =  response.data.data.information
-           
+
            var orderId = response.data.data.orderId
-           
+
           //  var base64Img = 'data:image/png;base64'+","+orderId
           //  console.log("base64Img",base64Img)
           //  var imgFile = this.base64ImgtoFile(base64Img)
@@ -1157,14 +1164,14 @@ export default {
     // toDrugInfo(){
     //   getdruginfoInformation().then(response=>{
     //      if(response.data.state==1){
-           
+
     //      }
     //   })
     // }
     toJiaBan(){
       UploadPrintOrder().then(response=>{
         if(response.data.state ==1){
-           
+
         }
       })
     }

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -114,6 +114,14 @@
               <el-input v-model="form.provinces_code" style="width:160px;" placeholder=""
                         ></el-input>
             </el-form-item>
+            <el-form-item label="bbx01 : " prop="bbx01">
+              <el-input v-model="form.bbx01" style="width:160px;" placeholder=""
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="bby01 : " prop="bby01">
+              <el-input v-model="form.bby01" style="width:160px;" placeholder=""
+              ></el-input>
+            </el-form-item>
             <el-form-item label="是否特病目录:" prop="is_special_diseases">
               <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
                 <el-option
@@ -198,7 +206,7 @@
             <el-form-item label="注册编码:" >
               <el-input v-model="form.register_number" style="width:180px"></el-input>
             </el-form-item>
-            
+
             <el-form-item label="是否零用:">
 
               <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择" @change="changeUse">
@@ -210,7 +218,7 @@
                   </el-option>
               </el-select>
              </el-form-item>
-           
+
             <el-form-item label="是否自动出库:" v-if="form.is_user == 1">
               <el-select v-model="form.is_warehouse" style="width:160px" filterable placeholder="请选择">
                   <el-option
@@ -221,13 +229,13 @@
                   </el-option>
               </el-select>
              </el-form-item>
- 
-          
+
+
             <el-form-item label="批准文号:" >
               <el-input v-model="form.number" style="width:180px"></el-input>
             </el-form-item>
 
-   
+
 
 
             <el-form-item label="备注 : " prop="name" style="width:100%;">
@@ -403,6 +411,8 @@
           is_user:"2",
           number:"",
           is_warehouse:"1",
+          bbx01:"",
+          bby01:"",
         },
 
         rules: {
@@ -472,7 +482,7 @@
       },
       show(id,form) {
          console.log("form",this.form)
-        
+
         if(form!=undefined){
           this.unitList = []
           var arr =  getDataConfig('hemodialysis','units')
@@ -537,6 +547,8 @@
               min_unit:"",
               total:"",
               is_user:"",
+            bbx01:"",
+            bby01:"",
             }
           this.good_status = []
           for (let key in tempform) {
@@ -632,6 +644,9 @@
         form["is_user"] = this.form.is_user
         form["number"] = this.form.number
         form["is_warehouse"] = this.form.is_warehouse
+        form["bbx01"] = this.form.bbx01
+        form["bby01"] = this.form.bby01
+
         return form
       }, changeSelected: function(val) {
         console.log(val)
@@ -705,7 +720,7 @@
         }
       },
      changeDefaultCountUnit(val){
-      
+
        this.form.default_count_unit = ''
         this.form.default_count_unit = val
       },
@@ -718,9 +733,9 @@
     },
     watch: {
       visible(val) {
-       
+
         this.form = this.formValue
-       
+
         this.good_unit = this.formValue.good_unit
 
         if (this.isCreated == 1) {
@@ -729,7 +744,7 @@
       }
     },
     created(){
-      
+
       this.getlist()
       //获取所有经销商
       this.GetAllConfig()