Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
-                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480"
+                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480 || org_id == 10721"
                        type="primary">登陆
             </el-button>
 
         </el-option>
       </el-select>
 
-      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 0"
+      <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 != 0"
                  style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
         </el-option>
       </el-select>
 
-      <el-select v-if="this.$store.getters.xt_user.org_id == 10721  || this.$store.getters.xt_user.org_id == 0"
+      <el-select v-if="this.$store.getters.xt_user.org_id == 10721  "
                  style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
         </el-option>
       </el-select>
 
+      <el-select v-if="this.$store.getters.xt_user.org_id == 10726 "
+                 style="width:50%;" v-model="temp_med_type"
+                 placeholder="医疗类型" @change="changevalue">
+        <el-option
+          v-for="(item,index) in register10726"
+          :key="index"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+
       <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
                 <el-button type="primary" @click="comfirmChangeMedType">确 定</el-button>
         { value: '140201', label: '门诊特病(140201)' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
+      ],register10726:[
+        { value: 11, label: '普通门诊' },
+        { value: 14, label: '门诊慢特病(14)' },
+        { value: '990101', label: '单病种(990101)' },
+        { value: '1111', label: '精一' },
+        { value: '1112', label: '精二' },
       ],
 
       registerThree: [
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {
             break
         }
       }else{
-        if(this.org_id != 10721  && this.org_id != 0) {
+        if(this.org_id != 10721  && this.org_id != 0 && this.org_id != 10726) {
           switch (med_type) {
             case 11:
               return '普通门诊' + '处方' + index
             case 992102:
               return '单病种(992102)' + '处方' + index
               break
+
             case 140104:
               return '门诊特殊病(140104)' + '处方' + index
               break
               return '118801' + '处方' + index
               break
           }
-        }else{
+        }else if (this.org_id == 10721){
           switch (med_type) {
             case 11:
               return '普通门诊' + '处方' + index
               return '门诊特病(140201)' + '处方' + index
               break
           }
+        }else if (this.org_id == 10726){
+          switch (med_type) {
+            case 11:
+              return '普通门诊' + '处方' + index
+              break
+            case 14:
+              return '门诊特殊病' + '处方' + index
+              break
+            case 1111:
+              return '精一' + '处方' + index
+              break
+            case 1112:
+              return '精二' + '处方' + index
+              break
+            case 990101:
+              return '单病种(990101)' + '处方' + index
+              break
+
+          }
+
+
         }
       }
     }, unique_four(array) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                 </el-date-picker>
 
 
-                <el-select v-if="org_id != 10206 && org_id != 10721 && org_id != 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                <el-select v-if="org_id != 10206 && org_id != 10721 && org_id != 0 && org_id != 10726" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                            @change="changevalue">
                   <el-option
                     v-for="(item,index) in register"
                 </el-select>
 
 
-                <el-select v-if="org_id == 10721 || org_id == 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                <el-select v-if="org_id == 10721" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
                            @change="changevalue">
                   <el-option
                     v-for="(item,index) in register10721"
                   </el-option>
                 </el-select>
 
+
+                <el-select v-if="org_id == 10726 || org_id == 0 " style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                           @change="changevalue">
+                  <el-option
+                    v-for="(item,index) in register10726"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+
                 <div style="float: right;margin-bottom:5px;margin-right:1%;">
                   <el-button
                     round
         { value: 1111, label: '精一' },
         { value: 1112, label: '精二' },
       ],
+      register10726: [
+        { value: 11, label: '普通门诊' },
+        { value: 14, label: '门诊特殊病' },
+        { value: 990101, label: '单病种(990101)' },
+        { value: 1111, label: '精一' },
+        { value: 1112, label: '精二' },
+      ],
       medical_care: [
         { value: 11, label: '普通门诊' },
         { value: 1102, label: '新冠门诊' },

src/xt_pages/stock/detail/stockOutDetail.vue

 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485){
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.org_id ==10635 || this.org_id ==10726 || this.org_id == 10724 || this.org_id ==10635 || this.org_id ==10724 || this.org_id ==10726 || this.org_id ==10721){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
          
         }
         if(this.orgId ==10445){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.org_id !=10635  &&  this.org_id !=10724 &&  this.org_id !=10726  &&  this.org_id !=10721){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)