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

src/xt_pages/device/airDisinfectTwo.vue

@@ -23,7 +23,7 @@
           <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="dialogFormVisible = true">打印</el-button>
             <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
-              
+
           </div>
           <div class="tab_air">
             <el-table  :data="tableData" :fit="true" stripe>
@@ -71,7 +71,7 @@
               @current-change="handleCurrentChange" -->
           </el-pagination>
          </div>
-           
+
             <!-- 新增 -->
           <el-dialog
           class="centerDialog"
@@ -135,7 +135,7 @@
                           :value="item.id">
                           </el-option>
                       </el-select>
-                  </el-form-item> 
+                  </el-form-item>
                   <el-form-item label="责任人" label-width="110px" required prop="creator">
                       <el-select v-model="form.creator" placeholder="请选择">
                           <el-option
@@ -192,7 +192,7 @@
                           :value="item.id">
                           </el-option>
                       </el-select>
-                  </el-form-item> 
+                  </el-form-item>
                   <el-form-item label="责任人" label-width="110px" required prop="creator">
                       <el-select v-model="form.creator" placeholder="请选择">
                           <el-option
@@ -249,7 +249,7 @@
                           :value="item.id">
                           </el-option>
                       </el-select>
-                  </el-form-item> 
+                  </el-form-item>
                   <el-form-item label="责任人" label-width="110px" required prop="creator">
                       <el-select v-model="form.creator" placeholder="请选择">
                           <el-option
@@ -297,7 +297,7 @@
                           :value="item.id">
                           </el-option>
                       </el-select>
-                  </el-form-item> 
+                  </el-form-item>
                   <el-form-item label="责任人" label-width="110px"  prop="creator">
                       <el-select v-model="form.creator" placeholder="请选择">
                           <el-option
@@ -308,14 +308,14 @@
                           </el-option>
                       </el-select>
                   </el-form-item>
-                  
+
               </el-form>
               <div slot="footer" class="dialog-footer">
                   <el-button @click="dialogFormVisible = false">取 消</el-button>
                   <el-button type="primary" @click="saveAirDisinfect('form')">保 存</el-button>
               </div>
           </el-dialog>
-          
+
           <!-- 编辑 -->
           <el-dialog
           class="centerDialog"
@@ -379,7 +379,7 @@
                           :value="item.id">
                           </el-option>
                       </el-select>
-                  </el-form-item> 
+                  </el-form-item>
                   <el-form-item label="责任人" label-width="110px" required prop="creator">
                       <el-select v-model="form.creator" placeholder="请选择">
                           <el-option
@@ -436,7 +436,7 @@
                           :value="item.id">
                           </el-option>
                       </el-select>
-                  </el-form-item> 
+                  </el-form-item>
                   <el-form-item label="责任人" label-width="110px" required prop="creator">
                       <el-select v-model="form.creator" placeholder="请选择">
                           <el-option
@@ -493,7 +493,7 @@
                           :value="item.id">
                           </el-option>
                       </el-select>
-                  </el-form-item> 
+                  </el-form-item>
                   <el-form-item label="责任人" label-width="110px" required prop="creator">
                       <el-select v-model="form.creator" placeholder="请选择">
                           <el-option
@@ -541,7 +541,7 @@
                           :value="item.id">
                           </el-option>
                       </el-select>
-                  </el-form-item> 
+                  </el-form-item>
                   <el-form-item label="责任人" label-width="110px" required prop="creator">
                       <el-select v-model="form.creator" placeholder="请选择">
                           <el-option
@@ -552,7 +552,7 @@
                           </el-option>
                       </el-select>
                   </el-form-item>
-                  
+
               </el-form>
               <div slot="footer" class="dialog-footer">
                   <el-button @click="editDialogFormVisible = false">取 消</el-button>
@@ -562,15 +562,15 @@
       </div>
     </div>
   </template>
-  
+
   <script>
     import BreadCrumb from '@/xt_pages/components/bread-crumb'
     import { getAllDoctorList,
         saveAirDisinfect,
-        getAirList, 
+        getAirList,
         getAirDisinfectDetail,
         updateAirDisinfect,
-        deleteAirDisinfect 
+        deleteAirDisinfect
     } from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
@@ -585,7 +585,7 @@
             { path: false, name: '院感管理' },
             { path: false, name: '透析室空气消毒记录表' }
           ],
-  
+
           dialogFormVisible:false,
           editDialogFormVisible:false,
           startvalue:'',
@@ -602,7 +602,7 @@
             detection_result:"",
             upload_time:"",
             check_out:"1",
-            modifications:"",  
+            modifications:"",
             start_time:new Date(2016, 9, 10, 18, 40),
             end_time:new Date(2016, 9, 10, 18, 40),
           },
@@ -610,7 +610,7 @@
           docList:[],
           options:[
             {id:1,name:"正常"},
-            {id:2,name:"撤销"}  
+            {id:2,name:"撤销"}
           ],
          airRules: {
           created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
@@ -624,7 +624,7 @@
          limit:20,
          page:1,
          total:0,
-         
+
          tableData: [{
                  date: '2016-05-03',
                  name: '王小虎',
@@ -650,7 +650,7 @@
     //              console.log("list222222",list)
     //              this.docList = list
     //           }
-    //         })  
+    //         })
     //       },
     //       saveAirDisinfect(formName){
     //          this.$refs[formName].validate(valid=>{
@@ -670,7 +670,7 @@
     //                  modifications:parseInt(this.form.modifications),
     //                }
     //               //  console.log("params",params)
-                  
+
     //              saveAirDisinfect(params).then(response=>{
     //                 if(response.data.state == 1){
     //                    var list = response.data.data.list
@@ -691,9 +691,9 @@
     //                 }
     //              })
     //            }
-    //          })  
+    //          })
     //       },
-  
+
     //       getAirList(){
     //           var params = {
     //              limit:this.limit,
@@ -734,9 +734,9 @@
     //       this.limit =val
     //       this.getAirList()
     //    },
-       
+
        handleEdit(id){
-        
+
          this.editDialogFormVisible = true
         //   getAirDisinfectDetail(id).then(response=>{
         //       if(response.data.state ==1){
@@ -755,13 +755,13 @@
         //          this.form.upload_time = this.getTime(detail.upload_time)
         //          this.form.check_out = detail.check_out.toString()
         //          this.form.modifications = detail.modifications
-  
+
         //       }
         //   })
         },
-  
+
     //     updateAirDisinfect(formName){
-            
+
     //       this.$refs[formName].validate(valid=>{
     //         if(valid){
     //               var params = {
@@ -791,7 +791,7 @@
     //           }
     //       })
     //     },
-  
+
     //      handleDelete(id,index) {
     //       this.$confirm('确认删除这条记录?', '删除记录', {
     //         confirmButtonText: '确定',
@@ -838,7 +838,7 @@
         margin-bottom: 10px;
         span{
             font-size: 20px;
-            font-weight: bold; 
+            font-weight: bold;
         }
       }
   }
@@ -854,7 +854,7 @@
         // 斜杠表格
         .el-table{
             th{
-                padding: 0px !important;  
+                padding: 0px !important;
             }
             tr:first-of-type th:first-of-type div.cell {
                 text-align: right;/*上边文字靠右*/
@@ -944,12 +944,11 @@
         // }
      }
     }
-   
-     
+
+
    }
   ::-webkit-scrollbar{
     height: 15px;
   }
 
   </style>
-  

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -58,6 +58,19 @@
       </el-form-item>
 
 
+      <el-form-item label="个账使用标识：" prop="acct_used_flag" v-if="this.$store.getters.xt_user.org_id == 10387">
+        <el-select style="margin-right:5px;width:100px;"
+                   v-model="form.acct_used_flag"  placeholder="">
+          <el-option
+            v-for="(item,index) in acct_used_flags"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
       <el-form-item label="" style="width:100%;">
 
         <el-radio-group v-model="form.pay_way">
@@ -137,6 +150,11 @@
         id:0,
         decimal:0,//当前押金余额
         record_date:'',
+        acct_used_flags: [
+          { id: 0, name: '不使用' },
+          { id: 1, name: '使用本人个账' },
+          { id: 2, name: '使用共济个账' },
+        ],
         form: {
           medical_insurance_price:0,
           private_price:'',//自费12
@@ -158,6 +176,7 @@
           overlmt_self_pay:'',
           acct_mulaid_pay:'',
           fulamt_ownpay_amt:'',
+          acct_used_flag:'',
         },
         payWays: [
           {value: 1, label: '现金'},

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -5,8 +5,8 @@
        element-loading-background="rgba(0, 0, 0, 0.8)">
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
-    </div>
 
+    </div>
 
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
@@ -758,6 +758,18 @@
                             value-format="yyyy-MM-dd HH:mm:ss">
                         </el-date-picker>
                       </el-form-item>
+                      <el-form-item label="个账使用标识：" prop="acct_used_flag">
+                        <el-select style="margin-right:5px;width:100px;"
+                                   v-model="form.acct_used_flag"  placeholder="">
+                          <el-option
+                            v-for="(item,index) in acct_used_flags"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
                     </el-form>
                   </div>
                   <p class="centerRightTitle">人员信息</p>
@@ -955,7 +967,8 @@ export default {
         sick_type: '',
         diagnosis: [],
         medical_care: '',
-        diagnosis_time: ''
+        diagnosis_time: '',
+        acct_used_flag:0,
       },
       current_med_type: '',
       rules: {
@@ -1101,6 +1114,12 @@ export default {
 
       sick: [],
       diagnoses: [],
+      acct_used_flags: [
+        { id: 0, name: '不使用' },
+        { id: 1, name: '使用本人个账' },
+        { id: 2, name: '使用共济个账' },
+      ],
+
       manufacturers: [],
 
       department: [],
@@ -5390,5 +5409,12 @@ li {
 ::-webkit-scrollbar {
   height: 20px;
 }
+
+.diagonal-header {
+  background-image: linear-gradient(-45deg, #fff 50%, #eef1f6 50%), linear-gradient(45deg, #fff 50%, #eef1f6 50%);
+  background-size: 100% 1px;
+  background-position: 0% 0%, 100% 0%;
+  background-repeat: no-repeat;
+}
 </style>
 

src/xt_pages/workforce/remind_print_setting.vue

@@ -125,12 +125,12 @@
                 <!-- 透析器灌流器 -->
                
                  <div>
-                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器 <span v-if="org_id==10445">/滤过器</span>:</span>
+                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器 <span v-if="org_id==10445 || org_id == 0">/滤过器</span>:</span>
                   <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_irrigation!=''">{{main_collection.dialysissolution.dialysis_irrigation}}</span>
                
                   <span v-if="org_id == 10440 && main_collection.dialysissolution.dialyzer_perfusion_apparatus!=''">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
-                  <span v-if="org_id == 10445"><span v-if="main_collection.dialysissolution.dialysis_strainer!=''">/</span>{{ main_collection.dialysissolution.dialysis_strainer }}</span>
+                  <span v-if="org_id == 10445 || org_id == 0"><span v-if="main_collection.dialysissolution.dialysis_strainer!=''">/</span>{{ main_collection.dialysissolution.dialysis_strainer }}</span>
                 </div>
                 <div v-if="printObj.doctor_advice == 1">
                     医嘱：