Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml

@@ -68,8 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
-            <if test="concat != null and concat != ''">concat = #{concat},</if>
-            <if test="phone != null and phone != ''">phone = #{phone},</if>
+            <if test="concat != null">concat = #{concat},</if>
+            <if test="phone != null">phone = #{phone},</if>
             update_time = sysdate()
         </set>
         where house_id = #{houseId}

sgzb-ui/src/api/base/base.js

@@ -154,6 +154,14 @@ export function unitTypeList(query) {
     params: query
   })
 }
+// 单位类型-列表-下拉
+export function unitTypeListAll(query) {
+  return request({
+    url: '/base/dic/lists',
+    method: 'get',
+    params: query
+  })
+}
 // 标签编号-列表
 export function getMaMachineLabelApi(query) {
   return request({

sgzb-ui/src/api/stquery/ledgerQuery.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getHoldingLedger(query) {
+  return request({
+    url: '/base/composite/getHoldingLedger',
+    method: 'get',
+    params: query,
+  })
+}

sgzb-ui/src/views/base/comeAndGo/index.vue

@@ -216,7 +216,7 @@
 
 <script>
 import { addUnit, delUnit, unitInfoAll, updateUnit } from "@/api/base/base";
-import { unitTypeList } from "@/api/base/base";
+import { unitTypeListAll } from "@/api/base/base";
 import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -287,7 +287,7 @@ export default {
   methods: {
     //获取单位类型
     getType() {
-      unitTypeList({ id: "1" }).then(response => {
+      unitTypeListAll({ id: "1" }).then(response => {
         this.typeList = response.rows;
       })
     },

sgzb-ui/src/views/stquery/ledgerQuery.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container" id="ledgerQuery">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
-      <el-form-item label="物品类型">
-        <el-select v-model="queryParams.type" placeholder="选择物品类型" clearable style="width: 240px">
-          <el-option v-for="item in typeList" :key="item.id" :label="item.type" :value="item.id"></el-option>
-        </el-select>
+      <el-form-item label="物品类型" prop="status">
+        <el-cascader placeholder="请输入物品类型" :options="deviceTypeTree" :props="deviceTypeTreeProps"
+          :show-all-levels="false" v-model="queryParams.typeId" :emitPath="true" @change="deviceTypeChange"
+          ref="deviceTypeCascader" filterable style="width: 240px"></el-cascader>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@@ -14,43 +14,55 @@
     <el-table v-loading="loading" :data="leaseAuditList">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
+        <template scope="scope">
           <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-          </template>
+        </template>
       </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-column label="总保有量(付)" align="center" prop="unit" :show-overflow-tooltip="true" />
-      <el-table-column label="在用数(付)" align="center" prop="preNum" :show-overflow-tooltip="true" />
-      <el-table-column
-        label="在库数(付)"
-        align="center"
-        prop="leasePerson"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column type="expand">
+        <template slot-scope="scope">
+          <div class="nested-table-container">
+            <el-table :data="scope.row.wholeSetDetails" style="width: 100%">
+              <!-- 子表格的列 -->
+              <el-table-column label="序号" align="center" type="index" />
+              <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="supplier" :show-overflow-tooltip="true" />
+
+              <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+              <el-table-column label="总保有量(付)" align="center" prop="allNum" :show-overflow-tooltip="true" />
+              <el-table-column label="在用数(付)" align="center" prop="usNum" :show-overflow-tooltip="true" />
+              <el-table-column label="在库数(付)" align="center" prop="num" :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
+      <el-table-column label="总保有量(付)" align="center" prop="allNum" :show-overflow-tooltip="true" />
+      <el-table-column label="在用数(付)" align="center" prop="usNum" :show-overflow-tooltip="true" />
+      <el-table-column label="在库数(付)" align="center" prop="num" :show-overflow-tooltip="true" />
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      :page-sizes="[5,10,15,20,30]"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :page-sizes="[5, 10, 15, 20, 30]" @pagination="getList" />
   </div>
 </template>
 <script>
+import { getHoldingLedger } from "@/api/stquery/ledgerQuery";
+import {
+  getDeviceTypeTree,
+} from '@/api/claimAndRefund/receive'
 export default {
   name: 'ledgerQuery',
   data() {
     return {
+      // 选中的设备类型
+      deviceTypeTree: [], // 设备 树结构数据
+      // 设备 树显示 配置
+      deviceTypeTreeProps: {
+        multiple: false,
+        value: 'id',
+      },
       // 遮罩层
       loading: false,
       typeList: [
@@ -62,14 +74,22 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        type: undefined,
+        typeId: undefined,
       },
       // 总条数
       total: 0,
     }
   },
+  created() {
+    this.getList()
+    this.GetDeviceTypeTree()
+  },
   methods: {
-    getList() {},
+    async getList() {
+      const res = await getHoldingLedger(this.queryParams)
+      console.log(res, 'sss');
+      this.leaseAuditList = res.data.rows
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -78,9 +98,22 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm('queryForm')
-      this.queryParams.type = null
+      this.queryParams.typeId = null
       this.handleQuery()
     },
+    // 获取 设备树结构数据
+    async GetDeviceTypeTree() {
+      const params = {
+        level: 4,
+      }
+      const res = await getDeviceTypeTree(params)
+      this.deviceTypeTree = res.data
+    },
+    /////// 设备类型树  切换
+    deviceTypeChange(val) {
+      this.queryParams.typeId = val[val.length - 1];
+      this.getList()
+    },
   },
 }
 </script>