合同签订钉钉端字段变更

client_h5/src/pages/contract/index.vue

@@ -66,6 +66,20 @@
               placeholder="签订方式"
               readonly
           />
+          <van-field
+              v-model="formData.signTime"
+              name="签订时间"
+              label="签订时间"
+              placeholder="签订时间"
+              readonly
+          />
+          <van-field
+              v-model="formData.dueTime"
+              name="履约到期时间"
+              label="履约到期时间"
+              placeholder="履约到期时间"
+              readonly
+          />
           <van-field
               v-model="formData.isBusinessUnitC"
               name="事业部独立开拓"
@@ -80,6 +94,20 @@
               placeholder="付款条件"
               readonly
           />
+          <van-field
+              v-model="formData.specialClause"
+              name="特别条款"
+              label="特别条款"
+              placeholder="特别条款"
+              readonly
+          />
+          <van-field
+              v-model="formData.bankaccount"
+              name="收款银行账户"
+              label="收款银行账户"
+              placeholder="收款银行账户"
+              readonly
+          />
           <van-field
               v-model="formData.bz"
               name="备注"
@@ -183,14 +211,6 @@
               placeholder="维护截止日期"
               readonly
           />
-          <van-field
-              v-model="formData.specialClause"
-              name="特别条款"
-              label="特别条款"
-              placeholder="特别条款"
-              readonly
-          />
-
         </van-cell-group>
       </van-form>
     </card>
@@ -228,45 +248,26 @@
         </van-cell-group>
       </van-form>
     </card>
-    <card title="到期提醒" style="height: auto">
-      <van-form  ref="form">
-        <van-cell-group inset>
-          <van-field
-              v-model="formData.isRemindExpiryc"
-              name="是否到期提醒"
-              label="是否到期提醒"
-              placeholder="是否到期提醒"
-              readonly
-          />
-          <van-field
-              v-model="formData.planSignDate"
-              name="合同预计签订时间"
-              label="合同预计签订时间"
-              placeholder="合同预计签订时间"
-              readonly
-          />
-        </van-cell-group>
-      </van-form>
-    </card>
+
     <card title="项目信息" style="height: auto">
       <van-form  ref="form">
         <van-cell-group inset>
           <van-field
-              v-model="formData.xmmc"
+              v-model="formData.project.xmmc"
               name="项目名称"
               label="项目名称"
               placeholder="项目名称"
               readonly
           />
           <van-field
-              v-model="formData.xmbh"
+              v-model="formData.project.xmbh"
               name="项目编号"
               label="项目编号"
               placeholder="项目编号"
               readonly
           />
           <van-field
-              v-model="formData.zrbm"
+              v-model="formData.project.zrbm"
               name="责任部门"
               label="责任部门"
               placeholder="责任部门"
@@ -309,7 +310,9 @@ const form = ref(null);
 interface FormDataType {
 }
 
-const formData = ref<FormDataType>({})
+const formData = ref<FormDataType>({
+  project: {},
+})
 const detailData = ref({})
 
 
@@ -345,6 +348,7 @@ const initFormData = async () => {
   const result = await reqest.get(`/business/flow/contract/mobileAdd?flowInstanceId=${flowInstanceId}`)
   formData.value = result.data
 
+  formData.project = result.data.project;
 
   formData.value.mainTypeText = getDictLabel(DICT_TYPE.CONTRACT_MAIN_TYPE, formData.value.mainType);
   formData.value.secondTypeText = getDictLabel(DICT_TYPE.CONTRACT_SECOND_TYPE, formData.value.secondType);

zjugis-business/src/main/java/com/zjugis/business/flow/contract/controller/vo/ContractVO.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.zjugis.business.bean.entity.ContractMilestone;
+import com.zjugis.business.bean.entity.Project;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -321,5 +322,17 @@ public class ContractVO {
 
     private BigDecimal virtualAmount;
 
+    /**
+     * 签订时间
+     * **/
+    private LocalDate signTime;
+
+    /**
+     * 履约到期时间
+     * **/
+    private LocalDate dueTime;
+
+    private Project project;
+
     List<ContractMilestone> detail;
 }

zjugis-business/src/main/java/com/zjugis/business/flow/contract/service/FlowContractService.java

@@ -166,6 +166,13 @@ public class FlowContractService {
     public ContractVO flowAdd(String flowInstanceId, String userId) {
         Contract entity = contractService.selectByInstanceId(flowInstanceId);
         ContractVO vo = ContractConvert.INSTANCE.convert(entity);
+
+        if (StringUtils.isNotBlank(entity.getProjectId())) {
+            Project project = projectService.selectById(entity.getProjectId());
+            if (project != null) {
+                vo.setProject(project);
+            }
+        }
         List<ContractMilestone> milestoneList = contractMilestoneService.selectByContractId(entity.getId());
         vo.setDetail(milestoneList);
         return vo;