🎈 perf: 仅优化UI使其更紧凑

klp-ui/src/api/wms/stock.js

@@ -42,3 +42,14 @@ export function delStock(stockId) {
     method: 'delete'
   })
 }
+
+// 物料追溯：根据批次号查找所有关联的单据明细
+export function getStockTrace(batchNo) {
+  return request({
+    url: '/wms/stockIoDetail/batch',
+    method: 'post',
+    data: {
+      batchNo
+    }
+  })
+}

klp-ui/src/assets/styles/element-ui.scss

@@ -616,6 +616,10 @@ body {
         }
       }
     }
+
+    .available.in-range div {
+      background-color: #111;
+    }
   }
 
   // 范围选择器底部按钮

klp-ui/src/components/KLPService/RawMaterialSelect/index.vue

@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-select v-model="selected" :placeholder="placeholder" filterable clearable :loading="loading"
+    <el-select v-model="selected" :placeholder="placeholder" filterable clearable :loading="loading" size="large"
       style="width: 100%" :value-key="'rawMaterialId'">
       <template #empty>
         <el-button v-if="canAdd" @click="add" icon="el-icon-plus">未搜索到原材料，点击添加</el-button>

klp-ui/src/views/mes/dv/repair/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="维修单编号" prop="repairCode">
         <el-input
           v-model="queryParams.repairCode"

klp-ui/src/views/mes/is/inspectionCommission/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <el-form-item label="委托单号" prop="commissionNo">
         <el-input
           v-model="queryParams.commissionNo"
@@ -49,7 +49,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="要求完成日期" prop="deadline">
+      <el-form-item label="截至日期" prop="deadline">
         <el-date-picker clearable
           v-model="queryParams.deadline"
           type="date"

klp-ui/src/views/mes/is/inspectionTask/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <el-form-item label="任务单号" prop="taskNo">
         <el-input v-model="queryParams.taskNo" placeholder="请输入任务单号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="负责人" prop="assignedTo">
         <user-select v-model="queryParams.assignedTo" placeholder="请选择负责人" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="任务开始时间" prop="startTime">
+      <el-form-item label="开始时间" prop="startTime">
         <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择任务开始时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="任务完成时间" prop="endTime">
+      <el-form-item label="完成时间" prop="endTime">
         <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择任务完成时间">
         </el-date-picker>

klp-ui/src/views/mes/is/sampleInventory/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="关联委托单" prop="commissionId">
         <el-select v-model="queryParams.commissionId" placeholder="请选择关联委托单">
           <el-option v-for="item in commissionList" :key="item.commissionId" :label="item.commissionNo" :value="item.commissionId" />

klp-ui/src/views/mes/qc/book/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <el-form-item label="缺陷名称" prop="defectName">
         <el-input
           v-model="queryParams.defectName"

klp-ui/src/views/mes/qc/history/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <el-form-item label="任务名称" prop="taskName">
         <el-input
           v-model="queryParams.taskName"

klp-ui/src/views/mes/qc/item/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="检查项名称" prop="itemName">
         <el-input
           v-model="queryParams.itemName"

klp-ui/src/views/mes/qc/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <el-form-item label="任务名称" prop="taskName">
         <el-input
           v-model="queryParams.taskName"

klp-ui/src/views/wms/contract/contractPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="合同编号" prop="contractNo">
         <el-input v-model="queryParams.contractNo" placeholder="请输入合同编号" clearable @keyup.enter.native="handleQuery" />

klp-ui/src/views/wms/express/index.vue

@@ -40,17 +40,6 @@
                         value-format="yyyy-MM-dd"
                         placeholder="请选择计划到货时间">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="项目" prop="projectId">
-<!--      <el-select v-model="queryParams.projectId" placeholder="请选择项目" filterable>
-        <el-option
-          v-for="item in allProject"
-          :key="item.projectId"
-          :label="item.projectName"
-          :value="item.projectId"
-        ></el-option>
-      </el-select>-->
-
       </el-form-item>
       <el-form-item label="物流公司" prop="expressType">
         <el-select v-model="queryParams.expressType" placeholder="请选择物流公司标识" clearable>
@@ -152,7 +141,7 @@
       </el-table-column>
       <el-table-column label="对方姓名" align="center" prop="supplyName"/>
       <el-table-column label="负责人" align="center" prop="ownerName"/>
-      <el-table-column label="负责人手机" align="center" prop="ownerPhone"/>
+      <el-table-column label="负责人手机" align="center" prop="ownerPhone" width="120" />
       <el-table-column label="计划到货时间" align="center" prop="planDate" width="180">
         <template slot-scope="scope">
           <span>{{parseTime(scope.row.planDate,'{y}-{m}-{d}')}}</span>
@@ -163,7 +152,7 @@
           <span>{{scope.row.updateTime}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="物流公司标识" align="center" prop="expressType">
+      <el-table-column label="物流公司" align="center" prop="expressType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.oa_express_type" :value="scope.row.expressType"/>
         </template>

klp-ui/src/views/wms/ledger/index.vue

@@ -15,6 +15,11 @@
           placeholder="请选择实际库存变动时间">
         </el-date-picker>
       </el-form-item>
+
+      <el-form-item label="批次号" prop="batchNo">
+        <el-input v-model="queryParams.batchNo" placeholder="请输入批次号" />
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -51,11 +56,12 @@
       <el-table-column label="变动数量" align="center" prop="changeQty" />
       <el-table-column label="变动后的库存数量" align="center" prop="afterQty" />
       <el-table-column label="变动类型" align="center" prop="changeType" />
-      <el-table-column label="实际库存变动时间" align="center" prop="changeTime" width="180">
+      <el-table-column label="库存数量变动时间" align="center" prop="changeTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.changeTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="批次号" align="center" prop="batchNo" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -101,6 +107,9 @@
             placeholder="请选择实际库存变动时间" disabled>
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="批次号" prop="batchNo">
+          <el-input v-model="form.batchNo" placeholder="请输入批次号" disabled/>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -168,6 +177,7 @@ export default {
         afterQty: undefined,
         changeType: undefined,
         changeTime: undefined,
+        batchNo: undefined,
       },
       // 表单参数
       form: {},

klp-ui/src/views/wms/product/semi.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="半成品编号" prop="productCode">
         <el-input
           v-model="queryParams.productCode"

klp-ui/src/views/wms/productBom/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="50px">
       <el-form-item label="产品" prop="productId">
         <ProductSelect v-model="queryParams.productId" placeholder="请选择产品" />
       </el-form-item>

klp-ui/src/views/wms/purchasePlan/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <el-form-item label="原材料" prop="rawMaterialId">
         <RawMaterialSelect v-model="queryParams.rawMaterialId" placeholder="请选择原材料" can-add />
       </el-form-item>
@@ -11,7 +11,7 @@
       <!-- <el-form-item label="供应商" prop="supplierId">
         <VendorSelect v-model="queryParams.supplierId" />
       </el-form-item> -->
-      <el-form-item label="关联订单ID" prop="orderId">
+      <el-form-item label="关联订单" prop="orderId">
         <el-input v-model="queryParams.orderId" placeholder="请输入关联订单ID" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -72,6 +72,7 @@
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <el-select v-model="scope.row.status"
+            size="large"
             @change="handleStatusChange(scope.row, scope.row.status, scope.row.status)">
             <el-option v-for="item in dict.type.pruchase_detail_status" :key="item.value" :label="item.label"
               :value="parseInt(item.value)">

klp-ui/src/views/wms/rawMaterial/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="原材料编号" prop="rawMaterialCode">
         <el-input
           v-model="queryParams.rawMaterialCode"

klp-ui/src/views/wms/rxgood/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <!-- <el-form-item label="关联汇报概述ID" prop="summaryId">
         <el-input
           v-model="queryParams.summaryId"
@@ -27,22 +27,6 @@
           style="width: 100%"
         />
       </el-form-item>
-      <!-- <el-form-item label="货物说明" prop="deviceDescription">
-        <el-input
-          v-model="queryParams.deviceDescription"
-          placeholder="请输入货物说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <el-form-item label="收发货详情" prop="reportDetail">
-        <el-input
-          v-model="queryParams.reportDetail"
-          placeholder="请输入收发货详情"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

klp-ui/src/views/wms/rxgood/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="收发货标题" prop="reportTitle">
         <el-input
           v-model="queryParams.reportTitle"

klp-ui/src/views/wms/stock/index.vue

@@ -19,13 +19,12 @@
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
+          <!-- 合并批次<el-switch v-model="queryParams.mergeBatch" :active-value="1" :inactive-value="0" @change="handleQuery" /> -->
         </el-form-item>
       </el-form>
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 
-     
-
       <KLPTable v-loading="loading" :data="stockList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="仓库" align="center" prop="warehouseName" />
@@ -58,6 +57,11 @@
         <el-table-column label="单位" align="center" prop="unit" />
         <el-table-column label="批次号" align="center" prop="batchNo" />
         <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="handleTrace(scope.row)">物料追溯</el-button>
+          </template>
+        </el-table-column>
       </KLPTable>
 
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -104,12 +108,27 @@
       <el-dialog :visible.sync="stockBoxVisible" title="暂存单据" width="800px" append-to-body>
         <stock-io :data="stockBoxData" @generateBill="handleGenerateBill" />
       </el-dialog>
+
+      <el-dialog :visible.sync="stockTraceVisible" title="物料追溯" width="800px" append-to-body>
+        <el-table :data="stockTraceList" style="width: 100%">
+          <el-table-column label="单据类型" align="center" prop="ioType">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.stock_io_type" :value="scope.row.ioType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="单据ID" align="center" prop="stockIoId" />
+          <el-table-column label="单据编号" align="center" prop="stockIoCode" />
+          <!-- <el-table-column label="创建时间" align="center" prop="createTime" /> -->
+          <el-table-column label="变更数量" align="center" prop="quantity" />
+          <el-table-column label="备注" align="center" prop="remark" />
+        </el-table>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
-import { listStock, delStock, addStock, updateStock } from "@/api/wms/stock";
+import { listStock, delStock, addStock, updateStock, getStockTrace } from "@/api/wms/stock";
 import { addStockIoWithDetail } from "@/api/wms/stockIo";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import ProductSelect from "@/components/KLPService/ProductSelect";
@@ -124,7 +143,7 @@ import MaterialSelect from "@/components/KLPService/MaterialSelect";
 
 export default {
   name: "Stock",
-  dicts: ['stock_item_type'],
+  dicts: ['stock_item_type', 'stock_io_type'],
   components: {
     WarehouseSelect,
     RawMaterialSelect,
@@ -171,6 +190,7 @@ export default {
         quantity: undefined,
         unit: undefined,
         batchNo: undefined,
+        mergeBatch: false,
       },
       // 表单参数
       form: {},
@@ -199,7 +219,9 @@ export default {
       stockBoxData: [],
       stockBoxVisible: false,
       // 选中的数据
-      selectedRows: []
+      selectedRows: [],
+      stockTraceList: [],
+      stockTraceVisible: false,
     };
   },
   created() {
@@ -328,6 +350,13 @@ export default {
       // 查看暂存单据
       console.log(this.stockBoxData);
       this.stockBoxVisible = true;
+    },
+    handleTrace(row) {
+      // 查询对应批次号的的出库和入库单据明细并展示
+      getStockTrace(row.batchNo).then(response => {
+        this.stockTraceList = response.data;
+        this.stockTraceVisible = true;
+      });
     }
   }
 };

klp-ui/src/views/wms/vendor/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="供应商名称" prop="name">
         <el-input
           v-model="queryParams.name"

klp-ui/src/views/wms/video/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="摄像头编号" prop="cameraCode">
         <el-input
           v-model="queryParams.cameraCode"

klp-ui/src/views/wms/warehouse/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
       <el-form-item label="仓库编码" prop="warehouseCode">
         <el-input
           v-model="queryParams.warehouseCode"