diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml
index 904ce739..6fbc63ae 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml
@@ -38,6 +38,39 @@
         <result column="input_tax_rate" property="inputTaxRate"/>
         <result column="output_tax_rate" property="outputTaxRate"/>
     </resultMap>
+    <resultMap id="getProductWhListMap" type="jnpf.entity.ProductWarehouseEntity">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="code" property="code"/>
+        <result column="spec" property="spec"/>
+        <result column="inventory_unit_id" property="inventoryUnitId"/>
+        <result column="inventory_unit_name" property="inventoryUnitName"/>
+        <result column="order_main_unit_id" property="orderMainUnitId"/>
+        <result column="order_main_unit_name" property="orderMainUnitName"/>
+        <result column="sales_main_unit_id" property="salesMainUnitId"/>
+        <result column="sales_main_unit_name" property="salesMainUnitName"/>
+        <result column="input_tax_rate" property="inputTaxRate"/>
+        <result column="output_tax_rate" property="outputTaxRate"/>
+    </resultMap>
+
+    <select id="getProductWhList" resultMap="getProductWhListMap">
+        SELECT
+            a.id,
+            a.name,
+            a.code,
+            a.photo,
+            a.spec,
+            a.inventory_unit_id,
+            JgFnUnitName(a.inventory_unit_id) as inventory_unit_name,
+            a.order_main_unit_id, JgFnUnitArrName(a.order_main_unit_id) as order_main_unit_name,
+            a.sales_main_unit_id, JgFnUnitArrName(a.sales_main_unit_id) as sales_main_unit_name,
+            a.input_tax_rate,
+            a.output_tax_rate
+        FROM jg_product a ${ew.customSqlSegment}
+        <if test="productWarehousePagination.sidx != null and productWarehousePagination.sidx != ''">
+            ORDER BY ${productWarehousePagination.sidx} ${productWarehousePagination.sort}
+        </if>
+    </select>
 
     <select id="getProductWarehouseList" resultMap="getProductWarehouseMap">
         SELECT
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ProductWarehouseMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ProductWarehouseMapper.java
index 79672808..694d9577 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ProductWarehouseMapper.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ProductWarehouseMapper.java
@@ -22,6 +22,8 @@ import java.util.List;
  */
 public interface ProductWarehouseMapper extends BaseMapper<ProductWarehouseEntity> {
 
+    IPage<ProductWarehouseEntity> getProductWhList(@Param("page") Page<ProductWarehouseEntity> page, @Param("productWarehousePagination") ProductWarehousePagination productWarehousePagination, @Param("ew") Wrapper<ProductWarehouseEntity> bomQueryWrapper);
+
     IPage<ProductWarehouseEntity> getProductWarehouseList(@Param("page") Page<ProductWarehouseEntity> page, @Param("productWarehousePagination") ProductWarehousePagination productWarehousePagination, @Param("ew") Wrapper<ProductWarehouseEntity> bomQueryWrapper);
 
     //凭证关联商品
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ProductWarehouseService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ProductWarehouseService.java
index 250d3b68..664d9e0e 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ProductWarehouseService.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ProductWarehouseService.java
@@ -42,6 +42,8 @@ public interface ProductWarehouseService extends IService<ProductWarehouseEntity
 
     List<ProductWarehouseEntity> getProductList(ProductWarehousePagination productWarehousePagination);
 
+    List<ProductWarehouseEntity> getProductWhList(ProductWarehousePagination productWarehousePagination);
+
     List<ProductWarehouseEntity> getProductTypeList(ProductWarehousePagination productWarehousePagination,String dataType);
 
     List<ProductWarehouseEntity> getProductByVoucherInfo(String id);
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
index 095a3c54..0f77c5a2 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
@@ -537,6 +537,14 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
         return getProductTypeList(productWarehousePagination,productWarehousePagination.getDataType());
     }
 
+    @Override
+    public List<ProductWarehouseEntity> getProductWhList(ProductWarehousePagination productWarehousePagination) {
+        QueryWrapper<ProductWarehouseEntity> productWarehouseQueryWrapper=new QueryWrapper<>();
+        Page<ProductWarehouseEntity> page=new Page<>(productWarehousePagination.getCurrentPage(), productWarehousePagination.getPageSize());
+        IPage<ProductWarehouseEntity> userIPage = productWarehouseMapper.getProductWhList(page, productWarehousePagination, productWarehouseQueryWrapper);
+        return productWarehousePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+    }
+
     @Override
     public List<ProductWarehouseEntity> getProductTypeList(ProductWarehousePagination productWarehousePagination, String dataType) {
         String userId=userProvider.get().getUserId();
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java
index b99e3088..f23316f5 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java
@@ -114,7 +114,28 @@ public class ProductWarehouseController {
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
-
+    /**
+     * 列表
+     *
+     * @param productWarehousePagination
+     * @return
+     */
+    @Operation(summary = "获取商品列表")
+    @PostMapping("/getProductlist")
+    public ActionResult productlist(@RequestBody ProductWarehousePagination productWarehousePagination)throws IOException{
+        List<ProductWarehouseEntity> list= productWarehouseService.getProductWhList(productWarehousePagination);
+        List<Map<String, Object>> realList=new ArrayList<>();
+        for (ProductWarehouseEntity entity : list) {
+            Map<String, Object> productWarehouseMap=JsonUtil.entityToMap(entity);
+            realList.add(productWarehouseMap);
+        }
+        //返回对象
+        PageListVO vo = new PageListVO();
+        vo.setList(realList);
+        PaginationVO page = JsonUtil.getJsonToBean(productWarehousePagination, PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
     /**
      * 加工获取商品列表
      *
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
index 6e184088..fbda273c 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java
@@ -283,4 +283,12 @@ public class ProductWarehouseEntity  {
 
     @TableField(exist = false)
     private String batchNumber;
+
+
+    @TableField(exist = false)
+    private String inventoryUnitName;
+    @TableField(exist = false)
+    private String orderMainUnitName;
+    @TableField(exist = false)
+    private String salesMainUnitName;
 }
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 86e99744..cbe47241 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
@@ -1,130 +1,254 @@
 <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="160px"
-                label-position="right" :disabled="setting.readonly">
-                <template v-if="!loading && formOperates">
-                    <!-- 具体表单 -->
-                    <el-col :span="24">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">合同类型</span>
-                        </div>
-                    </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">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">基本信息</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="8" v-if="judgeShow('contractTemplateId')">
-                        <jnpf-form-tip-item label="合同模板" v-if="judgeShow('contractTemplateId')"
-                            prop="contractTemplateId">
-                            <JnpfPopupSelectCus 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%' }"
-                                :filterVal="filterValContractTemplate">
-                            </JnpfPopupSelectCus>
-                        </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>
+  <div :style="{ margin: '0 auto', width: '100%' }">
+    <el-row :gutter="15" class="">
+      <el-form
+        ref="formRef"
+        :model="dataForm"
+        :rules="dataRule"
+        size="small"
+        label-width="160px"
+        label-position="right"
+        :disabled="setting.readonly"
+      >
+        <template v-if="!loading && formOperates">
+          <!-- 具体表单 -->
+          <el-col :span="24">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >合同类型</span
+              >
+            </div>
+          </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">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >基本信息</span
+              >
+            </div>
+          </el-col>
+          <el-col :span="8" v-if="judgeShow('contractTemplateId')">
+            <jnpf-form-tip-item
+              label="合同模板"
+              v-if="judgeShow('contractTemplateId')"
+              prop="contractTemplateId"
+            >
+              <JnpfPopupSelectCus
+                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%' }"
+                :filterVal="filterValContractTemplate"
+              >
+              </JnpfPopupSelectCus>
+            </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">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">主体信息</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="24">
-                        <jnpf-form-tip-item label="签约主体">
-                            <JnpfOrganizeSelect v-model="deptIdShow" selectType="all" :ableIds="ableAll.deptIdableIds"
-                                :disabled="true" clearable :style="{ width: '100%' }">
-                            </JnpfOrganizeSelect>
-                        </jnpf-form-tip-item>
-                    </el-col>
-                    <!-- <el-col :span="24" v-if="judgeShow('deptId')">
+          <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">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >主体信息</span
+              >
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="签约主体">
+              <JnpfOrganizeSelect
+                v-model="deptIdShow"
+                selectType="all"
+                :ableIds="ableAll.deptIdableIds"
+                :disabled="true"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </JnpfOrganizeSelect>
+            </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"
@@ -132,590 +256,1100 @@
                             </JnpfOrganizeSelect>
                         </jnpf-form-tip-item>
                     </el-col> -->
-                    <el-col :span="24" v-if="judgeShow('subject')">
-                        <template v-if="dataForm.contractType == 1">
-                            <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="531020715009245189" :pageSize="20"
-                                    :columnOptions="subjectcolumnOptions" clearable :style="{ width: '100%' }">
-                                </JnpfPopupSelect>
-                            </jnpf-form-tip-item>
-                        </template>
-                        <template v-else-if="dataForm.contractType == 2">
-                            <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="531022805093842949" :pageSize="20"
-                                    :columnOptions="subjectcolumnOptions" clearable :style="{ width: '100%' }">
-                                </JnpfPopupSelect>
-                            </jnpf-form-tip-item>
-                        </template>
-                        <template v-else>
-                            <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="531024727578247173" :pageSize="20"
-                                    :columnOptions="subjectcolumnOptions" clearable :style="{ width: '100%' }">
-                                </JnpfPopupSelect>
-                            </jnpf-form-tip-item>
-                        </template>
-                    </el-col>
-                    <el-col :span="24">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">财务信息</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-table :data="subjectList" size="mini" style="margin-bottom: 20px;">
-                            <el-table-column label="主体名称">
-                                <template slot-scope="scope">
-                                    {{ scope.row.name }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="合作方式">
-                                <template slot-scope="scope">
-                                    {{ scope.row.collaboration_method_name }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="结算方式">
-                                <template slot-scope="scope">
-                                    {{ scope.row.settlement_method_name }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="预付比例">
-                                <template slot-scope="scope">
-                                    {{ scope.row.advance_ratio_str }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="账期">
-                                <template slot-scope="scope">
-                                    {{ scope.row.account_period_str }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="压款方式">
-                                <template slot-scope="scope">
-                                    {{ scope.row.underpayment_method_name }}({{
-        scope.row.apply_for_underpayment_ratio
-    }}
-                                    {{ scope.row.underpayment_method_unit }})
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="保证金方式">
-                                <template slot-scope="scope">
-                                    {{ scope.row.margin_method_name }}({{
-        scope.row.apply_for_margin_ratio
-    }}
-                                    {{ scope.row.margin_method_unit }})
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="逾期利率">
-                                <template slot-scope="scope">
-                                    {{ scope.row.overdue_interest_rate_name }}({{
-        scope.row.apply_for_overdue_ratio_str
-    }})
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </el-col>
-                    <el-col :span="24">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">合同信息</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="8" v-if="judgeShow('procurementModel')">
-                        <template v-if="dataForm.contractType == 1">
-                            <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>
-                        </template>
-                        <template v-else-if="dataForm.contractType == 2">
-                            <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>
-                        </template>
-                        <template v-else> </template>
-                    </el-col>
-                    <el-col :span="8" v-if="judgeShow('relatedContractId')">
-                        <template v-if="dataForm.procurementModel == 1">
-                            <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>
-                        </template>
-                    </el-col>
-                    <el-col :span="8" v-if="judgeShow('subject2')">
-                        <template v-if="dataForm.contractType == 1">
-                            <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="531021494264791045" :pageSize="20"
-                                    :columnOptions="subjectcolumnOptions" clearable :style="{ width: '100%' }">
-                                </JnpfPopupSelect>
-                            </jnpf-form-tip-item>
-                        </template>
-                        <template v-else-if="dataForm.contractType == 2">
-                            <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="531023515868987397" :pageSize="20"
-                                    :columnOptions="subjectcolumnOptions" clearable :style="{ width: '100%' }">
-                                </JnpfPopupSelect>
-                            </jnpf-form-tip-item>
-                        </template>
-                        <template v-else> </template>
-                    </el-col>
-                    <el-col :span="8" v-if="judgeShow('subject3')">
-                        <template v-if="dataForm.contractType == 1">
-                            <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="531021990216073221" :pageSize="20"
-                                    :columnOptions="subjectcolumnOptions" clearable :style="{ width: '100%' }">
-                                </JnpfPopupSelect>
-                            </jnpf-form-tip-item>
-                        </template>
-                        <template v-else-if="dataForm.contractType == 2"> </template>
-                        <template v-else> </template>
-                    </el-col>
-                    <el-col :span="24">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">交货和运输信息</span>
-                        </div>
-                    </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">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">合同条款信息</span>
-                        </div>
-                    </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">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">商品明细</span>
-                        </div>
-                    </el-col>
-                    <el-col :span="24" v-if="judgeShow('isLongAgreement')">
-                        <jnpf-form-tip-item label="是否长协" v-if="judgeShow('isLongAgreement')" prop="isLongAgreement">
-                            <JnpfRadio v-model="dataForm.isLongAgreement" @change="changeData('isLongAgreement', -1)"
-                                :disabled="judgeWrite('isLongAgreement')" optionType="default" direction="horizontal"
-                                size="small" :options="isLongAgreementOptions" :props="isLongAgreementProps">
-                            </JnpfRadio>
-                        </jnpf-form-tip-item>
-                    </el-col>
-                    <el-col :span="24" v-if="judgeShow('contractlpriceformula-${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="商品ID" v-if="judgeShow('contractlcommodity-productId')"
-                                    prop="productId">
-                                    <template slot="header">
-                                        <span class="required-sign"
-                                            v-if="judgeRequired('contractlcommodityList-productId')">*</span>选择商品名称
-                                    </template>
-                                    <template slot-scope="scope">
-                                        <JnpfPopupSelect v-model="scope.row.productId" @change="
-        changeData('contractlcommodity-productId', scope.$index)
-        " :rowIndex="scope.$index" :formData="dataForm" :templateJson="interfaceRes.contractlcommodityproductId"
-                                            placeholder="请选择" :disabled="judgeWrite('contractlcommodityList') ||
-        judgeWrite('contractlcommodityList-productId')
-        " propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField="name"
-                                            :field="'productId' + scope.$index" interfaceId="530288111456878597"
-                                            :pageSize="20" :columnOptions="contractlcommodityproductIdcolumnOptions"
-                                            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">
-                                        {{ scope.row.commodityCode }}
-                                    </template>
-                                </el-table-column>
-                                <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">
-                                        {{ scope.row.commodityName }}
-                                    </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">
-                                        {{ scope.row.specifications }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="库存单位" v-if="judgeShow('contractlcommodity-inventoryUnitId')"
-                                    prop="inventoryUnitId">
-                                    <template slot="header">
-                                        <span class="required-sign" v-if="judgeRequired('contractlcommodityList-inventoryUnitId')
-        ">*</span>库存单位
-                                    </template>
-                                    <template slot-scope="scope">
-                                        {{ getProductUnitName(scope.row.inventoryUnitId) }}
-                                    </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="scope.row.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()"
+          <el-col :span="24" v-if="judgeShow('subject')">
+            <template v-if="dataForm.contractType == 1">
+              <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="531020715009245189"
+                  :pageSize="20"
+                  :columnOptions="subjectcolumnOptions"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </template>
+            <template v-else-if="dataForm.contractType == 2">
+              <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="531022805093842949"
+                  :pageSize="20"
+                  :columnOptions="subjectcolumnOptions"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </template>
+            <template v-else>
+              <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="531024727578247173"
+                  :pageSize="20"
+                  :columnOptions="subjectcolumnOptions"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </template>
+          </el-col>
+          <el-col :span="24">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >财务信息</span
+              >
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <el-table
+              :data="subjectList"
+              size="mini"
+              style="margin-bottom: 20px;"
+            >
+              <el-table-column label="主体名称">
+                <template slot-scope="scope">
+                  {{ scope.row.name }}
+                </template>
+              </el-table-column>
+              <el-table-column label="合作方式">
+                <template slot-scope="scope">
+                  {{ scope.row.collaboration_method_name }}
+                </template>
+              </el-table-column>
+              <el-table-column label="结算方式">
+                <template slot-scope="scope">
+                  {{ scope.row.settlement_method_name }}
+                </template>
+              </el-table-column>
+              <el-table-column label="预付比例">
+                <template slot-scope="scope">
+                  {{ scope.row.advance_ratio_str }}
+                </template>
+              </el-table-column>
+              <el-table-column label="账期">
+                <template slot-scope="scope">
+                  {{ scope.row.account_period_str }}
+                </template>
+              </el-table-column>
+              <el-table-column label="压款方式">
+                <template slot-scope="scope">
+                  {{ scope.row.underpayment_method_name }}({{
+                    scope.row.apply_for_underpayment_ratio
+                  }}
+                  {{ scope.row.underpayment_method_unit }})
+                </template>
+              </el-table-column>
+              <el-table-column label="保证金方式">
+                <template slot-scope="scope">
+                  {{ scope.row.margin_method_name }}({{
+                    scope.row.apply_for_margin_ratio
+                  }}
+                  {{ scope.row.margin_method_unit }})
+                </template>
+              </el-table-column>
+              <el-table-column label="逾期利率">
+                <template slot-scope="scope">
+                  {{ scope.row.overdue_interest_rate_name }}({{
+                    scope.row.apply_for_overdue_ratio_str
+                  }})
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+          <el-col :span="24">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >合同信息</span
+              >
+            </div>
+          </el-col>
+          <el-col :span="8" v-if="judgeShow('procurementModel')">
+            <template v-if="dataForm.contractType == 1">
+              <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>
+            </template>
+            <template v-else-if="dataForm.contractType == 2">
+              <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>
+            </template>
+            <template v-else> </template>
+          </el-col>
+          <el-col :span="8" v-if="judgeShow('relatedContractId')">
+            <template v-if="dataForm.procurementModel == 1">
+              <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>
+            </template>
+          </el-col>
+          <el-col :span="8" v-if="judgeShow('subject2')">
+            <template v-if="dataForm.contractType == 1">
+              <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="531021494264791045"
+                  :pageSize="20"
+                  :columnOptions="subjectcolumnOptions"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </template>
+            <template v-else-if="dataForm.contractType == 2">
+              <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="531023515868987397"
+                  :pageSize="20"
+                  :columnOptions="subjectcolumnOptions"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </template>
+            <template v-else> </template>
+          </el-col>
+          <el-col :span="8" v-if="judgeShow('subject3')">
+            <template v-if="dataForm.contractType == 1">
+              <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="531021990216073221"
+                  :pageSize="20"
+                  :columnOptions="subjectcolumnOptions"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </template>
+            <template v-else-if="dataForm.contractType == 2"> </template>
+            <template v-else> </template>
+          </el-col>
+          <el-col :span="24">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >交货和运输信息</span
+              >
+            </div>
+          </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">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >合同条款信息</span
+              >
+            </div>
+          </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">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >商品明细</span
+              >
+            </div>
+          </el-col>
+          <el-col :span="24" v-if="judgeShow('isLongAgreement')">
+            <jnpf-form-tip-item
+              label="是否长协"
+              v-if="judgeShow('isLongAgreement')"
+              prop="isLongAgreement"
+            >
+              <JnpfRadio
+                v-model="dataForm.isLongAgreement"
+                @change="changeData('isLongAgreement', -1)"
+                :disabled="judgeWrite('isLongAgreement')"
+                optionType="default"
+                direction="horizontal"
+                size="small"
+                :options="isLongAgreementOptions"
+                :props="isLongAgreementProps"
+              >
+              </JnpfRadio>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col
+            :span="24"
+            v-if="judgeShow('contractlpriceformula-${html.relationField}')"
+          >
+            <jnpf-form-tip-item label-width="0">
+              <el-table :data="dataForm.contractLCommodityList" size="mini">
+                <el-table-column type="index" width="50" label="序号" />
+                <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">
+                    {{ scope.row.commodityCode }}
+                  </template>
+                </el-table-column>
+                <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">
+                    {{ scope.row.commodityName }}
+                  </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">
+                    {{ scope.row.specifications }}
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="库存单位"
+                  v-if="judgeShow('contractlcommodity-inventoryUnitId')"
+                  prop="inventoryUnitId"
+                >
+                  <template slot="header">
+                    <span
+                      class="required-sign"
+                      v-if="
+                        judgeRequired('contractlcommodityList-inventoryUnitId')
+                      "
+                      >*</span
+                    >库存单位
+                  </template>
+                  <template slot-scope="scope">
+                    {{ getProductUnitName(scope.row.inventoryUnitId) }}
+                  </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="scope.row.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(
+                          'contractlcommodityList-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
+                      addonAfter="%"
+                      :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(
+                          'contractlcommodityList-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">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">费用条款</span>
-                        </div>
-                    </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="2" 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">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">付款节点</span>
-                        </div>
-                    </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="2" 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()"
+                            </div> -->
+              <div
+                class="table-actions"
+                @click="choiceRaw()"
+                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">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >费用条款</span
+              >
+            </div>
+          </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="2"
+                      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">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >付款节点</span
+              >
+            </div>
+          </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="2"
+                      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="12" v-if="judgeShow('totalAmount')">
-                        <jnpf-form-tip-item label="合计金额（人民币）" v-if="judgeShow('totalAmount')" prop="totalAmount">
-                            <JnpfInputNumber v-model="dataForm.totalAmount" @change="changeData('totalAmount', -1)"
-                                placeholder="数字文本" :disabled="judgeWrite('totalAmount')" :precision="2" addonAfter="元"
-                                :step="1">
-                            </JnpfInputNumber>
-                        </jnpf-form-tip-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <jnpf-form-tip-item label="大写金额（人民币）">
-                            {{ dataForm.amountCapitalization }}
-                        </jnpf-form-tip-item>
-                    </el-col>
-                    <!-- <el-col :span="12" v-if="judgeShow('amountCapitalization')">
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="12" v-if="judgeShow('totalAmount')">
+            <jnpf-form-tip-item
+              label="合计金额（人民币）"
+              v-if="judgeShow('totalAmount')"
+              prop="totalAmount"
+            >
+              <JnpfInputNumber
+                v-model="dataForm.totalAmount"
+                @change="changeData('totalAmount', -1)"
+                placeholder="数字文本"
+                :disabled="judgeWrite('totalAmount')"
+                :precision="2"
+                addonAfter="元"
+                :step="1"
+              >
+              </JnpfInputNumber>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="12">
+            <jnpf-form-tip-item label="大写金额（人民币）">
+              {{ dataForm.amountCapitalization }}
+            </jnpf-form-tip-item>
+          </el-col>
+          <!-- <el-col :span="12" v-if="judgeShow('amountCapitalization')">
                         <jnpf-form-tip-item label="大写金额（人民币）" v-if="judgeShow('amountCapitalization')"
                             prop="amountCapitalization">
                             <JnpfInputNumber v-model="dataForm.amountCapitalization"
@@ -725,81 +1359,147 @@
                             </JnpfInputNumber>
                         </jnpf-form-tip-item>
                     </el-col> -->
-                    <el-col :span="24">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">其他信息</span>
-                        </div>
-                    </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')" 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">
-                        <div style="padding:15px 0px">
-                            <span style="color: #409EFF;">▋</span>
-                            <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">附件信息</span>
-                        </div>
-                    </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">
+          <el-col :span="24">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >其他信息</span
+              >
+            </div>
+          </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')"
+              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">
+            <div style="padding:15px 0px">
+              <span style="color: #409EFF;">▋</span>
+              <span
+                style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);"
+                >附件信息</span
+              >
+            </div>
+          </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">
                         <div style="padding:15px 0px">
                             <span style="color: #409EFF;">▋</span>
                             <span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">合同标签</span>
@@ -813,14 +1513,25 @@
                             </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" />
-    </div>
+          <!-- 表单结束 -->
+        </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" />
+    <ProductListBox
+      v-if="BomgoodsBoxRawVisible"
+      ref="BomGoodsRawBox"
+      @refreshDataList="initRawList"
+    />
+  </div>
 </template>
 
 <script>
@@ -834,1119 +1545,1206 @@ import { getDataInterfaceDataSelect } from "@/api/systemData/dataInterface";
 import { getDefaultCurrentValueUserId } from "@/api/permission/user";
 import { getDefaultCurrentValueDepartmentId } from "@/api/permission/organize";
 import {
-    getDateDay,
-    getLaterData,
-    getBeforeData,
-    getBeforeTime,
-    getLaterTime
+  getDateDay,
+  getLaterData,
+  getBeforeData,
+  getBeforeTime,
+  getLaterTime
 } from "@/components/Generator/utils/index.js";
 import {
-    getAmountChinese,
-    thousandsFormat
+  getAmountChinese,
+  thousandsFormat
 } from "@/components/Generator/utils/index";
 import dayjs from "dayjs";
+import ProductListBox from "@/views/scm/publicPopup/ProductListBox";
 export default {
-    mixins: [comMixin],
-    components: {},
-    props: [],
-    data() {
-        return {
-            dataFormSubmitType: 0,
-            continueBtnLoading: false,
-            index: 0,
-            prevDis: false,
-            nextDis: false,
-            allList: [],
-            visible: false,
-            loading: false,
-            btnLoading: false,
-            formRef: "formRef",
-            setting: {},
-            eventType: "",
-            userBoxVisible: false,
-            selectDialogVisible: false,
-            currTableConf: {},
-            dataValueAll: {},
-            addTableConf: {
-                contractLPriceFormulaList: {
-                    popupType: "dialog",
-                    hasPage: true,
-                    popupTitle: "选择数据",
-                    pageSize: 20,
-                    columnOptions: [],
-                    interfaceId: "",
-                    interfaceName: "",
-                    relationOptions: [],
-                    templateJson: [],
-                    popupWidth: "800px"
-                },
-                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: {
-                contractLPriceFormulaList: {
-                    priceFormulaCode: "",
-                    priceFormulaCodeOptions: [],
-                    priceFormulaTypeOptions: [],
-                    fixedProfit1: "",
-                    fixedProfit1Options: [],
-                    fixedProfit2: "",
-                    fixedProfit2Options: [],
-                    fixedAmount: "",
-                    fixedAmountOptions: [],
-                    accountCost: "",
-                    accountCostOptions: [],
-                    handleCost: "",
-                    handleCostOptions: [],
-                    reshipmentCost: "",
-                    reshipmentCostOptions: [],
-                    otherCost1: "",
-                    otherCost1Options: [],
-                    otherCost2: "",
-                    otherCost2Options: [],
-                    otherCost3: "",
-                    otherCost3Options: [],
-                    otherCost4: "",
-                    otherCost4Options: [],
-                    settlementTonnage: "",
-                    settlementTonnageOptions: [],
-                    correspondTonnage: "",
-                    correspondTonnageOptions: [],
-                    saleTonnage: "",
-                    saleTonnageOptions: [],
-                    taxRate: "",
-                    taxRateOptions: [],
-                    taxRateCustomer: "",
-                    taxRateCustomerOptions: [],
-                    taxRateYellowBull: "",
-                    taxRateYellowBullOptions: [],
-                    taxRateInvoicingCompany: "",
-                    taxRateInvoicingCompanyOptions: [],
-                    fundRate: "",
-                    fundRateOptions: [],
-                    enabledmark: undefined
-                },
-                contractLCommodityList: {
-                    productId: "",
-                    productIdOptions: [],
-                    commodityCode: "",
-                    commodityCodeOptions: [],
-                    commodityName: "",
-                    commodityNameOptions: [],
-                    specifications: "",
-                    specificationsOptions: [],
-                    inventoryUnitId: "",
-                    inventoryUnitIdOptions: [],
-                    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: "",
-            dataForm: {
-                contractType: "1",
-                isLongAgreement: "1",
-                contractTemplateId: undefined,
-                contractNumber: undefined,
-                contractName: undefined,
-                contractNo: undefined,
-                contractSignedTime: dayjs().valueOf(),
-                businessId: undefined,
-                contractPeriodTime: dayjs().valueOf(),
-                contractPeriodTimeEnd: dayjs()
-                    .add(1, "year")
-                    .valueOf(),
-                deptId: "",
-                subject: undefined,
-                procurementModel: undefined,
-                relatedContractId: undefined,
-                subject2: undefined,
-                subject3: undefined,
-                deliveryModel: undefined,
-                deliveryLocation: undefined,
-                modeTransport: undefined,
-                costBearingMian: undefined,
-                pricingModel: undefined,
-                totalAmount: undefined,
-                amountCapitalization: undefined,
-                contractRequirement: undefined,
-                remark: undefined,
-                contractAppendices: [],
-                ancillaryDocuments: [],
-                transactionAppendices: [],
-                transactionAppendices2: [],
-                contractLabel: [],
-                contractLPriceFormulaList: [],
-                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"
-                    }
-                ],
-                businessId: [
-                    {
-                        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"
-                    }
-                ],
-                totalAmount: [
-                    {
-                        required: true,
-                        message: "数字文本",
-                        trigger: ["blur", "change"]
-                    }
-                ]
-            },
-            contractTypeOptions: [],
-            contractTypeProps: { label: "fullName", value: "enCode" },
-            contractTemplateIdcolumnOptions: [
-                { label: "合同模板", value: "name" },
-                { label: "合同类型", value: "type_name" },
-                { label: "状态", value: "status_name" }
-            ],
-            businessIdcolumnOptions: [{ label: "名称", value: "name" }],
-            subjectcolumnOptions: [
-                { label: "类型", value: "subject_basic_type_name" },
-                { label: "级别", value: "calssify_name" },
-                { label: "主体名称", value: "name" },
-                { label: "社会统一信息代码", value: "information_code" },
-                { label: "付款方式", value: "payment_method_name" },
-                { label: "合作方式", value: "collaboration_method_name" },
-                { label: "结算方式", value: "settlement_method_name" },
-                { label: "预付比例", value: "advance_ratio_str" },
-                { label: "账期", value: "account_period_str" },
-                { label: "压款方式", value: "underpayment_method_name" },
-                { label: "压款比例|金额", value: "apply_for_underpayment_ratio" },
-                { label: "压款单位", value: "underpayment_method_unit" },
-                { label: "保证金方式", value: "margin_method_name" },
-                { label: "保证金比例|金额", value: "apply_for_margin_ratio" },
-                { label: "保证金单位", value: "margin_method_unit" },
-                { label: "逾期利率方式", value: "overdue_interest_rate_name" },
-                { label: "逾期利率", value: "apply_for_overdue_ratio_str" }
-            ],
-            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" },
-            contractlpriceformulapriceFormulaTypeOptions: [],
-            contractlpriceformulapriceFormulaTypeProps: {
-                label: "fullName",
-                value: "enCode"
-            },
-            isLongAgreementOptions: [],
-            isLongAgreementProps: { label: "fullName", value: "enCode" },
-            contractlcommodityproductIdcolumnOptions: [
-                { label: "商品ID", value: "id" },
-                { label: "商品编码", value: "code" },
-                { label: "商品名称", value: "name" },
-                { label: "商品规格", value: "spec" },
-                { label: "库存单位", value: "inventory_unit_name" },
-                { label: "采购单位", value: "order_main_unit_name" },
-                { label: "销售单位", value: "sales_main_unit_name" }
-            ],
-            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"
-            },
-            optionsProductUnit: [],
-            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: [],
-                totalAmount: [],
-                amountCapitalization: [],
-                contractRequirement: [],
-                remark: [],
-                contractAppendices: [],
-                ancillaryDocuments: [],
-                transactionAppendices: [],
-                transactionAppendices2: [],
-                contractLabel: [],
-                contractlpriceformulapriceFormulaCode: [],
-                contractlpriceformulapriceFormulaType: [],
-                contractlpriceformulafixedProfit1: [],
-                contractlpriceformulafixedProfit2: [],
-                contractlpriceformulafixedAmount: [],
-                contractlpriceformulaaccountCost: [],
-                contractlpriceformulahandleCost: [],
-                contractlpriceformulareshipmentCost: [],
-                contractlpriceformulaotherCost1: [],
-                contractlpriceformulaotherCost2: [],
-                contractlpriceformulaotherCost3: [],
-                contractlpriceformulaotherCost4: [],
-                contractlpriceformulasettlementTonnage: [],
-                contractlpriceformulacorrespondTonnage: [],
-                contractlpriceformulasaleTonnage: [],
-                contractlpriceformulataxRate: [],
-                contractlpriceformulataxRateCustomer: [],
-                contractlpriceformulataxRateYellowBull: [],
-                contractlpriceformulataxRateInvoicingCompany: [],
-                contractlpriceformulafundRate: [],
-                contractlcommodityproductId: [],
-                contractlcommoditycommodityCode: [],
-                contractlcommoditycommodityName: [],
-                contractlcommodityspecifications: [],
-                contractlcommodityinventoryUnitId: [],
-                contractlcommodityprocureUnit: [],
-                contractlcommoditynumber: [],
-                contractlcommoditytaxRate: [],
-                contractlcommoditypriceRate: [],
-                contractlcommoditytotalRate: [],
-                contractlfeeclausefeeType: [],
-                contractlfeeclauseprice: [],
-                contractlfeeclauseremark: [],
-                contractlpaymentpaymentNode: [],
-                contractlpaymentpaymentMethod: [],
-                contractlpaymentpaymentRatio: [],
-                contractlpaymentprice: [],
-                contractlpaymentremark: []
-            },
-            listQuery: {
-                keyword: "",
-                currentPage: 1,
-                pageSize: 100000
-            },
-            subjectList: [],
-            subject2List: [],
-            subject3List: [],
-            elTestC: ""
-        };
-    },
-    computed: {
-        deptIdShow() {
-            return [this.dataForm.deptId];
+  mixins: [comMixin],
+  components: { ProductListBox },
+  props: [],
+  data() {
+    return {
+      BomgoodsBoxRawVisible: true,
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: "formRef",
+      setting: {},
+      eventType: "",
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+        contractLPriceFormulaList: {
+          popupType: "dialog",
+          hasPage: true,
+          popupTitle: "选择数据",
+          pageSize: 20,
+          columnOptions: [],
+          interfaceId: "",
+          interfaceName: "",
+          relationOptions: [],
+          templateJson: [],
+          popupWidth: "800px"
         },
-        formOperates() {
-            return this.setting.formOperates;
+        contractLCommodityList: {
+          popupType: "dialog",
+          hasPage: true,
+          popupTitle: "选择数据",
+          pageSize: 20,
+          columnOptions: [],
+          interfaceId: "",
+          interfaceName: "",
+          relationOptions: [],
+          templateJson: [],
+          popupWidth: "800px"
         },
-        filterValContractTemplate() {
-            let opts = this.contractTypeOptions;
-            let optType = this.dataForm.contractType;
-            let optNow = opts.filter(o1 => {
-                return o1.enCode == optType;
-            });
-            if (optNow && optNow.length > 0) {
-                return optNow[0]["fullName"];
-            } else {
-                return "";
-            }
+        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"
         }
-    },
-    watch: {
-        // "dataForm.contractType": function(val, oldVal) {
-        //   console.log(val);
-        //   this.dataForm.subject = undefined;
-        //   this.dataForm.subject2 = undefined;
-        //   this.dataForm.subject3 = undefined;
-        //   this.dataForm.procurementModel = undefined;
-        //   this.dataForm.relatedContractId = undefined;
-        // },
-        "dataForm.subject": function (val, oldVal) {
-            this.getSubjectInfo();
+      },
+      //可选范围默认值
+      ableAll: {},
+      tableRows: {
+        contractLPriceFormulaList: {
+          priceFormulaCode: "",
+          priceFormulaCodeOptions: [],
+          priceFormulaTypeOptions: [],
+          fixedProfit1: "",
+          fixedProfit1Options: [],
+          fixedProfit2: "",
+          fixedProfit2Options: [],
+          fixedAmount: "",
+          fixedAmountOptions: [],
+          accountCost: "",
+          accountCostOptions: [],
+          handleCost: "",
+          handleCostOptions: [],
+          reshipmentCost: "",
+          reshipmentCostOptions: [],
+          otherCost1: "",
+          otherCost1Options: [],
+          otherCost2: "",
+          otherCost2Options: [],
+          otherCost3: "",
+          otherCost3Options: [],
+          otherCost4: "",
+          otherCost4Options: [],
+          settlementTonnage: "",
+          settlementTonnageOptions: [],
+          correspondTonnage: "",
+          correspondTonnageOptions: [],
+          saleTonnage: "",
+          saleTonnageOptions: [],
+          taxRate: "",
+          taxRateOptions: [],
+          taxRateCustomer: "",
+          taxRateCustomerOptions: [],
+          taxRateYellowBull: "",
+          taxRateYellowBullOptions: [],
+          taxRateInvoicingCompany: "",
+          taxRateInvoicingCompanyOptions: [],
+          fundRate: "",
+          fundRateOptions: [],
+          enabledmark: undefined
         },
-        "dataForm.totalAmount": function (val, oldVal) {
-            this.dataForm.amountCapitalization = getAmountChinese(val);
+        contractLCommodityList: {
+          productId: "",
+          productIdOptions: [],
+          commodityCode: "",
+          commodityCodeOptions: [],
+          commodityName: "",
+          commodityNameOptions: [],
+          specifications: "",
+          specificationsOptions: [],
+          inventoryUnitId: "",
+          inventoryUnitIdOptions: [],
+          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: "",
+      dataForm: {
+        contractType: "1",
+        isLongAgreement: "1",
+        contractTemplateId: undefined,
+        contractNumber: undefined,
+        contractName: undefined,
+        contractNo: undefined,
+        contractSignedTime: dayjs().valueOf(),
+        businessId: undefined,
+        contractPeriodTime: dayjs().valueOf(),
+        contractPeriodTimeEnd: dayjs()
+          .add(1, "year")
+          .valueOf(),
+        deptId: "",
+        subject: undefined,
+        procurementModel: undefined,
+        relatedContractId: undefined,
+        subject2: undefined,
+        subject3: undefined,
+        deliveryModel: undefined,
+        deliveryLocation: undefined,
+        modeTransport: undefined,
+        costBearingMian: undefined,
+        pricingModel: undefined,
+        totalAmount: undefined,
+        amountCapitalization: undefined,
+        contractRequirement: undefined,
+        remark: undefined,
+        contractAppendices: [],
+        ancillaryDocuments: [],
+        transactionAppendices: [],
+        transactionAppendices2: [],
+        contractLabel: [],
+        contractLPriceFormulaList: [],
+        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"
+          }
+        ],
+        businessId: [
+          {
+            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"
+          }
+        ],
+        totalAmount: [
+          {
+            required: true,
+            message: "数字文本",
+            trigger: ["blur", "change"]
+          }
+        ]
+      },
+      contractTypeOptions: [],
+      contractTypeProps: { label: "fullName", value: "enCode" },
+      contractTemplateIdcolumnOptions: [
+        { label: "合同模板", value: "name" },
+        { label: "合同类型", value: "type_name" },
+        { label: "状态", value: "status_name" }
+      ],
+      businessIdcolumnOptions: [{ label: "名称", value: "name" }],
+      subjectcolumnOptions: [
+        { label: "类型", value: "subject_basic_type_name" },
+        { label: "级别", value: "calssify_name" },
+        { label: "主体名称", value: "name" },
+        { label: "社会统一信息代码", value: "information_code" },
+        { label: "付款方式", value: "payment_method_name" },
+        { label: "合作方式", value: "collaboration_method_name" },
+        { label: "结算方式", value: "settlement_method_name" },
+        { label: "预付比例", value: "advance_ratio_str" },
+        { label: "账期", value: "account_period_str" },
+        { label: "压款方式", value: "underpayment_method_name" },
+        { label: "压款比例|金额", value: "apply_for_underpayment_ratio" },
+        { label: "压款单位", value: "underpayment_method_unit" },
+        { label: "保证金方式", value: "margin_method_name" },
+        { label: "保证金比例|金额", value: "apply_for_margin_ratio" },
+        { label: "保证金单位", value: "margin_method_unit" },
+        { label: "逾期利率方式", value: "overdue_interest_rate_name" },
+        { label: "逾期利率", value: "apply_for_overdue_ratio_str" }
+      ],
+      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" },
+      contractlpriceformulapriceFormulaTypeOptions: [],
+      contractlpriceformulapriceFormulaTypeProps: {
+        label: "fullName",
+        value: "enCode"
+      },
+      isLongAgreementOptions: [],
+      isLongAgreementProps: { label: "fullName", value: "enCode" },
+      contractlcommodityproductIdcolumnOptions: [
+        { label: "商品ID", value: "id" },
+        { label: "商品编码", value: "code" },
+        { label: "商品名称", value: "name" },
+        { label: "商品规格", value: "spec" },
+        { label: "库存单位", value: "inventory_unit_name" },
+        { label: "采购单位", value: "order_main_unit_name" },
+        { label: "销售单位", value: "sales_main_unit_name" }
+      ],
+      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"
+      },
+      optionsProductUnit: [],
+      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: [],
+        totalAmount: [],
+        amountCapitalization: [],
+        contractRequirement: [],
+        remark: [],
+        contractAppendices: [],
+        ancillaryDocuments: [],
+        transactionAppendices: [],
+        transactionAppendices2: [],
+        contractLabel: [],
+        contractlpriceformulapriceFormulaCode: [],
+        contractlpriceformulapriceFormulaType: [],
+        contractlpriceformulafixedProfit1: [],
+        contractlpriceformulafixedProfit2: [],
+        contractlpriceformulafixedAmount: [],
+        contractlpriceformulaaccountCost: [],
+        contractlpriceformulahandleCost: [],
+        contractlpriceformulareshipmentCost: [],
+        contractlpriceformulaotherCost1: [],
+        contractlpriceformulaotherCost2: [],
+        contractlpriceformulaotherCost3: [],
+        contractlpriceformulaotherCost4: [],
+        contractlpriceformulasettlementTonnage: [],
+        contractlpriceformulacorrespondTonnage: [],
+        contractlpriceformulasaleTonnage: [],
+        contractlpriceformulataxRate: [],
+        contractlpriceformulataxRateCustomer: [],
+        contractlpriceformulataxRateYellowBull: [],
+        contractlpriceformulataxRateInvoicingCompany: [],
+        contractlpriceformulafundRate: [],
+        contractlcommodityproductId: [],
+        contractlcommoditycommodityCode: [],
+        contractlcommoditycommodityName: [],
+        contractlcommodityspecifications: [],
+        contractlcommodityinventoryUnitId: [],
+        contractlcommodityprocureUnit: [],
+        contractlcommoditynumber: [],
+        contractlcommoditytaxRate: [],
+        contractlcommoditypriceRate: [],
+        contractlcommoditytotalRate: [],
+        contractlfeeclausefeeType: [],
+        contractlfeeclauseprice: [],
+        contractlfeeclauseremark: [],
+        contractlpaymentpaymentNode: [],
+        contractlpaymentpaymentMethod: [],
+        contractlpaymentpaymentRatio: [],
+        contractlpaymentprice: [],
+        contractlpaymentremark: []
+      },
+      listQuery: {
+        keyword: "",
+        currentPage: 1,
+        pageSize: 100000
+      },
+      subjectList: [],
+      subject2List: [],
+      subject3List: [],
+      elTestC: "",
+      productIdList: []
+    };
+  },
+  computed: {
+    deptIdShow() {
+      return [this.dataForm.deptId];
     },
-    created() {
-        this.getFormById();
+    formOperates() {
+      return this.setting.formOperates;
+    },
+    filterValContractTemplate() {
+      let opts = this.contractTypeOptions;
+      let optType = this.dataForm.contractType;
+      let optNow = opts.filter(o1 => {
+        return o1.enCode == optType;
+      });
+      if (optNow && optNow.length > 0) {
+        return optNow[0]["fullName"];
+      } else {
+        return "";
+      }
+    }
+  },
+  watch: {
+    // "dataForm.contractType": function(val, oldVal) {
+    //   console.log(val);
+    //   this.dataForm.subject = undefined;
+    //   this.dataForm.subject2 = undefined;
+    //   this.dataForm.subject3 = undefined;
+    //   this.dataForm.procurementModel = undefined;
+    //   this.dataForm.relatedContractId = undefined;
+    // },
+    "dataForm.subject": function(val, oldVal) {
+      this.getSubjectInfo();
+    },
+    "dataForm.totalAmount": function(val, oldVal) {
+      this.dataForm.amountCapitalization = getAmountChinese(val);
+    }
+  },
+  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: {
+    fnChgTotalRate() {
+      for (let i = 0; i < this.dataForm.contractLCommodityList.length; i++) {
+        if (
+          isNaN(parseFloat(this.dataForm.contractLCommodityList[i].priceRate))
+        ) {
+          this.dataForm.contractLCommodityList[i].priceRate = "0";
+        }
+        if (isNaN(parseFloat(this.dataForm.contractLCommodityList[i].number))) {
+          this.dataForm.contractLCommodityList[i].number = "0";
+        }
+        this.dataForm.contractLCommodityList[i]["totalRate"] = String(
+          parseFloat(this.dataForm.contractLCommodityList[i]["priceRate"]) *
+            parseFloat(this.dataForm.contractLCommodityList[i]["number"])
+        );
+      }
+      let countNum = 0;
+      for (let i = 0; i < this.dataForm.contractLCommodityList.length; i++) {
+        if (
+          isNaN(parseFloat(this.dataForm.contractLCommodityList[i].priceRate))
+        ) {
+          this.dataForm.contractLCommodityList[i].priceRate = "0";
+        }
+        countNum =
+          countNum +
+          parseFloat(this.dataForm.contractLCommodityList[i]["totalRate"]);
+      }
+      for (let i = 0; i < this.dataForm.contractLFeeClauseList.length; i++) {
         if (
-            this.dataForm.id == null ||
-            (this.dataForm.id == "" && this.dataForm.id == undefined) ||
-            this.dataForm.id == 0
+          isNaN(parseFloat(this.dataForm.contractLFeeClauseList[i].priceRate))
         ) {
-            this.initDefaultData();
+          this.dataForm.contractLFeeClauseList[i].priceRate = "0";
         }
-        this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm));
+        countNum =
+          countNum +
+          parseFloat(this.dataForm.contractLFeeClauseList[i]["price"]);
+      }
+      this.dataForm.totalAmount = countNum;
     },
-    mounted() { },
-    methods: {
-        chgContractType() {
-            this.dataForm.subject = undefined;
-            this.dataForm.subject2 = undefined;
-            this.dataForm.subject3 = undefined;
-            this.dataForm.contractTemplateId = undefined;
-            this.dataForm.procurementModel = undefined;
-            this.dataForm.relatedContractId = undefined;
-        },
-        getSubjectInfo() {
-            const columnOptions = this.subjectcolumnOptions.map(o => o.value);
-            let interfaceId = undefined;
-            let query = {
-                ...this.listQuery,
-                interfaceId: this.dataForm.subject,
-                propsValue: "id",
-                relationField: "name",
-                columnOptions: columnOptions.join(","),
-                paramList: []
-            };
-            if (this.dataForm.contractType == 1) {
-                interfaceId = "531020715009245189";
-            } else if (this.dataForm.contractType == 2) {
-                interfaceId = "531022805093842949";
-            } else {
-                interfaceId = "531024727578247173";
-            }
-            getDataInterfaceDataSelect(interfaceId, query)
-                .then(res => {
-                    this.subjectList = res.data.list.filter(o1 => {
-                        return o1.id == this.dataForm.subject;
-                    });
-                })
-                .catch(() => { });
-        },
-        getProductInfoChg(index) {
-            let interfaceId = "530288111456878597";
-            let query = {
-                ...this.listQuery
-            };
-            if (this.dataForm.contractLCommodityList[index]) {
-                getDataInterfaceDataSelect(interfaceId, query)
-                    .then(res => {
-                        if (res.code == 200) {
-                            let productInfo = res.data.list.filter(o1 => {
-                                return (
-                                    o1.id ==
-                                    this.dataForm.contractLCommodityList[index]["productId"]
-                                );
-                            })[0];
-                            this.dataForm.contractLCommodityList[index]["commodityCode"] =
-                                productInfo.code;
-                            this.dataForm.contractLCommodityList[index]["commodityName"] =
-                                productInfo.name;
-                            this.dataForm.contractLCommodityList[index]["specifications"] =
-                                productInfo.spec;
-                            this.dataForm.contractLCommodityList[index]["inventoryUnitId"] =
-                                productInfo.inventory_unit_id;
-                            this.dataForm.contractLCommodityList[index]["inventoryUnitName"] =
-                                productInfo.inventory_unit_name;
-                            this.contractlcommodityinventoryUnitOptions = [
-                                {
-                                    fullName: productInfo.inventory_unit_name,
-                                    id: productInfo.inventory_unit_id
-                                }
-                            ];
-                            let procureUnitOptionsArr = [];
-                            for (
-                                let i = 0;
-                                i < JSON.parse(productInfo.order_main_unit_id).length;
-                                i++
-                            ) {
-                                procureUnitOptionsArr.push({
-                                    fullName: JSON.parse(productInfo.order_main_unit_name)[i],
-                                    id: JSON.parse(productInfo.order_main_unit_id)[i]
-                                });
-                            }
-                            this.dataForm.contractLCommodityList[index][
-                                "contractlcommodityprocureUnitOptions"
-                            ] = procureUnitOptionsArr;
-                            // console.log(procureUnitOptionsArr)
-                            // this.contractlcommodityprocureUnitOptions = procureUnitOptionsArr
-                        }
-                    })
-                    .catch(() => { });
-            }
-        },
-        changeData(model, index) {
-            if (model == "contractlcommodity-productId") {
-                this.getProductInfoChg(index);
-            }
-            if (model == "contractType") {
-                this.chgContractType();
-            }
-            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);
-                        }
-                    }
-                }
-            }
-        },
-        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;
-                }
-            }
-        },
-        dataAll() {
-            this.getcontractTypeOptions();
-            this.getprocurementModelOptions();
-            this.getdeliveryModelOptions();
-            this.getmodeTransportOptions();
-            this.getcostBearingMianOptions();
-            this.getpricingModelOptions();
-            this.getcontractLabelOptions();
-            this.getcontractlpriceformulapriceFormulaTypeOptions();
-            this.getcontractlfeeclausefeeTypeOptions();
-            this.getcontractlpaymentpaymentNodeOptions();
-            this.getcontractlpaymentpaymentMethodOptions();
-            this.getApiProductUnit();
-            this.getIsLongAgreementOptions();
-        },
-        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() {
-            console.log("zzzzzzzzzzzzzzzzzzzzzzzzz11");
-            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.contractlpriceformulaExist()) return;
-            if (!this.contractlcommodityExist()) return;
-            if (!this.contractlfeeclauseExist()) return;
-            if (!this.contractlpaymentExist()) return;
-            return isOk;
-        },
-        contractlpriceformulaExist() {
-            let isOk = true;
-            for (let i = 0; i < this.dataForm.contractLPriceFormulaList.length; i++) {
-                const e = this.dataForm.contractLPriceFormulaList[i];
-            }
-            return isOk;
-        },
-        contractlcommodityExist() {
-            if (this.dataForm.isLongAgreement == 1) {
-                if (this.dataForm.contractLCommodityList.length < 1) {
-                    this.$message({
-                        message: "非长协商品不能为空",
-                        type: "error",
-                        duration: 1000
-                    });
-                    return;
-                }
-            }
-            let isOk = true;
-            for (let i = 0; i < this.dataForm.contractLCommodityList.length; i++) {
-                const e = this.dataForm.contractLCommodityList[i];
-                if (!e.commodityCode) {
-                    this.$message({
-                        message: "商品不能为空",
-                        type: "error",
-                        duration: 1000
-                    });
-                    return;
-                }
-                console.log(e);
-            }
-            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;
+    initRawList(list) {
+      for (let i = 0; i < list.length; i++) {
+        const e = list[i];
+        let procureUnitOptionsArr = [];
+        for (let i = 0; i < JSON.parse(e.orderMainUnitId).length; i++) {
+          procureUnitOptionsArr.push({
+            fullName: JSON.parse(e.orderMainUnitName)[i],
+            id: JSON.parse(e.orderMainUnitId)[i]
+          });
+        }
+        let item = {
+          productId: e.id,
+          commodityCode: e.code,
+          commodityName: e.name,
+          specifications: e.spec,
+          inventoryUnitId: e.inventoryUnitId,
+          inventoryUnitName: e.inventoryUnitName,
+          contractlcommodityprocureUnitOptions: procureUnitOptionsArr,
+          priceRate: "0",
+          number: "0",
+          totalRate: "0"
+        };
+        switch (this.dataForm.contractType) {
+          case "1":
+            item.taxRate = e.inputTaxRate;
+            break;
+          case "2":
+            item.taxRate = e.outputTaxRate;
+            break;
+          default:
+            break;
+        }
+        this.dataForm.contractLCommodityList.push(item);
+      }
+    },
+    choiceRaw() {
+      this.BomgoodsBoxRawVisible = true;
+      // console.log('55555', this.dataForm.workOrderProductList)
+      let excludeIdList = [];
+      for (let i = 0; i < this.dataForm.contractLCommodityList.length; i++) {
+        excludeIdList.push(this.dataForm.contractLCommodityList[i].productId);
+      }
+      this.$nextTick(() => {
+        this.$refs.BomGoodsRawBox.init(excludeIdList);
+      });
+    },
+    chgContractType() {
+      this.dataForm.subject = undefined;
+      this.dataForm.subject2 = undefined;
+      this.dataForm.subject3 = undefined;
+      this.dataForm.contractTemplateId = undefined;
+      this.dataForm.procurementModel = undefined;
+      this.dataForm.relatedContractId = undefined;
+    },
+    getSubjectInfo() {
+      const columnOptions = this.subjectcolumnOptions.map(o => o.value);
+      let interfaceId = undefined;
+      let query = {
+        ...this.listQuery,
+        interfaceId: this.dataForm.subject,
+        propsValue: "id",
+        relationField: "name",
+        columnOptions: columnOptions.join(","),
+        paramList: []
+      };
+      if (this.dataForm.contractType == 1) {
+        interfaceId = "531020715009245189";
+      } else if (this.dataForm.contractType == 2) {
+        interfaceId = "531022805093842949";
+      } else {
+        interfaceId = "531024727578247173";
+      }
+      getDataInterfaceDataSelect(interfaceId, query)
+        .then(res => {
+          this.subjectList = res.data.list.filter(o1 => {
+            return o1.id == this.dataForm.subject;
+          });
+        })
+        .catch(() => {});
+    },
+    getProductInfoChg(index) {
+      let interfaceId = "530288111456878597";
+      let query = {
+        ...this.listQuery
+      };
+      if (this.dataForm.contractLCommodityList[index]) {
+        getDataInterfaceDataSelect(interfaceId, query)
+          .then(res => {
+            if (res.code == 200) {
+              let productInfo = res.data.list.filter(o1 => {
+                return (
+                  o1.id ==
+                  this.dataForm.contractLCommodityList[index]["productId"]
+                );
+              })[0];
+              this.dataForm.contractLCommodityList[index]["commodityCode"] =
+                productInfo.code;
+              this.dataForm.contractLCommodityList[index]["commodityName"] =
+                productInfo.name;
+              this.dataForm.contractLCommodityList[index]["specifications"] =
+                productInfo.spec;
+              this.dataForm.contractLCommodityList[index]["inventoryUnitId"] =
+                productInfo.inventory_unit_id;
+              this.dataForm.contractLCommodityList[index]["inventoryUnitName"] =
+                productInfo.inventory_unit_name;
+              this.contractlcommodityinventoryUnitOptions = [
+                {
+                  fullName: productInfo.inventory_unit_name,
+                  id: productInfo.inventory_unit_id
                 }
+              ];
+              let procureUnitOptionsArr = [];
+              for (
+                let i = 0;
+                i < JSON.parse(productInfo.order_main_unit_id).length;
+                i++
+              ) {
+                procureUnitOptionsArr.push({
+                  fullName: JSON.parse(productInfo.order_main_unit_name)[i],
+                  id: JSON.parse(productInfo.order_main_unit_id)[i]
+                });
+              }
+              this.dataForm.contractLCommodityList[index][
+                "contractlcommodityprocureUnitOptions"
+              ] = procureUnitOptionsArr;
+              // console.log(procureUnitOptionsArr)
+              // this.contractlcommodityprocureUnitOptions = procureUnitOptionsArr
             }
-            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;
-            });
-        },
-        getcontractlpriceformulapriceFormulaTypeOptions() {
-            getDictionaryDataSelector("529925559430414341").then(res => {
-                this.contractlpriceformulapriceFormulaTypeOptions = 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;
-            });
-        },
-        getIsLongAgreementOptions() {
-            getDictionaryDataSelector("522424260874993797").then(res => {
-                this.isLongAgreementOptions = res.data.list;
-            });
-        },
-        getApiProductUnit() {
-            let interfaceId = "522684730601111557";
-            let query = {
-                ...this.listQuery
-            };
-            getDataInterfaceDataSelect(interfaceId, query)
-                .then(res => {
-                    if (res.code == 200) {
-                        let optionsProductUnit = [];
-                        for (let i = 0; i < res.data.list.length; i++) {
-                            optionsProductUnit.push({
-                                fullName: res.data.list[i]["unit_name"],
-                                id: res.data.list[i]["product_unit_code"]
-                            });
-                        }
-                        this.optionsProductUnit = optionsProductUnit;
-                        this.contractlcommodityprocureUnitOptions = optionsProductUnit;
-                    }
-                })
-                .catch(() => { });
-        },
-        getProductUnitName(id) {
-            let fArr = this.optionsProductUnit.filter(o1 => {
-                return o1.id == id;
-            });
-            if (fArr.length > 0) {
-                return fArr[0]["fullName"];
-            }
-        },
-        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[0];
+          })
+          .catch(() => {});
+      }
+    },
+    changeData(model, index) {
+      this.fnChgTotalRate();
+      if (model == "contractlcommodity-productId") {
+        this.getProductInfoChg(index);
+      }
+      if (model == "contractType") {
+        this.chgContractType();
+      }
+      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);
             }
-        },
-        addcontractLPriceFormulaList() {
-            let item = {
-                priceFormulaCode: undefined,
-                priceFormulaType: "",
-                priceFormulaTypeOptions: [],
-                fixedProfit1: undefined,
-                fixedProfit2: undefined,
-                fixedAmount: undefined,
-                accountCost: undefined,
-                handleCost: undefined,
-                reshipmentCost: undefined,
-                otherCost1: undefined,
-                otherCost2: undefined,
-                otherCost3: undefined,
-                otherCost4: undefined,
-                settlementTonnage: undefined,
-                correspondTonnage: undefined,
-                saleTonnage: undefined,
-                taxRate: undefined,
-                taxRateCustomer: undefined,
-                taxRateYellowBull: undefined,
-                taxRateInvoicingCompany: undefined,
-                fundRate: undefined
-            };
-            this.getcontractLPriceFormulaList(item);
-        },
-        delcontractLPriceFormulaList(index) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                type: "warning"
-            })
-                .then(() => {
-                    this.dataForm.contractLPriceFormulaList.splice(index, 1);
-                })
-                .catch(() => { });
-        },
-        getcontractLPriceFormulaList(value) {
-            let item = { ...this.tableRows.contractLPriceFormulaList, ...value };
-            this.dataForm.contractLPriceFormulaList.push(item);
-            this.childIndex = this.dataForm.contractLPriceFormulaList.length - 1;
-            this.isEdit = true;
-            this.isEdit = false;
-            this.childIndex = -1;
-        },
-        addcontractLCommodityList() {
-            let item = {
-                productId: "",
-                commodityCode: undefined,
-                commodityName: undefined,
-                specifications: undefined,
-                inventoryUnitId: 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.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);
-                }
+          }
+        }
+      }
+    },
+    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;
             }
-        },
-        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();
-                    }
+          }
+        } else {
+          this.dataForm[data] = defaultValue;
+        }
+      }
+    },
+    dataAll() {
+      this.getcontractTypeOptions();
+      this.getprocurementModelOptions();
+      this.getdeliveryModelOptions();
+      this.getmodeTransportOptions();
+      this.getcostBearingMianOptions();
+      this.getpricingModelOptions();
+      this.getcontractLabelOptions();
+      this.getcontractlpriceformulapriceFormulaTypeOptions();
+      this.getcontractlfeeclausefeeTypeOptions();
+      this.getcontractlpaymentpaymentNodeOptions();
+      this.getcontractlpaymentpaymentMethodOptions();
+      this.getApiProductUnit();
+      this.getIsLongAgreementOptions();
+    },
+    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]);
                 }
-            }
-            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);
+                if (!boo) {
+                  this.$message({
+                    message: msg,
+                    type: "error",
+                    duration: 1000
+                  });
+                  isOk = false;
+                  break;
                 }
+              }
             }
-            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.contractLPriceFormulaList.length; i++) {
-                this.childIndex = i;
-            }
-            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;
+          }
+        }
+      }
+      if (!this.contractlpriceformulaExist()) return;
+      if (!this.contractlcommodityExist()) return;
+      if (!this.contractlfeeclauseExist()) return;
+      if (!this.contractlpaymentExist()) return;
+      return isOk;
+    },
+    contractlpriceformulaExist() {
+      let isOk = true;
+      for (let i = 0; i < this.dataForm.contractLPriceFormulaList.length; i++) {
+        const e = this.dataForm.contractLPriceFormulaList[i];
+      }
+      return isOk;
+    },
+    contractlcommodityExist() {
+      if (this.dataForm.isLongAgreement == 1) {
+        if (this.dataForm.contractLCommodityList.length < 1) {
+          this.$message({
+            message: "非长协商品不能为空",
+            type: "error",
+            duration: 1000
+          });
+          return;
+        }
+      }
+      let isOk = true;
+      for (let i = 0; i < this.dataForm.contractLCommodityList.length; i++) {
+        const e = this.dataForm.contractLCommodityList[i];
+        if (!e.commodityCode) {
+          this.$message({
+            message: "商品不能为空",
+            type: "error",
+            duration: 1000
+          });
+          return;
+        }
+        console.log(e);
+      }
+      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;
+    },
+    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;
+      });
+    },
+    getcontractlpriceformulapriceFormulaTypeOptions() {
+      getDictionaryDataSelector("529925559430414341").then(res => {
+        this.contractlpriceformulapriceFormulaTypeOptions = 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;
+      });
+    },
+    getIsLongAgreementOptions() {
+      getDictionaryDataSelector("522424260874993797").then(res => {
+        this.isLongAgreementOptions = res.data.list;
+      });
+    },
+    getApiProductUnit() {
+      let interfaceId = "522684730601111557";
+      let query = {
+        ...this.listQuery
+      };
+      getDataInterfaceDataSelect(interfaceId, query)
+        .then(res => {
+          if (res.code == 200) {
+            let optionsProductUnit = [];
+            for (let i = 0; i < res.data.list.length; i++) {
+              optionsProductUnit.push({
+                fullName: res.data.list[i]["unit_name"],
+                id: res.data.list[i]["product_unit_code"]
+              });
             }
-            this.childIndex = -1;
+            this.optionsProductUnit = optionsProductUnit;
+            this.contractlcommodityprocureUnitOptions = optionsProductUnit;
+          }
+        })
+        .catch(() => {});
+    },
+    getProductUnitName(id) {
+      let fArr = this.optionsProductUnit.filter(o1 => {
+        return o1.id == id;
+      });
+      if (fArr.length > 0) {
+        return fArr[0]["fullName"];
+      }
+    },
+    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[0];
+      }
+    },
+    addcontractLPriceFormulaList() {
+      let item = {
+        priceFormulaCode: undefined,
+        priceFormulaType: "",
+        priceFormulaTypeOptions: [],
+        fixedProfit1: undefined,
+        fixedProfit2: undefined,
+        fixedAmount: undefined,
+        accountCost: undefined,
+        handleCost: undefined,
+        reshipmentCost: undefined,
+        otherCost1: undefined,
+        otherCost2: undefined,
+        otherCost3: undefined,
+        otherCost4: undefined,
+        settlementTonnage: undefined,
+        correspondTonnage: undefined,
+        saleTonnage: undefined,
+        taxRate: undefined,
+        taxRateCustomer: undefined,
+        taxRateYellowBull: undefined,
+        taxRateInvoicingCompany: undefined,
+        fundRate: undefined
+      };
+      this.getcontractLPriceFormulaList(item);
+    },
+    delcontractLPriceFormulaList(index) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.dataForm.contractLPriceFormulaList.splice(index, 1);
+        })
+        .catch(() => {});
+    },
+    getcontractLPriceFormulaList(value) {
+      let item = { ...this.tableRows.contractLPriceFormulaList, ...value };
+      this.dataForm.contractLPriceFormulaList.push(item);
+      this.childIndex = this.dataForm.contractLPriceFormulaList.length - 1;
+      this.isEdit = true;
+      this.isEdit = false;
+      this.childIndex = -1;
+    },
+    addcontractLCommodityList() {
+      let item = {
+        productId: "",
+        commodityCode: undefined,
+        commodityName: undefined,
+        specifications: undefined,
+        inventoryUnitId: 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.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);
+        }
+      }
+    },
+    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();
+          }
         }
+      }
+      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);
+        }
+      }
+      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.contractLPriceFormulaList.length; i++) {
+        this.childIndex = i;
+      }
+      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>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue
new file mode 100644
index 00000000..bd907bc0
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-dialog
+    title="选择商品"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center"
+    lock-scroll
+    append-to-body
+    width="800px"
+  >
+    <el-row class="JNPF-common-search-box" :gutter="16">
+      <el-form @submit.native.prevent>
+        <el-col :span="10">
+          <el-form-item label="关键词">
+            <el-input
+              v-model="keyword"
+              placeholder="请输入关键词查询"
+              clearable
+              @keyup.enter.native="search()"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search()"
+              >{{ $t("common.search") }}
+            </el-button>
+            <el-button icon="el-icon-refresh-right" @click="refresh()"
+              >{{ $t("common.reset") }}
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-form>
+      <div class="JNPF-common-search-box-right">
+        <el-tooltip
+          effect="dark"
+          :content="$t('common.refresh')"
+          placement="top"
+        >
+          <el-link
+            icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+            :underline="false"
+            @click="search()"
+          />
+        </el-tooltip>
+      </div>
+    </el-row>
+    <JNPF-table
+      v-loading="listLoading"
+      :data="list"
+      hasC
+      @selection-change="handleSelectionChange"
+      :border="false"
+    >
+      <el-table-column prop="id" label="商品ID" align="left"> </el-table-column>
+      <el-table-column prop="name" label="商品名称" align="left">
+      </el-table-column>
+      <el-table-column prop="code" label="商品编码" align="left">
+      </el-table-column>
+      <el-table-column prop="spec" label="商品规格" align="left">
+      </el-table-column>
+      <el-table-column prop="inventoryUnitName" label="库存单位" align="left">
+      </el-table-column>
+      <el-table-column prop="orderMainUnitName" label="采购单位" align="left">
+      </el-table-column>
+      <el-table-column prop="salesMainUnitName" label="销售单位" align="left">
+      </el-table-column>
+    </JNPF-table>
+    <pagination
+      :total="total"
+      :page.sync="listQuery.currentPage"
+      :limit.sync="listQuery.pageSize"
+      @pagination="init"
+    />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{
+        $t("common.cancelButton")
+      }}</el-button>
+      <el-button type="primary" @click="select()">{{
+        $t("common.confirmButton")
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import request from "@/utils/request";
+import { GoodsList } from "@/api/extend/order";
+export default {
+  data() {
+    return {
+      visible: false,
+      listLoading: true,
+      keyword: "",
+      list: [],
+      total: 0,
+      listQuery: {
+        superQueryJson: "",
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: ""
+      },
+      excludeIdList: [],
+      checked: []
+    };
+  },
+  methods: {
+    init(excludeIdList, val) {
+      this.visible = true;
+      this.listLoading = true;
+      if (excludeIdList) {
+        this.excludeIdList = excludeIdList;
+      }
+      let query = {
+        ...this.listQuery,
+        dataType: 0,
+        keyword: this.keyword,
+        type: 1
+      };
+      request({
+        url: `/api/scm/ProductWarehouse/getProductlist`,
+        method: "post",
+        data: query
+      }).then(res => {
+        this.list = res.data.list;
+        this.listLoading = false;
+        this.total = res.data.pagination.total;
+      });
+    },
+    refresh() {
+      this.keyword = "";
+      this.listQuery.currentPage = 1;
+      this.listQuery.pageSize = 20;
+      this.listQuery.sort = "desc";
+      this.listQuery.sidx = "";
+      this.init();
+    },
+    search() {
+      this.listQuery.currentPage = 1;
+      this.listQuery.pageSize = 20;
+      this.listQuery.sort = "desc";
+      this.listQuery.sidx = "";
+      this.init();
+    },
+    select() {
+      if (!this.checked.length) return;
+      this.visible = false;
+      this.$emit("refreshDataList", this.checked);
+    },
+    handleSelectionChange(val) {
+      console.log(val);
+      this.checked = val;
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+>>> .el-dialog__body {
+  height: 70vh;
+  padding: 0 0 10px !important;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  .JNPF-common-search-box {
+    margin-bottom: 0;
+
+    .JNPF-common-search-box-right {
+      padding: 10px 10px 0 0;
+    }
+  }
+}
+</style>