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

src/xt_pages/outpatientCharges/costComparison.vue

@@ -213,7 +213,7 @@
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -152,7 +152,7 @@
 
       },
       getInfo(order_id) {
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
 
           var that = this
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -136,13 +136,13 @@
                         </el-button>
 
                         <el-button
-                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671"
+                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106"
                                 size="small" @click="open(10)" type="primary"
                         >退号
                         </el-button>
 
                         <el-button
-                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671"
+                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"
                                 size="small" @click="open(11)" type="primary"
                         >撤销明细
                         </el-button>
@@ -527,7 +527,7 @@
     },
     methods: {
       query() {
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538) {
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 ) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/org/info', {
             params: {}
@@ -645,7 +645,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form,
@@ -867,7 +867,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
@@ -1484,7 +1484,7 @@
           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
 
             var that = this
             this.$confirm('是否退费', '退费', {
@@ -1579,7 +1579,7 @@
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
@@ -1716,7 +1716,7 @@
             })
         } else if (index == 15) {
           var that = this
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106) {
 
             if (this.diagnosis.length || this.diagnosis == 0) {
               that.$message.error('诊断不能为空,请选择诊断内容')
@@ -1825,7 +1825,7 @@
 
           }
           this.loadingtwo = true
-          if (this.$store.getters.xt_user.org_id == 9919 ) {
+          if (this.$store.getters.xt_user.org_id == 9919||this.$store.getters.xt_user.org_id == 10106) {
             var that = this
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -150,8 +150,8 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671) {
-         
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 10106) {
+
         var that = this
 
         axios.get('http://127.0.0.1:9532/api/settle/query', {

src/xt_pages/outpatientCharges/summary.vue

@@ -96,7 +96,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="(scope.row.order_status == 2 || $store.getters.xt_user.org_id == 9504) && (scope.row.order_status == 2 || $store.getters.xt_user.org_id == 9919)">结算单</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>

src/xt_pages/outpatientRecord/outpatientRecord.vue

@@ -318,7 +318,7 @@
             type: 'warning'
           }).then(() => {
             let params = {
-              'id': row.id,
+              'id': row.record.id,
               'admin_user_id': this.$store.getters.xt_user.user.id
 
             }
@@ -403,9 +403,12 @@
               if(response.data.data.failed_code == -10){
                 that.$message.error(response.data.data.msg)
               }else{
+                that.$message.success("备案成功")
+                that.dialogFormVisible = false
                 for (let i = 0; i < that.tableData.length; i++) {
                   if (that.tableData[i].id == that.currentObject.id) {
                     that.tableData[i].record.is_cancel == 1
+                    that.tableData[i].record.id == response.data.data.result.id
                     that.tableData[i].record.trt_dcla_detl_sn = response.data.data.result.trt_dcla_detl_sn
                     that.tableData[i].record.psn_no = response.data.data.result.psn_no
                     that.tableData[i].record.doctor_id = response.data.data.result.doctor_id
@@ -414,8 +417,6 @@
                     that.tableData[i].record.insutype = response.data.data.result.insutype
                     that.tableData[i].record.sick_type = response.data.data.result.sick_type
 
-
-
                   }
                 }
               }

src/xt_pages/outpatientRegistration/index.vue

@@ -965,7 +965,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1172,7 +1172,7 @@
                 .catch(function(error) {
 
                 })
-            } else if (this.$store.getters.xt_user.org_id == 9919) {
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/api/register/get', {