1

fhKeeper/formulahousekeeper/octopus/src/views/signing/list.vue

@@ -116,7 +116,7 @@
                 <el-form-item label="乙方名称：" label-width="150px">
                     南京火石闪信网络科技有限公司
                 </el-form-item>              
-                <el-form-item label="甲方地址及电话：" label-width="150px" prop="secondPartyAddr">
+                <el-form-item label="甲方地址：" label-width="150px" prop="secondPartyAddr">
                     <el-input size="small" controls-position="right" v-model="formInline.secondPartyAddr" :disabled="finalize" style="width: 400px"></el-input>
                 </el-form-item>
                 <el-form-item label="乙方地址：" label-width="150px">
@@ -134,6 +134,9 @@
                 <el-form-item label="乙方电话：" label-width="150px">
                     15895914665
                 </el-form-item>
+                <el-form-item label="开票电话：" label-width="150px" prop="invoicingTel">
+                    <el-input size="small" controls-position="right" v-model="formInline.invoicingTel" :disabled="finalize" style="width: 150px"></el-input>
+                </el-form-item>
                 <el-form-item label="软件名称：" label-width="150px" prop="softwareName">
                     <el-input size="small" controls-position="right" v-model="formInline.softwareName" :disabled="finalize" style="width: 200px"></el-input>
                 </el-form-item>
@@ -248,6 +251,8 @@ import axios from 'axios'
                     firstPartyTel: null,
                     //乙方电话
                     secondPartyTel: null,
+                    //开票电话
+                    invoicingTel: null,
                     //软件名称
                     softwareName: null,
                     //服务周期
@@ -322,11 +327,11 @@ import axios from 'axios'
 
                 // 规则校验
                 rulesFormInline: {
-                    secondParty: [{ required: true, message: '请输入乙方名称', trigger: 'blur' }],
-                    secondPartyAddr: [{ required: true, message: '请输入乙方地址', trigger: 'blur' }],
-                    secondPartyContacts: [{ required: true, message: '请输入乙方联系人', trigger: 'blur' }],
+                    secondParty: [{ required: true, message: '请输入甲方名称', trigger: 'blur' }],
+                    secondPartyAddr: [{ required: true, message: '请输入甲方地址', trigger: 'blur' }],
+                    secondPartyContacts: [{ required: true, message: '请输入甲方联系人', trigger: 'blur' }],
                     secondPartyTel: [
-                        { required: true, message: '请输入乙方电话', trigger: 'blur' },
+                        { required: true, message: '请输入甲方电话', trigger: 'blur' },
                          { required: true, pattern:/^[0-9]{1,16}$/, message: '请输入正确的电话号码', trigger: 'change' },
                     ],
                     softwareName: [{ required: true, message: '请输入软件名称', trigger: 'blur' }],
@@ -652,6 +657,7 @@ import axios from 'axios'
                             secondPartyAddr:this.formInline.secondPartyAddr,
                             secondPartyContacts:this.formInline.secondPartyContacts,
                             secondPartyTel:this.formInline.secondPartyTel,
+                            invoicingTel:this.formInline.invoicingTel,
                             softwareName:this.formInline.softwareName,
                             serviceDate:this.formInline.serviceDate,
                             startDate:this.formInline.startDate,

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/controller/ContractDetailController.java

@@ -94,6 +94,7 @@ public class ContractDetailController {
         context.put("secondPartyAddr", contractDetail.getSecondPartyAddr());
         context.put("secondPartyContacts",contractDetail.getSecondPartyContacts() );
         context.put("secondPartyTel",contractDetail.getSecondPartyTel() );
+        context.put("invoicingTel",contractDetail.getInvoicingTel());
         context.put("softwareName", contractDetail.getSoftwareName());
         context.put("serviceDate", contractDetail.getServiceDate());
         context.put("startDate",df.format(startDate));

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/ContractDetail.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-02-07
+ * @since 2024-02-19
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -54,6 +54,12 @@ public class ContractDetail extends Model<ContractDetail> {
     @TableField("secondPartyTel")
     private String secondPartyTel;
 
+    /**
+     * 开票电话
+     */
+    @TableField("invoicingTel")
+    private String invoicingTel;
+
     /**
      * 软件名称
      */

fhKeeper/formulahousekeeper/ops-platform/src/main/resources/mapper/ContractDetailMapper.xml

@@ -9,6 +9,7 @@
         <result column="secondPartyAddr" property="secondPartyAddr" />
         <result column="secondPartyContacts" property="secondPartyContacts" />
         <result column="secondPartyTel" property="secondPartyTel" />
+        <result column="invoicingTel" property="invoicingTel" />
         <result column="softwareName" property="softwareName" />
         <result column="serviceDate" property="serviceDate" />
         <result column="startDate" property="startDate" />
@@ -26,7 +27,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        company_id, secondParty, secondPartyAddr, secondPartyContacts, secondPartyTel, softwareName, serviceDate, startDate, serviceChargeOfYear, customDevelopmentCosts, standardUnitPrice, firstOpenNum, secondPartyAccount, secondPartyBankOfDeposit, secondPartyBillingName, secondPartyTIN, invoiceType, finalize
+        company_id, secondParty, secondPartyAddr, secondPartyContacts, secondPartyTel, invoicingTel, softwareName, serviceDate, startDate, serviceChargeOfYear, customDevelopmentCosts, standardUnitPrice, firstOpenNum, secondPartyAccount, secondPartyBankOfDeposit, secondPartyBillingName, secondPartyTIN, invoiceType, finalize
     </sql>
 
 </mapper>