Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/crm/components/ReceiveTable.vue

@@ -70,14 +70,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="应收ID" align="center" prop="receivableId" v-if="false"/>
       <!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
-      <el-table-column label="到期日" align="center" prop="dueDate" width="180">
+      <el-table-column label="收款日期" align="center" prop="dueDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.dueDate, '{y}-{m}-{d}') }}</span>
-          <el-tag v-if="new Date(scope.row.dueDate) < new Date()" type="danger">过期</el-tag>
+          <!-- <el-tag v-if="new Date(scope.row.dueDate) < new Date()" type="danger">过期</el-tag>
-          <el-tag v-else-if="new Date(scope.row.dueDate) > new Date()" type="success">还剩{{ parseInt((new Date(scope.row.dueDate) - new Date()) / (1000 * 60 * 60 * 24)) }}天</el-tag>
+          <el-tag v-else-if="new Date(scope.row.dueDate) > new Date()" type="success">还剩{{ parseInt((new Date(scope.row.dueDate) - new Date()) / (1000 * 60 * 60 * 24)) }}天</el-tag> -->
         </template>
       </el-table-column>
-      <el-table-column label="应收金额" align="center" prop="amount" />
+      <el-table-column label="收款金额" align="center" prop="amount" />
       <!-- <el-table-column label="已收金额" align="center" prop="paidAmount" /> -->
       <!-- <el-table-column label="未收金额" align="center" prop="balanceAmount" /> -->
       <!-- <el-table-column label="状态" align="center" prop="status" /> -->
@@ -122,7 +122,7 @@
             v-model="form.dueDate"
             type="datetime"
             value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择到期日">
+            placeholder="请选择收款日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="收款金额" prop="amount">

klp-ui/src/views/wms/delivery/components/wayBill.vue

@@ -4,37 +4,39 @@
     <div class="waybill-container" ref="waybillRef">
       <div class="waybill-content">
       <!-- 头部信息 -->
+      <!-- 标题信息 -->
+      <div class="title">科伦普发货单</div>
       <div class="waybill-header">
         <div class="header-left">
           <span class="label">收货单位：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.consigneeUnit" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.consigneeUnit }}</div>
         </div>
         <div class="header-center">
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryYear" />
+          <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryYear }}</div>
           <span class="label date-label">年</span>
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryMonth" />
+          <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryMonth }}</div>
           <span class="label date-label">月</span>
-          <input type="text" class="editable-input date-input transparent-input" v-model="localWaybill.deliveryDay" />
+          <div class="editable-input date-input transparent-input" contenteditable>{{ localWaybill.deliveryDay }}</div>
           <span class="label date-label">日</span>
         </div>
         <div class="header-right">
           <span class="label">发货单位：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.senderUnit" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.senderUnit }}</div>
         </div>
       </div>
 
       <div class="waybill-header">
         <div class="header-left">
           <span class="label">负责人：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.principal" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principal }}</div>
         </div>
         <div class="header-right">
           <span class="label">电话：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.principalPhone" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.principalPhone }}</div>
         </div>
         <div class="header-center">
           <span class="label">车牌：</span>
-          <input type="text" class="editable-input transparent-input" v-model="localWaybill.licensePlate" />
+          <div class="editable-input transparent-input" contenteditable>{{ localWaybill.licensePlate }}</div>
         </div>
       </div>
 
@@ -68,27 +70,35 @@
           </tr>
           <!-- 明细数据 -->
           <tr v-for="(item, index) in displayWaybillDetails" :key="index">
-            <td><input type="text" class="table-input transparent-input" v-model="item.productName" /></td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.productName }}</div></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.edgeType" />
+            <td><div class="table-input transparent-input" contenteditable>{{ item.edgeType }}</div></td>
-            </td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.packageType }}</div></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.packageType" />
+            <td><div class="table-input transparent-input" contenteditable>{{ item.actualWarehouseName }}</div></td>
-            </td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.settlementType }}</div></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.actualWarehouseName" />
+            <td><div class="table-input transparent-input" contenteditable>{{ item.rawMaterialFactory }}</div></td>
-            </td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.coilNumber }}</div></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.settlementType" />
+            <td><div class="table-input transparent-input" contenteditable>{{ item.specification }}</div></td>
-            </td>
+            <td><div class="table-input transparent-input" contenteditable>{{ item.material }}</div></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.rawMaterialFactory" />
-            </td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.coilNumber" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.specification" /></td>
-            <td><input type="text" class="table-input transparent-input" v-model="item.material" />
-            </td>
             <!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
                 placeholder="0" /></td> -->
             <td><input type="number" class="table-input transparent-input" v-model.number="item.weight"
                 placeholder="0.00" /></td>
             <!-- <td><input type="text" class="table-input transparent-input" v-model="item.unitPrice" /></td> -->
-
+          </tr>
+          <!-- 加粗最后一行的线 -->
+          <tr style="height: 0;">
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <td style="height: 0;"></td>
+            <!-- <td><input type="number" class="table-input transparent-input" v-model.number="item.quantity"
+                placeholder="0" /></td> -->
+            <td style="height: 0;"></td>
           </tr>
         </tbody>
       </table>
@@ -104,7 +114,7 @@
 
       <div class="waybill-pickup-location">
         <!-- <div class="pickup-location-item inline"> -->
-        <span style="font-size: 16px; font-weight: bold;">取货地点：</span>
+        <span style="font-size: 18px; font-weight: bold;">取货地点：</span>
         <input type="text" class="editable-input full-input transparent-input" v-model="localWaybill.pickupLocation" />
         <!-- </div> -->
       </div>
@@ -113,15 +123,19 @@
       <div class="waybill-footer">
         <div class="footer-item inline">
           <span class="label">销售：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.salesman }}</div>
         </div>
         <div class="footer-item inline">
           <span class="label">发货：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.deliveryman }}</div>
+        </div>
+        <div class="footer-item inline">
+          <span class="label">司机：</span>
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.driver }}</div>
         </div>
         <div class="footer-item inline">
           <span class="label">磅房：</span>
-          <input type="text" class="editable-input signature-input transparent-input" />
+          <div class="editable-input signature-input transparent-input" contenteditable>{{ localWaybill.weightRoom }}</div>
         </div>
       </div>
       </div>
@@ -159,7 +173,7 @@ export default {
   data() {
     return {
       currentPage: 1,
-      perPage: 10,
+      perPage: 7,
       totalPages: 1,
       // 本地可编辑的发货单数据
       localWaybill: {
@@ -423,9 +437,18 @@ export default {
   box-shadow: none;
   font-family: SimSun, "Courier New", monospace;
   overflow: hidden;
+  color: #000 !important;
+  font-weight: 900 !important;
   box-sizing: border-box;
 }
 
+.title {
+  text-align: center;
+  font-size: 24px;
+  font-weight: bold;
+  margin-bottom: 5px;
+}
+
 .waybill-content {
   --paper-width-mm: 241;
   --content-width-mm: 241;
@@ -467,7 +490,7 @@ export default {
   font-weight: bold;
   display: inline-block;
   width: 100px;
-  font-size: 16px;
+  font-size: 18px;
   text-align: right;
   white-space: nowrap;
 }
@@ -481,10 +504,12 @@ export default {
   padding: 4px 8px;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
-  font-size: 16px;
+  font-size: 18px;
+  font-weight: bold;
   font-family: SimSun, serif;
   outline: none;
   transition: all 0.2s;
+  line-height: 18px;
   border-bottom: 1px dashed #dcdfe6;
 }
 
@@ -526,7 +551,8 @@ export default {
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;
-  font-size: 16px;
+  font-size: 18px;
+  font-weight: 900;
   padding: 0;
   overflow: hidden;
   white-space: nowrap;
@@ -628,7 +654,7 @@ export default {
   outline: none;
   background: transparent;
   /* font-family: inherit; */
-  font-size: 16px;
+  font-size: 18px;
   line-height: 6mm;
   text-align: center;
   vertical-align: middle;
@@ -649,7 +675,7 @@ export default {
   padding: 0 !important;
   margin: 0 !important;
   line-height: 6mm !important;
-  height: 6mm !important;
+  height: 6mm;
   vertical-align: middle !important;
 }
 
@@ -699,7 +725,7 @@ export default {
 /* 备注样式 */
 .waybill-remarks {
   margin-bottom: 30px;
-  font-size: 15px;
+  font-size: 18px;
   line-height: 1.5;
   /* font-weight: 600; */
   font-weight: bold;
@@ -716,21 +742,21 @@ export default {
   justify-content: space-between;
   align-items: center;
   margin-bottom: 20px;
-  font-size: 16px;
+  font-size: 18px;
 }
 
 .waybill-pickup-location {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
-  font-size: 16px;
+  font-size: 18px;
 }
 
 
 
 .waybill-pickup-location label {
-  font-size: 16px;
+  font-size: 18px;
   /* margin-right: 10px; */
   text-align: left !important;
   width: 40px;
@@ -751,7 +777,7 @@ export default {
 }
 
 .footer-item .label {
-  font-size: 16px;
+  font-size: 18px;
   margin-right: 10px;
   width: 40px;
 }

klp-ui/src/views/wms/report/zinc_.vue

@@ -0,0 +1,229 @@
+<template>
+  <div class="app-container" v-loading="loading">
+    <el-row>
+      <el-form label-width="80px" inline>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="入场钢卷号" prop="endTime">
+          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
+            placeholder="请输入入场钢卷号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="当前钢卷号" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="逻辑库位" prop="endTime">
+          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
+            style="width: 100%; display: inline-block; width: 200px;" clearable />
+        </el-form-item>
+        <el-form-item label="产品名称" prop="endTime">
+          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="规格" prop="endTime">
+          <memo-input style="width: 200px;" v-model="queryParams.itemSpecification" storageKey="coilSpec"
+            placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="材质" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="厂家" prop="endTime">
+          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <!-- <el-form-item label="收货计划" prop="planId">
+          <el-select style="width: 200px;" v-model="queryParams.planId" placeholder="请输入计划名称搜索收货计划" filterable remote
+            :remote-method="remoteMethod">
+            <el-option v-for="item in planList" :key="item.planId" :label="item.planName" :value="item.planId" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item prop="endTime">
+          <el-button type="primary" @click="getList">查询</el-button>
+          <el-button type="primary" @click="exportData">导出</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+
+    <el-descriptions title="统计信息" :column="3" border>
+      <el-descriptions-item label="总钢卷数量">{{ summary.totalCount }}</el-descriptions-item>
+      <el-descriptions-item label="总重">{{ summary.totalWeight }}t</el-descriptions-item>
+      <el-descriptions-item label="均重">{{ summary.avgWeight }}t</el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions title="明细信息" :column="3" border>
+    </el-descriptions>
+    <el-table :data="list" border height="calc(100vh - 320px)">
+      <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前钢卷号" align="center" prop="currentCoilNo">
+        <template slot-scope="scope">
+          <coil-no :coil-no="scope.row.currentCoilNo"></coil-no>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="逻辑库位" align="center" prop="warehouseName" />
+      <!-- <el-table-column label="实际库区" align="center" prop="actualWarehouseName" /> -->
+      <el-table-column label="产品类型" align="center" width="250">
+        <template slot-scope="scope">
+          <ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
+          <RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row.rawMaterial" />
+        </template>
+      </el-table-column>
+      <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
+      <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
+      <!-- <el-table-column label="出库状态" align="center" prop="status">
+        <template slot-scope="scope">
+          {{ scope.row.status === 0 ? '在库' : '已出库' }}
+        </template>
+      </el-table-column> -->
+      <el-table-column label="更新人" align="center" prop="updateByName" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listCoilWithIds } from "@/api/wms/coil";
+import {
+  listPendingAction,
+} from '@/api/wms/pendingAction';
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
+import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
+import MemoInput from "@/components/MemoInput";
+import MutiSelect from "@/components/MutiSelect";
+import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
+
+export default {
+  components: {
+    ProductInfo,
+    RawMaterialInfo,
+    CoilNo,
+    MemoInput,
+    MutiSelect,
+    WarehouseSelect,
+  },
+  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  data() {
+    // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
+    const addZero = (num) => num.toString().padStart(2, '0')
+
+    const now = new Date() // 当前本地北京时间
+    // 核心：获取【昨天】的日期对象（自动处理跨月/跨年，无边界问题）
+    const yesterday = new Date(now)
+    yesterday.setDate(yesterday.getDate() - 1)
+
+    // 昨天的年、月、日（补零格式化）
+    const yesYear = yesterday.getFullYear()
+    const yesMonth = addZero(yesterday.getMonth() + 1)
+    const yesDay = addZero(yesterday.getDate())
+
+    // 今天的年、月、日（补零格式化）
+    const nowYear = now.getFullYear()
+    const nowMonth = addZero(now.getMonth() + 1)
+    const nowDay = addZero(now.getDate())
+
+    // ✅ 目标时间区间：昨天早上6点 至 今天早上6点
+    const startTime = `${yesYear}-${yesMonth}-${yesDay} 07:00:00`
+    const endTime = `${nowYear}-${nowMonth}-${nowDay} 07:00:00`
+    return {
+      list: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 9999,
+        // status: 1,
+        byCreateTimeStart: startTime,
+        byCreateTimeEnd: endTime,
+        selectType: 'raw_material',
+        enterCoilNo: '',
+        currentCoilNo: '',
+        warehouseId: '',
+        productName: '',
+        itemSpecification: '',
+        itemMaterial: '',
+        itemManufacturer: '',
+        planId: '',
+      },
+      planList: [],
+      loading: false,
+    }
+  },
+  computed: {
+    summary() {
+      // 总钢卷数量、总重、均重
+      const totalCount = this.list.length
+      const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
+      const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
+      return {
+        totalCount,
+        totalWeight: totalWeight.toFixed(2),
+        avgWeight,
+      }
+    }
+  },
+  methods: {
+    remoteMethod(query) {
+      listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 5, planType: 1 }).then(res => {
+        this.planList = res.rows
+      })
+    },
+    getList() {
+      this.loading = true
+      listPendingAction({
+        // actionStatus: 2,
+        warehouseId: this.queryParams.planId,
+        // actionType: 401,
+        actionType: 501, // 镀锌工序
+        pageSize: 999,
+        pageNum: 1,
+        startTime: this.queryParams.byCreateTimeStart,
+        endTime: this.queryParams.byCreateTimeEnd,
+      }).then(res => {
+        const actions = res.rows
+        const coilIds = actions.map(item => item.coilId).join(',')
+        console.log(coilIds)
+        if (!coilIds) {
+          this.$message({
+            message: '暂无数据',
+            type: 'warning',
+          })
+          this.list = []
+          this.loading = false
+          return
+        }
+        listCoilWithIds({
+          ...this.queryParams,
+          coilIds: coilIds,
+        }).then(res => {
+          this.list = res.rows
+          this.loading = false
+        })
+      })
+    },
+    // 导出
+    exportData() {
+      this.download('wms/materialCoil/export', {
+        coilIds: this.list.map(item => item.coilId).join(',')
+      }, `materialCoil_${new Date().getTime()}.xlsx`)
+    },
+  },
+  mounted() {
+    this.getList()
+    this.remoteMethod('')
+  }
+}
+</script>
+
+<style scoped></style>