test_user 2 年前
父节点
当前提交
a7d721cb5d

+ 29 - 0
src/api/schedule_template/sch_template.js 查看文件

@@ -183,4 +183,33 @@ export function ExchangeSch(params) {
183 183
 }
184 184
 
185 185
 
186
+export function CoverSchTemplate(params) {
187
+  return request({
188
+    url: '/api/schtemplate/coversch',
189
+    method: 'get',
190
+    params: params,
191
+  })
192
+}
193
+
194
+
195
+export function ExchangeSchTemplate(params) {
196
+  return request({
197
+    url: '/api/schtemplate/exchange',
198
+    method: 'get',
199
+    params: params,
200
+  })
201
+}
202
+
203
+export function DeleteAndAddScheduleTemplateTwo(params) {
204
+  return request({
205
+    url: '/api/schtemplate/change',
206
+    method: 'post',
207
+    params: params,
208
+  })
209
+}
210
+
211
+
212
+
213
+
214
+
186 215
 

+ 10 - 1
src/xt_pages/hospitalStation/components/deskPrescription.vue 查看文件

@@ -2400,8 +2400,17 @@ export default {
2400 2400
                 }
2401 2401
               }
2402 2402
 
2403
+la
2404
+
2405
+              let prescription = []
2406
+
2407
+              for (let b = 0; b < this.prescriptions.length; b++) {
2408
+                if(this.prescriptions[b].order_status != 2 && this.prescriptions[b].order_status != 4){
2409
+                  prescription.push(this.prescriptions[b])
2410
+                }
2411
+              }
2403 2412
               let data = {
2404
-                'prescriptions': this.prescriptions
2413
+                'prescriptions':prescription
2405 2414
               }
2406 2415
               isLoading = true
2407 2416
 

+ 0 - 8
src/xt_pages/workforce/components/ScheduleItem.vue 查看文件

@@ -1,20 +1,12 @@
1 1
 <template>
2 2
     <div >
3
-        <el-tooltip placement="right" :disabled="scheduleDetail.patient.length>0?false:true" >
4
-            <div slot="content">
5
-                {{scheduleDetail.patient}}
6
-                <br/>
7
-                <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
8
-              <span >{{scheduleDetail.dialysis_machine_name}}</span>
9 3
 
10
-            </div>
11 4
             <div>
12 5
                 <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
13 6
                 <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
14 7
               <span >{{scheduleDetail.dialysis_machine_name}}</span>
15 8
 
16 9
             </div>
17
-        </el-tooltip>
18 10
     </div>
19 11
 </template>
20 12
 

+ 26 - 1
src/xt_pages/workforce/components/template_table.vue 查看文件

@@ -886,7 +886,7 @@
886 886
                       placeholder="请选择"
887 887
                       size="mini"
888 888
                       @change="changeJihao"
889
-                      @click.native="changeSch(scope.row)"
889
+                      @click.native="changeMachine(scope.row)"
890 890
                       class="select_list_arrage"
891 891
                     >
892 892
                       <el-option
@@ -1711,7 +1711,32 @@ export default {
1711 1711
       this.$emit("saveData", tempData);
1712 1712
     },changeJihao(){
1713 1713
       this.$forceUpdate()
1714
+    },    changeMachine(row) {
1715
+
1716
+      console.log(row)
1717
+      let params = {
1718
+        zone_id: row.zone_id,
1719
+        sch_type: row.time_type,
1720
+        weekday: this.getWeekByzhongwen(row.week),
1721
+        patient_id: this.cur_smart_patient_id,
1722
+        template_id:this.editableTabsValue,
1723
+      };
1724
+      //进行网络请求,获取空排班机位
1725
+      getTemplateSmartDevices(params).then((response) => {
1726
+        if (response.data.state == 0) {
1727
+          return false;
1728
+        } else {
1729
+          var devices = response.data.data.devices;
1730
+          row.jihaos = [];
1731
+          // row.jihaos = devices;
1732
+          for (let i = 0; i < devices.length; i++){
1733
+            this.$set(row.jihaos , i, devices[i])
1734
+          }
1735
+
1736
+        }
1737
+      });
1714 1738
     },
1739
+
1715 1740
     changeSch(row) {
1716 1741
 
1717 1742
       console.log(row)