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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -936,7 +936,7 @@
         </el-option>
       </el-select>
 
-      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 &&this.$store.getters.xt_user.org_id != 10726 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217"
+      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 &&this.$store.getters.xt_user.org_id != 10726 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10633  && this.$store.getters.xt_user.org_id != 0"
                  style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
@@ -946,6 +946,16 @@
           :value="item.value">
         </el-option>
       </el-select>
+      <el-select v-if="this.$store.getters.xt_user.org_id == 10633"
+                 style="width:50%;" v-model="temp_med_type"
+                 placeholder="医疗类型" @change="changevalue">
+        <el-option
+          v-for="(item,index) in register10633"
+          :key="index"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
 
       <el-select v-if="this.$store.getters.xt_user.org_id == 10721  "
                  style="width:50%;" v-model="temp_med_type"
@@ -1188,6 +1198,13 @@ export default {
       //   { value: '91', label: '新冠肺炎门诊' },
 
       // ],
+      register10633: [
+        { value: 11, label: '普通门诊' },
+        { value: 14, label: '门诊特殊病' },
+        { value: '140201', label: '门诊特殊病(140201)' },
+        { value: '1104', label: '异地门特'},
+        { value: '999999', label: '自费' },
+      ],
       register: [
         { value: 11, label: '普通门诊' },
         { value: 12, label: '门诊挂号' },
@@ -1569,6 +1586,21 @@ export default {
         })
     },
     openDialog(item) {
+
+      if(this.org_id == 10644 && item.order.order_status == 1 && item.order.med_type == item.med_type){
+        this.$confirm("当前处方处于预结算状态，无法调整医疗类型，请撤销明细后再进行调整医疗类型", '错误信息', {
+          confirmButtonText: '确 定',
+          type: 'warning'
+        }).then(() => {
+          this.dialogVisible = false
+        }).catch(() => {
+          this.dialogVisible = false
+        })
+        return
+      }
+      if(this.org_id == 10633){
+        this.temp_med_type = "140201"
+      }
       this.dialogVisible = true
       this.temp_prescriptions = item
     },

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -23,7 +23,9 @@
          <div class="listInfo" style="border-bottom: 2px solid;margin-bottom: 20px;padding-bottom: 20px;">
             <div>预交款：</div>
             <div>总费用：{{getAllPice()}}</div>
-            <div>门诊日期：{{this.$route.query.end_time}}</div>
+           <div v-if=" this.$store.getters.xt_user.org_id != 10387">门诊日期：{{this.$route.query.end_time}}</div>
+           <div v-if=" this.$store.getters.xt_user.org_id == 10387">门诊日期：{{this.$route.query.start_time}} ~ {{this.$route.query.end_time}}</div>
+
         </div>
         <div class="listInfo">
             <div>西药：{{getWesternMedicineCostTotal()}}</div>