9月2日

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -112,7 +112,7 @@
       </div>
       <div class="mainRight">
         <div class="titlelist">
-          <!-- <div>
+          <div>
             班次：
             <el-select
               v-model="shift"
@@ -141,7 +141,7 @@
               >
               </el-option>
             </el-select>
-          </div> -->
+          </div>
 
           <div>
             <!-- <el-button type="primary" @click="toExport" v-if="state == 2"

src/xt_pages/dialysis/schedualPatient.vue

@@ -609,10 +609,17 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           var resp = rs.data
           if (resp.state == 1) {
             var zones = resp.data.zones
+            var arr = []
+            for(let i=0;i<zones.length;i++){
+              if(zones[i].status == 1){
+                 arr.push(zones[i])
+              }
+            }
+            console.log("zone2w233323232wid",zones)
             var schedules = resp.data.schedules
             var zone_options = [{ id: 0, text: '全部分区' }]
-            for (let z_i = 0; z_i < zones.length; z_i++) {
-              const zone = zones[z_i]
+            for (let z_i = 0; z_i < arr.length; z_i++) {
+              const zone = arr[z_i]
               zone_options.push({ id: zone.id, text: zone.name })
             }
             this.zone_options = zone_options

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -18,6 +18,7 @@
           size="small"
           type="primary"
           @click="submit()"
+          v-loading="loading"
           v-if="is_check == 2"
           class="filter-item"
           >保 存</el-button

src/xt_pages/stock/stockInOrderAdd.vue

@@ -7,7 +7,7 @@
 
       <div style="float:right;">
         <el-button size="small" @click="back()" class="filter-item">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit()" class="filter-item">保 存</el-button>
+        <el-button size="small" type="primary" @click="submit()" class="filter-item" v-loading="loading">保 存</el-button>
         <el-button size="small" type="primary" v-show="showCheck" @click="toCheck()" class="filter-item">审 核</el-button>
         <!-- <el-button size="small" type="primary" v-show="showReturnCheck" @click="toReturnCheck()" class="filter-item">反 审 核</el-button> -->
       </div>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -19,6 +19,7 @@
           type="primary"
           @click="submit()"
           v-if="is_check == 2"
+          v-loading="loading"
           class="filter-item"
           >保 存</el-button
         >