Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/drawershow.vue

@@ -5,13 +5,13 @@
     :visible.sync="open"
     :direction="direction"
     :destroy-on-close="true"
-    size="50%"
+    size="53%"
   >
     <div class="content_box">
       <div class="text_line">
         <div class="text_box">
           <span>窗口负责人：</span>
-          <span>{{ form.ownerName }}</span>
+          <span>{{ form.ownerName || '--'}}</span>
         </div>
         <div class="text_box">
           <span>登记年月：</span>
@@ -28,7 +28,7 @@
       </div>
       <div class="text_line">
         <div class="text_box">
-          <span style="width: 920px;"
+          <span style="width: 100%;"
             ><el-table :data="tableData" border style="width: 100%">
               <el-table-column type="index" label="序号" width="50">
               </el-table-column>
@@ -87,19 +87,19 @@
       <div class="text_line">
         <div class="text_box">
           <span>备注：</span>
-          <span>{{ form.remark }}</span>
+          <span>{{ form.remark || '--' }}</span>
         </div>
       </div>
       <div class="text_line">
         <div class="text_box">
           <span>附件材料：</span>
-          <span>{{ form.annex }}</span>
+          <span>{{ form.annex || '--' }}</span>
         </div>
       </div>
       <div class="hecha_box">
         <div class="hecha_title">
           <span class="line"></span>
-          <span>核查情况</span>
+          <span style="font-size: 18px;font: bold;margin-bottom: 20px;color: #409eff;">核查情况</span>
         </div>
         <div class="hecha_content">
           <el-form ref="form" :model="form" :rules="rules" label-width="180px">

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

@@ -6,50 +6,126 @@
     :direction="direction"
     size="50%"
   >
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px" style="padding: 20px;">
       <el-row>
         <Field
-          label="部门"
-          prop="deptId"
           type="select"
-          v-model="form.deptId"
-          placeholder="请输入部门id号"
-        />
-
-        <Field
-          label="姓名"
+          label="负责人姓名"
           prop="name"
+          filterable
           v-model="form.name"
-          placeholder="请输入姓名"
+          :enumData="userList"
+          placeholder="请输入负责人姓名"
         />
         <Field
+          label="联系电话"
+          prop="phone"
+          v-model="form.phone"
+          placeholder="请输入联系电话"
+        />
+        <!-- <Field
+          label="大厅"
+          prop="deptId"
+          type="select"
+          v-model="form.deptId"
+          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
+          label="部门"
+          prop="deptId"
+          type="select"
+          v-model="form.deptId"
+          placeholder="请选择部门"
+        /> -->
+        <!-- <Field
           label="工号"
           prop="number"
           v-model="form.number"
           placeholder="请输入工号"
-        />
-        <Field
-          label="电话号码"
-          prop="phone"
-          v-model="form.phone"
-          placeholder="请输入电话号码"
-        />
-        <Field
+        /> -->
+        
+        <!-- <Field
           label="负责窗口数量"
           prop="windowCount"
           v-model="form.windowCount"
           placeholder="请输入负责窗口数量"
-        />
-        <Field
+        /> -->
+        <!-- <Field
           label="备注"
           prop="remark"
           v-model="form.remark"
           type="textarea"
           placeholder="请输入备注"
-        />
+        /> -->
       </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>
             
-      <form-buttons @submit="submitForm" noCancelBtn />
+          </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>
+      </div>
+      <div style="padding: 20px;">
+        <el-button type="primary" @click="submitForm" >提交</el-button>
+      </div>
     </el-form>
   </el-drawer>
 </template>
@@ -62,9 +138,18 @@ export default {
   components: {},
   created() {
     this.changePath("window/owner");
+    this.getUser()
   },
   data() {
     return {
+      //搜索表单
+      formInline:{
+
+      },
+      // 大厅
+      options:[],
+      //窗口
+      tableData:[],
       // 遮罩层
       loading: true,
       // 弹出层标题
@@ -75,11 +160,46 @@ export default {
       toString: [],
       toDate: [],
       // 表单校验
-      rules: {},
+      rules: {
+        name: [
+          { required: true, message: "请输入姓名", trigger: "blur" },
+          { max: 20, message: "最多只能录入20个字符", trigger: "blur" },
+        ]
+      },
+      userList:{},
+      
     };
   },
 
   methods: {
+    cascaderChange(val) {
+      if (this.deptList.length > 0) {
+        this.form.deptId = this.deptList[this.deptList.length - 1];
+      } else {
+        this.form.deptId = "";
+      }
+      console.log(this.form.deptId, "当前选择");
+    },
+    // 查询人员
+    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,"@@@")
+        }
+      })
+    },
+    onSubmitSearch(){
+
+    },
     /** 编辑 */
     edit(row) {
       this.reset();

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

@@ -35,7 +35,14 @@ export default {
     return {
       config: {
         isshowTabPane: true,
-        search: [],
+        search: [
+          {
+            name: "name",
+            type: "text",
+            label: "姓名",
+            fuzzy: true,
+          },
+        ],
         columns: [
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dingding/personal/service/IDingPersonService.java

@@ -78,13 +78,16 @@ public interface IDingPersonService extends IDingTalkService {
 
     /**
      * 根据系统电话查询指定时间的审批表单
-     * @param processCode 审批流的唯一码。
+     * @param processCode 审批流的唯一码（详见doc下 审批表单列表.txt）。
+     *                    请假：PROC-2E5C0DFF-3615-4409-A614-A2011FED5D38
+     *                    外出：PROC-56D3ADEE-45A4-47BC-931A-2A0DC067DE32
+     *                    出差：PROC-578CBDDF-B768-496D-9918-44A3F1D9CAE7
      * @param startTime 审批实例开始时间，Unix时间戳，单位毫秒
      * @param endTime 审批实例结束时间，Unix时间戳，单位毫秒。
      * @param nextToken 分页游标。如果是非首次调用，该参数传上次调用时返回的nextToken。
      * @param maxResults 分页参数，每页大小，最多传20。
-     * @param phones 发起人电话列表  最大列表长度为10
+     * @param userIds 发起人id列表  最大列表长度为10
      */
-    Rest<ListProcessInstanceIdsResponse> getProcessInstanceIdByPhone(String processCode, long startTime, long endTime, long nextToken, long maxResults, String phones) throws Exception;
+    Rest<ListProcessInstanceIdsResponse> getProcessInstanceIdByUserIds(String processCode,long startTime,long endTime,long nextToken,long maxResults,String userIds) throws Exception;
 
 }