feat(PlanDetailForm): 添加订单选择功能并优化表单结构

refactor(CoilNo): 调整线圈号显示逻辑

klp-ui/src/components/KLPService/Renderer/CoilNo.vue

@@ -2,7 +2,7 @@
   <div :class="{'g-coil-no': isGCoilNo}">
     <!-- 有coilId时显示popover，无则只显示标签 -->
     <el-popover
-      v-if="coilId && coil.enterCoilNo"
+      v-if="coilId || (coil && coil.currentCoilNo)"
       placement="left"
       width="200"
       trigger="hover"
@@ -100,7 +100,7 @@ export default {
       return this.coilInfo.manufacturer || this.coil?.manufacturer || '-'
     },
     currentCoilNo() {
-      return this.coilNo || this.coil?.currentCoilNo || '-'
+      return this.coilNo || this.coil?.currentCoilNo || this.coilInfo?.currentCoilNo || '-'
     },
     netWeight() {
       return this.coilInfo.netWeight || this.coil?.netWeight || '-'

klp-ui/src/views/aps/planSheet/PlanDetailForm.vue

@@ -1,11 +1,16 @@
 <template>
+  <div>
     <el-form ref="form" :model="formData" :rules="rules" label-width="60px" :disabled="readonly">
       <el-collapse v-model="activeNames" :accordion="false">
         <!-- 订单信息组 -->
         <el-collapse-item title="订单信息" name="1">
-        <!-- <el-form-item label="订单ID" prop="orderId">
+          <template slot="title">
-          <el-input v-model="formData.orderId" placeholder="请输入订单ID" />
+            <!-- 在这里选择订单后快速填写相关信息 -->
-        </el-form-item> -->
+            <span>订单信息</span>
+             <el-button @click.stop="openOrderDialog" style="margin-left: 10px;" plain :type="formData.orderId ? 'success' : 'default'">
+               {{ formData.orderId ? formData.orderCode : '选择订单' }}
+             </el-button>
+          </template>
           <el-row>
             <el-col :span="12">
               <el-form-item label="订单号" prop="orderCode">
@@ -112,7 +117,8 @@
 
             <el-col :span="12">
               <el-form-item label="表面处理" prop="surfaceTreatment">
-              <MemoInput storageKey="surfaceTreatmentDesc" v-model="formData.surfaceTreatment" placeholder="请输入表面处理" />
+                <MemoInput storageKey="surfaceTreatmentDesc" v-model="formData.surfaceTreatment"
+                  placeholder="请输入表面处理" />
               </el-form-item>
             </el-col>
 
@@ -194,9 +200,74 @@
         </el-collapse-item>
       </el-collapse>
     </el-form>
+
+    <el-dialog title="选择订单" :visible.sync="dialogVisible" width="80%" append-to-body>
+      <div class="order-dialog-content">
+        <!-- 筛选条件 -->
+        <el-form :model="orderQueryParams" ref="orderQueryForm" size="small" :inline="true" label-width="80px">
+          <el-form-item label="合同号">
+            <el-select v-model="orderQueryParams.contractId" placeholder="请选择合同">
+              <el-option
+                v-for="contract in contractList"
+                :key="contract.contractId"
+                :label="contract.contractNo"
+                :value="contract.contractId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="订单号">
+            <el-input v-model="orderQueryParams.orderCode" placeholder="请输入订单号" style="width: 180px" />
+          </el-form-item>
+          <el-form-item label="客户">
+            <el-input v-model="orderQueryParams.customerName" placeholder="请输入客户名称" style="width: 180px" />
+          </el-form-item>
+          <el-form-item label="业务员">
+            <el-input v-model="orderQueryParams.salesman" placeholder="请输入业务员" style="width: 120px" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="getOrderList">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetOrderQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <!-- 订单列表 -->
+        <el-table v-loading="orderLoading" :data="orderList" style="width: 100%" @row-click="handleOrderSelect">
+          <el-table-column type="selection" width="55" />
+          <el-table-column prop="orderCode" label="订单号" width="150" />
+          <el-table-column prop="orderType" label="订单类型" width="100" />
+          <el-table-column prop="contractCode" label="合同号" width="150" />
+          <el-table-column prop="companyName" label="客户" width="180" />
+          <el-table-column prop="salesman" label="业务员" width="100" />
+          <el-table-column prop="orderAmount" label="订单金额" width="120" align="right" />
+          <el-table-column prop="deliveryDate" label="交货日期" width="150" />
+          <el-table-column prop="createTime" label="创建时间" width="180" />
+          <el-table-column label="操作" width="80" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click.stop="selectOrder(scope.row)">选择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 分页 -->
+        <div class="pagination-container">
+          <el-pagination
+            background
+            layout="prev, pager, next, jumper"
+            :total="orderTotal"
+            :page-size="orderQueryParams.pageSize"
+            :current-page.sync="orderQueryParams.pageNum"
+            @current-change="getOrderList"
+          />
+        </div>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
+import { listOrder } from '@/api/crm/order';
+import { listContract } from '@/api/crm/contract';
+
 export default {
   name: "PlanDetailForm",
   props: {
@@ -234,6 +305,31 @@ export default {
         planSheetId: [
           { required: true, message: "关联排产单ID不能为空", trigger: "blur" }
         ]
+      },
+      // 订单列表
+      orderList: [],
+      // 订单总数
+      orderTotal: 0,
+      // 订单加载状态
+      orderLoading: false,
+      // 合同列表
+      contractList: [],
+      // 弹窗是否可见
+      dialogVisible: false,
+      // 订单查询参数
+      orderQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: undefined,
+        orderCode: undefined,
+        orderType: undefined,
+        customerId: undefined,
+        orderAmount: undefined,
+        salesman: undefined,
+        deliveryDate: undefined,
+        contractId: undefined,
+        contractCode: undefined,
+        customerName: undefined
       }
     };
   },
@@ -244,7 +340,75 @@ export default {
     },
     reset() {
       this.$refs["form"].resetFields();
+    },
+    /** 打开订单选择弹窗 */
+    openOrderDialog() {
+      this.dialogVisible = true;
+      // 加载合同列表
+      this.getContractList();
+      // 加载订单列表
+      this.getOrderList();
+    },
+    /** 获取合同列表 */
+    getContractList() {
+      listContract().then(response => {
+        this.contractList = response.rows;
+      });
+    },
+    /** 获取订单列表 */
+    getOrderList() {
+      this.orderLoading = true;
+      listOrder(this.orderQueryParams).then(response => {
+        this.orderList = response.rows;
+        this.orderTotal = response.total;
+        this.orderLoading = false;
+      });
+    },
+    /** 重置订单查询参数 */
+    resetOrderQuery() {
+      this.orderQueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: undefined,
+        orderCode: undefined,
+        orderType: undefined,
+        customerId: undefined,
+        orderAmount: undefined,
+        salesman: undefined,
+        deliveryDate: undefined,
+        contractId: undefined,
+        contractCode: undefined,
+        customerName: undefined
+      };
+      this.getOrderList();
+    },
+    /** 选择订单 */
+    selectOrder(row) {
+      this.formData.orderCode = row.orderCode;
+      this.formData.contractCode = row.contractCode;
+      this.formData.customerName = row.companyName;
+      this.formData.salesman = row.salesman;
+      this.dialogVisible = false;
+    },
+    /** 处理订单行点击 */
+    handleOrderSelect(row, event, column) {
+      // 点击操作列时不触发选择
+      if (column && column.fixed === 'right') {
+        return;
+      }
+      this.selectOrder(row);
     }
   }
 };
 </script>
+
+<style scoped>
+.order-dialog-content {
+  padding: 10px 0;
+}
+
+.pagination-container {
+  margin-top: 20px;
+  text-align: right;
+}
+</style>