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

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -142,6 +142,7 @@
               </el-option>
             </el-select>
           </div>
+          
 
           <div>
             <el-button type="primary" @click="toExport" v-if="state == 2"
@@ -533,7 +534,7 @@ export default {
         if (res.data.state == 1) {
            var list = res.data.data.list;
            console.log("hhhhawoowowow",list)
-          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ){
+          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ||  this.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
             this.tableData = []
             if(list!=null && list.length >0){
               for(let i=0;i<list.length;i++){
@@ -544,7 +545,7 @@ export default {
             }
 
           }
-          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 10387){
+          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 10387 && this.$store.getters.xt_user.org.id != 0 && this.$store.getters.xt_user.org.id != 10480 ){
             this.tableData = []
             this.tableData = list
           }

src/xt_pages/data/components/addDrugs.vue

@@ -488,6 +488,16 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否项目:" prop="is_pharmacy">
+                        <el-select v-model="form.is_project" style="width:160px;" placeholder="请选择">
+                            <el-option
+                                    v-for="item in projectList"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="" style="visibility: hidden;">
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
@@ -632,6 +642,7 @@
           is_pharmacy:1,//是否通过药房发药
           bbx01:"",
           bby01:"",
+          is_project:"",
         },
 
         rules: {
@@ -645,10 +656,10 @@
           unval:[{required:true,message:"请填写拆零",trigger:'change'}],
           min_number:[{required:true,message:"请填写拆零",trigger:'change'}],
           packing_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
-          drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
+          // drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
           drug_stock_limit: [{ required: true, message: '请填写库存警戒', trigger: 'blur' }],
           // drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
-          drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
+          // drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
           medical_insurance_level: [{ required: true, message: '请选择医保等级', trigger: 'change' }],
 
           unit_matrixing: [{ required: true, message: '请填写单位换算', trigger: 'blur' }],
@@ -657,7 +668,7 @@
           packing_price:[{required:true,message:'请填写包装零售价',trigger:'blur'}],
           drug_classify: [{ required: true, message: '请选择药物分类', trigger: 'change' }],
           drug_dose: [{ required: true, message: '请填写剂量', trigger: 'blur' }],
-          manufacturer: [{ required: true, message: '请选择生产产商', trigger: 'change' }],
+          // manufacturer: [{ required: true, message: '请选择生产产商', trigger: 'change' }],
           dealer: [{ required: true, message: '请选择经销商', trigger: 'change' }],
           prescription_mark: [{ required: true, message: '请选择处方药标志' }],
           social_security_directory_code: [{ required: true, message: '请填写社保目录编码' }],
@@ -690,6 +701,7 @@
           id: "2",
           name: "否"
         }],
+        projectList:[{id:"1",name:"是"},{id:"2",name:"否"}]
       }
     },
     props: {
@@ -961,6 +973,7 @@
         form['is_pharmacy'] = this.form.is_pharmacy
         form['bbx01'] = this.form.bbx01
         form['bby01'] = this.form.bby01
+        form['is_project'] = this.form.is_project
 
         return form
       },

src/xt_pages/data/components/drugs.vue

@@ -725,7 +725,12 @@
               if(this.formValue.drug_classify == 0){
                  this.formValue.drug_classify = ""
               }
-
+           
+              if(this.formValue.is_project<=0){
+                  this.formValue.is_project = ''
+              }else{
+                this.formValue.is_project = this.formValue.is_project.toString()
+              }
 
 
               this.$refs.addDrugs.show(id, this.formValue)

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -82,7 +82,7 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460">{{
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10567">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -93,7 +93,7 @@
           <div class="inline_block" v-if="org_id!=10460">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515 || org_id == 10567">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3081,15 +3081,20 @@ export default {
         if (row.sum_count <= 0) {
           if (selection) {
             selection.forEach(row => {
-              if (row.sum_count <= 0) {
+              if(row.is_project!=1){
+              if ( row.sum_count <= 0) {
                 this.$refs.multipleTable.toggleRowSelection(row)
               }
+            }
             })
           } else {
             this.$refs.multipleTable.clearSelection()
           }
-          this.$message.error(row.drug_name + '库存不足')
-          return
+          if (row.is_project == 0 || row.is_project == 2){
+            this.$message.error(row.drug_name + '库存不足')
+            return 
+          }
+        
        }
       }
 

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -4,6 +4,7 @@
       v-if="prescription.type == 1"
       :data="prescription.advices"
       border
+      ref="multipleTable"
       height="370"
       style="width: 99%"
       :row-style="changColor"
@@ -144,6 +145,7 @@
       :data="prescription.project"
       border
       height="370"
+      ref="multipleTable"
       style="width: 99%"
       :row-style="changColor"
       :header-cell-style="{
@@ -334,8 +336,12 @@ export default {
     return {
       drugways: [],
       efs: [],
+      // tableDate:prescription.project
     };
   },
+  created(){
+    console.log('rrrrr',this.prescription.project);
+  },
   mounted() {
     // getInitData().then(response => {
     //   if (response.data.state == 0) {
@@ -387,6 +393,14 @@ export default {
       return name;
     },
   },
+  watch:{
+    prescription:function(){
+      this.$nextTick(() => {
+        this.$refs.multipleTable.doLayout();
+        // table加ref="multipleTable"
+      })
+    }
+  }
 };
 </script>
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3233,6 +3233,7 @@ export default {
       this.$refs.additionalCharges.show()
     },
     selectDrugs(selection, row) {
+    
       // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
       //     if (row.count <= 0) {
       //       if (selection) {
@@ -3263,19 +3264,25 @@ export default {
       //     }
       // }
 
-      if(row.is_user!=1 &&  this.org_id != 10206 && this.org_id != 0){
+      if(row.is_user!=1 &&  this.org_id != 10206){
+        console.log("row.sum_count",row)
         if (row.sum_count <= 0) {
         if (selection) {
           selection.forEach(row => {
-            if (row.sum_count <= 0) {
-              this.$refs.multipleTable.toggleRowSelection(row)
+            if(row.is_project!=1){
+              if ( row.sum_count <= 0) {
+                this.$refs.multipleTable.toggleRowSelection(row)
+              }
             }
+            
           })
         } else {
           this.$refs.multipleTable.clearSelection()
         }
-        this.$message.error(row.drug_name + '库存不足')
-        return
+        if (row.is_project == 0 || row.is_project == 2){
+          this.$message.error(row.drug_name + '库存不足')
+          return 
+        }
        }
       }
 
@@ -3555,6 +3562,7 @@ export default {
       this.teamList = row
     },
     selectChange(selection, row) {
+    
       // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
       //    if (row.stock_count <= 0) {
       //     if (row.type == 3) {

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -45,7 +45,7 @@
         :editable="false"
         style="width: 150px;"
         type="date"
-        :picker-options="pickerOptions"
+       
         placeholder="选择日期时间"
         align="right"
         format="yyyy-MM-dd"
@@ -57,7 +57,7 @@
         prefix-icon="el-icon-date"
         @change="changeEndTime"
         :editable="false"
-        :picker-options="pickerOptions"
+        
         style="width: 150px;"
         type="date"
         placeholder="选择日期时间"
@@ -149,7 +149,7 @@
 
         pickerOptions: {
           disabledDate(time) {
-            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 2)).getTime() - 24 * 3600 * 1000
             return time.getTime() > Date.now() || time.getTime() < threeMonths
 
           }

src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue

@@ -65,7 +65,7 @@
         :editable="false"
         style="width: 150px;"
         type="date"
-        :picker-options="pickerOptions"
+       
         placeholder="选择日期时间"
         align="right"
         format="yyyy-MM-dd"
@@ -77,7 +77,7 @@
         prefix-icon="el-icon-date"
         @change="changeEndTime"
         :editable="false"
-        :picker-options="pickerOptions"
+      
         style="width: 150px;"
         type="date"
         placeholder="选择日期时间"
@@ -147,7 +147,7 @@
 
         pickerOptions: {
           disabledDate(time) {
-            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 2)).getTime() - 24 * 3600 * 1000
             return time.getTime() > Date.now() || time.getTime() < threeMonths
 
           }