From 64aaedc9060a870fa34698db342187bc4407c94d Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 5 Jun 2026 16:41:10 +0800
Subject: [PATCH] =?UTF-8?q?1.1.59=20=E5=8F=91=E8=B4=A7=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/erp/contractInfo/edit.vue  |  1 +
 src/views/wms/wmsShippingBill/index.vue | 57 ++++++++++++++-----------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue
index a1bee51..e94f7b3 100644
--- a/src/views/oa/erp/contractInfo/edit.vue
+++ b/src/views/oa/erp/contractInfo/edit.vue
@@ -1050,6 +1050,7 @@ const selectDeliveryStartTemplate = (row: { content: string }) => {
 /** 质保期描述预设模板 */
 const warrantyPeriodDescriptionTemplates = [
   { content: '设备自XX之日起提供XX月的质保期服务' },
+  { content: '设备自到货之日起提供12个月的质保期服务' },
   { content: '设备自验收合格之日起提供12个月的质保期服务' },
   { content: '设备自发货之日起提供18个月的质保期服务' },
 ];
diff --git a/src/views/wms/wmsShippingBill/index.vue b/src/views/wms/wmsShippingBill/index.vue
index a3286a0..e506a30 100644
--- a/src/views/wms/wmsShippingBill/index.vue
+++ b/src/views/wms/wmsShippingBill/index.vue
@@ -12,38 +12,47 @@
                 <el-option v-for="dict in shipping_mode" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="项目名称" prop="projectName">
-              <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable style="width: 180px" @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="客户名称" prop="customerName">
-              <el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable style="width: 180px" @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="发货类型" prop="shippingType">
               <el-select v-model="queryParams.shippingType" placeholder="请选择发货类型" clearable style="width: 180px">
                 <el-option v-for="dict in shipping_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="需到货确认" prop="needArrivalConfirm">
-              <el-select v-model="queryParams.needArrivalConfirm" placeholder="请选择" clearable style="width: 180px">
-                <el-option v-for="dict in need_arrival_confirm" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
+            <el-form-item label="项目编号" prop="projectCode">
+              <el-input v-model="queryParams.projectCode" placeholder="请输入项目编号" clearable style="width: 180px" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="是否全部到货" prop="isAllReceiving">
-              <el-select v-model="queryParams.isAllReceiving" placeholder="请选择到货标识" clearable style="width: 180px">
-                <el-option v-for="dict in is_all_receiving" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable style="width: 180px" @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="到货确认时间">
-              <el-date-picker
-                v-model="arrivalConfirmTimeRange"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                clearable
-              />
+            <el-form-item label="合同编号" prop="contractCode">
+              <el-input v-model="queryParams.contractCode" placeholder="请输入合同编号" clearable style="width: 180px" @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="合同名称" prop="contractName">
+              <el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable style="width: 180px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="客户名称" prop="customerName">
+              <el-input v-model="queryParams.customerName" placeholder="请输入客户名称" clearable style="width: 180px" @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="需到货确认" prop="needArrivalConfirm">-->
+<!--              <el-select v-model="queryParams.needArrivalConfirm" placeholder="请选择" clearable style="width: 180px">-->
+<!--                <el-option v-for="dict in need_arrival_confirm" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="是否全部到货" prop="isAllReceiving">-->
+<!--              <el-select v-model="queryParams.isAllReceiving" placeholder="请选择到货标识" clearable style="width: 180px">-->
+<!--                <el-option v-for="dict in is_all_receiving" :key="dict.value" :label="dict.label" :value="dict.value" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="到货确认时间">-->
+<!--              <el-date-picker-->
+<!--                v-model="arrivalConfirmTimeRange"-->
+<!--                type="daterange"-->
+<!--                range-separator="至"-->
+<!--                start-placeholder="开始时间"-->
+<!--                end-placeholder="结束时间"-->
+<!--                value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--                clearable-->
+<!--              />-->
+<!--            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>