毛料信息页面

ruoyi-ui/src/views/pay/material/index.vue

@@ -1,14 +1,23 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
-      <el-form-item label="租户id" prop="tenantId">
+    <div class="company" v-if="!$store.state.user.tenantId">
       <el-input
-          v-model="queryParams.tenantId"
+        style="width: 200px"
-          placeholder="请输入租户id"
+        placeholder="公司名称"
-          clearable
+        size="small"
-          @keyup.enter.native="handleQuery"
+        prefix-icon="el-icon-search"
-        />
+        v-model="gsInfo.tenantName"
-      </el-form-item>
+        @keyup.enter.native="getGsInfoList">
+      </el-input>
+      <div class="cp-content" style="width: 200px">
+        <div :class="gsInfo.active_id===item.id?'cp-item active':'cp-item'" @click="changCompany(item.id)" v-for="item in gsInfo.list">{{ item.name }}</div>
+      </div>
+    </div>
+
+    <div :class="$store.state.user.tenantId?'content-all':'content'">
+
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
         <el-form-item label="毛料名称" prop="name">
           <el-input
             v-model="queryParams.name"
@@ -17,26 +26,10 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-      <el-form-item label="规格" prop="specification">
+        <el-form-item label="材料种类" prop="materialType">
-        <el-input
-          v-model="queryParams.specification"
-          placeholder="请输入规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="尺寸" prop="size">
           <el-input
-          v-model="queryParams.size"
+            v-model="queryParams.materialType"
-          placeholder="请输入尺寸"
+            placeholder="请输入材料种类"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
             clearable
             @keyup.enter.native="handleQuery"
           />
@@ -95,8 +88,7 @@
 
       <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="id" v-if="true"/>
+        <el-table-column label="ID" align="center" prop="id"/>
-      <el-table-column label="租户id" align="center" prop="tenantId" />
         <el-table-column label="毛料名称" align="center" prop="name" />
         <el-table-column label="材料种类" align="center" prop="materialType" />
         <el-table-column label="规格" align="center" prop="specification" />
@@ -131,15 +123,17 @@
         @pagination="getList"
       />
 
+    </div>
+
     <!-- 添加或修改毛料信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="租户id" prop="tenantId">
-          <el-input v-model="form.tenantId" placeholder="请输入租户id" />
-        </el-form-item>
         <el-form-item label="毛料名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入毛料名称" />
         </el-form-item>
+        <el-form-item label="材料种类" prop="materialType">
+          <el-input v-model="form.materialType" placeholder="请输入材料种类" />
+        </el-form-item>
         <el-form-item label="规格" prop="specification">
           <el-input v-model="form.specification" placeholder="请输入规格" />
         </el-form-item>
@@ -163,11 +157,18 @@
 
 <script>
 import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/pay/material";
+import { listTenant } from "@/api/pay/tenant";
 
 export default {
   name: "Material",
   data() {
     return {
+      // 公司信息
+      gsInfo:{
+        tenantName:'',
+        active_id:this.$store.state.user.tenantId,
+        list:[]
+      },
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -203,40 +204,47 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "主键ID不能为空", trigger: "blur" }
-        ],
-        tenantId: [
-          { required: true, message: "租户id不能为空", trigger: "blur" }
-        ],
         name: [
           { required: true, message: "毛料名称不能为空", trigger: "blur" }
         ],
         materialType: [
           { required: true, message: "材料种类不能为空", trigger: "change" }
-        ],
-        specification: [
-          { required: true, message: "规格不能为空", trigger: "blur" }
-        ],
-        size: [
-          { required: true, message: "尺寸不能为空", trigger: "blur" }
-        ],
-        unit: [
-          { required: true, message: "单位不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
         ]
       }
     };
   },
   created() {
+    if (!this.$store.state.user.tenantId) {
+      this.getGsInfoList()
+    }else {
+      this.gsInfo.active_id = this.$store.state.user.tenantId
       this.getList();
+    }
   },
   methods: {
+    // 获取左侧公司列表
+    getGsInfoList(){
+      listTenant({ name: this.gsInfo.tenantName }).then(response => {
+        if(response.rows.length>0){
+          this.gsInfo.list = response.rows;
+          this.gsInfo.active_id = this.gsInfo.list[0].id
+          this.getList()
+        }else{
+          this.$alert(`没有查到相关公司，暂无数据！`, `提示`, {
+            type: 'warning'
+          });
+        }
+      });
+    },
+    // 选择公司
+    changCompany(id){
+      this.gsInfo.active_id = id
+      this.getList()
+    },
     /** 查询毛料信息列表 */
     getList() {
       this.loading = true;
+      this.queryParams.tenantId = this.gsInfo.active_id;
       listMaterial(this.queryParams).then(response => {
         this.materialList = response.rows;
         this.total = response.total;
@@ -305,6 +313,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          this.form.tenantId = this.gsInfo.active_id;
           if (this.form.id != null) {
             updateMaterial(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -349,3 +358,43 @@ export default {
   }
 };
 </script>
+
+<style scoped lang="scss">
+.app-container {
+  display: flex;
+  .company {
+    border-radius: 5px;
+    width: 230px;
+    height: calc(100vh - 115px);
+    overflow-y: auto;
+    .cp-content {
+      margin-top: 20px;
+      .cp-item {
+        cursor: pointer;
+        padding: 6px 10px 6px 5px;
+        color: #424242;
+        font-size: 14px;
+        &:hover {
+          background: #f6f6f6;
+        }
+      }
+      .active{
+        background: #edf6ff;
+      }
+    }
+  }
+  .content{
+    padding-left: 15px;
+    width: calc(100% - 250px);
+    .el-button--medium {
+      padding: 2px 0px;
+    }
+  }
+  .content-all{
+    width: 100%;
+    .el-button--medium {
+      padding: 2px 0px;
+    }
+  }
+}
+</style>

ruoyi-ui/src/views/pay/requireAttendanceReport/index.vue

@@ -276,6 +276,11 @@
           <el-table-column label="年龄" align="center" prop="age" />
           <el-table-column label="手机号" align="center" prop="phone" min-width="100"/>
           <el-table-column label="身份证号" align="center" prop="idcard" min-width="100" />
+          <el-table-column label="休息类型" align="center" prop="restType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.pay_work_rest_type" :value="scope.row.restType"/>
+            </template>
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -345,7 +350,7 @@ import { listTenant } from "@/api/pay/tenant";
 
 export default {
   name: "RequireAttendanceReport",
-  dicts: ['sys_user_sex', 'pay_del_status'],
+  dicts: ['sys_user_sex', 'pay_del_status', 'pay_work_rest_type'],
   data() {
     return {
       // 公司信息