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/outpatientChargesManagement.vue

@@ -88,9 +88,9 @@
           <el-button size="small" @click="open(5)" type="primary"
                      v-if="this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">退费
           </el-button>
-          <!-- <el-button size="small" @click="open(5)" type="primary"
+          <el-button size="small" @click="open(5)" type="primary"
                     >退费
-          </el-button> -->
+          </el-button>
 
 
           <!--<el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(7)" type="primary"-->
@@ -105,15 +105,15 @@
           >结算单
           </el-button>
 
-          <!--<el-button v-if="this.$store.getters.xt_user.org_id == 9919"-->
-          <!--size="small" @click="open(10)" type="primary"-->
-          <!--&gt;退号-->
-          <!--</el-button>-->
+          <el-button v-if="this.$store.getters.xt_user.org_id == 9919"
+          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"-->
-          <!--size="small" @click="open(11)" type="primary"-->
-          <!--&gt;撤销明细-->
-          <!--</el-button>-->
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
+          size="small" @click="open(11)" type="primary"
+          >撤销明细
+          </el-button>
 
 
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->
@@ -553,6 +553,8 @@
         form['id'] = this.patientInfo.id
         form['record_time'] = this.record_date
         form['admin_user_id'] = this.$store.getters.xt_user.user.id
+        form['order_id'] = this.order.id
+
 
         if (this.activeName == 'first') {
           form['settle_accounts_type'] = 1
@@ -1594,6 +1596,7 @@
                 } else {
                   that.loadingtwo = false
                   that.state = '预结算'
+
                   that.$message({ message: '预结算成功', type: 'success' })
                 }
               })