Merge branch 'master' of http://118.126.103.67:3000/JS_Park/gongshi

src/views/luru/gongshi.vue

@@ -264,6 +264,7 @@ export default {
       //员工列表
       staffName: "", //选中员工列表的名称
       staffIndex: 0, //选中员工列表的下标
+      user_id:'',//选中员工列表的ID
       staffNameDate: "",
       // staffIndex: 1, //选中员工列表的下标
       databak: "", //数据备份
@@ -336,7 +337,7 @@ export default {
     },
     showdata() {
       let data = this.tabledata.filter((item) => {
-        return item.user_name == this.staffName;
+        return item.user_id == this.user_id;
       });
       console.log(data, "showdata data");
       this.getSpanArr(data);
@@ -509,6 +510,7 @@ export default {
         console.log(that.staffList, "staffList");
         if (that.staffList.length > 0) {
           that.staffName = this.staffList[0].label;
+          that.user_id=this.staffList[0].value
           that.staffNameDate =
             this.staffList[0].label +
             " (" +
@@ -608,6 +610,8 @@ export default {
     },
     // 员工选择下拉框
     selectStaff(value) {
+      console.log(value)
+      this.user_id=value
       let val = this.staffList.find((item) => {
         return item.value == value;
       });