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

@@ -87,7 +87,8 @@
           <!--&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 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>
 
@@ -96,7 +97,8 @@
           <!--&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(13)" type="primary"
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
+                     size="small" @click="open(13)" type="primary"
           >查待遇
           </el-button>
 
@@ -178,59 +180,59 @@
               </div>
             </el-tab-pane>
             <!--<el-tab-pane label="月结" name="second">-->
-              <!--<div style="display:flex;height:100%;">-->
-                <!--<div class="centerLeft">-->
-                  <!--<div class="tabsBox">-->
-                    <!--&lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
-                    <!--<el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>-->
-
-                      <!--<el-tab-pane-->
-                        <!--v-for="(item, index) in month_prescriptions"-->
-                        <!--:key="index"-->
-                        <!--:label="item.name"-->
-                        <!--:name="item.name"-->
-                      <!--&gt;-->
-                      <!--</el-tab-pane>-->
-
-                      <!--<div class="RP">-->
-                        <!--Rp-->
-                        <!--<el-date-picker-->
-                          <!--v-model="other_start_time"-->
-                          <!--prefix-icon="el-icon-date"-->
-                          <!--@change="changeTime"-->
-                          <!--:editable="false"-->
-                          <!--style="width: 150px;"-->
-                          <!--type="date"-->
-                          <!--:picker-options="pickerOptions"-->
-                          <!--placeholder="选择开始时间"-->
-                          <!--align="right"-->
-                          <!--format="yyyy-MM-dd"-->
-                          <!--value-format="yyyy-MM-dd"-->
-                        <!--&gt;</el-date-picker>-->
-                        <!--<span class>-</span>-->
-                        <!--<el-date-picker-->
-                          <!--v-model="other_end_time"-->
-                          <!--prefix-icon="el-icon-date"-->
-                          <!--@change="changeEndTime"-->
-                          <!--:editable="false"-->
-                          <!--style="width: 150px;"-->
-                          <!--type="date"-->
-                          <!--placeholder="选择结束时间"-->
-                          <!--align="right"-->
-                          <!--format="yyyy-MM-dd"-->
-                          <!--value-format="yyyy-MM-dd"-->
-                        <!--&gt;</el-date-picker>-->
-                      <!--</div>-->
-                      <!--&lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
-                    <!--</el-tabs>-->
-
-                  <!--</div>-->
-                  <!--&lt;!&ndash;<div class="costBox">&ndash;&gt;-->
-                    <!--&lt;!&ndash;<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>&ndash;&gt;-->
-                    <!--&lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
-                  <!--&lt;!&ndash;</div>&ndash;&gt;-->
-                <!--</div>-->
-              <!--</div>-->
+            <!--<div style="display:flex;height:100%;">-->
+            <!--<div class="centerLeft">-->
+            <!--<div class="tabsBox">-->
+            <!--&lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
+            <!--<el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>-->
+
+            <!--<el-tab-pane-->
+            <!--v-for="(item, index) in month_prescriptions"-->
+            <!--:key="index"-->
+            <!--:label="item.name"-->
+            <!--:name="item.name"-->
+            <!--&gt;-->
+            <!--</el-tab-pane>-->
+
+            <!--<div class="RP">-->
+            <!--Rp-->
+            <!--<el-date-picker-->
+            <!--v-model="other_start_time"-->
+            <!--prefix-icon="el-icon-date"-->
+            <!--@change="changeTime"-->
+            <!--:editable="false"-->
+            <!--style="width: 150px;"-->
+            <!--type="date"-->
+            <!--:picker-options="pickerOptions"-->
+            <!--placeholder="选择开始时间"-->
+            <!--align="right"-->
+            <!--format="yyyy-MM-dd"-->
+            <!--value-format="yyyy-MM-dd"-->
+            <!--&gt;</el-date-picker>-->
+            <!--<span class>-</span>-->
+            <!--<el-date-picker-->
+            <!--v-model="other_end_time"-->
+            <!--prefix-icon="el-icon-date"-->
+            <!--@change="changeEndTime"-->
+            <!--:editable="false"-->
+            <!--style="width: 150px;"-->
+            <!--type="date"-->
+            <!--placeholder="选择结束时间"-->
+            <!--align="right"-->
+            <!--format="yyyy-MM-dd"-->
+            <!--value-format="yyyy-MM-dd"-->
+            <!--&gt;</el-date-picker>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
+            <!--</el-tabs>-->
+
+            <!--</div>-->
+            <!--&lt;!&ndash;<div class="costBox">&ndash;&gt;-->
+            <!--&lt;!&ndash;<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>&ndash;&gt;-->
+            <!--&lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
+            <!--&lt;!&ndash;</div>&ndash;&gt;-->
+            <!--</div>-->
+            <!--</div>-->
             <!--</el-tab-pane>-->
           </el-tabs>
 
@@ -295,8 +297,8 @@
     data() {
       return {
         key: "",
-        other_start_time:"",
-        other_end_time:"",
+        other_start_time: "",
+        other_end_time: "",
         crumbs: [
           {path: false, name: '门诊收费'},
           {path: false, name: '门诊收费管理'}
@@ -365,25 +367,27 @@
       this.getPatientList()
     },
     methods: {
-      changeTime(val){
+      changeTime(val) {
         this.other_start_time = val
 
 
-      },changeEndTime(val){
+      }, changeEndTime(val) {
         this.other_end_time = val
 
 
-
       }, chargeConfirm(form) {
 
         form['id'] = this.patientInfo.id
         form['record_time'] = this.record_date
-        if(this.activeName == 'first'){
+        form['admin_user_id'] = this.$store.getters.xt_user.user.id
+
+        if (this.activeName == 'first') {
           form['settle_accounts_type'] = 1
-        }else {
+        } else {
           form['start_time'] = this.other_start_time
           form['end_time'] = this.other_end_time
           form['settle_accounts_type'] = 2
+
         }
 
         this.loadingtwo = true
@@ -439,8 +443,9 @@
       },
       confirm(forms) {
         forms['id'] = this.patientInfo.id,
-          forms['record_time'] = this.record_date,
-          this.loadingone = true
+        forms['record_time'] = this.record_date,
+        forms['admin_user_id'] = this.$store.getters.xt_user.user.id
+        this.loadingone = true
 
         if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
           var that = this
@@ -705,6 +710,8 @@
                 'number': this.order.number,
                 'patient_id': this.patientInfo.id,
                 'record_time': this.record_date,
+                'admin_user_id':this.$store.getters.xt_user.user.id
+
 
               }
               axios.get('http://127.0.0.1:9532/api/refund/post', {