批量打印

src/api/device/device.js

@@ -125,6 +125,7 @@ export function createDeviceNumber(number, zone_id, group_id) {
         number: number,
         zone: zone_id,
         group: group_id,
+       
     }
     return request({
         url: '/api/device/number/create',
@@ -139,6 +140,7 @@ export function modifyDeviceNumber(id, number, zone_id, group_id) {
         number: number,
         zone: zone_id,
         group: group_id,
+      
     }
     return request({
         url: '/api/device/number/modify',

src/xt_pages/device/number_main.vue

@@ -36,6 +36,11 @@
               label="所属分组"
               align="center"
             ></el-table-column>
+            <!-- <el-table-column prop="sort" label="排序" align="center">
+                <template slot-scope="scope">
+                    {{scope.row.sort?scope.row.sort:""}}
+                </template>
+            </el-table-column> -->
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-tooltip
@@ -133,6 +138,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <!-- <el-form-item label="排序:">
+              <el-input style="width:220px" v-model="number_form.sort"></el-input>
+          </el-form-item> -->
           <!-- <el-form-item>
                     <el-button @click="cancelModifyDeviceNumber">取 消</el-button>
                     <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="editDeviceNumberSubmitAction">保存</el-button>
@@ -176,7 +184,8 @@ export default {
         id: 0,
         number: "",
         zone: "",
-        group: ""
+        group: "",
+        // sort:0,
       },
       formLabelWidth: "110px",
       showEditDeviceNumber: false,
@@ -194,10 +203,10 @@ export default {
       this.loading = false;
       var resp = rs.data;
       if (resp.state === 1) {
-        // console.log(resp)
         this.zones.push(...resp.data.zones);
         this.groups.push(...resp.data.groups);
         this.device_numbers.push(...resp.data.numbers);
+        
       } else {
         this.$message.error(resp.msg);
       }
@@ -212,6 +221,13 @@ export default {
       this.number_form.number = row.number;
       this.number_form.zone = row.zone_id;
       this.number_form.group = row.group_id;
+      // if(row.sort == 0){
+      //   this.number_form.sort = ""
+      // }
+      // if(row.sort != 0){
+      //   this.number_form.sort = row.sort
+      // }
+     
       this.showEditDeviceNumber = true;
     },
     cancelModifyDeviceNumber() {
@@ -229,13 +245,14 @@ export default {
             createDeviceNumber(
               this.number_form.number,
               this.number_form.zone,
-              this.number_form.group
+              this.number_form.group,
+              // this.number_form.sort
             ).then(rs => {
               var resp = rs.data;
               if (resp.state === 1) {
                 var newNumber = resp.data.number;
                 this.device_numbers.push(newNumber);
-                this.cancelModifyDeviceNumber();
+                this.cancelModifyDeviceNumber();           
               } else {
                 this.$message.error("床位号/机号已存在!");
               }
@@ -245,7 +262,8 @@ export default {
               this.number_form.id,
               this.number_form.number,
               this.number_form.zone,
-              this.number_form.group
+              this.number_form.group,
+              // this.number_form.sort
             ).then(rs => {
               var resp = rs.data;
               // console.log(resp.data)
@@ -262,6 +280,7 @@ export default {
                     number.group_id = resp.data.number.group_id;
                     number.zone_name = resp.data.number.zone_name;
                     number.group_name = resp.data.number.group_name;
+
                     break;
                   }
                 }

src/xt_pages/dialysis/PatientBox.vue

@@ -213,6 +213,7 @@ export default {
       temp_schedual: null,
       date:'',
       modedata:0,
+      scheduleArr:[]
     };
   },
   props: {
@@ -627,8 +628,34 @@ export default {
       } else if (id == 3) {
         return 'modePurple'
       }
+    },
+
+   compare(propertyName) {
+    return function(obj1, obj2) {
+        var value1 = obj1[propertyName];
+        var value2 = obj2[propertyName];
+        if (value1 < value2) {
+            return -1;
+        } else if (value1 > value2) {
+            return 1;
+        } else {
+            return 0;
+        }
     }
+}
   },
+  created(){
+    console.log("排班数据33333",this.schedules)
+
+  //   for(let i=0;i<this.schedules.length;i++){
+  //      this.schedules[i].Sort = this.schedules[i].device_number.sort
+  //   }
+
+  //  console.log("9999999",this.schedules)
+  //  this.schedules.sort(this.compare("Sort"))
+  //   console.log("122212121212112",this.schedules)
+  //   this.scheduleArr = this.schedules
+  }
 };
 </script>
 

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -9,6 +9,15 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <!-- <el-row>
+        <el-col>
+          <el-form-item label="耗材属性">
+              <el-radio v-model="stock_attribute" label="1">无</el-radio>
+              <el-radio v-model="stock_attribute" label="2">透析器</el-radio>
+              <el-radio v-model="stock_attribute" label="3">灌流器</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
       <el-row>
         <el-col>
           <el-form-item label="耗材出库" prop="out_stock">
@@ -57,7 +66,8 @@ export default {
           { required: true, message: "请输入类型名称", trigger: "blur" }
         ]
       },
-       out_stock: '1'
+       out_stock: '1',
+       stock_attribute:'1'
     };
   },
   props: {