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

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

@@ -61,6 +61,14 @@ export function listBoundCoil(query) {
   })
 }
 
+export function getBoundCoilStatisticsList(query) {
+  return request({
+    url: '/wms/deliveryWaybillDetail/statistics',
+    method: 'get',
+    params: query
+  })
+}
+
 // 按销售员查询订单明细的卷
 export function listDeliveryWaybillDetailBySaleman(principal) {
   return request({

klp-ui/src/views/cost/comprehensive.vue

@@ -63,7 +63,6 @@
             <el-button type="primary" size="mini" @click="showAddDetail=true">+ 明细列</el-button>
             <el-button size="mini" type="success" @click="openMetricPicker">+ 指标列</el-button>
             <el-button size="mini" plain @click="openMetricMgr">指标管理</el-button>
-            <el-button size="mini" plain @click="openCopyCfg">复制配置</el-button>
           </div>
         </div>
         <el-table :data="allCols" border stripe size="mini" highlight-current-row @dragover.native.prevent @drop.native="onNativeDrop" @current-change="curIdx = allCols.indexOf($event)" @selection-change="selCol=$event">

klp-ui/src/views/crm/contract/components/ContractTabs.vue

@@ -2,12 +2,12 @@
   <div class="contract-tabs">
     <div v-if="orderId" class="tabs-content">
       <el-tabs v-model="activeTab" type="border-card">
-        <el-tab-pane label="订单编辑" name="edit" v-hasPermi="['crm:order:edit']">
+        <!-- <el-tab-pane label="订单编辑" name="edit" v-hasPermi="['crm:order:edit']">
           <div class="order-detail" v-if="activeTab === 'edit'">
             <el-descriptions title="订单明细" />
             <OrderDetail :orderId="currentOrder.orderId" />
           </div>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane label="财务状态" name="finance" v-hasPermi="['crm:order:finance']">
           <div class="order-finance" v-if="activeTab === 'finance'">
             <!-- 财务状态内容 -->

klp-ui/src/views/wms/coil/panels/base.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="发货计划" prop="planId" v-if="showWaybill">
+        <el-select v-model="queryParams.planId" placeholder="请输入发货计划名称搜索" filterable remote clearable
+          :remote-method="remoteSearchWaybill" :loading="waybillLoading" style="width: 220px" @change="handleQuery">
+          <el-option v-for="item in waybillOptions" :key="item.planId" :label="item.planName" :value="item.planId" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="入场卷号" prop="enterCoilNo">
         <el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable
           @keyup.enter.native="handleQuery" />
@@ -10,8 +16,8 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="逻辑库位" prop="warehouseId" v-if="useWarehouseIds">
-        <muti-select v-model="warehouseIds" placeholder="请选择逻辑库位" 
+        <muti-select v-model="warehouseIds" placeholder="请选择逻辑库位" style="width: 100%; display: inline-block;" clearable
-          style="width: 100%; display: inline-block;" clearable :options="warehouseOptions">
+          :options="warehouseOptions">
         </muti-select>
       </el-form-item>
       <el-form-item label="逻辑库位" prop="warehouseId" v-else-if="!hideWarehouseQuery && !leftWarehouseQuery">
@@ -68,8 +74,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="品质">
-          <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
+        <muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status" placeholder="请选择品质"
-            placeholder="请选择品质" clearable />
+          clearable />
       </el-form-item>
 
       <el-form-item v-if="showWaybill" label="发货状态">
@@ -97,6 +103,8 @@
         <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>
         <el-button icon="el-icon-download" size="mini" @click="handleNewExport" v-if="showNewExport">导出</el-button>
+        <el-button type="danger" plain icon="el-icon-close" size="mini" :disabled="multiple" :loading="buttonLoading"
+          @click="handleBatchRemoveFromWaybill">批量移出发货单</el-button>
       </el-form-item>
 
       <!-- <el-form-item style="float: right;" v-if="showWaybill" v-loading="loading">
@@ -123,6 +131,9 @@
         <el-button type="info" plain icon="el-icon-printer" size="mini" :disabled="multiple"
           @click="handleBatchPrintLabel">批量打印标签</el-button>
       </el-col>
+      <!-- <el-col :span="2" v-if="showWaybill">
+       
+      </el-col> -->
       <el-col :span="1.5" v-if="showOrderBy">
         <el-checkbox v-model="queryParams.orderBy" v-loading="loading" @change="getList"
           label="orderBy">按实际库区排序</el-checkbox>
@@ -132,20 +143,20 @@
     </el-row>
 
     <div style="display: flex; align-items: flex-start;">
-      <div v-if="leftWarehouseQuery" 
+      <div v-if="leftWarehouseQuery" :style="{
-        :style="{ 
         width: '220px',
         height: showAbnormal ? 'calc(100vh - 400px)' : 'calc(100vh - 300px)',
         backgroundColor: '#ffffff',
         overflowY: 'auto',
-          overflowX: 'hidden' }">
+        overflowX: 'hidden'
+      }">
         <warehouse-tree warehouseType="logic" @node-click="handleWarehouseNodeClick" />
       </div>
       <div style="flex: 1; width: 100%; overflow: hidden;">
         <KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange"
           :floatLayer="true" :floatLayerConfig="floatLayerConfig" @row-click="handleRowClick"
           :height="showAbnormal ? 'calc(100vh - 400px)' : 'calc(100vh - 300px)'" border>
-          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+          <el-table-column v-if="showWaybill" type="selection" width="55" align="center" />
           <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
             <template slot-scope="scope">
               <coil-no :coil-no="scope.row.enterCoilNo"></coil-no>
@@ -321,7 +332,8 @@
           </el-table-column>
 
 
-          <el-table-column prop="action" label="操作" align="center" class-name="small-padding fixed-width" v-if="!moreColumn">
+          <el-table-column prop="action" label="操作" align="center" class-name="small-padding fixed-width"
+            v-if="!moreColumn">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
                 预览标签
@@ -561,13 +573,14 @@
 
     <!-- 钢卷改判弹窗 -->
     <el-dialog title="钢卷改判" :visible.sync="judgeDialogVisible" width="800px" append-to-body>
-      <CoilInfoRender :column="3" :coilInfo="judgeForm" border/>
+      <CoilInfoRender :column="3" :coilInfo="judgeForm" border />
 
       <div style="margin-top: 20px; padding: 15px; background-color: #f5f7fa; border-radius: 4px;">
         <el-form :model="judgeForm" label-width="120px">
           <el-form-item label="修改质量状态">
             <el-select v-model="judgeForm.qualityStatus" placeholder="请选择质量状态" style="width: 200px">
-              <el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :value="item.value" :label="item.label" />
+              <el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :value="item.value"
+                :label="item.label" />
             </el-select>
           </el-form-item>
           <el-form-item label="改判原因">
@@ -639,13 +652,15 @@
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="text" @click="openCoilSelection(scope.row)">选择钢卷</el-button>
-            <el-button size="mini" type="text" style="color: #f56c6c;" @click="deleteTempOrder(scope.row)">删除</el-button>
+            <el-button size="mini" type="text" style="color: #f56c6c;"
+              @click="deleteTempOrder(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 当没有数据时显示提示 -->
-      <div v-if="!tempOrderList || tempOrderList.length === 0" style="text-align: center; padding: 50px; color: #909399;">
+      <div v-if="!tempOrderList || tempOrderList.length === 0"
+        style="text-align: center; padding: 50px; color: #909399;">
         <i class="el-icon-document" style="font-size: 48px; margin-bottom: 10px;"></i>
         <div>暂无暂存单据</div>
         <div style="font-size: 12px; margin-top: 5px;">点击右上角"创建暂存单据"开始使用</div>
@@ -681,7 +696,8 @@
 
       <!-- 下方：钢卷列表 -->
       <div style="height: 500px;">
-        <el-table v-loading="coilLoading" :data="availableCoils" @selection-change="handleCoilSelection" border height="450">
+        <el-table v-loading="coilLoading" :data="availableCoils" @selection-change="handleCoilSelection" border
+          height="450">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
             <template slot-scope="scope">
@@ -720,14 +736,9 @@
         </el-table>
 
         <div style="margin-top: 10px; text-align: center;">
-          <el-pagination
+          <el-pagination @size-change="handleCoilSizeChange" @current-change="handleCoilCurrentChange"
-            @size-change="handleCoilSizeChange"
+            :current-page="coilQueryParams.pageNum" :page-sizes="[10, 20, 50, 100]"
-            @current-change="handleCoilCurrentChange"
+            :page-size="coilQueryParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="coilTotal">
-            :current-page="coilQueryParams.pageNum"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="coilQueryParams.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="coilTotal">
           </el-pagination>
         </div>
       </div>
@@ -774,7 +785,8 @@
         <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button size="mini" type="text" style="color: #f56c6c;" @click="removeCoilFromOrder(scope.$index)">移除</el-button>
+            <el-button size="mini" type="text" style="color: #f56c6c;"
+              @click="removeCoilFromOrder(scope.$index)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -797,7 +809,7 @@ import {
   getCoilStatisticsList,
   listWithAdjustRecordCoil
 } from "@/api/wms/coil";
-import { listBoundCoil } from "@/api/wms/deliveryWaybillDetail";
+import { listBoundCoil, getBoundCoilStatisticsList } from "@/api/wms/deliveryWaybillDetail";
 import { addPendingAction } from "@/api/wms/pendingAction";
 import { listTransferOrderItem } from "@/api/wms/transferOrderItem";
 import { listCoilQualityRejudge } from "@/api/wms/coilQualityRejudge";
@@ -829,6 +841,7 @@ import DragResizeBox from '@/components/DragResizeBox/index.vue';
 import ProcessFlow from '../components/ProcessFlow.vue';
 import WarehouseTree from '@/components/KLPService/WarehouseTree/index.vue';
 import { listDeliveryWaybillDetail, delDeliveryWaybillDetail } from "@/api/wms/deliveryWaybillDetail";
+import { listDeliveryPlan } from "@/api/wms/deliveryPlan";
 import { addCoilQualityRejudge } from "@/api/wms/coilQualityRejudge";
 
 export default {
@@ -978,6 +991,8 @@ export default {
       showProcessFlow: false,
       // 遮罩层
       loading: true,
+      waybillLoading: false,
+      waybillOptions: [],
       // 追溯加载中
       traceLoading: false,
       // 选中数组
@@ -1019,6 +1034,7 @@ export default {
         status: '',
         updateTime: undefined,
         orderBy: false,
+        planId: undefined,
         ...this.querys,
       },
       // 表单参数
@@ -1217,6 +1233,9 @@ export default {
     if (this.useWarehouseIds) {
       this.warehouseIds = this.warehouseOptions.map(item => item.value).join(',');
     }
+    if (this.showWaybill) {
+      this.remoteSearchWaybill();
+    }
     this.getList();
     // 初始化暂存单据列表
     this.loadTempOrderList();
@@ -1531,6 +1550,50 @@ export default {
       })
       // 打开一个弹窗列出查询到的所有单据明细
     },
+    async handleBatchRemoveFromWaybill() {
+      const selectedRows = this.materialCoilList.filter(item => this.ids.includes(item.coilId));
+      if (selectedRows.length === 0) {
+        this.$message.warning('请先勾选要移除的钢卷');
+        return;
+      }
+      this.$modal.confirm(`确认要将选中的 ${selectedRows.length} 个钢卷从发货单中移除吗？`, {
+        title: '批量移除',
+        type: 'warning',
+      }).then(async () => {
+        this.buttonLoading = true;
+        const detailIds = [];
+        const failCoils = [];
+        for (const row of selectedRows) {
+          try {
+            const res = await listDeliveryWaybillDetail({ coilId: row.coilId });
+            if (res.rows.length === 1) {
+              detailIds.push(res.rows[0].detailId);
+            } else {
+              failCoils.push(row.currentCoilNo);
+            }
+          } catch (e) {
+            failCoils.push(row.currentCoilNo);
+          }
+        }
+        if (detailIds.length === 0) {
+          this.$message.error('未找到任何可移除的发货单明细');
+          this.buttonLoading = false;
+          return;
+        }
+        try {
+          await delDeliveryWaybillDetail(detailIds.join(','));
+          if (failCoils.length > 0) {
+            this.$message.warning(`移除完成：成功 ${detailIds.length} 个，失败 ${failCoils.length} 个（${failCoils.join('、')}）`);
+          } else {
+            this.$message.success(`成功移除 ${detailIds.length} 个钢卷`);
+          }
+        } catch (e) {
+          this.$message.error('批量移除失败');
+        }
+        this.buttonLoading = false;
+        this.getList();
+      });
+    },
     // 处理重贴标签
     handleReplaceLabel(row) {
       updateMaterialCoilSimple({
@@ -1756,15 +1819,15 @@ export default {
           this.loading = false;
         })
         // 获取统计数据：已发货的数量和未发货的数量
-        listBoundCoil({ ...query, status: 0 }).then(res => {
+        listBoundCoil({ ...query, status: 0, pageNum: 1, pageSize: 1 }).then(res => {
           this.unshippedCount = res.total;
         })
         // 获取统计数据：已发货的数量和未发货的数量
-        listBoundCoil({ ...query, status: 1 }).then(res => {
+        listBoundCoil({ ...query, status: 1, pageNum: 1, pageSize: 1 }).then(res => {
           this.shippedCount = res.total;
         })
 
-        getCoilStatisticsList(query).then(res => {
+        getBoundCoilStatisticsList(query).then(res => {
           this.statistics = res.data || [];
         })
         return;
@@ -1892,6 +1955,14 @@ export default {
       };
       this.resetForm("form");
     },
+    remoteSearchWaybill(query) {
+      this.waybillLoading = true;
+      listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 20, planType: 0 }).then(res => {
+        this.waybillOptions = res.rows || [];
+      }).finally(() => {
+        this.waybillLoading = false;
+      });
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -2061,7 +2132,7 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.coilId != null) {
-            const { status, exclusiveStatus, dataType, ...payload} = {
+            const { status, exclusiveStatus, dataType, ...payload } = {
               ...this.form,
             }
             updateMaterialCoilSimple(payload).then(_ => {

klp-ui/src/views/wms/delivery/waybill/index.vue

@@ -56,6 +56,11 @@
               </el-select>
             </el-form-item>
 
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="queryParams.remark" 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>
@@ -178,7 +183,25 @@
         <!-- 如果没有绑定订单，这里是使用手机号字段来存储手填的订单编号 -->
         <el-form-item label="订单编号" prop="principalPhone" v-if="!form.orderId">
           <div style="display: flex; gap: 10px; align-items: center;">
-            <el-input v-model="form.principalPhone" placeholder="请输入订单编号" style="flex: 1;" />
+            <el-autocomplete
+              v-model="form.principalPhone"
+              :fetch-suggestions="queryOrderSuggestions"
+              placeholder="请输入订单编号"
+              style="flex: 1;"
+              value-key="orderCode"
+              @select="onOrderAutoSelect"
+              clearable
+              :highlight-first-item="true"
+              popper-class="order-autocomplete-popper"
+            >
+              <template slot-scope="{ item }">
+                <div class="order-suggestion-item">
+                  <span class="suggestion-code">{{ item.orderCode }}</span>
+                  <span class="suggestion-company">{{ item.companyName }}</span>
+                  <span class="suggestion-salesman">{{ item.salesman }}</span>
+                </div>
+              </template>
+            </el-autocomplete>
             <el-button type="primary" size="small" @click="bindOrder">绑定订单</el-button>
           </div>
         </el-form-item>
@@ -344,6 +367,8 @@ export default {
       // 订单搜索关键词
       orderQuery: '',
       orderId: '',
+      // 订单自动补全
+      orderSuggestLoading: false,
     };
   },
   created() {
@@ -645,6 +670,52 @@ export default {
       this.form.principal = row.salesman;
       this.orderDialogVisible = false;
     },
+    /** 订单编号自动补全 */
+    queryOrderSuggestions(queryString, callback) {
+      if (!queryString || queryString.trim() === '') {
+        callback([]);
+        return;
+      }
+      this.orderSuggestLoading = true;
+      listOrder({ pageNum: 1, pageSize: 10, keyword: queryString }).then(response => {
+        const suggestions = (response.rows || []).map(item => ({
+          ...item,
+          value: item.orderCode
+        }));
+        this.orderSuggestLoading = false;
+        callback(suggestions);
+      }).catch(() => {
+        this.orderSuggestLoading = false;
+        callback([]);
+      });
+    },
+    /** 自动补全选择订单 */
+    onOrderAutoSelect(item) {
+      const existing = this.deliveryWaybillList.find(
+        d => d.orderId === item.orderId || d.orderCode === item.orderCode
+      );
+      if (existing) {
+        this.$confirm(
+          `订单"${item.orderCode}"已绑定在发货单"${existing.waybillName}"中，确定继续绑定？`,
+          '提示',
+          { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
+        ).then(() => {
+          this.doBindOrder(item);
+        }).catch(() => {
+          this.form.principalPhone = item.orderCode;
+        });
+      } else {
+        this.doBindOrder(item);
+      }
+    },
+    /** 执行订单绑定并填写信息 */
+    doBindOrder(item) {
+      this.form.orderId = item.orderId;
+      this.form.orderCode = item.orderCode;
+      this.form.consigneeUnit = item.companyName;
+      this.form.principal = item.salesman;
+      this.form.principalPhone = item.orderCode;
+    },
     /** 打印发货单 */
     handlePrint(row, printType) {
       this.loading = true;
@@ -856,4 +927,58 @@ export default {
 ::v-deep .el-pagination {
   margin-top: 6px !important;
 }
+
+.order-suggestion-item {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 4px 0;
+}
+
+.suggestion-code {
+  font-weight: 500;
+  color: #303133;
+  min-width: 120px;
+}
+
+.suggestion-company {
+  color: #909399;
+  font-size: 12px;
+  flex: 1;
+}
+
+.suggestion-salesman {
+  color: #409eff;
+  font-size: 12px;
+}
+</style>
+
+<style>
+.order-autocomplete-popper {
+  min-width: 380px !important;
+}
+
+.order-autocomplete-popper .order-suggestion-item {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 4px 0;
+}
+
+.order-autocomplete-popper .suggestion-code {
+  font-weight: 500;
+  color: #303133;
+  min-width: 120px;
+}
+
+.order-autocomplete-popper .suggestion-company {
+  color: #909399;
+  font-size: 12px;
+  flex: 1;
+}
+
+.order-autocomplete-popper .suggestion-salesman {
+  color: #409eff;
+  font-size: 12px;
+}
 </style>