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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1630,11 +1630,11 @@ export default {
         this.tabProject = this.allProject
       } else {
         let arr = []
-        for (let i = 0; i < this.allProject.length; i++) {
+        for (let i = 0; i < this.tabProject.length; i++) {
             // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-            this.allProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
-              arr = arr.concat(this.allProject[i])
+            if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+            this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+              arr = arr.concat(this.tabProject[i])
             }
 
         }

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -154,7 +154,8 @@ export default {
         for (let i = 0; i < this.all_data.length; i++) {
           if (
             this.all_data[i].name.indexOf(this.search_input) != -1 ||
-            this.all_data[i].dialysis_no.indexOf(this.search_input) != -1
+            this.all_data[i].dialysis_no.indexOf(this.search_input) != -1 ||
+            this.all_data[i].first_letter.indexOf(this.search_input) != -1
           ) {
             this.data.push(this.all_data[i]);
           }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -138,7 +138,7 @@
                                             <el-table-column type="selection" width="40"
                                                              align="center"></el-table-column>
                                             <el-table-column label="名称">
-                                                <template slot-scope="scope">{{ scope.row.drug_name + "(" +scope.row.number + ")"}}</template>
+                                                <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                             </el-table-column>
                                           <el-table-column label="规格" width="60" v-if="org_id != 10206 && org_id != 0">
                                             <template slot-scope="scope">
@@ -197,7 +197,7 @@
                                                 <el-table-column type="selection" width="40"
                                                                  align="center"></el-table-column>
                                                 <el-table-column prop="name" label="名称">
-                                                    <template slot-scope="scope">{{ scope.row.project_name}}{{scope.row.good_number?"("+scope.row.good_number+")":""}}</template>
+                                                    <template slot-scope="scope">{{ scope.row.project_name }}</template>
                                                 </el-table-column>
                                                 <el-table-column label="规格" width="60">
                                                     <template slot-scope="scope">{{ scope.row.single_dose }}</template>
@@ -638,15 +638,15 @@
 
         } else {
           let arr = []
-          for (let i = 0; i < this.allProject.length; i++) {
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
-              arr = arr.concat(this.allProject[i])
+          for (let i = 0; i < this.tabProject.length; i++) {
+            if (this.tabProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+            this.tabProject[i].first_letter.indexOf(this.search_project_keyword) !=-1) {
+              arr = arr.concat(this.tabProject[i])
             }
           }
           this.tabProject = arr
 
         }
-
       },
       searchAction() {
         if (this.search_keyword.length == 0) {
@@ -654,7 +654,10 @@
         } else {
           let arr = []
           for (let i = 0; i < this.drugs.length; i++) {
-            if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || this.drugs[i].pinyin.indexOf(this.search_keyword) != -1) {
+            if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
+            this.drugs[i].wubi.indexOf(this.search_keyword) != -1 ||
+            this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
+            this.drugs[i].first_letter.indexOf(this.search_keyword) != -1) {
               arr = arr.concat(this.drugs[i])
             }
           }
@@ -1162,7 +1165,7 @@
 
         }
 
-        obj.med_type = 12
+        obj.med_type = 14
 
         this.prescriptions.push(obj)
 
@@ -1522,7 +1525,7 @@
                   prescribing_number: temp3[b].prescribing_number,
                   single_dose_unit: temp3[b].drug.drug_dose_unit,
                   prescribing_number_unit: temp3[b].drug.max_unit,
-                  medical_insurance_number: temp3[b].drug.medical_insurance_number,
+                  medical_insurance_number: temp3[b].drug.medical_insurance_number
 
                 }
 
@@ -1561,8 +1564,7 @@
                   groupno: index + temp_index,
                   frequency_type: 1,
                   day_count: 0,
-                  week_day: '',
-                  number: temp[b].number,
+                  week_day: ''
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
@@ -1591,13 +1593,11 @@
                   type: temp2[b].type,
                   frequency_type: 1,
                   day_count: 0,
-                  week_day: '',
-
+                  week_day: ''
                 }
                 if (temp2[b].type == 2) {
                   obj['project'] = temp2[b].project
                   obj['unit'] = temp2[b].project.unit
-
                 } else if (temp2[b].type == 3) {
                   obj['good_info'] = temp2[b].good_info
                   obj['unit'] = temp2[b].good_info.packing_unit
@@ -1756,7 +1756,7 @@
                 order_status: 0,
                 med_type: ''
               }
-              obj.med_type = 12
+              obj.med_type = 14
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
             }
@@ -1783,8 +1783,7 @@
                 type: 2,
                 is_special_diseases: project[i].disease_directory,
                 project: project[i],
-                good_number: "",
-
+                first_letter:project[i].first_letter
               }
 
               this.tabProject.push(obj)
@@ -1807,7 +1806,7 @@
                 type: 3,
                 is_special_diseases: good_info[i].is_special_diseases,
                 good_info: good_info[i],
-                good_number: good_info[i].good_number
+                first_letter:good_info[i].first_letter
               }
               this.tabProject.push(obj)
             }
@@ -2101,7 +2100,7 @@
                 med_type: ''
               }
 
-              obj.med_type = 12
+              obj.med_type = 14
 
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]

src/xt_pages/workforce/appointment.vue

@@ -136,9 +136,9 @@
             <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
             <div>
               <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="historyclick">
-                <!-- <el-tab-pane name="beforeWeek">
+                <el-tab-pane name="beforeWeek">
                   <span slot="label"><i class="el-icon-date"></i> 上上周 ({{ theWeek.historyWeek }})</span>
-                </el-tab-pane> -->
+                </el-tab-pane>
                 <el-tab-pane name="lastWeek">
                   <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
                 </el-tab-pane>
@@ -178,7 +178,7 @@
 
         </edit-table-data>
         <!-- 编辑上上周 -->
-        <!-- <beforeweekTable ref="beforeweeks" v-show="beforeshow" :week-time="activeName" :partitions-prop="partitions"
+        <beforeweekTable ref="beforeweeks" v-show="beforeshow" :week-time="activeName" :partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone" @event3="changeWeekDay">
           <div class="position">
             <div>
@@ -221,7 +221,7 @@
               <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
             </div>
           </div>
-        </beforeweekTable> -->
+        </beforeweekTable>
         <!-- 历史 -->
         <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" :partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
@@ -397,21 +397,21 @@ export default {
 
     },
     // 打开编辑上上周
-    // historyclick(e){
-    //   console.log('vvvvwwww',e);
-    //   if(e.name=='beforeWeek'){
-    //     console.log('gggggwerwe');
-    //     this.beforeshow=true
-    //     this.schedulingTableVisible=false
-    //     this.$nextTick(function() {//, this.days,this.zones
-    //       this.$refs.beforeweeks.setEditData(this.patientList, this.$store.getters.treatment_mode, this.days,this.zones)
-    //     })
-    //   }else{
-    //     this.beforeshow=false
-    //     this.schedulingTableVisible=true
-    //   }
-    // },
-   
+    historyclick(e){
+      console.log('vvvvwwww',e);
+      if(e.name=='beforeWeek'){
+        console.log('gggggwerwe');
+        this.beforeshow=true
+        this.schedulingTableVisible=false
+        this.$nextTick(function() {//, this.days,this.zones
+          this.$refs.beforeweeks.setEditData(this.patientList, this.$store.getters.treatment_mode, this.days,this.zones)
+        })
+      }else{
+        this.beforeshow=false
+        this.schedulingTableVisible=true
+      }
+    },
+
     dragstart(event, item) {
       // console.log('start的索引',item.moveIndex)
       // 开始移动的时候将移动的索引值+图片的url存储下来

src/xt_pages/workforce/components/beforeweekTable.vue

@@ -73,7 +73,7 @@
           </el-table>
         </div>
       </div>
-      <div style="width: 86%;" class="center-tab">
+      <div style="width: 86%;" class="center-tab" id="table_data">
         <span>日期：</span>
         <el-select v-model="week_type" style="margin-bottom: 15px;" placeholder="请选择" multiple>
           <el-option
@@ -127,7 +127,7 @@
           min-width="40"
           align="center"
           fixed
-          
+
         ></el-table-column>
         <el-table-column
           prop="cut"
@@ -135,7 +135,7 @@
           align="center"
           min-width="40"
           fixed
-         
+
         ></el-table-column>
         <el-table-column
           :label="' 周一(' + weekTitle[0] + ')'"
@@ -1108,7 +1108,7 @@ export default {
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
         return "";
       } else {
-         if(this.weekTime == "historyWeek"){
+        //  if(this.weekTime == "historyWeek"){
           // if(column.label == '晚' ){
           //   return 'evening_border schedule-table-cell-disable'
           // }
@@ -1116,7 +1116,7 @@ export default {
             return 'hover-td '
           }
           return 'schedule-table-cell-disable'
-        }
+        // }
       }
       return "";
     },
@@ -2806,26 +2806,26 @@ textarea{
 #table_data ::-webkit-scrollbar {
   height: 15px;
 }
-.el-table td,
-.el-table th.is-leaf,
-.el-table--border,
-.el-table--group {
-  border-color: #d0d3da;
-}
-.el-table--border::after,
-.el-table--group::after,
-.el-table::before {
-  background-color: #d0d3da;
-}
-.el-table--border th {
-  border-color: #d0d3da;
-}
-.el-table--border td {
-  border-color: #d0d3da;
-}
-.el-table td {
-  border-color: #d0d3da;
-}
+// .el-table td,
+// .el-table th.is-leaf,
+// .el-table--border,
+// .el-table--group {
+//   border-color: #d0d3da;
+// }
+// .el-table--border::after,
+// .el-table--group::after,
+// .el-table::before {
+//   background-color: #d0d3da;
+// }
+// .el-table--border th {
+//   border-color: #d0d3da;
+// }
+// .el-table--border td {
+//   border-color: #d0d3da;
+// }
+// .el-table td {
+//   border-color: #d0d3da;
+// }
 
 #table_data {
   .el-table__body tr.current-row > td {
@@ -2833,11 +2833,11 @@ textarea{
     color: #3a8ee6;
   }
   .el-table__body tr > td:hover {
-    background-color: #409eff !important;
+    background-color: #40ff53 !important;
     color: #fff;
   }
   .el-table__body tr .hover-td {
-    background-color: #409eff !important;
+    background-color: #f540ff !important;
     color: #fff;
   }
   .Infectious_disease{

src/xt_pages/workforce/components/template_table_item.vue

@@ -1,10 +1,10 @@
 <template>
     <div>
-            <div>
-                <span>{{info.name}}</span>
-                <br/>
-                <span v-if="info.treat_mode.length > 0">({{info.treat_mode}})</span>
-            </div>
+          <div :class="modeColor(info.treat_mode)">
+              <span >{{info.name}}</span>
+              <br/>
+              <span v-if="info.treat_mode.length > 0">({{info.treat_mode}})</span>
+          </div>
     </div>
 </template>
 
@@ -30,12 +30,25 @@ export default {
             }
         }
     },
+    methods:{
+      modeColor(name){
+          if(name == 'HD'){
+
+          }else if(name == 'HDF'){
+              return 'modeRed'
+          }else if(name == 'HD+HP'){
+              return 'modePurple'
+          }
+      }
+    }
 }
 </script>
 
-<style scoped>
-/* .label {
-    width: 100%;
-    font-size: 12px;
-} */
+<style lang="scss" scoped>
+.modeRed{
+  color:#ee0ad0;
+}
+.modePurple{
+  color: #53b86e;
+}
 </style>

src/xt_pages/workforce/template.vue

@@ -185,35 +185,35 @@
               <div>
                 <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
 
-        <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
+                  <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
 
-          <span slot="label"> {{first_template.week?'一周模版'+'（'+first_template.week+'周'+'）':'一周模版'+'（'+first_template.week+'周'+'）'}}
+                    <span slot="label"> {{first_template.week?'一周模版'+'（'+first_template.week+'周'+'）':'一周模版'+'（'+first_template.week+'周'+'）'}}
 
-             <span v-if="schedule.mode ==1">{{'(本周)'}}</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">{{'(下一周)'}}</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">{{'(本周)'}}</span>
+                      <span v-if="schedule.mode ==1">{{'(本周)'}}</span>
+                      <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">{{'(下一周)'}}</span>
+                      <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">{{'(本周)'}}</span>
 
-          </span>
+                    </span>
 
-        </el-tab-pane>
+                  </el-tab-pane>
 
-        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
+                  <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
 
-          <span slot="label"> {{second_template.week?'二周模版'+'（'+second_template.week+'周'+'）':'二周模版'+'（'+second_template.week+'周'+'）'}}
+                    <span slot="label"> {{second_template.week?'二周模版'+'（'+second_template.week+'周'+'）':'二周模版'+'（'+second_template.week+'周'+'）'}}
 
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">{{'(本周)'}}</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">{{'(下一周)'}}</span>
+                      <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">{{'(本周)'}}</span>
+                      <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">{{'(下一周)'}}</span>
 
-          </span>
-        </el-tab-pane>
-<!--                  {{ four_template.week?four_template.week+'周':""}}-->
-        <el-tab-pane :label="'三周模版'+'（'+third_template.week+'周'+'）'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+                    </span>
+                  </el-tab-pane>
+          <!--                  {{ four_template.week?four_template.week+'周':""}}-->
+                  <el-tab-pane :label="'三周模版'+'（'+third_template.week+'周'+'）'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
 
-        </el-tab-pane>
+                  </el-tab-pane>
 
-      <el-tab-pane :label="'四周模版'+'（'+four_template.week+'周'+'）'" name="four" :disabled="template_mode.mode  != 4 ">
-        </el-tab-pane>
-      </el-tabs>
+                  <el-tab-pane :label="'四周模版'+'（'+four_template.week+'周'+'）'" name="four" :disabled="template_mode.mode  != 4 ">
+                  </el-tab-pane>
+                </el-tabs>
               </div>
               <div style="display:flex;align-items:center">
 
@@ -247,12 +247,6 @@
 <!--      <template-table  ref="table" :editable="true" :device_numbers="device_numbers" :template="tar_template" :is_editing="is_editing"-->
 <!--                      :modes="modes"   :patients="patients" @cancel_sch="refresh" :data="data" :template_mode="template_mode" @saveSuccess="refresh" @cur_info="cur_info" @saveData="saveData" ></template-table>-->
 
-
-
-
-
-
-
     </div>
 
     <set-up-template-dialog ref="setup_dialog" :template_mode="template_mode" :origin_mode="origin_mode"