优化新增借出资产

ruoyi-admin/src/main/java/com/ruoyi/asset/controller/TbAssetInformationController.java

@@ -66,6 +66,12 @@ public class TbAssetInformationController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/select")
+    public AjaxResult select(TbAssetInformation tbAssetInformation) {
+        List<TbAssetInformation> tbAssetInformations = tbAssetInformationService.selectTbAssetInformationList2(tbAssetInformation);
+        return AjaxResult.success(tbAssetInformations);
+    }
+
     /**
      * 导出资产信息列表
      */

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbAssetInformation.java

@@ -62,6 +62,13 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "入账时间", width = 40, dateFormat = "yyyy-MM-dd")
     private Date paymentReceivingTime;
 
+    /** 所在位置编号 */
+    @Excel(name = "所在位置编号")
+    private String locationNumber;
+    /** 位置名称 */
+    @Excel(name = "所在位置名称（导出）")
+    private String locationName;
+
     /** 使用部门 */
     @Excel(name = "使用部门")
     private String userDepartment;
@@ -70,37 +77,18 @@ public class TbAssetInformation extends BaseEntity
     @Excel(name = "使用部门名称（导出）")
     private String userDepartmentName;
 
-    /** 所在位置编号 */
-    @Excel(name = "所在位置编号")
-    private String locationNumber;
 
     /** 位置ID */
     private Long locationId;
-    /** 位置名称 */
-    @Excel(name = "所在位置名称（导出）")
-    private String locationName;
+
     /** 位置标签 */
     @Excel(name = "所在位置标签（导出）")
     private String locationLabel;
 
     /** 位置ID */
     private Long parentLocationId;
-//    /** 位置名称 */
-//    @Excel(name = "父级位置名称（导出）")
-//    private String parentLocationName;
-//    /** 位置标签 */
-//    @Excel(name = "父级位置标签（导出）")
-//    private String parentLocationLabel;
-//
     /** 位置ID */
     private Long ancestorLocationId;
-//    /** 位置名称 */
-//    @Excel(name = "祖级位置名称（导出）")
-//    private String ancestorLocationName;
-//    /** 位置标签 */
-//    @Excel(name = "祖级位置标签（导出）")
-//    private String ancestorLocationLabel;
-
     /** 资产条码 */
     @Excel(name = "资产条码")
     private String code;

ruoyi-ui/src/api/asset/information.js

@@ -10,6 +10,15 @@ export function listInformation(query) {
 }
 
 // 查询资产信息列表
+export function select(query) {
+  return request({
+    url: '/asset/information/select',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询资产信息列表
 export function listInformation2() {
   return request({
     url: '/visitor/asset/list',

ruoyi-ui/src/views/asset/adjustment/index.vue

@@ -200,7 +200,7 @@ export default {
         recordStatus: [{ required: true, message: '记录状态不能为空', trigger: 'change' }],
       },
       // 资产原信息
-      originalAssetInfo: {}
+      originalAssetInfo: {},
     }
   },
   created() {
@@ -208,8 +208,7 @@ export default {
   },
   methods: {
     test(val) {
-      const json = JSON.parse(val)
-      console.log('资产原信息:', json)
+      const json = JSON.parse(val)('资产原信息:', json)
     },
     /** 查询资产调整列表 */
     getList() {

ruoyi-ui/src/views/asset/borrow/index.vue

@@ -185,7 +185,17 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="借出资产编码" prop="assetNumber">
-          <el-input v-model="form.assetNumber" placeholder="请输入借出资产编码" :disabled="isUpdate"/>
+          <!-- <el-input v-model="form.assetNumber" placeholder="请输入借出资产编码" :disabled="isUpdate"/> -->
+          <el-select v-model="form.assetNumber" :disabled="isUpdate" filterable placeholder="请选择借出资产编码">
+            <el-option
+              v-for="item in assetSelect"
+              :key="item.id"
+              :label="item.number"
+              :value="item.number">
+              <span style="float: left">{{ item.number }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="借出人用户名" prop="userName">
           <el-input v-model="form.userName" placeholder="请输入借出人用户名" @change="onCheckUserName">
@@ -244,6 +254,7 @@
 
 <script>
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/asset/borrow";
+import { select as AssetSelect } from '@/api/asset/information'
 import { isExistsUserName } from '@/api/system/user'
 import { treeSelect } from '@/api/asset/location'
 import UserSearch from '@/components/SysUserSearch/index.vue'
@@ -321,7 +332,8 @@ export default {
         returnLocationNumber: [
           { required: true, message: "归还位置不能为空", trigger: "blur" }
         ],
-      }
+      },
+      assetSelect: []
     };
   },
   created() {
@@ -346,6 +358,12 @@ export default {
       treeSelect().then((response) => {
         this.locationList = response.data
       })
+      this.getAssetSelect()
+    },
+    getAssetSelect() {
+      AssetSelect().then((res) => {
+        this.assetSelect = res.data
+      })
     },
     // 取消按钮
     cancel() {
@@ -404,6 +422,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getAssetSelect()
       this.open = true;
       this.isUpdate = false
       this.title = "添加资产借用";

ruoyi-ui/src/views/asset/information/index.vue

@@ -225,12 +225,8 @@
       <el-table-column label="计量" align="center" prop="units" />
       <el-table-column label="数量" align="center" prop="quantity" />
       <el-table-column v-if="isExist('入账时间')" label="入账时间" align="center" prop="paymentReceivingTime" />
+      <el-table-column label="所在位置" align="center" prop="locationName" width="120"/>
       <el-table-column label="使用部门" align="center" prop="userDepartmentName"/>
-      <el-table-column label="所在位置" align="center" prop="locationName" width="120">
-        <!-- <template slot-scope="scope">
-          <span>{{ (scope.row.ancestorLocationName ? scope.row.ancestorLocationName + '-' : '') + (scope.row.parentLocationName ? scope.row.parentLocationName + '-' : '') + scope.row.locationName }}</span>
-        </template> -->
-      </el-table-column>
       <el-table-column label="资产条码" v-if="isExist('资产条码')" align="center" prop="code" />
       <el-table-column v-if="isExist('epc')" label="EPC" align="center" prop="epc" width="180">
         <template slot-scope="scope">
@@ -824,6 +820,7 @@ export default {
       },
       singlePrintIndexes: [],
       isSinglePrinter: false,
+      assetSelect: []
     }
   },
   created() {

ruoyi-ui/src/views/asset/location/index.vue

@@ -42,7 +42,7 @@
     <el-table v-loading="loading" :data="locationList" row-key="id" @selection-change="handleSelectionChange" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="位置编号" align="center" prop="number" /> -->
-      <el-table-column label="名称" align="left" prop="name" width="300"/>
+      <el-table-column label="名称" align="left" prop="name" width="300" />
       <el-table-column label="二维码" align="center" prop="number">
         <template slot-scope="scope">
           <image-preview :src="getCode(scope.row.number)" :width="80" :height="80" />
@@ -171,7 +171,7 @@ export default {
     },
     getTreeSelect() {
       treeSelect().then((res) => {
-        console.log('下拉树结果', res)
+        '下拉树结果', res
         this.locationOption = res.data
       })
     },
@@ -214,7 +214,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection)
+      selection
       this.ids = selection.map((item) => item.id)
       this.single = selection.length !== 1
       this.multiple = !selection.length

ruoyi-ui/src/views/index.vue

@@ -1,141 +1,61 @@
 <template>
   <div class="hotel-index">
     <h3>待审批信息</h3>
-    <el-table
-      :data="orderList"
-      height="260"
-      border
-      style="width: 100%"
-      :default-sort="{ prop: 'applicationDate', order: 'descending' }"
-    >
+    <el-table :data="orderList" height="260" border style="width: 100%" :default-sort="{ prop: 'applicationDate', order: 'descending' }">
       <el-table-column type="expand">
         <template slot-scope="props">
           <el-form label-position="left" class="table-expand">
             <el-descriptions :column="4" border>
-              <el-descriptions-item
-                v-if="props.row.orderType !== 1"
-                label="资产总原值"
-              >
+              <el-descriptions-item v-if="props.row.orderType !== 1" label="资产总原值">
                 <span>{{ props.row.assetTotalOriginalValue }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType !== 1"
-                label="资产总净值"
-              >
+              <el-descriptions-item v-if="props.row.orderType !== 1" label="资产总净值">
                 <span>{{ props.row.assetTotalNetValue }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 1"
-                label="【调整】资产编号"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 1" label="【调整】资产编号">
                 <span>{{ props.row.adjustmentAssetNumber }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 1"
-                label="【调整】资产原信息"
-              >
-                <el-button
-                  type="text"
-                  icon="el-icon-search"
-                  @click="
-                    onSelectOriginalAssetInfo(
-                      props.row.adjustmentOriginalAssetInfo
-                    )
-                  "
-                  >查看</el-button
-                >
+              <el-descriptions-item v-if="props.row.orderType === 1" label="【调整】资产原信息">
+                <el-button type="text" icon="el-icon-search" @click="onSelectOriginalAssetInfo(props.row.adjustmentOriginalAssetInfo)">查看</el-button>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType !== 1"
-                label="资产明细"
-              >
-                <el-button
-                  type="text"
-                  icon="el-icon-search"
-                  @click="
-                    onSelectopenDetail(
-                      props.row
-                    )
-                  "
-                  >查看</el-button
-                >
+              <el-descriptions-item v-if="props.row.orderType !== 1" label="资产明细">
+                <el-button type="text" icon="el-icon-search" @click="onSelectopenDetail(props.row)">查看</el-button>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 2"
-                label="【调拨】调出部门"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 2" label="【调拨】调出部门">
                 <span>{{ props.row.allocationCallOutDepartmentName }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 2"
-                label="【调拨】调出经办人"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 2" label="【调拨】调出经办人">
                 <span>{{ props.row.allocationCallOutBy }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 2"
-                label="【调拨】调出日期"
-              >
-                <span>{{
-                  parseTime(props.row.allocationCallOutDate, "{y}-{m}-{d}")
-                }}</span>
+              <el-descriptions-item v-if="props.row.orderType === 2" label="【调拨】调出日期">
+                <span>{{ parseTime(props.row.allocationCallOutDate, '{y}-{m}-{d}') }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 2"
-                label="【调拨】调入部门"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 2" label="【调拨】调入部门">
                 <span>{{ props.row.allocationCallInDepartmentName }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 2"
-                label="【调拨】调入经办人"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 2" label="【调拨】调入经办人">
                 <span>{{ props.row.allocationCallInBy }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 2"
-                label="【调拨】调入日期"
-              >
-                <span>{{
-                  parseTime(props.row.allocationCallInDate, "{y}-{m}-{d}")
-                }}</span>
+              <el-descriptions-item v-if="props.row.orderType === 2" label="【调拨】调入日期">
+                <span>{{ parseTime(props.row.allocationCallInDate, '{y}-{m}-{d}') }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 2"
-                label="【调拨】新管理人"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 2" label="【调拨】新管理人">
                 <span>{{ props.row.allocationNewResponsiblePerson }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 2"
-                label="【调拨】新功能位置编号"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 2" label="【调拨】新功能位置编号">
                 <span>{{ props.row.allocationNewLocationNumber }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 3"
-                label="【借出】借出部门"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 3" label="【借出】借出部门">
                 <span>{{ props.row.lendDepartmentName }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 3"
-                label="【借出】经手人"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 3" label="【借出】经手人">
                 <span>{{ props.row.lendBySponsor }}</span>
               </el-descriptions-item>
-              <el-descriptions-item
-                v-if="props.row.orderType === 3"
-                label="【借出】往来单位"
-              >
+              <el-descriptions-item v-if="props.row.orderType === 3" label="【借出】往来单位">
                 <span>{{ props.row.lendPassingUnitName }}</span>
               </el-descriptions-item>
-              <el-descriptions-item label="原因说明">{{
-                props.row.reason
-              }}</el-descriptions-item>
-              <el-descriptions-item label="所属公司">{{
-                props.row.corporationName
-              }}</el-descriptions-item>
+              <el-descriptions-item label="原因说明">{{ props.row.reason }}</el-descriptions-item>
+              <el-descriptions-item label="所属公司">{{ props.row.corporationName }}</el-descriptions-item>
             </el-descriptions>
           </el-form>
         </template>
@@ -143,75 +63,32 @@
       <el-table-column label="单据编号" align="center" prop="orderNumber" />
       <el-table-column label="单据类型" align="center" prop="orderType">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.asset_order_type"
-            :value="scope.row.orderType"
-          />
+          <dict-tag :options="dict.type.asset_order_type" :value="scope.row.orderType" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="申请日期"
-        align="center"
-        prop="applicationDate"
-        width="180"
-      >
+      <el-table-column label="申请日期" align="center" prop="applicationDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.applicationDate, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="申请部门"
-        align="center"
-        prop="applicationDepartmentName"
-      />
+      <el-table-column label="申请部门" align="center" prop="applicationDepartmentName" />
       <el-table-column label="制单人" align="center" prop="preparedBy" />
-      <el-table-column
-        label="制单部门"
-        align="center"
-        prop="preparedDepartmentName"
-      />
+      <el-table-column label="制单部门" align="center" prop="preparedDepartmentName" />
       <el-table-column label="记录状态" align="center" prop="recordStatus">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.asset_record_status"
-            :value="scope.row.recordStatus"
-          />
+          <dict-tag :options="dict.type.asset_record_status" :value="scope.row.recordStatus" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleAudit(scope.row, 2)"
-            v-hasPermi="['order:order:audit']"
-            >审批</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleAudit(scope.row, 0)"
-            v-hasPermi="['order:order:audit']"
-            >撤销</el-button
-          >
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row, 2)" v-hasPermi="['order:order:audit']">审批</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleAudit(scope.row, 0)" v-hasPermi="['order:order:audit']">撤销</el-button>
         </template>
       </el-table-column>
     </el-table>
     <h3>待盘点信息</h3>
-    <el-table
-      :data="inventoryList"
-      height="260"
-      border
-      style="width: 100%"
-      :default-sort="{ prop: 'applicationDate', order: 'descending' }"
-    >
-    <el-table-column  width="55" align="center" />
+    <el-table :data="inventoryList" height="260" border style="width: 100%" :default-sort="{ prop: 'applicationDate', order: 'descending' }">
+      <el-table-column width="55" align="center" />
       <el-table-column label="资产盘点记录编号" align="center" prop="id" />
       <el-table-column label="单据编号" align="center" prop="orderNumber" />
       <el-table-column label="任务名称" align="center" prop="name" />
@@ -227,32 +104,24 @@
     </el-table>
 
     <!-- 【调整】资产信息 -->
-    <el-dialog
-      title="资产调整"
-      :visible.sync="openAdjustment"
-      width="900px"
-      append-to-body
-    >
-      <AssetInfo
-        :title="'资产原信息'"
-        :assetInfo="adjustmentOriginalAssetInfo"
-      />
+    <el-dialog title="资产调整" :visible.sync="openAdjustment" width="900px" append-to-body>
+      <AssetInfo :title="'资产原信息'" :assetInfo="adjustmentOriginalAssetInfo" />
     </el-dialog>
     <el-dialog title="单据详细信息" :visible.sync="openDetail" width="1300px" append-to-body>
-      <OrderDetail v-if="openDetail" :orderInfo="orderInfo"/>
+      <OrderDetail v-if="openDetail" :orderInfo="orderInfo" />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listOrder, auditOrder } from "@/api/order/order";
-import { listInventoryDTO } from "@/api/inventory/inventory";
-import { getUserProfile } from "@/api/system/user";
+import { listOrder, auditOrder } from '@/api/order/order'
+import { listInventoryDTO } from '@/api/inventory/inventory'
+import { getUserProfile } from '@/api/system/user'
 
 export default {
-  dicts: ["asset_order_type", "asset_record_status"],
+  dicts: ['asset_order_type', 'asset_record_status'],
   components: {
-    AssetInfo: () => import("@/components/asset/assetCard.vue"),
+    AssetInfo: () => import('@/components/asset/assetCard.vue'),
     OrderDetail: () => import('@/views/order/detail/index.vue'),
   },
   data() {
@@ -278,33 +147,32 @@ export default {
         inventoryResult: 0,
         inventoryBy: '',
       },
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     /** 查询资产单据列表 */
     getList() {
-      this.loading = true;
-      getUserProfile().then(response => {
-        this.user = response.data;
+      this.loading = true
+      getUserProfile().then((response) => {
+        this.user = response.data
         this.queryParams.inventoryBy = this.user.userName
-        listInventoryDTO(this.queryParams).then(response => {
-        this.inventoryList = response.rows;
-      });
-      });
+        listInventoryDTO(this.queryParams).then((response) => {
+          this.inventoryList = response.rows
+        })
+      })
       listOrder(this.queryParams).then((response) => {
-        this.orderList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.orderList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     onSelectOriginalAssetInfo(info) {
-      const json = JSON.parse(info);
-      this.adjustmentOriginalAssetInfo = json;
-      this.openAdjustment = true;
-      console.log("资产原信息:", json);
+      const json = JSON.parse(info)
+      this.adjustmentOriginalAssetInfo = json
+      this.openAdjustment = true('资产原信息:', json)
     },
     // 表单重置
     reset() {
@@ -334,11 +202,10 @@ export default {
         preparedDepartment: null,
         corporation: null,
         recordStatus: null,
-      };
+      }
     },
     onSelectopenDetail(order) {
-      this.orderInfo = order
-      console.log('单据信息:', order)
+      this.orderInfo = order('单据信息:', order)
       this.openDetail = true
     },
     handleAudit(row, recordStatus) {
@@ -346,24 +213,24 @@ export default {
       this.$modal
         .confirm(title)
         .then(() => {
-          this.reset();
-          this.form.id = row.id;
-          this.form.orderNumber = row.orderNumber;
-          this.form.orderType = row.orderType;
-          this.form.recordStatus = recordStatus;
+          this.reset()
+          this.form.id = row.id
+          this.form.orderNumber = row.orderNumber
+          this.form.orderType = row.orderType
+          this.form.recordStatus = recordStatus
           auditOrder(this.form).then((response) => {
-            this.$modal.msgSuccess("操作成功");
-            this.getList();
-          });
+            this.$modal.msgSuccess('操作成功')
+            this.getList()
+          })
         })
         .catch(() => {})
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>
 .hotel-index {
   padding: 0 15px;
 }
-</style>
+</style>

ruoyi-ui/src/views/inventory/statement/index.vue

@@ -1,13 +1,8 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams"  ref="queryForm" class="queryForm" size="small" :inline="true"  label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" class="queryForm" size="small" :inline="true" label-width="68px">
       <el-form-item label="盘点部门" prop="inventoryDepartment">
-        <treeselect
-          v-model="queryParams.deptId"
-          :options="deptOptions"
-          placeholder="选择盘点部门"
-          @keyup.enter.native="onQueryLoss"
-        />
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" placeholder="选择盘点部门" @keyup.enter.native="onQueryLoss" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="onQueryLoss">搜索</el-button>
@@ -15,67 +10,27 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-button
-        type="warning"
-        plain
-        icon="el-icon-download"
-        size="mini"
-        @click="onLossExport"
-        v-hasPermi="['inventory:inventory:export']"
-      >导出</el-button>
+      <el-button type="warning" plain icon="el-icon-download" size="mini" @click="onLossExport" v-hasPermi="['inventory:inventory:export']">导出</el-button>
     </el-row>
 
     <el-table :data="lossList">
       <el-table-column type="expand">
         <template v-slot="slot">
-          <el-table :data="slot.row.compareResultList" ref="table" :header-cell-style="{ background: '#dcdfe6' }" >
-            <el-table-column
-              prop="assetName"
-              label="资产名称">
-            </el-table-column>
-            <el-table-column
-              prop="location"
-              label="资产位置">
-            </el-table-column>
-            <el-table-column
-              prop="category"
-              label="类别">
-            </el-table-column>
-            <el-table-column
-              prop="nowQuantity"
-              label="账面数量变化">
-            </el-table-column>
-            <el-table-column
-              prop="invQuantity"
-              label="实点数量变化">
-            </el-table-column>
-            <el-table-column
-              prop="lossQuantity"
-              label="损耗数量变化">
-            </el-table-column>
-            <el-table-column
-              prop="units"
-              label="计量单位">
-            </el-table-column>
-            <el-table-column
-              prop="lossVal"
-              label="损耗值变化">
-            </el-table-column>
+          <el-table :data="slot.row.compareResultList" ref="table" :header-cell-style="{ background: '#dcdfe6' }">
+            <el-table-column prop="assetName" label="资产名称"> </el-table-column>
+            <el-table-column prop="location" label="资产位置"> </el-table-column>
+            <el-table-column prop="category" label="类别"> </el-table-column>
+            <el-table-column prop="nowQuantity" label="账面数量变化"> </el-table-column>
+            <el-table-column prop="invQuantity" label="实点数量变化"> </el-table-column>
+            <el-table-column prop="lossQuantity" label="损耗数量变化"> </el-table-column>
+            <el-table-column prop="units" label="计量单位"> </el-table-column>
+            <el-table-column prop="lossVal" label="损耗值变化"> </el-table-column>
           </el-table>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deptName"
-        label="盘点部门">
-      </el-table-column>
-      <el-table-column
-        prop="lastSecondDate"
-        label="最后第二次盘点日期">
-      </el-table-column>
-      <el-table-column
-        prop="lastFirstDate"
-        label="最后盘点日期">
-      </el-table-column>
+      <el-table-column prop="deptName" label="盘点部门"> </el-table-column>
+      <el-table-column prop="lastSecondDate" label="最后第二次盘点日期"> </el-table-column>
+      <el-table-column prop="lastFirstDate" label="最后盘点日期"> </el-table-column>
     </el-table>
 
     <!-- <pagination
@@ -86,17 +41,16 @@
       @pagination="onQueryLoss"
     /> -->
   </div>
-
 </template>
 
 <script>
 import { deptTreeSelect } from '@/api/system/user.js'
-import { getDepAssetLossTb } from '@/api/inventory/detail';
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getDepAssetLossTb } from '@/api/inventory/detail'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  components : {
-    Treeselect
+  components: {
+    Treeselect,
   },
   data() {
     return {
@@ -108,8 +62,8 @@ export default {
       queryParams: {
         // pageNum: 1,
         // pageSize: 10,
-        deptId: null
-      }
+        deptId: null,
+      },
     }
   },
   created() {
@@ -119,33 +73,34 @@ export default {
     /** 查询部门下拉树结构 */
     getDeptTree() {
       deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        this.queryParams.deptId = this.deptOptions[0].id;
+        this.deptOptions = response.data
+        this.queryParams.deptId = this.deptOptions[0].id
         this.onQueryLoss()
-      });
+      })
     },
     onQueryLoss() {
       if (this.queryParams.deptId === null) {
-        this.$modal.msgWarning("部门不能为空");
+        this.$modal.msgWarning('部门不能为空')
         return
       }
-      getDepAssetLossTb(this.queryParams).then(response => {
-        this.lossList = response.data
-        // this.total = response.total;
-        console.log('资产报表', this.lossData)
+      getDepAssetLossTb(this.queryParams).then((response) => {
+        this.lossList = response.data(
+          // this.total = response.total;
+          '资产报表',
+          this.lossData
+        )
       })
     },
     onLossExport() {
       if (this.queryParams.deptId === null) {
-        this.$modal.msgWarning("部门不能为空");
+        this.$modal.msgWarning('部门不能为空')
         return
       }
       const deptId = this.queryParams.deptId
-      this.download('inventory/inventory/exportDepAssetLossTb/' + deptId, {
-      }, `资产报表_${new Date().getTime()}.xlsx`)
+      this.download('inventory/inventory/exportDepAssetLossTb/' + deptId, {}, `资产报表_${new Date().getTime()}.xlsx`)
       this.openExport = false
-    }
-  }
+    },
+  },
 }
 </script>
 
@@ -159,10 +114,10 @@ export default {
     height: 32px;
   }
 }
-.clickNumber{
-  color: #409EFF;
+.clickNumber {
+  color: #409eff;
 
-  &:hover{
+  &:hover {
     cursor: pointer;
     text-decoration: underline;
   }

ruoyi-ui/src/views/label/labelModel/index.vue

@@ -144,7 +144,7 @@ export default {
       this.labelInfo = json
     },
     onJsonChange(val) {
-      console.log('json:', val)
+      ('json:', val)
     },
     /** 查询标签模板信息列表 */
     getList() {

ruoyi-ui/src/views/order/order/index.vue

@@ -261,7 +261,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item v-if="form.orderType === 3" label="【借出】借出部门" prop="lendDepartment">
@@ -281,7 +281,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-form-item label="原因说明" prop="reason">
           <el-input type="textarea" v-model="form.reason" placeholder="请输入原因说明" />
         </el-form-item>
@@ -321,7 +321,7 @@
     </el-dialog>
 
     <el-dialog title="单据详细信息" :visible.sync="openDetail" width="1300px" append-to-body>
-      <OrderDetail v-if="openDetail" :orderInfo="orderInfo" @cancelByOrder="cancelByOrder"/>
+      <OrderDetail v-if="openDetail" :orderInfo="orderInfo" @cancelByOrder="cancelByOrder" />
     </el-dialog>
   </div>
 </template>
@@ -551,7 +551,7 @@ export default {
         }
       })
       selection = selection.filter((item) => item.recordStatus < 1)
-      selection.forEach(item => {
+      selection.forEach((item) => {
         if (item.recordStatus < 1) {
           this.ids.push(item.id)
         }
@@ -560,8 +560,7 @@ export default {
         this.ids = []
       }
       this.single = selection.length !== 1
-      this.multiple = !selection.length
-      console.log('多选数据', selection, this.ids)
+      this.multiple = !selection.length('多选数据', selection, this.ids)
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -574,12 +573,10 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
-      console.log('修改表单信息:', row)
+      this.reset()('修改表单信息:', row)
       const id = row.id || this.ids
       getOrder(id).then((response) => {
-        this.form = response.data
-        console.log('修改表单信息:', this.form)
+        this.form = response.data('修改表单信息:', this.form)
         if (response.data.recordStatus > 0) {
           this.$modal.msgWarning('已提交单据不可修改')
           return
@@ -597,8 +594,7 @@ export default {
       })
     },
     handleWithdraw() {
-      this.reset()
-      console.log(this.ids)
+      this.reset()(this.ids)
       withdrawMoreOrder(this.ids).then((response) => {
         this.$modal.msgSuccess('撤回成功')
         this.getList()
@@ -620,13 +616,13 @@ export default {
                 this.$modal.msgSuccess('保存成功')
               } else {
                 this.$modal.msgSuccess('提交成功')
-              } 
+              }
               this.open = false
               this.getList()
             })
           } else {
             this.form.recordStatus = recordStatus
-            addOrder(this.form).then((response) => {            
+            addOrder(this.form).then((response) => {
               this.open = false
               this.getList()
               if (response.data.orderType !== 1) {
@@ -635,7 +631,7 @@ export default {
                   this.$modal.msgSuccess('保存成功')
                 } else {
                   this.$modal.msgSuccess('提交成功')
-                }  
+                }
               }
             })
           }
@@ -668,7 +664,7 @@ export default {
     },
     cancelByOrder(value) {
       this.openDetail = false
-    }
+    },
   },
 }
 </script>