fix: 将库区显示改为规格显示并添加实际库区字段

在多个组件中将“库区”标签改为“规格”标签，并显示对应的规格数据
在CoilCard组件中添加实际库区字段的显示

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

@@ -35,6 +35,10 @@
               </div>
               <div class="param-divider"></div>
               <div class="param-coil">
+                <div class="param-row" v-if="coil.actualWarehouseName">
+                  <span class="param-label">实际库区：</span>
+                  <span class="param-value">{{ coil.actualWarehouseName }}</span>
+                </div>
                 <div class="param-row" v-if="coil.qualityStatus">
                   <span class="param-label">质量状态：</span>
                   <span class="param-value">{{ coil.qualityStatus }}</span>
@@ -136,8 +140,8 @@
             <span class="info-value" :title="coil.warehouseName">{{ coil.warehouseName || '—' }}</span>
           </div>
           <div class="info-coil">
-            <span class="info-label">库区：</span>
-            <span class="info-value" :title="coil.actualWarehouseName">{{ coil.actualWarehouseName || '—'
+            <span class="info-label">规格：</span>
+            <span class="info-value" :title="coil.specification">{{ coil.specification || '—'
               }}</span>
           </div>
           <div class="info-coil">

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

@@ -210,12 +210,6 @@
       <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="合同号" prop="contractCode">
             <el-input v-model="orderQueryParams.contractCode" placeholder="请输入合同号" style="width: 180px" />
           </el-form-item>
@@ -237,6 +231,8 @@
           <!-- <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="signTime" label="签订时间" width="150" />
+          <el-table-column prop="signLocation" label="签订地点" />
           <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" />

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

@@ -74,7 +74,7 @@
           <!-- 合同名称和编号 -->
           <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 8px;">
             <div style="font-weight: bold;">{{ row.contractName }}</div>
-            <div style="font-size: 12px; color: #606266;">{{ row.contractNo }}</div>
+            <div style="font-size: 12px; color: #606266;">{{ row.contractCode }}</div>
           </div>
 
           <!-- 供方和需方 -->
@@ -144,7 +144,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         contractName: undefined,
-        contractNo: undefined,
+        contractCode: undefined,
         supplier: undefined,
         customer: undefined,
         signTime: undefined,
@@ -230,7 +230,7 @@ export default {
 
       // 合同编号
       worksheet.mergeCells('G2:H2');
-      worksheet.getCell('G2').value = `合同编号：${row.contractNo || ''}`;
+      worksheet.getCell('G2').value = `合同编号：${row.contractCode || ''}`;
       worksheet.getCell('G2').alignment = { horizontal: 'right', vertical: 'middle' };
 
       // 供方信息
@@ -692,7 +692,7 @@ export default {
       // 5. 导出文件
       const buffer = await workbook.xlsx.writeBuffer();
       const blob = new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-      saveAs(blob, `合同_${row.contractNo || row.contractName || '未命名'}.xlsx`);
+      saveAs(blob, `合同_${row.contractCode || row.contractName || '未命名'}.xlsx`);
     },
   }
 };

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

@@ -95,18 +95,6 @@ export default {
       type: [Number, String],
       default: null
     },
-    customerId: {
-      type: String,
-      default: ''
-    },
-    financeList: {
-      type: Array,
-      default: () => []
-    },
-    objectionList: {
-      type: Array,
-      default: () => []
-    },
     coilList: {
       type: Array,
       default: () => []
@@ -115,10 +103,6 @@ export default {
       type: Boolean,
       default: false
     },
-    tabLoading: {
-      type: Boolean,
-      default: false
-    },
     // 附件字段
     contractAttachment: {
       type: String,
@@ -132,10 +116,6 @@ export default {
       type: String,
       default: ''
     },
-    wmsDeliveryWaybills: {
-      type: Array,
-      default: () => []
-    },
     // 新增必要的props
     form: {
       type: Object,
@@ -145,10 +125,6 @@ export default {
       type: Object,
       default: () => ({})
     },
-    customerList: {
-      type: Array,
-      default: () => []
-    },
     deliveryWaybillList: {
       type: Array,
       default: () => []
@@ -179,10 +155,6 @@ export default {
         .replace('{i}', minutes)
         .replace('{s}', seconds);
     },
-    // 处理订单保存
-    handleOrderSave() {
-      // 这里可以添加保存逻辑
-    }
   }
 };
 </script>

klp-ui/src/views/crm/contract/index.vue

@@ -23,9 +23,7 @@
 
       <!-- 右侧下方：Tab标签页 -->
       <div class="tab-panel" ref="tabPanel" style="flex: 1; overflow-y: auto;">
-        <ContractTabs :orderId="form.orderId" :customerId="form.customerId" :financeList="financeList"
-          :objectionList="objectionList" :wmsDeliveryWaybills="wmsDeliveryWaybills" :coilList="coilList"
-          :tabLoading="tabLoading" :contract-attachment="form.businessAnnex" :technical-agreement="form.techAnnex"
+        <ContractTabs :orderId="form.orderId" :deliveryWaybillList="wmsDeliveryWaybills" :coilList="coilList" :contract-attachment="form.businessAnnex" :technical-agreement="form.techAnnex"
           :other-attachment="form.productionSchedule" :currentOrder="form" />
       </div>
     </div>
@@ -339,15 +337,10 @@ export default {
     /** 行点击事件 */
     handleRowClick(row) {
       this.form = row;
-      // this.tabLoading = true;
       this.getCoilList();
-      // listContractOrderObjection(row.contractId).then(response => {
-      //   this.financeList = response.data.financeList || [];
-      //   this.objectionList = response.data.oobjectionList || [];
-      //   this.wmsDeliveryWaybills = response.data.wmsDeliveryWaybills || [];
-      // }).finally(() => {
-      //   this.tabLoading = false;
-      // })
+      listDeliveryWaybill({ orderId: row.orderId, pageNum: 1, pageSize: 50 }).then(res => {
+        this.wmsDeliveryWaybills = res.rows || [];
+      })
     },
     /** 查询合同配卷列表 */
     getCoilList() {
@@ -360,7 +353,7 @@ export default {
       this.form = {
         contractId: undefined,
         contractName: '产品销售合同',
-        contractNo: undefined,
+        contractCode: undefined,
         supplier: '嘉祥科伦普重工有限公司',
         customer: undefined,
         signTime: undefined,
@@ -478,8 +471,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+          const payload = {
+            ...this.form,
+            orderCode: this.form.contractCode,
+          }
           if (this.form.orderId != null) {
-            updateOrder(this.form).then(response => {
+            updateOrder(payload).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.$refs.orderList.getList();
@@ -487,7 +484,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addOrder(this.form).then(response => {
+            addOrder(payload).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.$refs.orderList.getList();

klp-ui/src/views/crm/order/index.vue

@@ -114,7 +114,7 @@
         </el-form-item>
          <el-form-item label="合同号" prop="contractId">
           <el-select style="width: 100%;" v-model="form.contractId" placeholder="请选择合同号" filterable clearable @change="handleContractChange">
-            <el-option v-for="item in contractList" :key="item.contractId" :label="item.contractNo"
+            <el-option v-for="item in contractList" :key="item.contractId" :label="item.contractCode"
               :value="item.contractId" />
           </el-select>
         </el-form-item>

klp-ui/src/views/wms/coil/do/correct.vue

@@ -74,8 +74,8 @@
                     <span class="info-value" :title="item.warehouseName">{{ item.warehouseName || '—' }}</span>
                   </div>
                   <div class="info-item">
-                    <span class="info-label">库区：</span>
-                    <span class="info-value" :title="item.actualWarehouseName">{{ item.actualWarehouseName || '—'
+                    <span class="info-label">规格：</span>
+                    <span class="info-value" :title="item.specification">{{ item.specification || '—'
                     }}</span>
                   </div>
                   <div class="info-item">

klp-ui/src/views/wms/coil/do/correntAll.vue

@@ -65,8 +65,8 @@
                   <span class="info-value" :title="item.warehouseName">{{ item.warehouseName || '—' }}</span>
                 </div>
                 <div class="info-item">
-                  <span class="info-label">库区：</span>
-                  <span class="info-value" :title="item.actualWarehouseName">{{ item.actualWarehouseName || '—'
+                  <span class="info-label">规格：</span>
+                  <span class="info-value" :title="item.specification">{{ item.specification || '—'
                   }}</span>
                 </div>
                 <div class="info-item">

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

@@ -1,8 +1,8 @@
 <template>
   <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" />
+      <el-form-item label="合同编号" prop="contractCode">
+        <el-input v-model="queryParams.contractCode" placeholder="请输入合同编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="合同类型" prop="type" v-if="showType">
         <el-select v-model="queryParams.type" placeholder="请选择合同类型">
@@ -43,7 +43,7 @@
     <KLPTable v-loading="loading" :data="contractList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="合同ID" align="center" prop="contractId" v-if="false" />
-      <el-table-column label="合同编号" align="center" prop="contractNo" />
+      <el-table-column label="合同编号" align="center" prop="contractCode" />
       <el-table-column label="合同金额" align="center" prop="amount" />
       <el-table-column label="合同类型" align="center" prop="type" v-if="showType">
         <template slot-scope="scope">
@@ -71,8 +71,8 @@
     <!-- 添加或修改合同信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="合同编号" prop="contractNo">
-          <el-input v-model="form.contractNo" placeholder="请输入合同编号" />
+        <el-form-item label="合同编号" prop="contractCode">
+          <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
         </el-form-item>
         <el-form-item label="合同金额" prop="amount">
           <el-input v-model="form.amount" placeholder="请输入合同金额" />
@@ -141,7 +141,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        contractNo: undefined,
+        contractCode: undefined,
         partyA: undefined,
         partyB: undefined,
       },
@@ -186,7 +186,7 @@ export default {
     reset() {
       this.form = {
         contractId: undefined,
-        contractNo: undefined,
+        contractCode: undefined,
         amount: undefined,
         type: this.type || undefined,
         accessory: undefined,