Browse Source

提交代码

陈少旭 1 year ago
parent
commit
fe5047673e

+ 7 - 7
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -221,13 +221,13 @@
221 221
                                   type="primary"
222 222
                                 >读电子凭证
223 223
                                 </el-button>
224
-                                <el-button
225
-                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id == 10480)"
226
-                                  size="small"
227
-                                  @click="open(28,items.med_type,items.prescriptions[0].order,items.prescriptions)"
228
-                                  type="primary"
229
-                                >就医特殊属性上传
230
-                                </el-button>
224
+<!--                                <el-button-->
225
+<!--                                  v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id == 10480)"-->
226
+<!--                                  size="small"-->
227
+<!--                                  @click="open(28,items.med_type,items.prescriptions[0].order,items.prescriptions)"-->
228
+<!--                                  type="primary"-->
229
+<!--                                >就医特殊属性上传-->
230
+<!--                                </el-button>-->
231 231
 
232 232
                                 <el-button
233 233
                                   v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"

+ 3 - 8
src/xt_pages/outpatientCharges/statementPrint.vue View File

@@ -709,7 +709,6 @@ export default {
709 709
     searchAction() {
710 710
     },
711 711
     getInfo(order_id, obj) {
712
-
713 712
       if (obj.balance_accounts_type == 2) {
714 713
         let params = {
715 714
           his_patient_id: obj.his_patient_id,
@@ -842,7 +841,6 @@ export default {
842 841
             }
843 842
           })
844 843
         } else {
845
-          console.log("------==========`````")
846 844
           getPrivateExpensesOrder(params).then((response) => {
847 845
             if (response.data.state == 0) {
848 846
               // this.$message.error(response.data.msg)
@@ -1220,7 +1218,7 @@ export default {
1220 1218
             }
1221 1219
           })
1222 1220
         } else {
1223
-          if(this.org_id == 10480 || this.org_id == 0){
1221
+          if(this.org_id == 10480){
1224 1222
             let params = {
1225 1223
               order_id: obj.order_id,
1226 1224
               admin_user_id: this.$store.getters.xt_user.user.id
@@ -1779,18 +1777,15 @@ export default {
1779 1777
   },
1780 1778
 
1781 1779
   created() {
1782
-    console.log(this.paramsObj)
1783
-    this.getInfo(this.paramsObj.order_id, this.paramsObj)
1784 1780
     this.org_id = this.$store.getters.xt_user.org_id
1785
-    console.log('this.org_id', this.org_id)
1781
+    this.getInfo(this.paramsObj.order_id, this.paramsObj)
1786 1782
   },
1787 1783
   watch: {
1788 1784
     paramsObj: {
1789 1785
       //深度监听,可监听到对象、数组的变化
1790 1786
       handler(val, oldVal) {
1791 1787
         this.paramsObj = val
1792
-        console.log(this.paramsObj)
1793
-
1788
+        this.org_id = this.$store.getters.xt_user.org_id
1794 1789
         this.getInfo(this.paramsObj.order_id, this.paramsObj)
1795 1790
       },
1796 1791
       deep: true,