Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/DataTable.vue

 <template>
   <el-table
     size="small"
+    ref="eltable"
     :data="tableData"
     :row-key="handleRowKeyMethod"
     :span-method="handleSpanMethod"
@@ -49,6 +50,10 @@
 <script>
 export default {
   props: {
+    toggleRowSelection:{
+      type:Array,
+      default:()=>[]
+    },
     handleRowKeyMethod: {
       type: Function,
       required: false,
@@ -117,7 +122,9 @@ export default {
       return !this.loading && !this.tableData.length ? "暂无数据" : "加载中...";
     },
   },
-  mounted() {},
+  created(){
+    
+  },
   watch: {
     tableData(val) {
       val.length == 0 || val.length > 0
@@ -133,6 +140,15 @@ export default {
       //   console.log(val);
       // }
     },
+    toggleRowSelection:{
+      handler:function(v){
+        v.forEach(element => {
+          this.$refs.eltable.toggleRowSelection(element,true)
+        });
+      },
+      deep:true,
+      immediate:true
+    }
   },
   methods: {},
   data() {

attendance-performance-manager-ui/admin/src/components/FormField.vue

@@ -66,7 +66,7 @@
             v-for="($label, $value) in enumData"
             :key="$value"
             :label="$label"
-            :value="$value"
+            :value="Number($value)"
           ></el-option>
         </el-select>
 

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -33,8 +33,8 @@
           :filterable="item.filterable"
           :multiple="item.multiple"
           :clearable="true"
-          @change="item.change"
-          @clear="item.clear"
+          @change="item.change && item.change"
+          @clear="item.clear && item.clear"
           v-if="item.type === 'select'"
           :placeholder="'请选择' + item.label"
         >
@@ -541,6 +541,7 @@ export default {
   computed: {},
   data() {
     return {
+      downloadUrl:false,
       form: {
         // groupList: [],
       },

attendance-performance-manager-ui/admin/src/components/Table.vue

@@ -174,6 +174,7 @@
         />
         <DataTable
           v-if="showType == 'table'"
+          :toggleRowSelection="toggleRowSelection"
           :tableData="data.data"
           :columns="config.columns"
           :loading="data.loading"
@@ -255,6 +256,10 @@ import DataTreeTable from "@/components/DataTreeTable.vue";
 import TabPane from "@/components/tabPane.vue";
 export default {
   props: {
+    toggleRowSelection:{
+      type: Array,
+      default: () => [],
+    },
     data: {
       type: Object,
       required: true,

attendance-performance-manager-ui/admin/src/views/window/owner/drawershow.vue

@@ -11,9 +11,9 @@
         <Field
           type="select"
           label="负责人姓名"
-          prop="name"
+          prop="staffId"
           filterable
-          v-model="form.name"
+          v-model="form.staffId"
           :enumData="userList"
           placeholder="请输入负责人姓名"
         />
@@ -23,41 +23,29 @@
           v-model="form.phone"
           placeholder="请输入联系电话"
         />
-        <!-- <Field
+        <Field
           label="大厅"
-          prop="deptId"
+          prop="salaId"
           type="select"
-          v-model="form.deptId"
+          v-model="form.salaId"
+          :enumData="dict.salaId"
           placeholder="请选择大厅"
-        /> -->
-        <el-col :span="12">
-          <el-form-item label="大厅/部门" prop="deptId">
-            <el-cascader
-              v-model="form.deptId"
-              style="width:100%"
-              @change="cascaderChange"
-              :options="dict.deptId"
-              clearable
-              :props="{ label: 'label', value: 'id' }"
-            >
-            </el-cascader>
-          </el-form-item>
-        </el-col>
-
-        <!-- <Field
+        />
+        <Field
           label="部门"
           prop="deptId"
           type="select"
           v-model="form.deptId"
+          :enumData="dict.deptId"
           placeholder="请选择部门"
-        /> -->
+        />
         <!-- <Field
           label="工号"
           prop="number"
           v-model="form.number"
           placeholder="请输入工号"
         /> -->
-
+        
         <!-- <Field
           label="负责窗口数量"
           prop="windowCount"
@@ -73,55 +61,9 @@
         /> -->
       </el-row>
       <div style="background-color: rgba(242, 246, 252, 1);padding: 20px;">
-        <div style="display: flex;align-items: center;margin-bottom: 20px;">
-          <div style="flex: 1;">请选择窗口</div>
-          <div>
-            <el-form :inline="true" :model="formInline" class="demo-form-inline">
-              <el-form-item >
-                <el-input v-model="formInline.user" placeholder="请输入窗口名称或编号"></el-input>
-              </el-form-item>
-              <el-form-item >
-                <el-select v-model="formInline.region" placeholder="请选择大厅">
-                  <el-option label="区域一" value="shanghai"></el-option>
-                  <el-option label="区域二" value="beijing"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="onSubmitSearch">查询</el-button>
-              </el-form-item>
-            </el-form>
-
-          </div>
-        </div>
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%">
-          <el-table-column
-            prop="date"
-            label="序号">
-          </el-table-column>
-          <el-table-column
-            prop="date"
-            label="窗口名称">
-          </el-table-column>
-          <el-table-column
-            prop="name"
-            label="编号">
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            label="所属楼栋">
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            label="所属楼层">
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            label="操作">
-          </el-table-column>
-        </el-table>
+        
+        <wintable ref="wintable" :hallId="dict.hallId" class="wintabel" @selection-change="selectionChange"/>
+        
       </div>
       <div style="padding: 20px;">
         <el-button type="primary" @click="submitForm" >提交</el-button>
@@ -132,20 +74,19 @@
 
 <script>
 import form from "@/assets/mixins/formdialog";
+import wintable from "./wintable.vue";
 export default {
   name: "WindowOwnerDetail",
   mixins: [form],
-  components: {},
+  components: {
+    wintable
+  },
   created() {
     this.changePath("window/owner");
     this.getUser()
   },
   data() {
     return {
-      //搜索表单
-      formInline:{
-
-      },
       // 大厅
       options:[],
       //窗口
@@ -167,11 +108,15 @@ export default {
         ]
       },
       userList:{},
-
+      
     };
   },
 
   methods: {
+    // 选中窗口
+    selectionChange(v){
+      console.log(v,this.$refs.wintable,"########@@@@")
+    },
     cascaderChange(val) {
       if (this.deptList.length > 0) {
         this.form.deptId = this.deptList[this.deptList.length - 1];
@@ -183,17 +128,14 @@ export default {
     // 查询人员
     getUser(){
       this.$post("/staff/list",{page:1,size:-1}).then(res=>{
-        console.log(res)
         const {code,data} = res
         if(code == 1){
           const userList = data.data
           const arr = {}
           data.data.forEach(element => {
             arr[element.id] = element.name
-            // arr.push({label:element.name,value:element.id})
           });
           this.userList = arr
-          console.log(arr,"@@@")
         }
       })
     },
@@ -261,3 +203,9 @@ export default {
   },
 };
 </script>
+<style lang="less">
+.wintabel .table-body{
+  height: 500px;
+  overflow-y: auto;
+}
+</style>

attendance-performance-manager-ui/admin/src/views/window/owner/wintable.vue

+<template>
+    <LayoutTable :toggleRowSelection="toggleRowSelection" ref="LayoutTable" :data="tableData" :config="tableConfig" @selection-change="handleSelectionChange">
+        <div slot="table-head-left"><div>请选择窗口</div></div>
+        <div slot="table-head-center"></div>
+    </LayoutTable>
+</template>
+<script>
+import table from "@/assets/mixins/table";
+export default {
+    props:['hallId','checkId'],
+    mixins: [table],
+    methods:{
+        handleSelectionChange(v){
+            this.$emit("selection-change",v)
+        },
+        beforeFecth(){
+            this.pageInfo.list = '/window/owner/subWindowList'
+        },
+    },
+    created(){
+        this.config.search[0].enumData = this.hallId
+        // setTimeout(()=>{
+        //     this.toggleRowSelection = [this.tableData.data[0]]
+        // },2000)
+    },
+    data(){
+        return {
+            toggleRowSelection:[],
+            config: {
+                downloadUrl:"",
+                isshowTabPane: false,
+                search: [
+                    {
+                        name: "hallId",
+                        type: "select",
+                        label: "大厅",
+                        enumData:{}
+                    },
+                    {
+                        name: "deptName",
+                        type: "text",
+                        label: "窗口名称",
+                        fuzzy: true,
+                    },
+                ],
+                columns: [
+                    { type: "selection", width: 60 },
+                    // { type: "index", label: "序号", width: 50 },
+
+                    { label: "窗口名称", prop: "name" },
+
+                    { label: "编号", prop: "fromnum" },
+
+                    { label: "所属楼栋", prop: "building" },
+
+                    { label: "所属楼层", prop: "level" },
+                    // {
+                    //     label: "操作",
+                    //     width: 240,
+                    //     formatter: (row) => {
+                    //     return (
+                    //         <table-buttons
+                    //         noAdd
+                    //         row={row}
+                    //         onEdit={this.toEdit}
+                    //         onView={this.toView}
+                    //         onDel={this.toDel}
+                    //         />
+                    //     );
+                    //     },
+                    // },
+                ],
+            },
+        }
+    },
+}
+</script>
\ No newline at end of file