From 6fbfd2bd5c179306f5cef7554552a1fd477c19a5 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Mon, 19 Feb 2024 17:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=9F=BA=E6=9C=AC=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf-web/src/views/scm/contractL/form.vue | 2474 +++++++++--------
 1 file changed, 1302 insertions(+), 1172 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
index a774ed7e..68d3d446 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
@@ -2,580 +2,710 @@
 
 
 
-    <template>
-    <div :style="{margin: '0 auto',width:'100%'}">
-    <el-row :gutter="15" class="">
-    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="130px" label-position="right"  :disabled="setting.readonly" >
-    <template v-if="!loading && formOperates">
-        <!-- 具体表单 -->
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="合同类型">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="24"  v-if="judgeShow('contractType')" >
-        <jnpf-form-tip-item
- label="合同类型"  tipLabel="不同的合同类型可编辑的字段内容不同，合同类型一旦保存不可修改，请选择更匹配你需求的一个。"  v-if="judgeShow('contractType')"   prop="contractType" >
-        <JnpfRadio   v-model="dataForm.contractType" @change="changeData('contractType',-1)" 
- :disabled="judgeWrite('contractType')"  optionType="button"  direction="horizontal"  size="small"  :options="contractTypeOptions" :props="contractTypeProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="基本信息">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="8"  v-if="judgeShow('contractTemplateId')" >
-        <jnpf-form-tip-item
- label="合同模板"  v-if="judgeShow('contractTemplateId')"   prop="contractTemplateId" >
-        <JnpfPopupSelect   v-model="dataForm.contractTemplateId" @change="changeData('contractTemplateId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.contractTemplateId"  placeholder="请选择"  :disabled="judgeWrite('contractTemplateId')"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  field='contractTemplateId'  interfaceId="528856731099332613"  :pageSize="20"  :columnOptions="contractTemplateIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('contractNumber')" >
-        <jnpf-form-tip-item
- label="合同编号"  v-if="judgeShow('contractNumber')"   prop="contractNumber" >
-        <JnpfInput   v-model="dataForm.contractNumber" @change="changeData('contractNumber',-1)" 
- placeholder="系统自动生成"  :disabled="judgeWrite('contractNumber')"  readonly  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('contractName')" >
-        <jnpf-form-tip-item
- label="合同名称"  v-if="judgeShow('contractName')"   prop="contractName" >
-        <JnpfInput   v-model="dataForm.contractName" @change="changeData('contractName',-1)" 
- placeholder="请输入"  :disabled="judgeWrite('contractName')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('contractNo')" >
-        <jnpf-form-tip-item
- label="对方合同编号"  v-if="judgeShow('contractNo')"   prop="contractNo" >
-        <JnpfInput   v-model="dataForm.contractNo" @change="changeData('contractNo',-1)" 
- placeholder="请输入"  :disabled="judgeWrite('contractNo')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
+<template>
+    <div :style="{ margin: '0 auto', width: '100%' }">
+        <el-row :gutter="15" class="">
+            <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="130px"
+                label-position="right" :disabled="setting.readonly">
+                <template v-if="!loading && formOperates">
+                    <!-- 具体表单 -->
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="合同类型">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('contractType')">
+                        <jnpf-form-tip-item label="合同类型" tipLabel="不同的合同类型可编辑的字段内容不同，合同类型一旦保存不可修改，请选择更匹配你需求的一个。"
+                            v-if="judgeShow('contractType')" prop="contractType">
+                            <JnpfRadio v-model="dataForm.contractType" @change="changeData('contractType', -1)"
+                                :disabled="judgeWrite('contractType')" optionType="button" direction="horizontal"
+                                size="small" :options="contractTypeOptions" :props="contractTypeProps">
+                            </JnpfRadio>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="基本信息">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('contractTemplateId')">
+                        <jnpf-form-tip-item label="合同模板" v-if="judgeShow('contractTemplateId')" prop="contractTemplateId">
+                            <JnpfPopupSelect v-model="dataForm.contractTemplateId"
+                                @change="changeData('contractTemplateId', -1)" :rowIndex="null" :formData="dataForm"
+                                :templateJson="interfaceRes.contractTemplateId" placeholder="请选择"
+                                :disabled="judgeWrite('contractTemplateId')" propsValue="id" popupWidth="800px"
+                                popupTitle="选择数据" popupType="dialog" relationField='name' field='contractTemplateId'
+                                interfaceId="528856731099332613" :pageSize="20"
+                                :columnOptions="contractTemplateIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                            </JnpfPopupSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('contractNumber')">
+                        <jnpf-form-tip-item label="合同编号" v-if="judgeShow('contractNumber')" prop="contractNumber">
+                            <JnpfInput v-model="dataForm.contractNumber" @change="changeData('contractNumber', -1)"
+                                placeholder="系统自动生成" :disabled="judgeWrite('contractNumber')" readonly
+                                :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('contractName')">
+                        <jnpf-form-tip-item label="合同名称" v-if="judgeShow('contractName')" prop="contractName">
+                            <JnpfInput v-model="dataForm.contractName" @change="changeData('contractName', -1)"
+                                placeholder="请输入" :disabled="judgeWrite('contractName')" clearable
+                                :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('contractNo')">
+                        <jnpf-form-tip-item label="对方合同编号" v-if="judgeShow('contractNo')" prop="contractNo">
+                            <JnpfInput v-model="dataForm.contractNo" @change="changeData('contractNo', -1)"
+                                placeholder="请输入" :disabled="judgeWrite('contractNo')" clearable
+                                :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
 
-        <el-col :span="8"  v-if="judgeShow('contractSignedTime')" >
-        <jnpf-form-tip-item
- label="签订日期"  v-if="judgeShow('contractSignedTime')"   prop="contractSignedTime" >
-        <JnpfDatePicker   v-model="dataForm.contractSignedTime" @change="changeData('contractSignedTime',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  :disabled="judgeWrite('contractSignedTime')"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('businessId')" >
-        <jnpf-form-tip-item
- label="关联业务线"  v-if="judgeShow('businessId')"   prop="businessId" >
-        <JnpfPopupSelect   v-model="dataForm.businessId" @change="changeData('businessId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.businessId"  placeholder="请选择"  :disabled="judgeWrite('businessId')"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  field='businessId'  interfaceId="517979330417001669"  :pageSize="20"  :columnOptions="businessIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
+                    <el-col :span="8" v-if="judgeShow('contractSignedTime')">
+                        <jnpf-form-tip-item label="签订日期" v-if="judgeShow('contractSignedTime')" prop="contractSignedTime">
+                            <JnpfDatePicker v-model="dataForm.contractSignedTime"
+                                @change="changeData('contractSignedTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
+                                :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                                :disabled="judgeWrite('contractSignedTime')" clearable :style='{ "width": "100%" }'
+                                type="date" format="yyyy-MM-dd">
+                            </JnpfDatePicker>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('businessId')">
+                        <jnpf-form-tip-item label="关联业务线" v-if="judgeShow('businessId')" prop="businessId">
+                            <JnpfPopupSelect v-model="dataForm.businessId" @change="changeData('businessId', -1)"
+                                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
+                                placeholder="请选择" :disabled="judgeWrite('businessId')" propsValue="id" popupWidth="800px"
+                                popupTitle="选择数据" popupType="dialog" relationField='name' field='businessId'
+                                interfaceId="517979330417001669" :pageSize="20" :columnOptions="businessIdcolumnOptions"
+                                clearable :style='{ "width": "100%" }'>
+                            </JnpfPopupSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
 
-        <el-col :span="8"  v-if="judgeShow('contractPeriodTime')" >
-        <jnpf-form-tip-item
- label="有效期开始 "  v-if="judgeShow('contractPeriodTime')"   prop="contractPeriodTime" >
-        <JnpfDatePicker   v-model="dataForm.contractPeriodTime" @change="changeData('contractPeriodTime',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  :disabled="judgeWrite('contractPeriodTime')"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
+                    <el-col :span="8" v-if="judgeShow('contractPeriodTime')">
+                        <jnpf-form-tip-item label="有效期开始 " v-if="judgeShow('contractPeriodTime')" prop="contractPeriodTime">
+                            <JnpfDatePicker v-model="dataForm.contractPeriodTime"
+                                @change="changeData('contractPeriodTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
+                                :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                                :disabled="judgeWrite('contractPeriodTime')" clearable :style='{ "width": "100%" }'
+                                type="date" format="yyyy-MM-dd">
+                            </JnpfDatePicker>
+                        </jnpf-form-tip-item>
+                    </el-col>
 
-        <el-col :span="8"  v-if="judgeShow('contractPeriodTimeEnd')" >
-        <jnpf-form-tip-item
- label="有效期结束 "  v-if="judgeShow('contractPeriodTimeEnd')"   prop="contractPeriodTimeEnd" >
-        <JnpfDatePicker   v-model="dataForm.contractPeriodTimeEnd" @change="changeData('contractPeriodTimeEnd',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  :disabled="judgeWrite('contractPeriodTimeEnd')"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="主体信息">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="24"  v-if="judgeShow('deptId')" >
-        <jnpf-form-tip-item
- label="签约主体"  v-if="judgeShow('deptId')"   prop="deptId" >
-        <JnpfOrganizeSelect   v-model="dataForm.deptId" @change="changeData('deptId',-1)" 
- placeholder="请选择"  selectType="all"  :ableIds="ableAll.deptIdableIds"  :disabled="judgeWrite('deptId')"  clearable  :style='{"width":"100%"}'>
-    </JnpfOrganizeSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24"  v-if="judgeShow('subject')" >
-        <jnpf-form-tip-item
- label="乙方主体"  v-if="judgeShow('subject')"   prop="subject" >
-        <JnpfPopupSelect   v-model="dataForm.subject" @change="changeData('subject',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.subject"  placeholder="请选择"  :disabled="judgeWrite('subject')"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  field='subject'  interfaceId="523869248829799685"  :pageSize="20"  :columnOptions="subjectcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="财务信息">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="合同信息">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="8"  v-if="judgeShow('procurementModel')" >
-        <jnpf-form-tip-item
- label="采购模式"  v-if="judgeShow('procurementModel')"   prop="procurementModel" >
-        <JnpfSelect   v-model="dataForm.procurementModel" @change="changeData('procurementModel',-1)" 
- placeholder="请选择"  :disabled="judgeWrite('procurementModel')"  clearable  :style='{"width":"100%"}' :options="procurementModelOptions" :props="procurementModelProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('relatedContractId')" >
-        <jnpf-form-tip-item
- label="关联销售合同"  v-if="judgeShow('relatedContractId')"   prop="relatedContractId" >
-        <JnpfPopupSelect   v-model="dataForm.relatedContractId" @change="changeData('relatedContractId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.relatedContractId"  placeholder="请选择"  :disabled="judgeWrite('relatedContractId')"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='contract_name'  field='relatedContractId'  interfaceId="529270998021701701"  :pageSize="20"  :columnOptions="relatedContractIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('subject2')" >
-        <jnpf-form-tip-item
- label="乙方主体二级"  v-if="judgeShow('subject2')"   prop="subject2" >
-        <JnpfPopupSelect   v-model="dataForm.subject2" @change="changeData('subject2',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.subject2"  placeholder="请选择"  :disabled="judgeWrite('subject2')"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  field='subject2'  interfaceId="523869248829799685"  :pageSize="20"  :columnOptions="subject2columnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('subject3')" >
-        <jnpf-form-tip-item
- label="乙方主体三级"  v-if="judgeShow('subject3')"   prop="subject3" >
-        <JnpfPopupSelect   v-model="dataForm.subject3" @change="changeData('subject3',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.subject3"  placeholder="请选择"  :disabled="judgeWrite('subject3')"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  field='subject3'  interfaceId="523869248829799685"  :pageSize="20"  :columnOptions="subject3columnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="交货和运输信息">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="8"  v-if="judgeShow('deliveryModel')" >
-        <jnpf-form-tip-item
- label="交货方式"  v-if="judgeShow('deliveryModel')"   prop="deliveryModel" >
-        <JnpfSelect   v-model="dataForm.deliveryModel" @change="changeData('deliveryModel',-1)" 
- placeholder="请选择"  :disabled="judgeWrite('deliveryModel')"  clearable  :style='{"width":"100%"}' :options="deliveryModelOptions" :props="deliveryModelProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('deliveryLocation')" >
-        <jnpf-form-tip-item
- label="交货地点 "  v-if="judgeShow('deliveryLocation')"   prop="deliveryLocation" >
-        <JnpfInput   v-model="dataForm.deliveryLocation" @change="changeData('deliveryLocation',-1)" 
- placeholder="请输入"  :disabled="judgeWrite('deliveryLocation')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('modeTransport')" >
-        <jnpf-form-tip-item
- label="运输方式"  v-if="judgeShow('modeTransport')"   prop="modeTransport" >
-        <JnpfSelect   v-model="dataForm.modeTransport" @change="changeData('modeTransport',-1)" 
- placeholder="请选择"  :disabled="judgeWrite('modeTransport')"  clearable  :style='{"width":"100%"}' :options="modeTransportOptions" :props="modeTransportProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('costBearingMian')" >
-        <jnpf-form-tip-item
- label="费用承担主体"  v-if="judgeShow('costBearingMian')"   prop="costBearingMian" >
-        <JnpfSelect   v-model="dataForm.costBearingMian" @change="changeData('costBearingMian',-1)" 
- placeholder="请选择"  :disabled="judgeWrite('costBearingMian')"  clearable  :style='{"width":"100%"}' :options="costBearingMianOptions" :props="costBearingMianProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content=" 合同条款信息">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="8"  v-if="judgeShow('pricingModel')" >
-        <jnpf-form-tip-item
- label="定价模式 "  v-if="judgeShow('pricingModel')"   prop="pricingModel" >
-        <JnpfSelect   v-model="dataForm.pricingModel" @change="changeData('pricingModel',-1)" 
- placeholder="请选择"  :disabled="judgeWrite('pricingModel')"  clearable  :style='{"width":"100%"}' :options="pricingModelOptions" :props="pricingModelProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="商品明细">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="24"   v-if="judgeShow('-${html.relationField}')" >
-            <jnpf-form-tip-item label-width="0">
-                <el-table :data="dataForm.contractlcommodityList" size='mini' >
-                    <el-table-column type="index" width="50" label="序号" align="center" />
-        <el-table-column
- label="商品名称"  v-if="judgeShow('contractlcommodity-commodityName')"   prop="commodityName" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-commodityName')" >*</span>商品名称
+                    <el-col :span="8" v-if="judgeShow('contractPeriodTimeEnd')">
+                        <jnpf-form-tip-item label="有效期结束 " v-if="judgeShow('contractPeriodTimeEnd')"
+                            prop="contractPeriodTimeEnd">
+                            <JnpfDatePicker v-model="dataForm.contractPeriodTimeEnd"
+                                @change="changeData('contractPeriodTimeEnd', -1)" :startTime="dateTime(false, 1, 1, '', '')"
+                                :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                                :disabled="judgeWrite('contractPeriodTimeEnd')" clearable :style='{ "width": "100%" }'
+                                type="date" format="yyyy-MM-dd">
+                            </JnpfDatePicker>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="主体信息">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('deptId')">
+                        <jnpf-form-tip-item label="签约主体" v-if="judgeShow('deptId')" prop="deptId">
+                            <JnpfOrganizeSelect v-model="dataForm.deptId" @change="changeData('deptId', -1)"
+                                placeholder="请选择" selectType="all" :ableIds="ableAll.deptIdableIds"
+                                :disabled="judgeWrite('deptId')" clearable :style='{ "width": "100%" }'>
+                            </JnpfOrganizeSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('subject')">
+                        <jnpf-form-tip-item label="乙方主体" v-if="judgeShow('subject')" prop="subject">
+                            <JnpfPopupSelect v-model="dataForm.subject" @change="changeData('subject', -1)" :rowIndex="null"
+                                :formData="dataForm" :templateJson="interfaceRes.subject" placeholder="请选择"
+                                :disabled="judgeWrite('subject')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                                popupType="dialog" relationField='name' field='subject' interfaceId="523869248829799685"
+                                :pageSize="20" :columnOptions="subjectcolumnOptions" clearable :style='{ "width": "100%" }'>
+                            </JnpfPopupSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="财务信息">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="合同信息">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('procurementModel')">
+                        <jnpf-form-tip-item label="采购模式" v-if="judgeShow('procurementModel')" prop="procurementModel">
+                            <JnpfSelect v-model="dataForm.procurementModel" @change="changeData('procurementModel', -1)"
+                                placeholder="请选择" :disabled="judgeWrite('procurementModel')" clearable
+                                :style='{ "width": "100%" }' :options="procurementModelOptions"
+                                :props="procurementModelProps">
+                            </JnpfSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('relatedContractId')">
+                        <jnpf-form-tip-item label="关联销售合同" v-if="judgeShow('relatedContractId')" prop="relatedContractId">
+                            <JnpfPopupSelect v-model="dataForm.relatedContractId"
+                                @change="changeData('relatedContractId', -1)" :rowIndex="null" :formData="dataForm"
+                                :templateJson="interfaceRes.relatedContractId" placeholder="请选择"
+                                :disabled="judgeWrite('relatedContractId')" propsValue="id" popupWidth="800px"
+                                popupTitle="选择数据" popupType="dialog" relationField='contract_name' field='relatedContractId'
+                                interfaceId="529270998021701701" :pageSize="20"
+                                :columnOptions="relatedContractIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                            </JnpfPopupSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('subject2')">
+                        <jnpf-form-tip-item label="乙方主体二级" v-if="judgeShow('subject2')" prop="subject2">
+                            <JnpfPopupSelect v-model="dataForm.subject2" @change="changeData('subject2', -1)"
+                                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subject2"
+                                placeholder="请选择" :disabled="judgeWrite('subject2')" propsValue="id" popupWidth="800px"
+                                popupTitle="选择数据" popupType="dialog" relationField='name' field='subject2'
+                                interfaceId="523869248829799685" :pageSize="20" :columnOptions="subject2columnOptions"
+                                clearable :style='{ "width": "100%" }'>
+                            </JnpfPopupSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('subject3')">
+                        <jnpf-form-tip-item label="乙方主体三级" v-if="judgeShow('subject3')" prop="subject3">
+                            <JnpfPopupSelect v-model="dataForm.subject3" @change="changeData('subject3', -1)"
+                                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subject3"
+                                placeholder="请选择" :disabled="judgeWrite('subject3')" propsValue="id" popupWidth="800px"
+                                popupTitle="选择数据" popupType="dialog" relationField='name' field='subject3'
+                                interfaceId="523869248829799685" :pageSize="20" :columnOptions="subject3columnOptions"
+                                clearable :style='{ "width": "100%" }'>
+                            </JnpfPopupSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="交货和运输信息">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('deliveryModel')">
+                        <jnpf-form-tip-item label="交货方式" v-if="judgeShow('deliveryModel')" prop="deliveryModel">
+                            <JnpfSelect v-model="dataForm.deliveryModel" @change="changeData('deliveryModel', -1)"
+                                placeholder="请选择" :disabled="judgeWrite('deliveryModel')" clearable
+                                :style='{ "width": "100%" }' :options="deliveryModelOptions" :props="deliveryModelProps">
+                            </JnpfSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('deliveryLocation')">
+                        <jnpf-form-tip-item label="交货地点 " v-if="judgeShow('deliveryLocation')" prop="deliveryLocation">
+                            <JnpfInput v-model="dataForm.deliveryLocation" @change="changeData('deliveryLocation', -1)"
+                                placeholder="请输入" :disabled="judgeWrite('deliveryLocation')" clearable
+                                :style='{ "width": "100%" }'>
+                            </JnpfInput>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('modeTransport')">
+                        <jnpf-form-tip-item label="运输方式" v-if="judgeShow('modeTransport')" prop="modeTransport">
+                            <JnpfSelect v-model="dataForm.modeTransport" @change="changeData('modeTransport', -1)"
+                                placeholder="请选择" :disabled="judgeWrite('modeTransport')" clearable
+                                :style='{ "width": "100%" }' :options="modeTransportOptions" :props="modeTransportProps">
+                            </JnpfSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('costBearingMian')">
+                        <jnpf-form-tip-item label="费用承担主体" v-if="judgeShow('costBearingMian')" prop="costBearingMian">
+                            <JnpfSelect v-model="dataForm.costBearingMian" @change="changeData('costBearingMian', -1)"
+                                placeholder="请选择" :disabled="judgeWrite('costBearingMian')" clearable
+                                :style='{ "width": "100%" }' :options="costBearingMianOptions"
+                                :props="costBearingMianProps">
+                            </JnpfSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content=" 合同条款信息">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('pricingModel')">
+                        <jnpf-form-tip-item label="定价模式 " v-if="judgeShow('pricingModel')" prop="pricingModel">
+                            <JnpfSelect v-model="dataForm.pricingModel" @change="changeData('pricingModel', -1)"
+                                placeholder="请选择" :disabled="judgeWrite('pricingModel')" clearable
+                                :style='{ "width": "100%" }' :options="pricingModelOptions" :props="pricingModelProps">
+                            </JnpfSelect>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="商品明细">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
+                        <jnpf-form-tip-item label-width="0">
+                            <el-table :data="dataForm.contractLCommodityList" size='mini'>
+                                <el-table-column type="index" width="50" label="序号" align="center" />
+                                <el-table-column label="商品名称" v-if="judgeShow('contractlcommodity-commodityName')"
+                                    prop="commodityName">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-commodityName')">*</span>商品名称
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfPopupSelect v-model="scope.row.commodityName"
+                                            @change="changeData('contractlcommodity-commodityName', scope.$index)"
+                                            :rowIndex="scope.$index" :formData="dataForm"
+                                            :templateJson="interfaceRes.contractlcommoditycommodityName" placeholder="请选择"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-commodityName')"
+                                            propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                                            relationField='fullName' :field="'commodityName' + scope.$index"
+                                            interfaceId="523160915206474309" :pageSize="20"
+                                            :columnOptions="contractlcommoditycommodityNamecolumnOptions" clearable
+                                            :style='{ "width": "100%" }'>
+                                        </JnpfPopupSelect>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="商品编码" v-if="judgeShow('contractlcommodity-commodityCode')"
+                                    prop="commodityCode">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-commodityCode')">*</span>商品编码
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.commodityCode"
+                                            @change="changeData('contractlcommodity-commodityCode', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-commodityCode')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="商品规格" v-if="judgeShow('contractlcommodity-specifications')"
+                                    prop="specifications">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-specifications')">*</span>商品规格
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.specifications"
+                                            @change="changeData('contractlcommodity-specifications', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-specifications')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="库存单位" v-if="judgeShow('contractlcommodity-inventoryUnit')"
+                                    prop="inventoryUnit">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-inventoryUnit')">*</span>库存单位
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.inventoryUnit"
+                                            @change="changeData('contractlcommodity-inventoryUnit', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-inventoryUnit')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="采购单位" v-if="judgeShow('contractlcommodity-procureUnit')"
+                                    prop="procureUnit">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-procureUnit')">*</span>采购单位
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfSelect v-model="scope.row.procureUnit"
+                                            @change="changeData('contractlcommodity-procureUnit', scope.$index)"
+                                            placeholder="请选择"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-procureUnit')"
+                                            clearable :style='{ "width": "100%" }'
+                                            :options="contractlcommodityprocureUnitOptions"
+                                            :props="contractlcommodityprocureUnitProps">
+                                        </JnpfSelect>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="数量" v-if="judgeShow('contractlcommodity-number')" prop="number">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-number')">*</span>数量
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.number"
+                                            @change="changeData('contractlcommodity-number', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-number')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="税率" v-if="judgeShow('contractlcommodity-taxRate')" prop="taxRate">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-taxRate')">*</span>税率
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.taxRate"
+                                            @change="changeData('contractlcommodity-taxRate', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-taxRate')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="含税单价" v-if="judgeShow('contractlcommodity-priceRate')"
+                                    prop="priceRate">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-priceRate')">*</span>含税单价
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.priceRate"
+                                            @change="changeData('contractlcommodity-priceRate', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-priceRate')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="含税总金额" v-if="judgeShow('contractlcommodity-totalRate')"
+                                    prop="totalRate">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlcommodityList-totalRate')">*</span>含税总金额
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.totalRate"
+                                            @change="changeData('contractlcommodity-totalRate', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlcommodityList') || judgeWrite('contractlcommodityList-totalRate')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="操作" width="50" v-if="!judgeWrite('contractlcommodityList')">
+                                    <template slot-scope="scope">
+                                        <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                            @click="delcontractLCommodityList(scope.$index)">删除</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <div class="table-actions" @click="addcontractLCommodityList()"
+                                v-if="!judgeWrite('contractlcommodityList')">
+                                <el-button type="text" icon="el-icon-plus">添加</el-button>
+                            </div>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="费用条款">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('contractlcommodity-${html.relationField}')">
+                        <jnpf-form-tip-item label-width="0">
+                            <el-table :data="dataForm.contractLFeeClauseList" size='mini'>
+                                <el-table-column type="index" width="50" label="序号" align="center" />
+                                <el-table-column label="费用类型" v-if="judgeShow('contractlfeeclause-feeType')" prop="feeType">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlfeeclauseList-feeType')">*</span>费用类型
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfSelect v-model="scope.row.feeType"
+                                            @change="changeData('contractlfeeclause-feeType', scope.$index)"
+                                            placeholder="请选择"
+                                            :disabled="judgeWrite('contractlfeeclauseList') || judgeWrite('contractlfeeclauseList-feeType')"
+                                            clearable :style='{ "width": "100%" }' filterable
+                                            :options="contractlfeeclausefeeTypeOptions"
+                                            :props="contractlfeeclausefeeTypeProps">
+                                        </JnpfSelect>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="金额" v-if="judgeShow('contractlfeeclause-price')" prop="price">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlfeeclauseList-price')">*</span>金额
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInputNumber v-model="scope.row.price"
+                                            @change="changeData('contractlfeeclause-price', scope.$index)"
+                                            placeholder="数字文本"
+                                            :disabled="judgeWrite('contractlfeeclauseList') || judgeWrite('contractlfeeclauseList-price')"
+                                            :precision="1" addonAfter="元" :step="1">
+                                        </JnpfInputNumber>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="备注" v-if="judgeShow('contractlfeeclause-remark')" prop="remark">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlfeeclauseList-remark')">*</span>备注
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.remark"
+                                            @change="changeData('contractlfeeclause-remark', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlfeeclauseList') || judgeWrite('contractlfeeclauseList-remark')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="操作" width="50" v-if="!judgeWrite('contractlfeeclauseList')">
+                                    <template slot-scope="scope">
+                                        <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                            @click="delcontractLFeeClauseList(scope.$index)">删除</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <div class="table-actions" @click="addcontractLFeeClauseList()"
+                                v-if="!judgeWrite('contractlfeeclauseList')">
+                                <el-button type="text" icon="el-icon-plus">添加</el-button>
+                            </div>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="付款节点">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('contractlfeeclause-${html.relationField}')">
+                        <jnpf-form-tip-item label-width="0">
+                            <el-table :data="dataForm.contractLPaymentList" size='mini'>
+                                <el-table-column type="index" width="50" label="序号" align="center" />
+                                <el-table-column label="收付款节点" v-if="judgeShow('contractlpayment-paymentNode')"
+                                    prop="paymentNode">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlpaymentList-paymentNode')">*</span>收付款节点
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfSelect v-model="scope.row.paymentNode"
+                                            @change="changeData('contractlpayment-paymentNode', scope.$index)"
+                                            placeholder="请选择"
+                                            :disabled="judgeWrite('contractlpaymentList') || judgeWrite('contractlpaymentList-paymentNode')"
+                                            clearable :style='{ "width": "100%" }'
+                                            :options="contractlpaymentpaymentNodeOptions"
+                                            :props="contractlpaymentpaymentNodeProps">
+                                        </JnpfSelect>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="收付款方式" v-if="judgeShow('contractlpayment-paymentMethod')"
+                                    prop="paymentMethod">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlpaymentList-paymentMethod')">*</span>收付款方式
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfSelect v-model="scope.row.paymentMethod"
+                                            @change="changeData('contractlpayment-paymentMethod', scope.$index)"
+                                            placeholder="请选择"
+                                            :disabled="judgeWrite('contractlpaymentList') || judgeWrite('contractlpaymentList-paymentMethod')"
+                                            clearable :style='{ "width": "100%" }'
+                                            :options="contractlpaymentpaymentMethodOptions"
+                                            :props="contractlpaymentpaymentMethodProps">
+                                        </JnpfSelect>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="付款比例" v-if="judgeShow('contractlpayment-paymentRatio')"
+                                    prop="paymentRatio">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlpaymentList-paymentRatio')">*</span>付款比例
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInputNumber v-model="scope.row.paymentRatio"
+                                            @change="changeData('contractlpayment-paymentRatio', scope.$index)"
+                                            placeholder="请输入"
+                                            :disabled="judgeWrite('contractlpaymentList') || judgeWrite('contractlpaymentList-paymentRatio')"
+                                            :precision="1" addonAfter="%" :step="1">
+                                        </JnpfInputNumber>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="金额" v-if="judgeShow('contractlpayment-price')" prop="price">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlpaymentList-price')">*</span>金额
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInputNumber v-model="scope.row.price"
+                                            @change="changeData('contractlpayment-price', scope.$index)" placeholder="请输入"
+                                            :disabled="judgeWrite('contractlpaymentList') || judgeWrite('contractlpaymentList-price')"
+                                            :precision="1" addonAfter="元" :step="1">
+                                        </JnpfInputNumber>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="备注" v-if="judgeShow('contractlpayment-remark')" prop="remark">
+                                    <template slot="header">
+                                        <span class="required-sign"
+                                            v-if="judgeRequired('contractlpaymentList-remark')">*</span>备注
+                                    </template>
+                                    <template slot-scope="scope">
+                                        <JnpfInput v-model="scope.row.remark"
+                                            @change="changeData('contractlpayment-remark', scope.$index)" placeholder="请输入"
+                                            :disabled="judgeWrite('contractlpaymentList') || judgeWrite('contractlpaymentList-remark')"
+                                            clearable :style='{ "width": "100%" }'>
+                                        </JnpfInput>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="操作" width="50" v-if="!judgeWrite('contractlpaymentList')">
+                                    <template slot-scope="scope">
+                                        <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                            @click="delcontractLPaymentList(scope.$index)">删除</el-button>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <div class="table-actions" @click="addcontractLPaymentList()"
+                                v-if="!judgeWrite('contractlpaymentList')">
+                                <el-button type="text" icon="el-icon-plus">添加</el-button>
+                            </div>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="其他信息">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('contractRequirement')">
+                        <jnpf-form-tip-item label="合同要求" v-if="judgeShow('contractRequirement')" prop="contractRequirement">
+                            <JnpfTextarea v-model="dataForm.contractRequirement"
+                                @change="changeData('contractRequirement', -1)" placeholder="请输入"
+                                :disabled="judgeWrite('contractRequirement')" :style='{ "width": "100%" }' true
+                                type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
+                            </JnpfTextarea>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('remark')">
+                        <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" label-width="0px" prop="remark">
+                            <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
+                                :disabled="judgeWrite('remark')" :style='{ "width": "100%" }' true type="textarea"
+                                :autosize='{ "minRows": 4, "maxRows": 4 }'>
+                            </JnpfTextarea>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="附件信息">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('contractAppendices')">
+                        <jnpf-form-tip-item label="合同附件" v-if="judgeShow('contractAppendices')" prop="contractAppendices">
+                            <JnpfUploadFile v-model="dataForm.contractAppendices"
+                                @change="changeData('contractAppendices', -1)" :disabled="judgeWrite('contractAppendices')"
+                                tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" :fileSize="20" sizeUnit="MB"
+                                :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
+                            </JnpfUploadFile>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('ancillaryDocuments')">
+                        <jnpf-form-tip-item label="附属文件" v-if="judgeShow('ancillaryDocuments')" prop="ancillaryDocuments">
+                            <JnpfUploadFile v-model="dataForm.ancillaryDocuments"
+                                @change="changeData('ancillaryDocuments', -1)" :disabled="judgeWrite('ancillaryDocuments')"
+                                tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" :fileSize="20" sizeUnit="MB"
+                                :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
+                            </JnpfUploadFile>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="8" v-if="judgeShow('transactionAppendices')">
+                        <jnpf-form-tip-item label="关联交易合同（二级）" v-if="judgeShow('transactionAppendices')"
+                            prop="transactionAppendices">
+                            <JnpfUploadFile v-model="dataForm.transactionAppendices"
+                                @change="changeData('transactionAppendices', -1)"
+                                :disabled="judgeWrite('transactionAppendices')"
+                                tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" :fileSize="20" sizeUnit="MB"
+                                :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
+                            </JnpfUploadFile>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('transactionAppendices2')">
+                        <jnpf-form-tip-item label="关联交易合同（三级）" v-if="judgeShow('transactionAppendices2')"
+                            prop="transactionAppendices2">
+                            <JnpfUploadFile v-model="dataForm.transactionAppendices2"
+                                @change="changeData('transactionAppendices2', -1)"
+                                :disabled="judgeWrite('transactionAppendices2')"
+                                tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" :fileSize="20" sizeUnit="MB"
+                                :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
+                            </JnpfUploadFile>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <jnpf-form-tip-item>
+                            <JnpfText
+                                :textStyle='{ "color": "#62A2CB", "font-weight": "bold", "text-decoration": "none", "font-size": 16, "line-height": 32, "font-style": "normal", "text-align": "center" }'
+                                content="合同标签">
+                            </JnpfText>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <el-col :span="24" v-if="judgeShow('contractLabel')">
+                        <jnpf-form-tip-item label="合同标签" v-if="judgeShow('contractLabel')" prop="contractLabel">
+                            <JnpfCheckbox v-model="dataForm.contractLabel" @change="changeData('contractLabel', -1)"
+                                :disabled="judgeWrite('contractLabel')" optionType="default" direction="horizontal"
+                                size="small" :options="contractLabelOptions" :props="contractLabelProps">
+                            </JnpfCheckbox>
+                        </jnpf-form-tip-item>
+                    </el-col>
+                    <!-- 表单结束 -->
                 </template>
-        <template slot-scope="scope">
-        <JnpfPopupSelect   v-model="scope.row.commodityName" @change="changeData('contractlcommodity-commodityName',scope.$index)" 
- :rowIndex="scope.$index"  :formData="dataForm"  :templateJson="interfaceRes.contractlcommoditycommodityName"  placeholder="请选择"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-commodityName')"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='fullName'  :field="'commodityName'+scope.$index"  interfaceId="523160915206474309"  :pageSize="20"  :columnOptions="contractlcommoditycommodityNamecolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="商品编码"  v-if="judgeShow('contractlcommodity-commodityCode')"   prop="commodityCode" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-commodityCode')" >*</span>商品编码
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.commodityCode" @change="changeData('contractlcommodity-commodityCode',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-commodityCode')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="商品规格"  v-if="judgeShow('contractlcommodity-specifications')"   prop="specifications" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-specifications')" >*</span>商品规格
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.specifications" @change="changeData('contractlcommodity-specifications',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-specifications')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="库存单位"  v-if="judgeShow('contractlcommodity-inventoryUnit')"   prop="inventoryUnit" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-inventoryUnit')" >*</span>库存单位
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.inventoryUnit" @change="changeData('contractlcommodity-inventoryUnit',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-inventoryUnit')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="采购单位"  v-if="judgeShow('contractlcommodity-procureUnit')"   prop="procureUnit" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-procureUnit')" >*</span>采购单位
-                </template>
-        <template slot-scope="scope">
-        <JnpfSelect   v-model="scope.row.procureUnit" @change="changeData('contractlcommodity-procureUnit',scope.$index)" 
- placeholder="请选择"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-procureUnit')"  clearable  :style='{"width":"100%"}' :options="contractlcommodityprocureUnitOptions" :props="contractlcommodityprocureUnitProps" >
-    </JnpfSelect>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="数量"  v-if="judgeShow('contractlcommodity-number')"   prop="number" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-number')" >*</span>数量
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.number" @change="changeData('contractlcommodity-number',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-number')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="税率"  v-if="judgeShow('contractlcommodity-taxRate')"   prop="taxRate" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-taxRate')" >*</span>税率
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.taxRate" @change="changeData('contractlcommodity-taxRate',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-taxRate')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="含税单价"  v-if="judgeShow('contractlcommodity-priceRate')"   prop="priceRate" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-priceRate')" >*</span>含税单价
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.priceRate" @change="changeData('contractlcommodity-priceRate',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-priceRate')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="含税总金额"  v-if="judgeShow('contractlcommodity-totalRate')"   prop="totalRate" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlcommodityList-totalRate')" >*</span>含税总金额
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.totalRate" @change="changeData('contractlcommodity-totalRate',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlcommodityList')||judgeWrite('contractlcommodityList-totalRate')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-                        <el-table-column label="操作" width="50"   v-if="!judgeWrite('contractlcommodityList')">
-                            <template slot-scope="scope">
-                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcontractlcommodityList(scope.$index)">删除</el-button>
-                            </template>
-                        </el-table-column>
-                </el-table>
-                    <div class="table-actions" @click="addcontractlcommodityList()"  v-if="!judgeWrite('contractlcommodityList')">
-                        <el-button type="text" icon="el-icon-plus">添加</el-button>
-                    </div>
-            </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="费用条款">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="24"   v-if="judgeShow('contractlcommodity-${html.relationField}')" >
-            <jnpf-form-tip-item label-width="0">
-                <el-table :data="dataForm.contractlfeeclauseList" size='mini' >
-                    <el-table-column type="index" width="50" label="序号" align="center" />
-        <el-table-column
- label="费用类型"  v-if="judgeShow('contractlfeeclause-feeType')"   prop="feeType" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlfeeclauseList-feeType')" >*</span>费用类型
-                </template>
-        <template slot-scope="scope">
-        <JnpfSelect   v-model="scope.row.feeType" @change="changeData('contractlfeeclause-feeType',scope.$index)" 
- placeholder="请选择"  :disabled="judgeWrite('contractlfeeclauseList')||judgeWrite('contractlfeeclauseList-feeType')"  clearable  :style='{"width":"100%"}' filterable  :options="contractlfeeclausefeeTypeOptions" :props="contractlfeeclausefeeTypeProps" >
-    </JnpfSelect>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="金额"  v-if="judgeShow('contractlfeeclause-price')"   prop="price" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlfeeclauseList-price')" >*</span>金额
-                </template>
-        <template slot-scope="scope">
-        <JnpfInputNumber   v-model="scope.row.price" @change="changeData('contractlfeeclause-price',scope.$index)" 
- placeholder="数字文本"  :disabled="judgeWrite('contractlfeeclauseList')||judgeWrite('contractlfeeclauseList-price')"  :precision="1"  addonAfter="元"  :step="1" >
-    </JnpfInputNumber>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="备注"  v-if="judgeShow('contractlfeeclause-remark')"   prop="remark" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlfeeclauseList-remark')" >*</span>备注
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.remark" @change="changeData('contractlfeeclause-remark',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlfeeclauseList')||judgeWrite('contractlfeeclauseList-remark')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-                        <el-table-column label="操作" width="50"   v-if="!judgeWrite('contractlfeeclauseList')">
-                            <template slot-scope="scope">
-                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcontractlfeeclauseList(scope.$index)">删除</el-button>
-                            </template>
-                        </el-table-column>
-                </el-table>
-                    <div class="table-actions" @click="addcontractlfeeclauseList()"  v-if="!judgeWrite('contractlfeeclauseList')">
-                        <el-button type="text" icon="el-icon-plus">添加</el-button>
-                    </div>
-            </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="付款节点">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="24"   v-if="judgeShow('contractlfeeclause-${html.relationField}')" >
-            <jnpf-form-tip-item label-width="0">
-                <el-table :data="dataForm.contractlpaymentList" size='mini' >
-                    <el-table-column type="index" width="50" label="序号" align="center" />
-        <el-table-column
- label="收付款节点"  v-if="judgeShow('contractlpayment-paymentNode')"   prop="paymentNode" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlpaymentList-paymentNode')" >*</span>收付款节点
-                </template>
-        <template slot-scope="scope">
-        <JnpfSelect   v-model="scope.row.paymentNode" @change="changeData('contractlpayment-paymentNode',scope.$index)" 
- placeholder="请选择"  :disabled="judgeWrite('contractlpaymentList')||judgeWrite('contractlpaymentList-paymentNode')"  clearable  :style='{"width":"100%"}' :options="contractlpaymentpaymentNodeOptions" :props="contractlpaymentpaymentNodeProps" >
-    </JnpfSelect>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="收付款方式"  v-if="judgeShow('contractlpayment-paymentMethod')"   prop="paymentMethod" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlpaymentList-paymentMethod')" >*</span>收付款方式
-                </template>
-        <template slot-scope="scope">
-        <JnpfSelect   v-model="scope.row.paymentMethod" @change="changeData('contractlpayment-paymentMethod',scope.$index)" 
- placeholder="请选择"  :disabled="judgeWrite('contractlpaymentList')||judgeWrite('contractlpaymentList-paymentMethod')"  clearable  :style='{"width":"100%"}' :options="contractlpaymentpaymentMethodOptions" :props="contractlpaymentpaymentMethodProps" >
-    </JnpfSelect>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="付款比例"  v-if="judgeShow('contractlpayment-paymentRatio')"   prop="paymentRatio" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlpaymentList-paymentRatio')" >*</span>付款比例
-                </template>
-        <template slot-scope="scope">
-        <JnpfInputNumber   v-model="scope.row.paymentRatio" @change="changeData('contractlpayment-paymentRatio',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlpaymentList')||judgeWrite('contractlpaymentList-paymentRatio')"  :precision="1"  addonAfter="%"  :step="1" >
-    </JnpfInputNumber>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="金额"  v-if="judgeShow('contractlpayment-price')"   prop="price" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlpaymentList-price')" >*</span>金额
-                </template>
-        <template slot-scope="scope">
-        <JnpfInputNumber   v-model="scope.row.price" @change="changeData('contractlpayment-price',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlpaymentList')||judgeWrite('contractlpaymentList-price')"  :precision="1"  addonAfter="元"  :step="1" >
-    </JnpfInputNumber>
-            </template>
-    </el-table-column>
-        <el-table-column
- label="备注"  v-if="judgeShow('contractlpayment-remark')"   prop="remark" >
-                <template slot="header" >
-                    <span class="required-sign"   v-if="judgeRequired('contractlpaymentList-remark')" >*</span>备注
-                </template>
-        <template slot-scope="scope">
-        <JnpfInput   v-model="scope.row.remark" @change="changeData('contractlpayment-remark',scope.$index)" 
- placeholder="请输入"  :disabled="judgeWrite('contractlpaymentList')||judgeWrite('contractlpaymentList-remark')"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-            </template>
-    </el-table-column>
-                        <el-table-column label="操作" width="50"   v-if="!judgeWrite('contractlpaymentList')">
-                            <template slot-scope="scope">
-                                <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcontractlpaymentList(scope.$index)">删除</el-button>
-                            </template>
-                        </el-table-column>
-                </el-table>
-                    <div class="table-actions" @click="addcontractlpaymentList()"  v-if="!judgeWrite('contractlpaymentList')">
-                        <el-button type="text" icon="el-icon-plus">添加</el-button>
-                    </div>
-            </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="其他信息">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="24"  v-if="judgeShow('contractRequirement')" >
-        <jnpf-form-tip-item
- label="合同要求"  v-if="judgeShow('contractRequirement')"   prop="contractRequirement" >
-        <JnpfTextarea   v-model="dataForm.contractRequirement" @change="changeData('contractRequirement',-1)" 
- placeholder="请输入"  :disabled="judgeWrite('contractRequirement')"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
-    </JnpfTextarea>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24"  v-if="judgeShow('remark')" >
-        <jnpf-form-tip-item
- label="备注"  v-if="judgeShow('remark')"  label-width="0px"  prop="remark" >
-        <JnpfTextarea   v-model="dataForm.remark" @change="changeData('remark',-1)" 
- placeholder="请输入"  :disabled="judgeWrite('remark')"  :style='{"width":"100%"}' true  type="textarea"  :autosize='{"minRows":4,"maxRows":4}' >
-    </JnpfTextarea>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="附件信息">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="8"  v-if="judgeShow('contractAppendices')" >
-        <jnpf-form-tip-item
- label="合同附件"  v-if="judgeShow('contractAppendices')"   prop="contractAppendices" >
-        <JnpfUploadFile   v-model="dataForm.contractAppendices" @change="changeData('contractAppendices',-1)" 
- :disabled="judgeWrite('contractAppendices')"  tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB"  :fileSize="20" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  buttonText="点击上传" >
-    </JnpfUploadFile>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('ancillaryDocuments')" >
-        <jnpf-form-tip-item
- label="附属文件"  v-if="judgeShow('ancillaryDocuments')"   prop="ancillaryDocuments" >
-        <JnpfUploadFile   v-model="dataForm.ancillaryDocuments" @change="changeData('ancillaryDocuments',-1)" 
- :disabled="judgeWrite('ancillaryDocuments')"  tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB"  :fileSize="20" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  buttonText="点击上传" >
-    </JnpfUploadFile>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="8"  v-if="judgeShow('transactionAppendices')" >
-        <jnpf-form-tip-item
- label="关联交易合同（二级）"  v-if="judgeShow('transactionAppendices')"   prop="transactionAppendices" >
-        <JnpfUploadFile   v-model="dataForm.transactionAppendices" @change="changeData('transactionAppendices',-1)" 
- :disabled="judgeWrite('transactionAppendices')"  tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB"  :fileSize="20" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  buttonText="点击上传" >
-    </JnpfUploadFile>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24"  v-if="judgeShow('transactionAppendices2')" >
-        <jnpf-form-tip-item
- label="关联交易合同（三级）"  v-if="judgeShow('transactionAppendices2')"   prop="transactionAppendices2" >
-        <JnpfUploadFile   v-model="dataForm.transactionAppendices2" @change="changeData('transactionAppendices2',-1)" 
- :disabled="judgeWrite('transactionAppendices2')"  tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB"  :fileSize="20" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0"  buttonText="点击上传" >
-    </JnpfUploadFile>
-    </jnpf-form-tip-item>
-        </el-col>
-            <el-col :span="24" >
-                <jnpf-form-tip-item>
-                    <JnpfText 
- :textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}' content="合同标签">
-                </JnpfText>
-                </jnpf-form-tip-item>
-            </el-col>
-        <el-col :span="24"  v-if="judgeShow('contractLabel')" >
-        <jnpf-form-tip-item
- label="合同标签"  v-if="judgeShow('contractLabel')"   prop="contractLabel" >
-        <JnpfCheckbox   v-model="dataForm.contractLabel" @change="changeData('contractLabel',-1)" 
- :disabled="judgeWrite('contractLabel')"  optionType="default"  direction="horizontal"  size="small"  :options="contractLabelOptions" :props="contractLabelProps" >
-    </JnpfCheckbox>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-form>
-    </el-row>
-    <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
+                <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+                    @select="addForSelect" @close="selectDialogVisible = false" />
+            </el-form>
+        </el-row>
+        <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
     </div>
-    </template>
+</template>
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import {getFormById} from '@/api/workFlow/FormDesign'
-    import comMixin from '@/views/workFlow/workFlowForm/mixin';
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        mixins: [comMixin],
-        components: { },
-        props: [],
-        data() {
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getFormById } from '@/api/workFlow/FormDesign'
+import comMixin from '@/views/workFlow/workFlowForm/mixin';
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    mixins: [comMixin],
+    components: {},
+    props: [],
+    data() {
         return {
             dataFormSubmitType: 0,
             continueBtnLoading: false,
@@ -587,651 +717,651 @@
             loading: false,
             btnLoading: false,
             formRef: 'formRef',
-            setting:{},
+            setting: {},
             eventType: '',
-            userBoxVisible:false,
+            userBoxVisible: false,
             selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
-                            contractlcommodityList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
-                            contractlfeeclauseList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
-                            contractlpaymentList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"},
+            currTableConf: {},
+            dataValueAll: {},
+            addTableConf: {
+                contractLCommodityList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
+                contractLFeeClauseList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
+                contractLPaymentList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
             },
             //可选范围默认值
-            ableAll:{
-            },
-        tableRows:{
-                    contractlcommodityList:{
-                            commodityName : '',
-                                commodityNameOptions:[],
-                            commodityCode : '',
-                                commodityCodeOptions:[],
-                            specifications : '',
-                                specificationsOptions:[],
-                            inventoryUnit : '',
-                                inventoryUnitOptions:[],
-                                procureUnitOptions:[],
-                            number : '',
-                                numberOptions:[],
-                            taxRate : '',
-                                taxRateOptions:[],
-                            priceRate : '',
-                                priceRateOptions:[],
-                            totalRate : '',
-                                totalRateOptions:[],
-                    enabledmark:undefined
+            ableAll: {
             },
-                    contractlfeeclauseList:{
-                                feeTypeOptions:[],
-                            price : undefined,
-                                priceOptions:[],
-                            remark : '',
-                                remarkOptions:[],
-                    enabledmark:undefined
-            },
-                    contractlpaymentList:{
-                                paymentNodeOptions:[],
-                                paymentMethodOptions:[],
-                            paymentRatio : undefined,
-                                paymentRatioOptions:[],
-                            price : undefined,
-                                priceOptions:[],
-                            remark : '',
-                                remarkOptions:[],
-                    enabledmark:undefined
+            tableRows: {
+                contractLCommodityList: {
+                    commodityName: '',
+                    commodityNameOptions: [],
+                    commodityCode: '',
+                    commodityCodeOptions: [],
+                    specifications: '',
+                    specificationsOptions: [],
+                    inventoryUnit: '',
+                    inventoryUnitOptions: [],
+                    procureUnitOptions: [],
+                    number: '',
+                    numberOptions: [],
+                    taxRate: '',
+                    taxRateOptions: [],
+                    priceRate: '',
+                    priceRateOptions: [],
+                    totalRate: '',
+                    totalRateOptions: [],
+                    enabledmark: undefined
+                },
+                contractLFeeClauseList: {
+                    feeTypeOptions: [],
+                    price: undefined,
+                    priceOptions: [],
+                    remark: '',
+                    remarkOptions: [],
+                    enabledmark: undefined
+                },
+                contractLPaymentList: {
+                    paymentNodeOptions: [],
+                    paymentMethodOptions: [],
+                    paymentRatio: undefined,
+                    paymentRatioOptions: [],
+                    price: undefined,
+                    priceOptions: [],
+                    remark: '',
+                    remarkOptions: [],
+                    enabledmark: undefined
+                },
             },
-        },
-            Vmodel:"",
-            currVmodel:"",
+            Vmodel: "",
+            currVmodel: "",
             dataForm: {
-                                    contractType : "1",
-                                    contractTemplateId : undefined,
-                                contractNumber : undefined,
-                                contractName : undefined,
-                                contractNo : undefined,
-                                contractSignedTime : undefined,
-                                    businessId : undefined,
-                                contractPeriodTime : undefined,
-                                contractPeriodTimeEnd : undefined,
-                                    deptId : [],
-                                    subject : "522407918746741061",
-                                    procurementModel : undefined,
-                                    relatedContractId : undefined,
-                                    subject2 : undefined,
-                                    subject3 : undefined,
-                                    deliveryModel : undefined,
-                                deliveryLocation : undefined,
-                                    modeTransport : undefined,
-                                    costBearingMian : undefined,
-                                    pricingModel : undefined,
-                                contractRequirement : undefined,
-                                remark : undefined,
-                                    contractAppendices : [],
-                                    ancillaryDocuments : [],
-                                    transactionAppendices : [],
-                                    transactionAppendices2 : [],
-                                    contractLabel : [],
-                        contractlcommodityList:[],
-                        contractlfeeclauseList:[],
-                        contractlpaymentList:[],
-                    version: 0,
+                contractType: "1",
+                contractTemplateId: undefined,
+                contractNumber: undefined,
+                contractName: undefined,
+                contractNo: undefined,
+                contractSignedTime: undefined,
+                businessId: undefined,
+                contractPeriodTime: undefined,
+                contractPeriodTimeEnd: undefined,
+                deptId: [],
+                subject: "522407918746741061",
+                procurementModel: undefined,
+                relatedContractId: undefined,
+                subject2: undefined,
+                subject3: undefined,
+                deliveryModel: undefined,
+                deliveryLocation: undefined,
+                modeTransport: undefined,
+                costBearingMian: undefined,
+                pricingModel: undefined,
+                contractRequirement: undefined,
+                remark: undefined,
+                contractAppendices: [],
+                ancillaryDocuments: [],
+                transactionAppendices: [],
+                transactionAppendices2: [],
+                contractLabel: [],
+                contractLCommodityList: [],
+                contractLFeeClauseList: [],
+                contractLPaymentList: [],
+                version: 0,
             },
             tableRequiredData: {},
             dataRule:
             {
-                            contractName: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            contractPeriodTime: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            contractPeriodTimeEnd: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            procurementModel: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            relatedContractId: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            deliveryModel: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            deliveryLocation: [
-                                {
-                                    required: true,
-                                    message: '请输入',
-                                    trigger: 'blur'
-                                },
-                        ],
-                            modeTransport: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            costBearingMian: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
-                            pricingModel: [
-                                {
-                                    required: true,
-                                    message: '请选择',
-                                    trigger: 'change'
-                                },
-                        ],
+                contractName: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                contractPeriodTime: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                contractPeriodTimeEnd: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                procurementModel: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                relatedContractId: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                deliveryModel: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                deliveryLocation: [
+                    {
+                        required: true,
+                        message: '请输入',
+                        trigger: 'blur'
+                    },
+                ],
+                modeTransport: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                costBearingMian: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                pricingModel: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
             },
-                    contractTypeOptions:[],
-                            contractTypeProps:{"label":"fullName","value":"enCode"  },
-                    contractTemplateIdcolumnOptions:[ {"label":"合同模板","value":"name"}, {"label":"合同类型","value":"type"}, {"label":"状态","value":"status"},],
-                    businessIdcolumnOptions:[ {"label":"名称","value":"name"},],
-                    subjectcolumnOptions:[ {"label":"类型","value":"subject_basic_type"}, {"label":"级别","value":"calssify"}, {"label":"主体名称","value":"name"}, {"label":"社会统一信息代码","value":"information_code"}, {"label":"付款方式","value":"payment_method"}, {"label":"合作方式","value":"collaboration_method"}, {"label":"结算方式","value":"settlement_method"}, {"label":"预付比例","value":"advance_ratio"}, {"label":"账期","value":"account_period"}, {"label":"压款方式","value":"underpayment_method"}, {"label":"保证金方式","value":"margin_method"}, {"label":"逾期利率","value":"overdue_interest_rate"},],
-                    procurementModelOptions:[],
-                            procurementModelProps:{"label":"fullName","value":"enCode"  },
-                    relatedContractIdcolumnOptions:[ {"label":"销售合同","value":"contract_name"},],
-                    subject2columnOptions:[ {"label":"类型","value":"subject_basic_type"}, {"label":"级别","value":"calssify"}, {"label":"主体名称","value":"name"},],
-                    subject3columnOptions:[ {"label":"类型","value":"subject_basic_type"}, {"label":"级别","value":"calssify"}, {"label":"主体名称","value":"name"},],
-                    deliveryModelOptions:[],
-                            deliveryModelProps:{"label":"fullName","value":"enCode"  },
-                    modeTransportOptions:[],
-                            modeTransportProps:{"label":"fullName","value":"enCode"  },
-                    costBearingMianOptions:[],
-                            costBearingMianProps:{"label":"fullName","value":"enCode"  },
-                    pricingModelOptions:[],
-                            pricingModelProps:{"label":"fullName","value":"enCode"  },
-                    contractLabelOptions:[],
-                            contractLabelProps:{"label":"fullName","value":"enCode"  },
-                        contractlcommoditycommodityNamecolumnOptions:[],
-                                contractlcommodityprocureUnitOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
-                                contractlcommodityprocureUnitProps:{"label":"fullName","value":"id"  },
-                        contractlfeeclausefeeTypeOptions:[],
-                                contractlfeeclausefeeTypeProps:{"label":"fullName","value":"enCode"  },
-                        contractlpaymentpaymentNodeOptions:[],
-                                contractlpaymentpaymentNodeProps:{"label":"fullName","value":"enCode"  },
-                        contractlpaymentpaymentMethodOptions:[],
-                                contractlpaymentpaymentMethodProps:{"label":"fullName","value":"enCode"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        contractType:[] ,
-                        contractTemplateId:[] ,
-                        contractNumber:[] ,
-                        contractName:[] ,
-                        contractNo:[] ,
-                        contractSignedTime:[] ,
-                        businessId:[] ,
-                        contractPeriodTime:[] ,
-                        contractPeriodTimeEnd:[] ,
-                        deptId:[] ,
-                        subject:[] ,
-                        procurementModel:[] ,
-                        relatedContractId:[] ,
-                        subject2:[] ,
-                        subject3:[] ,
-                        deliveryModel:[] ,
-                        deliveryLocation:[] ,
-                        modeTransport:[] ,
-                        costBearingMian:[] ,
-                        pricingModel:[] ,
-                        contractRequirement:[] ,
-                        remark:[] ,
-                        contractAppendices:[] ,
-                        ancillaryDocuments:[] ,
-                        transactionAppendices:[] ,
-                        transactionAppendices2:[] ,
-                        contractLabel:[] ,
-                            contractlcommoditycommodityName:[{"fieldName":"","field":"contractId","defaultValue":"","dataType":"varchar","id":"spNokw1","required":"0"}] ,
-                            contractlcommoditycommodityCode: [] ,
-                            contractlcommodityspecifications: [] ,
-                            contractlcommodityinventoryUnit: [] ,
-                            contractlcommodityprocureUnit: [] ,
-                            contractlcommoditynumber: [] ,
-                            contractlcommoditytaxRate: [] ,
-                            contractlcommoditypriceRate: [] ,
-                            contractlcommoditytotalRate: [] ,
-                            contractlfeeclausefeeType: [] ,
-                            contractlfeeclauseprice: [] ,
-                            contractlfeeclauseremark: [] ,
-                            contractlpaymentpaymentNode: [] ,
-                            contractlpaymentpaymentMethod: [] ,
-                            contractlpaymentpaymentRatio: [] ,
-                            contractlpaymentprice: [] ,
-                            contractlpaymentremark: [] ,
+            contractTypeOptions: [],
+            contractTypeProps: { "label": "fullName", "value": "enCode" },
+            contractTemplateIdcolumnOptions: [{ "label": "合同模板", "value": "name" }, { "label": "合同类型", "value": "type" }, { "label": "状态", "value": "status" },],
+            businessIdcolumnOptions: [{ "label": "名称", "value": "name" },],
+            subjectcolumnOptions: [{ "label": "类型", "value": "subject_basic_type" }, { "label": "级别", "value": "calssify" }, { "label": "主体名称", "value": "name" }, { "label": "社会统一信息代码", "value": "information_code" }, { "label": "付款方式", "value": "payment_method" }, { "label": "合作方式", "value": "collaboration_method" }, { "label": "结算方式", "value": "settlement_method" }, { "label": "预付比例", "value": "advance_ratio" }, { "label": "账期", "value": "account_period" }, { "label": "压款方式", "value": "underpayment_method" }, { "label": "保证金方式", "value": "margin_method" }, { "label": "逾期利率", "value": "overdue_interest_rate" },],
+            procurementModelOptions: [],
+            procurementModelProps: { "label": "fullName", "value": "enCode" },
+            relatedContractIdcolumnOptions: [{ "label": "销售合同", "value": "contract_name" },],
+            subject2columnOptions: [{ "label": "类型", "value": "subject_basic_type" }, { "label": "级别", "value": "calssify" }, { "label": "主体名称", "value": "name" },],
+            subject3columnOptions: [{ "label": "类型", "value": "subject_basic_type" }, { "label": "级别", "value": "calssify" }, { "label": "主体名称", "value": "name" },],
+            deliveryModelOptions: [],
+            deliveryModelProps: { "label": "fullName", "value": "enCode" },
+            modeTransportOptions: [],
+            modeTransportProps: { "label": "fullName", "value": "enCode" },
+            costBearingMianOptions: [],
+            costBearingMianProps: { "label": "fullName", "value": "enCode" },
+            pricingModelOptions: [],
+            pricingModelProps: { "label": "fullName", "value": "enCode" },
+            contractLabelOptions: [],
+            contractLabelProps: { "label": "fullName", "value": "enCode" },
+            contractlcommoditycommodityNamecolumnOptions: [],
+            contractlcommodityprocureUnitOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
+            contractlcommodityprocureUnitProps: { "label": "fullName", "value": "id" },
+            contractlfeeclausefeeTypeOptions: [],
+            contractlfeeclausefeeTypeProps: { "label": "fullName", "value": "enCode" },
+            contractlpaymentpaymentNodeOptions: [],
+            contractlpaymentpaymentNodeProps: { "label": "fullName", "value": "enCode" },
+            contractlpaymentpaymentMethodOptions: [],
+            contractlpaymentpaymentMethodProps: { "label": "fullName", "value": "enCode" },
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                contractType: [],
+                contractTemplateId: [],
+                contractNumber: [],
+                contractName: [],
+                contractNo: [],
+                contractSignedTime: [],
+                businessId: [],
+                contractPeriodTime: [],
+                contractPeriodTimeEnd: [],
+                deptId: [],
+                subject: [],
+                procurementModel: [],
+                relatedContractId: [],
+                subject2: [],
+                subject3: [],
+                deliveryModel: [],
+                deliveryLocation: [],
+                modeTransport: [],
+                costBearingMian: [],
+                pricingModel: [],
+                contractRequirement: [],
+                remark: [],
+                contractAppendices: [],
+                ancillaryDocuments: [],
+                transactionAppendices: [],
+                transactionAppendices2: [],
+                contractLabel: [],
+                contractlcommoditycommodityName: [{ "fieldName": "", "field": "contractId", "defaultValue": "", "dataType": "varchar", "id": "spNokw1", "required": "0" }],
+                contractlcommoditycommodityCode: [],
+                contractlcommodityspecifications: [],
+                contractlcommodityinventoryUnit: [],
+                contractlcommodityprocureUnit: [],
+                contractlcommoditynumber: [],
+                contractlcommoditytaxRate: [],
+                contractlcommoditypriceRate: [],
+                contractlcommoditytotalRate: [],
+                contractlfeeclausefeeType: [],
+                contractlfeeclauseprice: [],
+                contractlfeeclauseremark: [],
+                contractlpaymentpaymentNode: [],
+                contractlpaymentpaymentMethod: [],
+                contractlpaymentpaymentRatio: [],
+                contractlpaymentprice: [],
+                contractlpaymentremark: [],
             },
         }
-        },
-        computed: {
-            formOperates() {
-                return this.setting.formOperates
-            }
-        },
-        watch: {},
-        created() {
-            this.getFormById()
-            if(this.dataForm.id == null || this.dataForm.id == '' && this.dataForm.id == undefined || this.dataForm.id == 0) {
-                this.initDefaultData()
+    },
+    computed: {
+        formOperates() {
+            return this.setting.formOperates
+        }
+    },
+    watch: {},
+    created() {
+        this.getFormById()
+        if (this.dataForm.id == null || this.dataForm.id == '' && this.dataForm.id == undefined || this.dataForm.id == 0) {
+            this.initDefaultData()
+        }
+        this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+    },
+    mounted() { },
+    methods: {
+        changeData(model, index) {
+            this.isEdit = false
+            this.childIndex = index
+            let modelAll = model.split("-");
+            let faceMode = "";
+            for (let i = 0; i < modelAll.length; i++) {
+                faceMode += modelAll[i];
             }
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-        },
-        mounted() {},
-        methods: {
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
+            for (let key in this.interfaceRes) {
+                if (key != faceMode) {
+                    let faceReList = this.interfaceRes[key]
+                    for (let i = 0; i < faceReList.length; i++) {
+                        if (faceReList[i].relationField == model) {
+                            let options = 'get' + key + 'Options';
+                            if (this[options]) {
+                                this[options]()
                             }
+                            this.changeData(key, index)
                         }
                     }
                 }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
+            }
+        },
+        changeDataFormData(type, data, model, index, defaultValue) {
+            if (!this.isEdit) {
+                if (type == 2) {
+                    for (let i = 0; i < this.dataForm[data].length; i++) {
+                        if (index == -1) {
+                            this.dataForm[data][i][model] = defaultValue
+                        } else if (index == i) {
+                            this.dataForm[data][i][model] = defaultValue
                         }
-                    } else {
-                        this.dataForm[data] = defaultValue
                     }
+                } else {
+                    this.dataForm[data] = defaultValue
                 }
-            },
-            dataAll(){
-                        this.getcontractTypeOptions();
-                        this.getprocurementModelOptions();
-                        this.getdeliveryModelOptions();
-                        this.getmodeTransportOptions();
-                        this.getcostBearingMianOptions();
-                        this.getpricingModelOptions();
-                        this.getcontractLabelOptions();
-                            this.getcontractlfeeclausefeeTypeOptions();
-                            this.getcontractlpaymentpaymentNodeOptions();
-                            this.getcontractlpaymentpaymentMethodOptions();
-            },
-            selfGetInfo(dataForm) {
-                this.dataInfo(dataForm)
-            },
-            beforeSubmit(){
-                const _data =this.dataList()
-                return _data
-            },
-            selfInit() {
-                this.dataAll()
-            },
-            getFormById() {
-                getFormById("528841438817943557").then(res => {
-                    this.dataForm.flowId = res.data&&res.data.flowId
-                    // this.encode = res.data&&res.data.encode
-                })
-            },
-            exist() {
-                let isOk = true
-                for (let key in this.tableRequiredData) {
-                    if (this.dataForm[key] && Array.isArray(this.dataForm[key])) {
-                        for (let i = 0; i < this.dataForm[key].length; i++) {
-                            let item = this.dataForm[key][i]
-                            inner: for (let id in item) {
-                                let arr = this.tableRequiredData[key].filter(o => o.id === id) || []
-                                if (!arr.length) continue inner
-                                if (arr[0].required) {
-                                    let msg = `${arr[0].name}不能为空`
-                                    let boo = true
-                                    if (arr[0].dataType === 'array') {
-                                        boo = !this.jnpf.isEmptyArray(item[id])
-                                    } else {
-                                        boo = !this.jnpf.isEmpty(item[id])
-                                    }
-                                    if (!boo) {
-                                        this.$message({
-                                            message: msg,
-                                            type: 'error',
-                                            duration: 1000
-                                        })
-                                        isOk = false
-                                        break
-                                    }
+            }
+        },
+        dataAll() {
+            this.getcontractTypeOptions();
+            this.getprocurementModelOptions();
+            this.getdeliveryModelOptions();
+            this.getmodeTransportOptions();
+            this.getcostBearingMianOptions();
+            this.getpricingModelOptions();
+            this.getcontractLabelOptions();
+            this.getcontractlfeeclausefeeTypeOptions();
+            this.getcontractlpaymentpaymentNodeOptions();
+            this.getcontractlpaymentpaymentMethodOptions();
+        },
+        selfGetInfo(dataForm) {
+            this.dataInfo(dataForm)
+        },
+        beforeSubmit() {
+            const _data = this.dataList()
+            return _data
+        },
+        selfInit() {
+            this.dataAll()
+        },
+        getFormById() {
+            getFormById("528841438817943557").then(res => {
+                this.dataForm.flowId = res.data && res.data.flowId
+                // this.encode = res.data&&res.data.encode
+            })
+        },
+        exist() {
+            let isOk = true
+            for (let key in this.tableRequiredData) {
+                if (this.dataForm[key] && Array.isArray(this.dataForm[key])) {
+                    for (let i = 0; i < this.dataForm[key].length; i++) {
+                        let item = this.dataForm[key][i]
+                        inner: for (let id in item) {
+                            let arr = this.tableRequiredData[key].filter(o => o.id === id) || []
+                            if (!arr.length) continue inner
+                            if (arr[0].required) {
+                                let msg = `${arr[0].name}不能为空`
+                                let boo = true
+                                if (arr[0].dataType === 'array') {
+                                    boo = !this.jnpf.isEmptyArray(item[id])
+                                } else {
+                                    boo = !this.jnpf.isEmpty(item[id])
+                                }
+                                if (!boo) {
+                                    this.$message({
+                                        message: msg,
+                                        type: 'error',
+                                        duration: 1000
+                                    })
+                                    isOk = false
+                                    break
                                 }
                             }
                         }
                     }
                 }
-                    if (!this.contractlcommodityExist()) return
-                    if (!this.contractlfeeclauseExist()) return
-                    if (!this.contractlpaymentExist()) return
-                    return isOk
-                },
-                contractlcommodityExist() {
-                let isOk = true;
-            for(let i=0;i<this.dataForm.contractlcommodityList.length;i++){
-                const e = this.dataForm.contractlcommodityList[i];
             }
-                return isOk;
-            },
-                contractlfeeclauseExist() {
-                let isOk = true;
-            for(let i=0;i<this.dataForm.contractlfeeclauseList.length;i++){
-                const e = this.dataForm.contractlfeeclauseList[i];
-                            if (!e.feeType) {
-                        this.$message({
-                            message: '费用类型不能为空',
-                            type: 'error',
-                            duration: 1000
-                        });
-                        isOk = false
-                        break
-                        }
-                        if (!e.price) {
-                        this.$message({
-                            message: '金额不能为空',
-                            type: 'error',
-                            duration: 1000
-                        });
-                        isOk = false
-                        break
-                        }
+            if (!this.contractlcommodityExist()) return
+            if (!this.contractlfeeclauseExist()) return
+            if (!this.contractlpaymentExist()) return
+            return isOk
+        },
+        contractlcommodityExist() {
+            let isOk = true;
+            for (let i = 0; i < this.dataForm.contractLCommodityList.length; i++) {
+                const e = this.dataForm.contractLCommodityList[i];
             }
-                return isOk;
-            },
-                contractlpaymentExist() {
-                let isOk = true;
-            for(let i=0;i<this.dataForm.contractlpaymentList.length;i++){
-                const e = this.dataForm.contractlpaymentList[i];
+            return isOk;
+        },
+        contractlfeeclauseExist() {
+            let isOk = true;
+            for (let i = 0; i < this.dataForm.contractLFeeClauseList.length; i++) {
+                const e = this.dataForm.contractLFeeClauseList[i];
+                if (!e.feeType) {
+                    this.$message({
+                        message: '费用类型不能为空',
+                        type: 'error',
+                        duration: 1000
+                    });
+                    isOk = false
+                    break
+                }
+                if (!e.price) {
+                    this.$message({
+                        message: '金额不能为空',
+                        type: 'error',
+                        duration: 1000
+                    });
+                    isOk = false
+                    break
+                }
             }
-                return isOk;
-            },
-                    getcontractTypeOptions() {
-                    getDictionaryDataSelector('519483543638772229').then(res => {
-                        this.contractTypeOptions = res.data.list
-                    })
-                },
-                    getprocurementModelOptions() {
-                    getDictionaryDataSelector('528908998779338757').then(res => {
-                        this.procurementModelOptions = res.data.list
-                    })
-                },
-                    getdeliveryModelOptions() {
-                    getDictionaryDataSelector('528909902031093765').then(res => {
-                        this.deliveryModelOptions = res.data.list
-                    })
-                },
-                    getmodeTransportOptions() {
-                    getDictionaryDataSelector('528911662179155973').then(res => {
-                        this.modeTransportOptions = res.data.list
-                    })
-                },
-                    getcostBearingMianOptions() {
-                    getDictionaryDataSelector('528912119651893253').then(res => {
-                        this.costBearingMianOptions = res.data.list
-                    })
-                },
-                    getpricingModelOptions() {
-                    getDictionaryDataSelector('528918479743483909').then(res => {
-                        this.pricingModelOptions = res.data.list
-                    })
-                },
-                    getcontractLabelOptions() {
-                    getDictionaryDataSelector('529252201021833285').then(res => {
-                        this.contractLabelOptions = res.data.list
-                    })
-                },
-                        getcontractlfeeclausefeeTypeOptions() {
-                        getDictionaryDataSelector('528957381233606661').then(res => {
-                            this.contractlfeeclausefeeTypeOptions = res.data.list
-                        })
-                    },
-                        getcontractlpaymentpaymentNodeOptions() {
-                        getDictionaryDataSelector('529219891287294021').then(res => {
-                            this.contractlpaymentpaymentNodeOptions = res.data.list
-                        })
-                    },
-                        getcontractlpaymentpaymentMethodOptions() {
-                        getDictionaryDataSelector('529220245760507973').then(res => {
-                            this.contractlpaymentpaymentMethodOptions = res.data.list
-                        })
-                    },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            //初始化默认数据
-            initDefaultData() {
-        if(this.userInfo.organizeIdList instanceof Array && this.userInfo.organizeIdList.length > 0) {
+            return isOk;
+        },
+        contractlpaymentExist() {
+            let isOk = true;
+            for (let i = 0; i < this.dataForm.contractLPaymentList.length; i++) {
+                const e = this.dataForm.contractLPaymentList[i];
+            }
+            return isOk;
+        },
+        getcontractTypeOptions() {
+            getDictionaryDataSelector('519483543638772229').then(res => {
+                this.contractTypeOptions = res.data.list
+            })
+        },
+        getprocurementModelOptions() {
+            getDictionaryDataSelector('528908998779338757').then(res => {
+                this.procurementModelOptions = res.data.list
+            })
+        },
+        getdeliveryModelOptions() {
+            getDictionaryDataSelector('528909902031093765').then(res => {
+                this.deliveryModelOptions = res.data.list
+            })
+        },
+        getmodeTransportOptions() {
+            getDictionaryDataSelector('528911662179155973').then(res => {
+                this.modeTransportOptions = res.data.list
+            })
+        },
+        getcostBearingMianOptions() {
+            getDictionaryDataSelector('528912119651893253').then(res => {
+                this.costBearingMianOptions = res.data.list
+            })
+        },
+        getpricingModelOptions() {
+            getDictionaryDataSelector('528918479743483909').then(res => {
+                this.pricingModelOptions = res.data.list
+            })
+        },
+        getcontractLabelOptions() {
+            getDictionaryDataSelector('529252201021833285').then(res => {
+                this.contractLabelOptions = res.data.list
+            })
+        },
+        getcontractlfeeclausefeeTypeOptions() {
+            getDictionaryDataSelector('528957381233606661').then(res => {
+                this.contractlfeeclausefeeTypeOptions = res.data.list
+            })
+        },
+        getcontractlpaymentpaymentNodeOptions() {
+            getDictionaryDataSelector('529219891287294021').then(res => {
+                this.contractlpaymentpaymentNodeOptions = res.data.list
+            })
+        },
+        getcontractlpaymentpaymentMethodOptions() {
+            getDictionaryDataSelector('529220245760507973').then(res => {
+                this.contractlpaymentpaymentMethodOptions = res.data.list
+            })
+        },
+        goBack() {
+            this.$emit('refresh')
+        },
+        clearData() {
+            this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+        },
+        //初始化默认数据
+        initDefaultData() {
+            if (this.userInfo.organizeIdList instanceof Array && this.userInfo.organizeIdList.length > 0) {
                 this.dataForm.deptId = this.userInfo.organizeIdList
-        }
+            }
 
-            },
-                addcontractlcommodityList(){
-                let item = {
-                            commodityName:'',
-                            commodityCode:undefined,
-                            specifications:undefined,
-                            inventoryUnit:undefined,
-                            procureUnit:'',
-                            number:undefined,
-                            taxRate:undefined,
-                            priceRate:undefined,
-                            totalRate:undefined,
+        },
+        addcontractLCommodityList() {
+            let item = {
+                commodityName: '',
+                commodityCode: undefined,
+                specifications: undefined,
+                inventoryUnit: undefined,
+                procureUnit: '',
+                number: undefined,
+                taxRate: undefined,
+                priceRate: undefined,
+                totalRate: undefined,
             }
-                this.getcontractlcommodityList(item)
-            },
-                delcontractlcommodityList(index) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    this.dataForm.contractlcommodityList.splice(index, 1);
-                }).catch(() => {
-                });
-            },
-                getcontractlcommodityList(value){
-                let item={...this.tableRows.contractlcommodityList,...value}
-                this.dataForm.contractlcommodityList.push(item)
-                this.childIndex=this.dataForm.contractlcommodityList.length-1
-                this.isEdit = true
-                this.isEdit = false
-                this.childIndex = -1
-            },
-                addcontractlfeeclauseList(){
-                let item = {
-                            feeType:'',
-                                    feeTypeOptions:[],
-                            price:undefined,
-                            remark:undefined,
+            this.getcontractLCommodityList(item)
+        },
+        delcontractLCommodityList(index) {
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                type: 'warning'
+            }).then(() => {
+                this.dataForm.contractLCommodityList.splice(index, 1);
+            }).catch(() => {
+            });
+        },
+        getcontractLCommodityList(value) {
+            let item = { ...this.tableRows.contractLCommodityList, ...value }
+            this.dataForm.contractLCommodityList.push(item)
+            this.childIndex = this.dataForm.contractLCommodityList.length - 1
+            this.isEdit = true
+            this.isEdit = false
+            this.childIndex = -1
+        },
+        addcontractLFeeClauseList() {
+            let item = {
+                feeType: '',
+                feeTypeOptions: [],
+                price: undefined,
+                remark: undefined,
             }
-                this.getcontractlfeeclauseList(item)
-            },
-                delcontractlfeeclauseList(index) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    this.dataForm.contractlfeeclauseList.splice(index, 1);
-                }).catch(() => {
-                });
-            },
-                getcontractlfeeclauseList(value){
-                let item={...this.tableRows.contractlfeeclauseList,...value}
-                this.dataForm.contractlfeeclauseList.push(item)
-                this.childIndex=this.dataForm.contractlfeeclauseList.length-1
-                this.isEdit = true
-                this.isEdit = false
-                this.childIndex = -1
-            },
-                addcontractlpaymentList(){
-                let item = {
-                            paymentNode:'',
-                                    paymentNodeOptions:[],
-                            paymentMethod:'',
-                                    paymentMethodOptions:[],
-                            paymentRatio:undefined,
-                            price:undefined,
-                            remark:undefined,
+            this.getcontractLFeeClauseList(item)
+        },
+        delcontractLFeeClauseList(index) {
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                type: 'warning'
+            }).then(() => {
+                this.dataForm.contractLFeeClauseList.splice(index, 1);
+            }).catch(() => {
+            });
+        },
+        getcontractLFeeClauseList(value) {
+            let item = { ...this.tableRows.contractLFeeClauseList, ...value }
+            this.dataForm.contractLFeeClauseList.push(item)
+            this.childIndex = this.dataForm.contractLFeeClauseList.length - 1
+            this.isEdit = true
+            this.isEdit = false
+            this.childIndex = -1
+        },
+        addcontractLPaymentList() {
+            let item = {
+                paymentNode: '',
+                paymentNodeOptions: [],
+                paymentMethod: '',
+                paymentMethodOptions: [],
+                paymentRatio: undefined,
+                price: undefined,
+                remark: undefined,
             }
-                this.getcontractlpaymentList(item)
-            },
-                delcontractlpaymentList(index) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    this.dataForm.contractlpaymentList.splice(index, 1);
-                }).catch(() => {
-                });
-            },
-                getcontractlpaymentList(value){
-                let item={...this.tableRows.contractlpaymentList,...value}
-                this.dataForm.contractlpaymentList.push(item)
-                this.childIndex=this.dataForm.contractlpaymentList.length-1
-                this.isEdit = true
-                this.isEdit = false
-                this.childIndex = -1
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
-                this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
-                })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
+            this.getcontractLPaymentList(item)
+        },
+        delcontractLPaymentList(index) {
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                type: 'warning'
+            }).then(() => {
+                this.dataForm.contractLPaymentList.splice(index, 1);
+            }).catch(() => {
+            });
+        },
+        getcontractLPaymentList(value) {
+            let item = { ...this.tableRows.contractLPaymentList, ...value }
+            this.dataForm.contractLPaymentList.push(item)
+            this.childIndex = this.dataForm.contractLPaymentList.length - 1
+            this.isEdit = true
+            this.isEdit = false
+            this.childIndex = -1
+        },
+        openSelectDialog(key) {
+            this.currTableConf = this.addTableConf[key]
+            this.currVmodel = key
+            this.selectDialogVisible = true
+            this.$nextTick(() => {
+                this.$refs.selectDialog.init()
+            })
+        },
+        addForSelect(data) {
+            for (let i = 0; i < data.length; i++) {
+                let t = data[i]
+                if (this['get' + this.currVmodel]) {
+                    this['get' + this.currVmodel](t)
                 }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
+            }
+        },
+        dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+            let timeDataValue = null;
+            let timeValue = Number(timeValueData)
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = new Date().getTime()
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getBeforeData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
                     }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getLaterData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
                     }
                 }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                    for(let i=0;i<_dataAll.contractlcommodityList.length;i++){
-                        this.childIndex = i
-                    }
-                    for(let i=0;i<_dataAll.contractlfeeclauseList.length;i++){
-                        this.childIndex = i
-                    }
-                    for(let i=0;i<_dataAll.contractlpaymentList.length;i++){
-                        this.childIndex = i
+            }
+            return timeDataValue;
+        },
+        time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+            let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+            let timeDataValue = null
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue || '00:00:00'
+                    if (timeDataValue.split(':').length == 3) {
+                        timeDataValue = timeDataValue
+                    } else {
+                        timeDataValue = timeDataValue + ':00'
                     }
-                this.childIndex=-1
-            },
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = this.jnpf.toDate(new Date(), format)
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    previousDate = getBeforeTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    previousDate = getLaterTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
+                }
+            }
+            return timeDataValue;
+        },
+        dataList() {
+            var _data = this.dataForm;
+            return _data;
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+            this.isEdit = true
+            this.dataAll()
+            for (let i = 0; i < _dataAll.contractLCommodityList.length; i++) {
+                this.childIndex = i
+            }
+            for (let i = 0; i < _dataAll.contractLFeeClauseList.length; i++) {
+                this.childIndex = i
+            }
+            for (let i = 0; i < _dataAll.contractLPaymentList.length; i++) {
+                this.childIndex = i
+            }
+            this.childIndex = -1
         },
-    }
+    },
+}
 
 </script>