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

@@ -197,7 +197,7 @@
                     </el-form-item>
 
 
-                  <el-form-item label="清算机构" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id">
+                  <el-form-item label="清算机构" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id = 10106">
                     <el-select v-model="query_clr_org" placeholder="请选择" style="width: 200px;">
                       <el-option
                           v-for="item in clrOrgOptions"
@@ -208,6 +208,17 @@
                     </el-select>
                   </el-form-item>
 
+                  <el-form-item label="清算类别" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id = 9919">
+                    <el-select v-model="clr_type" placeholder="请选择" style="width: 200px;">
+                      <el-option
+                          v-for="item in clrOptions"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+
                 </el-form>
                 <div slot="footer" class="dialog-footer">
                     <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -264,6 +275,7 @@
         query_insutype: '',
         query_clr_type: '',
         query_clr_org:'',
+        clr_type:'',
         fromData: [],
         options: [
           {
@@ -296,8 +308,8 @@
             value: '99',
             label: '其他'
           }, {
-            value: '99',
-            label: '其他'
+            value: '9903',
+            label: '异地'
           }
         ],
         insutypes: [
@@ -462,7 +474,7 @@
             start_time: this.start_time,
             end_time: this.end_time,
             insutype: this.insutype,
-            clr_type: '11',
+            clr_type: this.clr_type,
             clr_optins:this.query_clr_org,
           }
           var that = this
@@ -791,9 +803,7 @@
 
           }
         })
-
       },
-
     },
     created() {
       this.getList()

src/xt_pages/outpatientCharges/summary.vue

@@ -275,10 +275,8 @@
           case 14:
             return '门诊特殊病'
             break
-
           case 15:
             return '门诊统筹'
-
             break
           case 16:
             return '门诊慢性病'
@@ -529,10 +527,7 @@
               } else {
                 time = this.getTimes(order.settle_accounts_date)
               }
-
               var hifmi_pay = 0.00
-
-              console.log(order.setl_detail)
               if (order.setl_detail && order.setl_detail.length > 0) {
                 var jsonObj = JSON.parse(order.setl_detail)
                 console.log(jsonObj)