1.1.16 合同变更变更后合同信息与合同编辑页面同步。

src/api/oa/erp/contractChangeInfo/types.ts

@@ -147,7 +147,7 @@ export interface ContractChangeInfoVO {
   /**
    * 发货/交货期
    */
-  deliveryStart: number;
+  deliveryStart: string;
 
   /**
    * 质保期描述
@@ -345,7 +345,7 @@ export interface ContractChangeInfoForm extends BaseEntity {
   /**
    * 发货/交货期
    */
-  deliveryStart?: number;
+  deliveryStart?: string;
 
   /**
    * 质保期描述
@@ -539,7 +539,7 @@ export interface ContractChangeInfoQuery extends PageQuery {
   /**
    * 发货/交货期
    */
-  deliveryStart?: number;
+  deliveryStart?: string;
 
   /**
    * 质保期描述

src/views/oa/erp/contractChange/edit.vue

@@ -108,7 +108,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="合同编号">
-                    <el-input v-model="form.changeInfo.contractCode" placeholder="请输入合同编号或点击生成" :disabled="isFormDisabled">
+                    <el-input v-model="form.changeInfo.contractCode" placeholder="请输入合同编号" :disabled="isFormDisabled">
                       <template #append>
                         <el-button
                           type="primary"
@@ -128,7 +128,7 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="合同大类">
-                    <el-select v-model="form.changeInfo.contractCategory" placeholder="请选择合同大类" :disabled="isFormDisabled" style="width: 100%">
+                    <el-select v-model="form.changeInfo.contractCategory" placeholder="请选择合同大类" disabled style="width: 100%">
                       <el-option v-for="dict in contract_category" :key="dict.value" :label="dict.label" :value="dict.value" />
                     </el-select>
                   </el-form-item>
@@ -142,14 +142,28 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="合同负责人">
-                    <el-select v-model="form.changeInfo.contractManagerId" placeholder="请选择签订人" :disabled="isFormDisabled" filterable style="width: 100%">
+                    <el-select
+                      v-model="form.changeInfo.contractManagerId"
+                      placeholder="请选择该合同客户经理或签订人"
+                      :disabled="isFormDisabled"
+                      filterable
+                      style="width: 100%"
+                    >
                       <el-option v-for="item in userInfoList" :key="item.userId" :label="item.nickName" :value="item.userId" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="合同签订日期">
-                    <el-date-picker v-model="form.changeInfo.contractDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择合同时间" :disabled="isFormDisabled" style="width: 100%" />
+                    <el-date-picker
+                      clearable
+                      v-model="form.changeInfo.contractDate"
+                      type="date"
+                      value-format="YYYY-MM-DD HH:mm:ss"
+                      placeholder="请选择合同时间"
+                      :disabled="isFormDisabled"
+                      style="width: 100%"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -175,22 +189,38 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="甲方授权代表">
-                    <el-input v-model="form.changeInfo.oneRepresent" placeholder="甲方法人或授权代表" :disabled="isFormDisabled" />
+                    <el-input v-model="form.changeInfo.oneRepresent" placeholder="请输入甲方法人或其授权代表" :disabled="isFormDisabled" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="乙方授权代表">
-                    <el-input v-model="form.changeInfo.twoRepresent" placeholder="乙方法人或授权代表" :disabled="isFormDisabled" />
+                    <el-input v-model="form.changeInfo.twoRepresent" placeholder="请输入乙方法人或其授权代表" :disabled="isFormDisabled" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="甲方签字日期">
-                    <el-date-picker v-model="form.changeInfo.oneDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="甲方签字日期" :disabled="isFormDisabled" style="width: 100%" />
+                    <el-date-picker
+                      clearable
+                      v-model="form.changeInfo.oneDate"
+                      type="date"
+                      value-format="YYYY-MM-DD HH:mm:ss"
+                      placeholder="请选择甲方签字日期"
+                      :disabled="isFormDisabled"
+                      style="width: 100%"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="乙方签字日期">
-                    <el-date-picker v-model="form.changeInfo.twoDate" type="date" value-format="YYYY-MM-DD HH:mm:ss" placeholder="乙方签字日期" :disabled="isFormDisabled" style="width: 100%" />
+                    <el-date-picker
+                      clearable
+                      v-model="form.changeInfo.twoDate"
+                      type="date"
+                      value-format="YYYY-MM-DD HH:mm:ss"
+                      placeholder="请选择乙方签字日期"
+                      :disabled="isFormDisabled"
+                      style="width: 100%"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -226,46 +256,63 @@
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="合同总价">
-                    <el-input v-model="form.changeInfo.totalPrice" placeholder="根据物料自动计算" disabled>
+                    <el-input v-model="form.changeInfo.totalPrice" placeholder="根据合同物料自动计算" disabled>
                       <template #append>元</template>
                     </el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="质保期描述">
-                    <el-input v-model="form.changeInfo.warrantyPeriodDescription" placeholder="如：验收合格后12个月" :disabled="isFormDisabled" />
+                    <el-input
+                      v-model="form.changeInfo.warrantyPeriodDescription"
+                      placeholder="请完整输入质保期描述（如：验收合格后12个月或发货后18个月等）"
+                      :disabled="isFormDisabled"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="交货地点">
-                    <el-input v-model="form.changeInfo.deliveryLocation" placeholder="如：甲方指定仓库" :disabled="isFormDisabled" />
+                    <el-input
+                      v-model="form.changeInfo.deliveryLocation"
+                      placeholder="请输入交货地点（如：甲方指定仓库/项目现场等）"
+                      :disabled="isFormDisabled"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="运输方式">
-                    <el-input v-model="form.changeInfo.shipMethod" placeholder="如：汽运、空运" :disabled="isFormDisabled" />
+                    <el-input
-                  </el-form-item>
+                      v-model="form.changeInfo.shipMethod"
-                </el-col>
+                      placeholder="请输入运输方式（如：汽运、空运、海运等）"
-                <el-col :span="12">
+                      :disabled="isFormDisabled"
-                  <el-form-item label="发货/交货期">
+                    />
-                    <el-input-number v-model="form.changeInfo.deliveryStart" placeholder="天" :disabled="isFormDisabled" :min="0" controls-position="right" style="width: 100%" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="签订地点">
-                    <el-input v-model="form.changeInfo.signingPlace" placeholder="签订地点" :disabled="isFormDisabled" />
+                    <el-input v-model="form.changeInfo.signingPlace" placeholder="请输入签订地点" :disabled="isFormDisabled" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="付款方式">
+                  <el-form-item label="发货/交货期">
-                    <el-select v-model="form.changeInfo.paymentMethod" placeholder="请选择付款方式" :disabled="isFormDisabled" clearable style="width: 100%">
+                    <el-input
-                      <el-option v-for="item in paymentMethodOptions" :key="item" :label="item" :value="item" />
+                      v-model="form.changeInfo.deliveryStart"
-                    </el-select>
+                      type="textarea"
+                      :rows="2"
+                      placeholder="请完整描述发货/交货条件（如：合同签订生效后XX日且乙方收到甲方合同约定的XX款）"
+                      :disabled="isFormDisabled"
+                      style="width: 100%"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="备注">
-                    <el-input v-model="form.changeInfo.remark" type="textarea" placeholder="备注" :disabled="isFormDisabled" />
+                    <el-input
+                      v-model="form.changeInfo.remark"
+                      type="textarea"
+                      placeholder="请输入备注（该处备注信息不体现在合同模板）"
+                      :disabled="isFormDisabled"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -289,14 +336,23 @@
             <template #header>
               <div style="text-align: left; font-weight: bold; font-size: 18px">合同付款方式</div>
             </template>
-            <div style="margin-bottom: 16px">
+            <div style="margin-bottom: 16px; display: flex; align-items: center; gap: 12px">
               <el-button type="primary" icon="Plus" v-if="!isFormDisabled" @click="handleAddPaymentMethod">新增付款方式</el-button>
+              <el-form-item label="付款方式" prop="changeInfo.paymentMethod" style="margin-bottom: 0; width: 360px">
+                <el-select
+                  v-model="form.changeInfo.paymentMethod"
+                  placeholder="请选择付款方式"
+                  :disabled="isFormDisabled"
+                  clearable
+                  style="width: 100%"
+                >
+                  <el-option v-for="item in paymentMethodOptions" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
             </div>
-            <el-table :data="changePaymentMethodList" border>
+            <el-table :data="changePaymentMethodList" v-loading="buttonLoading" border>
               <el-table-column label="序号" align="center" prop="sortOrder" width="80" />
-              <el-table-column label="付款条款" align="center" prop="paymentDescription" min-width="200" show-overflow-tooltip />
+              <el-table-column label="付款条款" align="center" prop="paymentDescription" min-width="120" />
-              <el-table-column label="支付金额" align="center" prop="paymentAmount" width="100" />
-              <el-table-column label="支付比例(%)" align="center" prop="paymentPercentage" width="100" />
               <el-table-column label="操作" align="center" fixed="right" width="150" v-if="!isFormDisabled">
                 <template #default="scope">
                   <el-button link type="primary" icon="Edit" @click="handleEditPaymentMethod(scope.row, scope.$index)">编辑</el-button>
@@ -314,29 +370,39 @@
             <div style="margin-bottom: 16px">
               <el-button type="primary" icon="Plus" v-if="!isFormDisabled" @click="handleAddMaterial">新增合同物料</el-button>
             </div>
-            <el-table :data="changeMaterialList" border>
+            <el-table :data="changeMaterialList" v-loading="buttonLoading" border>
               <el-table-column label="物料编号" align="center" prop="materialCode" width="120" />
               <el-table-column label="物料名称" align="center" prop="materialName" width="120" />
               <el-table-column label="销售物料名称" align="center" prop="saleMaterialName" width="120" />
-              <el-table-column label="产品名称(合同显示)" align="center" prop="productName" min-width="140" />
+              <el-table-column label="产品名称(合同显示)" align="center" prop="productName" min-width="160" />
-              <el-table-column label="规格描述" align="center" prop="specificationDescription" min-width="100" />
+              <el-table-column label="规格描述" align="center" prop="specificationDescription" min-width="120" />
               <el-table-column label="数量" align="center" prop="amount" width="80">
-                <template #default="scope">{{ scope.row.amount != null ? Number(scope.row.amount).toFixed(2) : '0.00' }}</template>
+                <template #default="scope">
+                  {{ scope.row.amount ? Number(scope.row.amount).toFixed(2) : '0.00' }}
+                </template>
               </el-table-column>
               <el-table-column label="单位" align="center" prop="unitName" width="60" />
               <el-table-column label="未税单价" align="center" prop="beforePrice" width="100">
-                <template #default="scope">{{ scope.row.beforePrice != null ? Number(scope.row.beforePrice).toFixed(2) : '0.00' }}</template>
+                <template #default="scope">
+                  {{ scope.row.beforePrice ? Number(scope.row.beforePrice).toFixed(2) : '0.00' }}
+                </template>
               </el-table-column>
               <el-table-column label="税率(%)" align="center" prop="taxRate" width="80">
-                <template #default="scope">{{ scope.row.taxRate != null ? Number(scope.row.taxRate).toFixed(2) : '0.00' }}</template>
+                <template #default="scope">
+                  {{ scope.row.taxRate ? Number(scope.row.taxRate).toFixed(2) : '0.00' }}
+                </template>
               </el-table-column>
               <el-table-column label="含税单价" align="center" prop="includingPrice" width="100">
-                <template #default="scope">{{ scope.row.includingPrice != null ? Number(scope.row.includingPrice).toFixed(2) : '0.00' }}</template>
+                <template #default="scope">
+                  {{ scope.row.includingPrice ? Number(scope.row.includingPrice).toFixed(2) : '0.00' }}
+                </template>
               </el-table-column>
-              <el-table-column label="小计" align="center" prop="subtotal" width="90">
+              <el-table-column label="小计" align="center" prop="subtotal" width="80">
-                <template #default="scope">{{ scope.row.subtotal != null ? Number(scope.row.subtotal).toFixed(2) : '0.00' }}</template>
+                <template #default="scope">
+                  {{ scope.row.subtotal ? Number(scope.row.subtotal).toFixed(2) : '0.00' }}
+                </template>
               </el-table-column>
-              <el-table-column label="备注" align="center" prop="remark" min-width="80" />
+              <el-table-column label="备注" align="center" prop="remark" min-width="100" />
               <el-table-column label="操作" align="center" fixed="right" width="150" v-if="!isFormDisabled">
                 <template #default="scope">
                   <el-button link type="primary" icon="Edit" @click="handleEditMaterial(scope.row)">编辑</el-button>
@@ -344,8 +410,14 @@
                 </template>
               </el-table-column>
             </el-table>
-            <el-form-item label="合同物料备注" style="margin-bottom: 16px; margin-top: 16px">
+            <el-form-item label="合同物料备注" prop="changeInfo.materialRemark" style="margin-bottom: 16px">
-              <el-input v-model="form.changeInfo.materialRemark" type="textarea" :rows="3" placeholder="合同物料备注" :disabled="isFormDisabled" />
+              <el-input
+                v-model="form.changeInfo.materialRemark"
+                type="textarea"
+                :rows="3"
+                placeholder="请输入合同物料备注"
+                :disabled="isFormDisabled"
+              />
             </el-form-item>
           </el-card>
         </template>