上传

src/views/Clue/Order/Comp/Delivery.vue

@@ -67,25 +67,23 @@
     </el-form>
 
     <el-table v-loading="loading" :data="tableList" border>
-      <el-table-column prop="signId" label="成交单号" min-width="150px" />
+      <el-table-column prop="signId" label="成交单号" min-width="120px" />
-      <el-table-column prop="name" label="线索名称" min-width="200px" />
+      <el-table-column prop="name" label="线索名称" min-width="120px" />
-      <el-table-column prop="phone" label="联系方式" min-width="150px" />
+      <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
-      <el-table-column
+      <el-table-column prop="dealDate" label="登记时间" width="120px" :formatter="dateFormatter" />
-        prop="dealDate"
-        label="登记时间"
-        min-width="150px"
-        :formatter="dateFormatter"
-      />
       <el-table-column prop="productName" label="成交产品" min-width="150px" />
       <el-table-column prop="specsName" label="产品规格" min-width="150px" />
+      <el-table-column prop="signNum" label="销售数量" width="90px" />
       <el-table-column
         prop="createTime"
         label="发货时间"
-        min-width="150px"
+        width="120px"
         :formatter="dateFormatter"
       />
-      <el-table-column prop="warehouseName" label="发货仓库" min-width="100px" />
+      <el-table-column prop="batchNo" label="发货批次" min-width="120px" />
+      <el-table-column prop="warehouseName" label="发货仓库" min-width="120px" />
+      <el-table-column prop="sendNum" label="发货数量" width="90px" />
       <el-table-column label="发货备注">
         <template #default="scope">
           <el-popover

src/views/MiniMall/Inventory/Comp/InventoryRecord.vue

@@ -1,6 +1,12 @@
 <template>
   <div>
     <el-form inline :model="searchForm" class="-mb-15px" label-width="0">
+      <el-form-item>
+        <el-select v-model="searchForm.changeType" placeholder="变动类型" clearable filterable>
+          <el-option label="入库" :value="1" />
+          <el-option label="出库" :value="2" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-select
           v-model="searchForm.productId"
@@ -53,13 +59,13 @@
       <el-table-column type="index" width="50px" />
       <el-table-column prop="productName" label="产品名称" />
       <el-table-column prop="specsName" label="规格" />
-      <el-table-column label="变动类型">
+      <el-table-column label="变动类型" width="90px">
         <template #default="{ row }">
           {{ ['', '入库', '出库'][row.changeType] }}
         </template>
       </el-table-column>
-      <el-table-column prop="num" label="数量" />
+      <el-table-column prop="num" label="变动数量" width="90px" />
-      <!-- <el-table-column prop="money" label="金额" /> -->
+      <el-table-column prop="batchNo" label="批次号" />
       <el-table-column prop="changeTime" label="变动时间" :formatter="dateFormatter" />
       <el-table-column prop="changeUserName" label="变动人员" />
       <el-table-column prop="warehouseName" label="所属仓库" />
@@ -92,6 +98,7 @@ const searchForm = ref({
   pproductId: undefined,
   specsId: undefined,
   warehouseId: undefined,
+  changeType: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -111,6 +118,7 @@ function resetQuery() {
     productId: undefined,
     specsId: undefined,
     warehouseId: undefined,
+    changeType: undefined,
     pageNo: 1,
     pageSize: 20
   }