问题修复

src/api/materialsStation/index.js

@@ -567,6 +567,43 @@ export const getLevelListApi = data => {
   })
 }
 
+// 安全工器具预警-列表
+export const getSafetyListApi = data => {
+  return request({
+    url: '/material/material_maMachine/getSafeDetailsList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 班组库存日志-列表
+export const getTeamNumListApi = data => {
+  return request({
+    url: '/material/material_maMachine/getTeamNumList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 班组库存日志二级页面-列表
+export const getTeamNumSecondListApi = data => {
+  return request({
+    url: '/material/material_maMachine/getTeamNumSecondList',
+    method: 'get',
+    params: data
+  })
+}
+
+// 班组库存日志三级页面-列表
+export const getTeamNumThirdApi = data => {
+  return request({
+    url: '/material/material_maMachine/getTeamNumThirdList',
+    method: 'get',
+    params: data
+  })
+}
+
+
 // 总站点领料-列表
 export const getTotalListApi = data => {
   return request({

src/views/materialsStation/equipment/equipmentRecord/index.vue

@@ -72,7 +72,7 @@
       <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span
-            v-if="scope.row.manageType == '编码' && scope.row.usNum > 0"
+            v-if="scope.row.usNum > 0"
             class="clickText"
             @click="openUserRecords(scope.row)"
           >
@@ -175,7 +175,7 @@
         <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
         <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
         <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true" />
-        <el-table-column label="租赁价（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true" />
+        <!-- <el-table-column label="租赁价（元）" align="center" prop="buyPrice" :show-overflow-tooltip="true" /> -->
         <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
         <el-table-column label="操作人" align="center" prop="creator" :show-overflow-tooltip="true" />
         <el-table-column label="出库时间" align="center" prop="outTime" :show-overflow-tooltip="true" />

src/views/materialsStation/equipment/safetyWarn/index.vue

@@ -0,0 +1,180 @@
+<template>
+  <!-- 基础页面 -->
+  <div class="app-container">
+    <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline @submit.native.prevent>
+      <el-form-item label="关键字" prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option label="正常" value="0" />
+          <el-option label="1个月检测到期" value="2" />
+          <el-option label="3个月检测到期" value="1" />
+          <el-option label="已过期" value="3" />
+        </el-select>
+      </el-form-item>
+      <!-- 表单按钮 -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table :data="tableList" fit highlight-current-row style="width: 100%">
+      <el-table-column
+        type="index"
+        width="55"
+        label="序号"
+        align="center"
+        :index="index => (queryParams.pageNum - 1) * queryParams.pageSize + index + 1"
+      />
+      <el-table-column label="工程名称" align="center" prop="proName" width="160"  />
+      <el-table-column label="班组名称" align="center" prop="teamName" width="120"  />
+      <el-table-column label="设备类型" align="center" prop="typeName"  :show-overflow-tooltip="true" />
+      <el-table-column label="规格型号" align="center" prop="typeModelName"  :show-overflow-tooltip="true" />
+      <el-table-column label="设备编号" align="center" prop="maCode"  :show-overflow-tooltip="true" />
+      <el-table-column label="本次检验时间" align="center" prop="thisCheckTime"  :show-overflow-tooltip="true" />
+      <el-table-column label="下次检验时间" align="center" prop="nextCheckTime"  :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span :class="getStatusClass(scope.row.status)">{{ getStatusText(scope.row.status) }}</span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import TreeSelect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import QRCodeView from '@/components/QRCodeView'
+import { getMachineInfoApi,getSafetyListApi, getLevelListApi } from '@/api/materialsStation'
+
+export default {
+  components: { TreeSelect, QRCodeView },
+  data() {
+    return {
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        keyWord: '', // 关键字
+        status: '' // 规格型号
+      },
+      total: 0, // 总条数
+      // 表格数据
+      tableList: []
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getStatusText(status) {
+      switch (status) {
+        case '0':
+          return '正常';
+        case '1':
+          return '3个月检测到期';
+        case '2':
+          return '1个月检测到期';
+        case '3':
+          return '已过期';
+        default:
+          return '';
+      }
+    },
+    // 根据状态值返回对应的 CSS 类名
+    getStatusClass(status) {
+      switch (status) {
+        case '0':
+          return 'status-normal';
+        case '1':
+          return 'status-three-months';
+        case '2':
+          return 'status-one-month';
+        case '3':
+          return 'status-expired';
+        default:
+          return '';
+      }
+    },
+
+    // 查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    // 重置
+    handleReset() {
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
+      this.$refs.queryForm.resetFields()
+      this.queryParams.keyWord = ''
+      this.queryParams.status = ''
+      this.getList()
+    },
+    // 获取列表
+    async getList() {
+      console.log('列表-查询', this.queryParams)
+      const loading = this.$loading({ text: '加载中...' })
+      try {
+        const params = { ...this.queryParams }
+        const res = await getSafetyListApi(params)
+        console.log('🚀 ~ 获取列表 ~ res:', res)
+        this.tableList = res.data.rows
+        this.total = res.data.total
+        loading.close()
+      } catch (error) {
+        console.log('🚀 ~ 获取列表 ~ error:', error)
+        this.tableList = []
+        this.total = 0
+        loading.close()
+      }
+    },
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+// 定义不同状态的颜色样式
+.status-normal {
+  color: #67C23A; // 绿色
+}
+.status-three-months {
+  color: #E6A23C; // 橙色
+}
+.status-one-month {
+  color: #F56C6C; // 红色
+}
+.status-expired {
+  color: #909399; // 灰色
+}
+</style>

src/views/materialsStation/equipment/teamStorage/index.vue

@@ -0,0 +1,310 @@
+<template>
+  <!-- 基础页面 -->
+  <div class="app-container">
+    <el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline @submit.native.prevent>
+      <el-form-item label="关键字" prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          @keyup.enter.native="handleQuery"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <!-- 表单按钮 -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+        <el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
+        <el-button icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table :data="tableList" fit highlight-current-row style="width: 100%">
+      <el-table-column
+        type="index"
+        width="55"
+        label="序号"
+        align="center"
+        :index="index => (queryParams.pageNum - 1) * queryParams.pageSize + index + 1"
+      />
+      <el-table-column label="班组名称" align="center" prop="teamName" />
+      <el-table-column label="班组长" align="center" prop="teamName"   />
+      <el-table-column label="库存" align="center" prop="usNum" >
+        <template slot-scope="scope">
+          <span
+            v-if="scope.row.usNum > 0"
+            class="clickText"
+            @click="openUserRecords(scope.row)"
+          >
+            {{ scope.row.usNum }}
+          </span>
+          <!-- 否则，直接显示数字 -->
+          <span v-else>
+            {{ scope.row.usNum }}
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 二级页面 -->
+    <el-dialog :title="title" :visible.sync="openUseRecord" width="1200px" append-to-body>
+      <el-form :model="dialogUseQuery" ref="dialogUseQuery" size="small" :inline="true" label-width="80px">
+        <el-form-item label="关键字" prop="keyWord">
+          <el-input
+            v-model="dialogUseQuery.keyWord"
+            placeholder="请输入关键字"
+            clearable
+            :maxlength="20"
+            style="width: 240px"
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogUseQuery">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="el-icon-download" size="mini" @click="handleDialogUserExport">导出</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="useRecordList">
+        <el-table-column
+          label="序号"
+          align="center"
+          width="80"
+          type="index"
+          :index="indexContinuation(dialogUseQuery.pageNum, dialogUseQuery.pageSize)"
+        ></el-table-column>
+        <el-table-column label="班组名称" align="center" prop="teamName" :show-overflow-tooltip="true" />
+        <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
+        <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
+        <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+        <el-table-column label="库存" align="center" prop="usNum" :show-overflow-tooltip="true" />
+        <el-table-column label="操作" align="center" width="100" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="mini" v-if="scope.row.manageType==0" style="margin-bottom: 10px" type="primary" @click="handleView(scope.row)">
+            查看
+          </el-button>
+        </template>
+      </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="dialogUserTotal > 0"
+        :total="dialogUserTotal"
+        :page.sync="dialogUseQuery.pageNum"
+        :limit.sync="dialogUseQuery.pageSize"
+        @pagination="getUserRecords"
+      />
+    </el-dialog>
+
+    <!-- 三级页面 -->
+    <el-dialog :title="titleThree" :visible.sync="openUseRecordThree" width="800px" append-to-body>
+      <el-form :model="dialogUseQueryThree" ref="dialogUseQueryThree" size="small" :inline="true" label-width="80px">
+        <el-form-item label="关键字" prop="keyWord">
+          <el-input
+            v-model="dialogUseQueryThree.keyWord"
+            placeholder="请输入关键字"
+            clearable
+            :maxlength="20"
+            style="width: 240px"
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogUseQueryThree">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="el-icon-download" size="mini" @click="handleResetThree">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="loading" :data="useRecordListThree">
+        <el-table-column
+          label="序号"
+          align="center"
+          width="80px"
+          type="index"
+          :index="indexContinuation(dialogUseQueryThree.pageNum, dialogUseQueryThree.pageSize)"
+        ></el-table-column>
+        <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+        <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+        <el-table-column label="设备编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
+      </el-table>
+
+      <pagination
+        v-show="dialogUserThreeTotal > 0"
+        :total="dialogUserThreeTotal"
+        :page.sync="dialogUseQueryThree.pageNum"
+        :limit.sync="dialogUseQueryThree.pageSize"
+        @pagination="getTeamNumThird"
+      />
+    </el-dialog>
+  </div>
+
+  
+</template>
+
+<script>
+import TreeSelect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import QRCodeView from '@/components/QRCodeView'
+import { getTeamNumListApi,getTeamNumSecondListApi, getTeamNumThirdApi } from '@/api/materialsStation'
+
+export default {
+  components: { TreeSelect, QRCodeView },
+  data() {
+    return {
+      showSearch: true,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        keyWord: '', // 关键字
+        status: '' // 规格型号
+      },
+      total: 0, // 总条数
+      // 表格数据
+      tableList: [],
+      //在用弹窗
+      openUseRecord: false,
+      dialogUseQuery: {
+        pageNum: 1,
+        pageSize: 10,
+        keyWord: undefined
+      },
+      useRecordList: [],
+      dialogUserTotal: 0,
+      loading: false,
+      title: '库存查看',
+      openUseRecordThree: false,
+      dialogUseQueryThree: {
+        pageNum: 1,
+        pageSize: 10,
+        keyWord: undefined
+      },
+      useRecordListThree: [],
+      dialogUserThreeTotal: 0,
+      titleThree: '查看',
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    // 查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    // 重置
+    handleReset() {
+      this.queryParams.pageNum = 1
+      this.queryParams.pageSize = 10
+      this.$refs.queryForm.resetFields()
+      this.queryParams.keyWord = ''
+      this.queryParams.status = ''
+      this.getList()
+    },
+    // 获取列表
+    async getList() {
+      console.log('列表-查询', this.queryParams)
+      const loading = this.$loading({ text: '加载中...' })
+      try {
+        const params = { ...this.queryParams }
+        const res = await getTeamNumListApi(params)
+        console.log('🚀 ~ 获取列表 ~ res:', res)
+        this.tableList = res.data.rows
+        this.total = res.data.total
+        loading.close()
+      } catch (error) {
+        console.log('🚀 ~ 获取列表 ~ error:', error)
+        this.tableList = []
+        this.total = 0
+        loading.close()
+      }
+    },
+
+    //查看在用设备
+    openUserRecords(row) {
+      this.openUseRecord = true
+      this.dialogUseQuery.teamId = row.teamId
+      this.dialogUseQuery.keyWord = ''
+      this.getUserRecords()
+    },
+    /** 查询在用设备列表 */
+    getUserRecords() {
+      getTeamNumSecondListApi(this.dialogUseQuery).then(response => {
+        this.useRecordList = response.data.rows
+        this.dialogUserTotal = response.data.total
+      })
+    },
+    /** 搜索在用按钮操作 */
+    handleDialogUseQuery() {
+      this.dialogUseQuery.pageNum = 1
+      this.getUserRecords()
+    },
+    //三级页面查看
+    handleView(row) {
+      this.openUseRecordThree = true
+      this.dialogUseQueryThree.agreementId = row.agreementId
+      this.dialogUseQueryThree.typeId = row.typeId
+      this.dialogUseQueryThree.keyWord = ''
+      this.getTeamNumThird()
+    },
+    getTeamNumThird() {
+      getTeamNumThirdApi(this.dialogUseQueryThree).then(response => {
+        this.useRecordListThree = response.data.rows
+        this.dialogUserThreeTotal = response.data.total
+      })
+    },
+        /** 搜索在用按钮操作 */
+    handleDialogUseQueryThree() {
+      this.dialogUseQueryThree.pageNum = 1
+      this.getTeamNumThird()
+    },
+    handleResetThree() {
+      this.dialogUseQueryThree.pageNum = 1
+      this.dialogUseQueryThree.pageSize = 10
+      this.$refs.dialogUseQueryThree.resetFields()
+      this.dialogUseQueryThree.keyWord = ''
+      this.getTeamNumThird()
+    },
+
+    handleExport() {
+      this.download(
+        'material/material_maMachine/exportTeamNumList',
+        { ...this.queryParams },
+        `班组库存查询_${new Date().getTime()}.xlsx`
+      )
+    },
+
+    handleDialogUserExport() {
+      this.download(
+        'material/material_maMachine/exportTeamNumSecondList',
+        { ...this.dialogUseQuery },
+        `班组库存编码设备查询_${new Date().getTime()}.xlsx`
+      )
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.clickText {
+  color: #02a7f0;
+  cursor: pointer;
+}
+</style>

src/views/materialsStation/toolsLease/apply/component/homeApply.vue

@@ -192,6 +192,13 @@
             <div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
               <div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
                 <div style="width: 50%">发料：</div>
+                  <img
+                    v-if="leaseApplyOutData.outSignUrl"
+                    :src="leaseApplyOutData.outSignUrl"
+                    style="width: 40px; height: 90px"
+                    :style="{transform: leaseApplyOutData.outSignType == 0 ? 'rotate(-90deg)' : ''}"
+                    alt=""
+                  />
               </div>
               <div class="item" style="width: 50%; display: flex; align-items: center; flex-wrap: wrap">
                 <div style="display: flex; align-items: center">
@@ -297,6 +304,8 @@ export default {
       leaseApplyDetails: [],
       // 领料任务详情数据
       leaseApplyData: {},
+      // 领料任务详情发料数据
+      leaseApplyOutData: {},
       // 编码管理查看弹窗
       showView: false,
       titleView: '',
@@ -371,6 +380,7 @@ export default {
       const res = await getPickListApi({ id: row.id })
       this.leaseApplyDetails = res.data.leaseApplyDetailsList
       this.leaseApplyData = res.data.leaseApplyInfo
+      this.leaseApplyOutData = res.data.leaseOutSign
     },
 
     //出库检验单打印