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

src/api/device/device.js

@@ -120,12 +120,14 @@ export function getDeviceNumbers() {
     })
 }
 
-export function createDeviceNumber(number, zone_id, group_id) {
+export function createDeviceNumber(number, zone_id, group_id,sort) {
     const params = {
         number: number,
         zone: zone_id,
         group: group_id,
+        sort:sort,
     }
+   
     return request({
         url: '/api/device/number/create',
         method: 'post',
@@ -133,12 +135,13 @@ export function createDeviceNumber(number, zone_id, group_id) {
     })
 }
 
-export function modifyDeviceNumber(id, number, zone_id, group_id) {
+export function modifyDeviceNumber(id, number, zone_id, group_id,sort) {
     const params = {
         id: id,
         number: number,
         zone: zone_id,
         group: group_id,
+        sort:sort
     }
     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:"",
       },
       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() {
@@ -219,6 +235,7 @@ export default {
       this.number_form.number = "";
       this.number_form.zone = "";
       this.number_form.group = "";
+      this.number_form.sort = ""
       this.$refs.form_number.clearValidate();
       this.showEditDeviceNumber = false;
     },
@@ -229,13 +246,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 +263,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 +281,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;
+                    number.sort = resp.data.number.sort;
                     break;
                   }
                 }

src/xt_pages/dialysis/PatientBox.vue

@@ -3,7 +3,7 @@
     <!-- <router-link to="/dialysis/details"> -->
     <div
       class="patient"
-      v-for="schedule in schedules"
+      v-for="schedule in scheduleArr"
       v-if="schedule.patient"
       :class="borderColor(schedule)"
       @click.stop="detailAction(schedule)"
@@ -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,11 +9,20 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col>
+          <el-form-item label="耗材属性">
+              <el-radio v-model="formValue.stock_attribute" label="1">无</el-radio>
+              <el-radio v-model="formValue.stock_attribute" label="2">透析器</el-radio>
+              <el-radio v-model="formValue.stock_attribute" label="3">灌流器</el-radio>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col>
           <el-form-item label="耗材出库" prop="out_stock">
-             <el-radio v-model="out_stock" label="1">是</el-radio>
-             <el-radio v-model="out_stock" label="2">否</el-radio>
+             <el-radio v-model="formValue.out_stock" label="1">是</el-radio>
+             <el-radio v-model="formValue.out_stock" label="2">否</el-radio>
           </el-form-item>     
         </el-col>
       </el-row>
@@ -57,7 +66,8 @@ export default {
           { required: true, message: "请输入类型名称", trigger: "blur" }
         ]
       },
-       out_stock: '1'
+       out_stock: '1',
+       stock_attribute:"1"
     };
   },
   props: {
@@ -96,7 +106,8 @@ export default {
       form["type_name"] = this.formValue.type_name;
       form["remark"] = this.formValue.remark;
       form["isCreated"] = this.isCreated;
-      form['out_stock'] = this.out_stock;
+      form['out_stock'] = this.formValue.out_stock;
+      form["stock_attribute"] = this.formValue.stock_attribute
       return form;
     }
   },
@@ -107,6 +118,8 @@ export default {
           this.$refs["formValue"].resetFields();
           this.formValue.remark = "";
           this.formValue.type_name = "";
+          this.formValue.stock_attribute="1";
+          this.formValue.out_stock = "1"
         }, 0);
     }
   }

src/xt_pages/stock/config/goodType.vue

@@ -228,7 +228,9 @@ export default {
           isCreated: 1, //1.创建 2.编辑 3.查看详情
           formValue: {
             type_name: "",
-            remark: ""
+            remark: "",
+            stock_attribute:"1",
+            out_stock:"1",
           },
           isVisibility: false
         }
@@ -251,13 +253,15 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          this.goodType.goodTypeDialog.formValue.remark =
-            response.data.data.goodType.remark;
-          this.goodType.goodTypeDialog.formValue.type_name =
-            response.data.data.goodType.type_name;
+          console.log("response.data.data",response.data.data.goodType)
+          this.goodType.goodTypeDialog.formValue.remark = response.data.data.goodType.remark;
+          this.goodType.goodTypeDialog.formValue.type_name =response.data.data.goodType.type_name;
+          this.goodType.goodTypeDialog.formValue.stock_attribute = response.data.data.goodType.stock_attribute.toString()
+          this.goodType.goodTypeDialog.formValue.out_stock = response.data.data.goodType.out_stock.toString()
           this.goodType.goodTypeDialog.isCreated = 2;
           this.$refs.dialog.show();
           this.goodType.type_code = response.data.data.goodType.type_code;
+
         }
       });
     },
@@ -315,6 +319,7 @@ export default {
           type_code: this.goodType.type_code,
           id: this.goodType.editTypeId,
           out_stock:val.out_stock,
+          stock_attribute:val.stock_attribute,
         };
       
         modifyGoodType(params).then(response => {
@@ -334,6 +339,7 @@ export default {
         });
       } else if (val.isCreated == 1) {
         //新增
+        console.log("val22222",val)
        
         createGoodType(val).then(response => {