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

src/xt_pages/stock/stockOutOrder.vue

@@ -1064,7 +1064,7 @@ export default {
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      type: 1,
+      type: 0,
       drug_id: 0,
       dialogVisible: false,
       editdialogVisible: false,
@@ -1217,6 +1217,7 @@ export default {
         storehouse_id: this.storehouse_id,
         way_type: this.way_type,
         check_type:this.check_type,
+        keywords: this.searchKey,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then((response) => {

src/xt_pages/workforce/components/tableWeeks.vue

@@ -886,7 +886,7 @@
       },
       signPrint() {
 //
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375 || this.org_id ==10517 || this.org_id ==0){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375 || this.org_id ==10517){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []
@@ -905,7 +905,7 @@
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1+"&ids="+this.ids
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469 && this.org_id!=10517 && this.org_id!=0){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469 && this.org_id!=10517){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/remind_print_setting.vue

@@ -155,13 +155,18 @@
                
                 <div v-if="org_id!=10440 && org_id!=10600">打印时间:
                      {{getTime(main_collection.schedule_date)}}   
+
+                   <span v-if="printObj.week == 1">
                      <span v-if="main_collection.schedule_week ==1">星期一</span>
                      <span v-if="main_collection.schedule_week ==2">星期二</span>
                      <span v-if="main_collection.schedule_week ==3">星期三</span>
                      <span v-if="main_collection.schedule_week ==4">星期四</span>
                      <span v-if="main_collection.schedule_week ==5">星期五</span>
                      <span v-if="main_collection.schedule_week ==6">星期六</span>
-                     <span v-if="main_collection.schedule_week ==7">星期日</span></div>
+                     <span v-if="main_collection.schedule_week ==7">星期日</span>
+                    </span>   
+                    </div>
+                  
               </div>
 
               <div class="signPrint" style="font-size:16px;" v-else>