From 63db1e91adcf714e9e0291b2e70f96daaa023016 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Tue, 7 May 2024 14:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=88=E5=90=8Capp?=
 =?UTF-8?q?=E5=88=9D=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jnpf-app/pages.json                           |   58 +-
 jnpf-app/pages/scm/form/contractL/index.vue   | 1977 +++++++++++++++++
 .../pages/scm/form/productWarehouse/index.vue | 1330 +++++++++++
 jnpf-app/pages/scm/index/contractL/index.vue  |  539 +++++
 .../scm/index/productWarehouse/index.vue      |  539 +++++
 jnpf-app/pages/workFlow/flowBefore/form.vue   |  131 +-
 6 files changed, 4511 insertions(+), 63 deletions(-)
 create mode 100644 jnpf-app/pages/scm/form/contractL/index.vue
 create mode 100644 jnpf-app/pages/scm/form/productWarehouse/index.vue
 create mode 100644 jnpf-app/pages/scm/index/contractL/index.vue
 create mode 100644 jnpf-app/pages/scm/index/productWarehouse/index.vue

diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index 276faafa..5ef53664 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -3,7 +3,8 @@
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
 		"^jnpf-(.*)": "@/components/jnpf/jnpf-$1/index.vue"
 	},
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/launch/index",
 			"style": {
 				"app-plus": {
@@ -148,18 +149,21 @@
 		// #ifdef H5
 		{
 			"root": "pages/mpPortal",
-			"pages": [{
-				"path": "index",
-				"style": {
-					"navigationStyle": "custom", // 隐藏系统导航栏
-					"navigationBarTextStyle": "black" // 状态栏字体为白色
+			"pages": [
+				{
+					"path": "index",
+					"style": {
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"navigationBarTextStyle": "black" // 状态栏字体为白色
+					}
 				}
-			}]
+			]
 		},
 		// #endif
 		{
 			"root": "pages/message",
-			"pages": [{
+			"pages": [
+				{
 					"path": "userDetail/index",
 					"style": {
 						"navigationBarTitleText": "",
@@ -191,7 +195,8 @@
 		},
 		{
 			"root": "pages/workFlow",
-			"pages": [{
+			"pages": [
+				{
 					"path": "flowBefore/index",
 					"style": {
 						"navigationBarTitleText": ""
@@ -291,7 +296,8 @@
 		},
 		{
 			"root": "pages/apply",
-			"pages": [{
+			"pages": [
+				{
 					"path": "reportLog/index",
 					"style": {
 						"navigationBarTitleText": "汇报日志"
@@ -374,25 +380,38 @@
 				}
 			]
 		},
-		
-		
 		{
 			"root": "pages/scm/form",
-			"pages": [{
+			"pages": [
+				{
 					"path": "subjectbasic/customerIndex",
 					"style": {
 						"navigationBarTitleText": ""
 					}
-				},{
+				},
+				{
 					"path": "subjectbasic/supplierIndex",
 					"style": {
 						"navigationBarTitleText": ""
 					}
-				},{
+				},
+				{
 					"path": "subjectbasic/serviceIndex",
 					"style": {
 						"navigationBarTitleText": ""
 					}
+				},
+				{
+					"path": "contractL/index",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "productWarehouse/index",
+					"style": {
+						"navigationBarTitleText": ""
+					}
 				}
 			]
 		},
@@ -409,7 +428,8 @@
 		// #ifdef APP-PLUS
 		{
 			"root": "pages/componentLibrary",
-			"pages": [{
+			"pages": [
+				{
 					"path": "index"
 				},
 				// parse-富文本解析器
@@ -921,7 +941,8 @@
 		// #endif
 		{
 			"root": "pages/my",
-			"pages": [{
+			"pages": [
+				{
 					"path": "settings/index",
 					"style": {
 						"navigationBarTitleText": "设置",
@@ -1039,7 +1060,8 @@
 		"color": "#303133",
 		"selectedColor": "#2979FF",
 		"backgroundColor": "#ffffff",
-		"list": [{
+		"list": [
+			{
 				"pagePath": "pages/index/portal",
 				"text": "首页",
 				"iconPath": "static/image/tabbar/home.png",
diff --git a/jnpf-app/pages/scm/form/contractL/index.vue b/jnpf-app/pages/scm/form/contractL/index.vue
new file mode 100644
index 00000000..7f2e70d9
--- /dev/null
+++ b/jnpf-app/pages/scm/form/contractL/index.vue
@@ -0,0 +1,1977 @@
+<template>
+	<view class="jnpf-wrap jnpf-wrap-form" v-if="!loading">
+		<u-form :model="dataForm" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left"
+			label-align="right" :label-width="labelwidth" class="jnpf-form">
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="合同类型" content="合同类型">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractType')" :required="requiredList.contractType" label="合同类型"
+					left-icon="question-circle-fill"
+					@clickIcon="clickIcon('合同类型','不同的合同类型可编辑的字段内容不同，合同类型一旦保存不可修改，请选择更匹配你需求的一个。')"
+					:left-icon-style="{'color':'#a0acb7'}" prop="contractType">
+					<jnpf-radio v-model="dataForm.contractType" :disabled="judgeWrite('contractType')"
+						@change="changeData('contractType',-1)" optionType="button" direction="horizontal"
+						:props="contractTypeProps" :options="contractTypeOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="基本信息" content="基本信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractTemplateId')" :required="requiredList.contractTemplateId"
+					label="合同模板" prop="contractTemplateId">
+					<jnpf-popup-select v-model="dataForm.contractTemplateId"
+						:disabled="judgeWrite('contractTemplateId')" @change="changeData('contractTemplateId',-1)"
+						:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.contractTemplateId" clearable
+						propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+						vModel='contractTemplateId' :columnOptions="contractTemplateIdColumnOptions"
+						interfaceId="528856731099332613" :pageSize="20" placeholder="请选择" type="popup"
+						:style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractNumber')" :required="requiredList.contractNumber" label="合同编号"
+					prop="contractNumber">
+					<u-input v-model="dataForm.contractNumber" disabled @change="changeData('contractNumber',-1)"
+						input-align='right' placeholder="系统自动生成" :style='{"width":"100%"}' readonly>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractName')" :required="requiredList.contractName" label="合同名称"
+					prop="contractName">
+					<u-input v-model="dataForm.contractName" :disabled="judgeWrite('contractName')"
+						@change="changeData('contractName',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractNo')" :required="requiredList.contractNo" label="对方合同编号"
+					prop="contractNo">
+					<u-input v-model="dataForm.contractNo" :disabled="judgeWrite('contractNo')"
+						@change="changeData('contractNo',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractSignedTime')" :required="requiredList.contractSignedTime"
+					label="签订日期" prop="contractSignedTime">
+					<jnpf-date-time v-model="dataForm.contractSignedTime" :disabled="judgeWrite('contractSignedTime')"
+						@change="changeData('contractSignedTime',-1)" :startTime="dateTime(false,1,1,'','')"
+						:endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd" clearable placeholder="请选择" type="date"
+						:style='{"width":"100%"}'>
+					</jnpf-date-time>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('businessId')" :required="requiredList.businessId" label="关联业务线"
+					prop="businessId">
+					<jnpf-popup-select v-model="dataForm.businessId" :disabled="judgeWrite('businessId')"
+						@change="changeData('businessId',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.businessId" clearable propsValue="id" popupWidth="800px"
+						popupTitle="选择数据" popupType="dialog" relationField='name' vModel='businessId'
+						:columnOptions="businessIdColumnOptions" interfaceId="517979330417001669" :pageSize="20"
+						placeholder="请选择" type="popup" :style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractPeriodTime')" :required="requiredList.contractPeriodTime"
+					label="有效期开始 " prop="contractPeriodTime">
+					<jnpf-date-time v-model="dataForm.contractPeriodTime" :disabled="judgeWrite('contractPeriodTime')"
+						@change="changeData('contractPeriodTime',-1)" :startTime="dateTime(false,1,1,'','')"
+						:endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd" clearable placeholder="请选择" type="date"
+						:style='{"width":"100%"}'>
+					</jnpf-date-time>
+				</u-form-item>
+			</view>
+
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractPeriodTimeEnd')" :required="requiredList.contractPeriodTimeEnd"
+					label="有效期结束 " prop="contractPeriodTimeEnd">
+					<jnpf-date-time v-model="dataForm.contractPeriodTimeEnd"
+						:disabled="judgeWrite('contractPeriodTimeEnd')" @change="changeData('contractPeriodTimeEnd',-1)"
+						:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd"
+						clearable placeholder="请选择" type="date" :style='{"width":"100%"}'>
+					</jnpf-date-time>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="主体信息" content="主体信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('deptId')" :required="requiredList.deptId" label="签约主体" prop="deptId">
+					<jnpf-com-select v-model="dataForm.deptId" :disabled="judgeWrite('deptId')"
+						@change="changeData('deptId',-1)" selectType="all" :ableIds="ableAll.deptIdableIds" clearable
+						placeholder="请选择" type="organize" :style='{"width":"100%"}'>
+					</jnpf-com-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('subject')" :required="requiredList.subject" label="乙方主体" prop="subject">
+					<jnpf-popup-select v-model="dataForm.subject" :disabled="judgeWrite('subject')"
+						@change="changeData('subject',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.subject" clearable propsValue="id" popupWidth="800px"
+						popupTitle="选择数据" popupType="dialog" relationField='name' vModel='subject'
+						:columnOptions="subjectColumnOptions" interfaceId="523869248829799685" :pageSize="20"
+						placeholder="请选择" type="popup" :style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="财务信息" content="财务信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="合同信息" content="合同信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('procurementModel')" :required="requiredList.procurementModel" label="采购模式"
+					prop="procurementModel">
+					<jnpf-select v-model="dataForm.procurementModel" :disabled="judgeWrite('procurementModel')"
+						@change="changeData('procurementModel',-1)" clearable placeholder="请选择"
+						:props="procurementModelProps" :options="procurementModelOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('relatedContractId')" :required="requiredList.relatedContractId"
+					label="关联销售合同" prop="relatedContractId">
+					<jnpf-popup-select v-model="dataForm.relatedContractId" :disabled="judgeWrite('relatedContractId')"
+						@change="changeData('relatedContractId',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.relatedContractId" clearable propsValue="id" popupWidth="800px"
+						popupTitle="选择数据" popupType="dialog" relationField='contract_name' vModel='relatedContractId'
+						:columnOptions="relatedContractIdColumnOptions" interfaceId="529270998021701701" :pageSize="20"
+						placeholder="请选择" type="popup" :style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('subject2')" :required="requiredList.subject2" label="乙方主体二级"
+					prop="subject2">
+					<jnpf-popup-select v-model="dataForm.subject2" :disabled="judgeWrite('subject2')"
+						@change="changeData('subject2',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.subject2" clearable propsValue="id" popupWidth="800px"
+						popupTitle="选择数据" popupType="dialog" relationField='name' vModel='subject2'
+						:columnOptions="subject2ColumnOptions" interfaceId="523869248829799685" :pageSize="20"
+						placeholder="请选择" type="popup" :style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('subject3')" :required="requiredList.subject3" label="乙方主体三级"
+					prop="subject3">
+					<jnpf-popup-select v-model="dataForm.subject3" :disabled="judgeWrite('subject3')"
+						@change="changeData('subject3',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.subject3" clearable propsValue="id" popupWidth="800px"
+						popupTitle="选择数据" popupType="dialog" relationField='name' vModel='subject3'
+						:columnOptions="subject3ColumnOptions" interfaceId="523869248829799685" :pageSize="20"
+						placeholder="请选择" type="popup" :style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="交货和运输信息" content="交货和运输信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('deliveryModel')" :required="requiredList.deliveryModel" label="交货方式"
+					prop="deliveryModel">
+					<jnpf-select v-model="dataForm.deliveryModel" :disabled="judgeWrite('deliveryModel')"
+						@change="changeData('deliveryModel',-1)" clearable placeholder="请选择" :props="deliveryModelProps"
+						:options="deliveryModelOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('deliveryLocation')" :required="requiredList.deliveryLocation"
+					label="交货地点 " prop="deliveryLocation">
+					<u-input v-model="dataForm.deliveryLocation" :disabled="judgeWrite('deliveryLocation')"
+						@change="changeData('deliveryLocation',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('modeTransport')" :required="requiredList.modeTransport" label="运输方式"
+					prop="modeTransport">
+					<jnpf-select v-model="dataForm.modeTransport" :disabled="judgeWrite('modeTransport')"
+						@change="changeData('modeTransport',-1)" clearable placeholder="请选择" :props="modeTransportProps"
+						:options="modeTransportOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('costBearingMian')" :required="requiredList.costBearingMian" label="费用承担主体"
+					prop="costBearingMian">
+					<jnpf-select v-model="dataForm.costBearingMian" :disabled="judgeWrite('costBearingMian')"
+						@change="changeData('costBearingMian',-1)" clearable placeholder="请选择"
+						:props="costBearingMianProps" :options="costBearingMianOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value=" 合同条款信息" content=" 合同条款信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('pricingModel')" :required="requiredList.pricingModel" label="定价模式 "
+					prop="pricingModel">
+					<jnpf-select v-model="dataForm.pricingModel" :disabled="judgeWrite('pricingModel')"
+						@change="changeData('pricingModel',-1)" clearable placeholder="请选择" :props="pricingModelProps"
+						:options="pricingModelOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table" v-if="judgeShow('contractLPriceFormulaList')">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.contractLPriceFormulaList" :key="i">
+					<view class="jnpf-table-item-title u-flex u-row-between">
+						<text class="jnpf-table-item-title-num">价格公式({{i+1}})</text>
+						<view class="jnpf-table-item-title-action"
+							v-if=" !judgeWrite('contractLPriceFormulaList') && dataForm.contractLPriceFormulaList.length>0"
+							@click="delcontractlpriceformulaList(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-priceFormulaCode')"
+							:required="requiredList['contractlpriceformulaList-priceFormulaCode']" label="公式编码">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].priceFormulaCode" disabled
+								@change="changeData('contractlpriceformula-priceFormulaCode',i)" input-align='right'
+								placeholder="系统自动生成" :style='{"width":"100%"}' readonly>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-priceFormulaType')"
+							:required="requiredList['contractlpriceformulaList-priceFormulaType']" label="价格公式类型">
+							<jnpf-select v-model="dataForm.contractLPriceFormulaList[i].priceFormulaType"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-priceFormulaType')"
+								@change="changeData('contractlpriceformula-priceFormulaType',i)" clearable
+								placeholder="请选择" :props="contractlpriceformulapriceFormulaTypeProps"
+								:options="contractlpriceformulapriceFormulaTypeOptions" :style='{"width":"100%"}'>
+							</jnpf-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-fixedProfit1')"
+							:required="requiredList['contractlpriceformulaList-fixedProfit1']" label="固定利润1">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].fixedProfit1"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-fixedProfit1')"
+								@change="changeData('contractlpriceformula-fixedProfit1',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-fixedProfit2')"
+							:required="requiredList['contractlpriceformulaList-fixedProfit2']" label="固定利润2">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].fixedProfit2"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-fixedProfit2')"
+								@change="changeData('contractlpriceformula-fixedProfit2',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-fixedAmount')"
+							:required="requiredList['contractlpriceformulaList-fixedAmount']" label="固定金额">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].fixedAmount"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-fixedAmount')"
+								@change="changeData('contractlpriceformula-fixedAmount',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-accountCost')"
+							:required="requiredList['contractlpriceformulaList-accountCost']" label="户头费">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].accountCost"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-accountCost')"
+								@change="changeData('contractlpriceformula-accountCost',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-handleCost')"
+							:required="requiredList['contractlpriceformulaList-handleCost']" label="装卸费">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].handleCost"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-handleCost')"
+								@change="changeData('contractlpriceformula-handleCost',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-reshipmentCost')"
+							:required="requiredList['contractlpriceformulaList-reshipmentCost']" label="倒运费">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].reshipmentCost"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-reshipmentCost')"
+								@change="changeData('contractlpriceformula-reshipmentCost',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-otherCost1')"
+							:required="requiredList['contractlpriceformulaList-otherCost1']" label="其它费用1">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].otherCost1"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-otherCost1')"
+								@change="changeData('contractlpriceformula-otherCost1',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-otherCost2')"
+							:required="requiredList['contractlpriceformulaList-otherCost2']" label="其它费用2">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].otherCost2"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-otherCost2')"
+								@change="changeData('contractlpriceformula-otherCost2',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-otherCost3')"
+							:required="requiredList['contractlpriceformulaList-otherCost3']" label="其它费用3">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].otherCost3"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-otherCost3')"
+								@change="changeData('contractlpriceformula-otherCost3',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-otherCost4')"
+							:required="requiredList['contractlpriceformulaList-otherCost4']" label="其它费用4">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].otherCost4"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-otherCost4')"
+								@change="changeData('contractlpriceformula-otherCost4',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-settlementTonnage')"
+							:required="requiredList['contractlpriceformulaList-settlementTonnage']" label="结算吨数">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].settlementTonnage"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-settlementTonnage')"
+								@change="changeData('contractlpriceformula-settlementTonnage',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-correspondTonnage')"
+							:required="requiredList['contractlpriceformulaList-correspondTonnage']" label="对应吨数">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].correspondTonnage"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-correspondTonnage')"
+								@change="changeData('contractlpriceformula-correspondTonnage',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-saleTonnage')"
+							:required="requiredList['contractlpriceformulaList-saleTonnage']" label="销售吨数">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].saleTonnage"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-saleTonnage')"
+								@change="changeData('contractlpriceformula-saleTonnage',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-taxRate')"
+							:required="requiredList['contractlpriceformulaList-taxRate']" label="税率">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].taxRate"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-taxRate')"
+								@change="changeData('contractlpriceformula-taxRate',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-taxRateCustomer')"
+							:required="requiredList['contractlpriceformulaList-taxRateCustomer']" label="客户税负率">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].taxRateCustomer"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-taxRateCustomer')"
+								@change="changeData('contractlpriceformula-taxRateCustomer',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-taxRateYellowBull')"
+							:required="requiredList['contractlpriceformulaList-taxRateYellowBull']" label="黄牛税负率">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].taxRateYellowBull"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-taxRateYellowBull')"
+								@change="changeData('contractlpriceformula-taxRateYellowBull',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-taxRateInvoicingCompany')"
+							:required="requiredList['contractlpriceformulaList-taxRateInvoicingCompany']"
+							label="开票公司税负率">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].taxRateInvoicingCompany"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-taxRateInvoicingCompany')"
+								@change="changeData('contractlpriceformula-taxRateInvoicingCompany',i)"
+								input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpriceformulaList-fundRate')"
+							:required="requiredList['contractlpriceformulaList-fundRate']" label="资金利率">
+							<u-input v-model="dataForm.contractLPriceFormulaList[i].fundRate"
+								:disabled="judgeWrite('contractLPriceFormulaList')||judgeWrite('contractlpriceformulaList-fundRate')"
+								@change="changeData('contractlpriceformula-fundRate',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="jnpf-table-addBtn" @click="addcontractlpriceformulaList"
+					v-if="!judgeWrite('contractLPriceFormulaList')">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.contractLPriceFormulaList.length==0?"添加价格公式":"添加"}}</span>
+				</view>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="商品明细" content="商品明细">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table" v-if="judgeShow('contractLCommodityList')">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.contractLCommodityList" :key="i">
+					<view class="jnpf-table-item-title u-flex u-row-between">
+						<text class="jnpf-table-item-title-num">商品明细({{i+1}})</text>
+						<view class="jnpf-table-item-title-action"
+							v-if=" !judgeWrite('contractLCommodityList') && dataForm.contractLCommodityList.length>0"
+							@click="delcontractlcommodityList(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-productId')"
+							:required="requiredList['contractlcommodityList-productId']" label="商品ID">
+							<jnpf-popup-select v-model="dataForm.contractLCommodityList[i].productId"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-productId')"
+								@change="changeData('contractlcommodity-productId',i)" :rowIndex="i"
+								:formData="dataForm" :templateJson="interfaceRes.contractlcommodityproductId" clearable
+								propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+								relationField='id' :vModel="'productId'+i"
+								:columnOptions="contractlcommodityproductIdColumnOptions"
+								interfaceId="530288111456878597" :pageSize="20" placeholder="请选择" type="popup"
+								:style='{"width":"100%"}'>
+							</jnpf-popup-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-commodityCode')"
+							:required="requiredList['contractlcommodityList-commodityCode']" label="商品编码">
+							<u-input v-model="dataForm.contractLCommodityList[i].commodityCode"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-commodityCode')"
+								@change="changeData('contractlcommodity-commodityCode',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}' readonly>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-commodityName')"
+							:required="requiredList['contractlcommodityList-commodityName']" label="商品名称">
+							<u-input v-model="dataForm.contractLCommodityList[i].commodityName"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-commodityName')"
+								@change="changeData('contractlcommodity-commodityName',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}' readonly>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-specifications')"
+							:required="requiredList['contractlcommodityList-specifications']" label="商品规格">
+							<u-input v-model="dataForm.contractLCommodityList[i].specifications"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-specifications')"
+								@change="changeData('contractlcommodity-specifications',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}' readonly>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-inventoryUnitId')"
+							:required="requiredList['contractlcommodityList-inventoryUnitId']" label="库存单位">
+							<u-input v-model="dataForm.contractLCommodityList[i].inventoryUnitId"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-inventoryUnitId')"
+								@change="changeData('contractlcommodity-inventoryUnitId',i)" input-align='right'
+								clearable placeholder="请输入" :style='{"width":"100%"}' readonly>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-procureUnit')"
+							:required="requiredList['contractlcommodityList-procureUnit']" label="采购单位">
+							<jnpf-select v-model="dataForm.contractLCommodityList[i].procureUnit"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-procureUnit')"
+								@change="changeData('contractlcommodity-procureUnit',i)" clearable placeholder="请选择"
+								:props="contractlcommodityprocureUnitProps"
+								:options="contractlcommodityprocureUnitOptions" :style='{"width":"100%"}'>
+							</jnpf-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-number')"
+							:required="requiredList['contractlcommodityList-number']" label="数量">
+							<u-input v-model="dataForm.contractLCommodityList[i].number"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-number')"
+								@change="changeData('contractlcommodity-number',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-taxRate')"
+							:required="requiredList['contractlcommodityList-taxRate']" label="税率">
+							<u-input v-model="dataForm.contractLCommodityList[i].taxRate"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-taxRate')"
+								@change="changeData('contractlcommodity-taxRate',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-priceRate')"
+							:required="requiredList['contractlcommodityList-priceRate']" label="含税单价">
+							<u-input v-model="dataForm.contractLCommodityList[i].priceRate"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-priceRate')"
+								@change="changeData('contractlcommodity-priceRate',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlcommodityList-totalRate')"
+							:required="requiredList['contractlcommodityList-totalRate']" label="含税总金额">
+							<u-input v-model="dataForm.contractLCommodityList[i].totalRate"
+								:disabled="judgeWrite('contractLCommodityList')||judgeWrite('contractlcommodityList-totalRate')"
+								@change="changeData('contractlcommodity-totalRate',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="jnpf-table-addBtn" @click="addcontractlcommodityList"
+					v-if="!judgeWrite('contractLCommodityList')">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.contractLCommodityList.length==0?"添加商品明细":"添加"}}</span>
+				</view>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="费用条款" content="费用条款">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table" v-if="judgeShow('contractLFeeClauseList')">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.contractLFeeClauseList" :key="i">
+					<view class="jnpf-table-item-title u-flex u-row-between">
+						<text class="jnpf-table-item-title-num">费用条款({{i+1}})</text>
+						<view class="jnpf-table-item-title-action"
+							v-if=" !judgeWrite('contractLFeeClauseList') && dataForm.contractLFeeClauseList.length>0"
+							@click="delcontractLFeeClauseList(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractLFeeClauseList-feeType')"
+							:required="requiredList['contractLFeeClauseList-feeType']" label="费用类型">
+							<jnpf-select v-model="dataForm.contractLFeeClauseList[i].feeType"
+								:disabled="judgeWrite('contractLFeeClauseList')||judgeWrite('contractLFeeClauseList-feeType')"
+								@change="changeData('contractLFeeClause-feeType',i)" clearable filterable
+								placeholder="请选择" :props="contractLFeeClausefeeTypeProps"
+								:options="contractLFeeClausefeeTypeOptions" :style='{"width":"100%"}'>
+							</jnpf-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractLFeeClauseList-price')"
+							:required="requiredList['contractLFeeClauseList-price']" label="金额">
+							<jnpf-number-box v-model="dataForm.contractLFeeClauseList[i].price"
+								:disabled="judgeWrite('contractLFeeClauseList')||judgeWrite('contractLFeeClauseList-price')"
+								@change="changeData('contractLFeeClause-price',i)" :precision="2" addonAfter="元"
+								:controls="false" placeholder="数字文本" :step="1">
+							</jnpf-number-box>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractLFeeClauseList-remark')"
+							:required="requiredList['contractLFeeClauseList-remark']" label="备注">
+							<u-input v-model="dataForm.contractLFeeClauseList[i].remark"
+								:disabled="judgeWrite('contractLFeeClauseList')||judgeWrite('contractLFeeClauseList-remark')"
+								@change="changeData('contractLFeeClause-remark',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="jnpf-table-addBtn" @click="addcontractLFeeClauseList"
+					v-if="!judgeWrite('contractLFeeClauseList')">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.contractLFeeClauseList.length==0?"添加费用条款":"添加"}}</span>
+				</view>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="付款节点" content="付款节点">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table" v-if="judgeShow('contractLPaymentList')">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.contractLPaymentList" :key="i">
+					<view class="jnpf-table-item-title u-flex u-row-between">
+						<text class="jnpf-table-item-title-num">付款节点({{i+1}})</text>
+						<view class="jnpf-table-item-title-action"
+							v-if=" !judgeWrite('contractLPaymentList') && dataForm.contractLPaymentList.length>0"
+							@click="delcontractlpaymentList(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpaymentList-paymentNode')"
+							:required="requiredList['contractlpaymentList-paymentNode']" label="收付款节点">
+							<jnpf-select v-model="dataForm.contractLPaymentList[i].paymentNode"
+								:disabled="judgeWrite('contractLPaymentList')||judgeWrite('contractlpaymentList-paymentNode')"
+								@change="changeData('contractlpayment-paymentNode',i)" clearable placeholder="请选择"
+								:props="contractlpaymentpaymentNodeProps" :options="contractlpaymentpaymentNodeOptions"
+								:style='{"width":"100%"}'>
+							</jnpf-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpaymentList-paymentMethod')"
+							:required="requiredList['contractlpaymentList-paymentMethod']" label="收付款方式">
+							<jnpf-select v-model="dataForm.contractLPaymentList[i].paymentMethod"
+								:disabled="judgeWrite('contractLPaymentList')||judgeWrite('contractlpaymentList-paymentMethod')"
+								@change="changeData('contractlpayment-paymentMethod',i)" clearable placeholder="请选择"
+								:props="contractlpaymentpaymentMethodProps"
+								:options="contractlpaymentpaymentMethodOptions" :style='{"width":"100%"}'>
+							</jnpf-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpaymentList-paymentRatio')"
+							:required="requiredList['contractlpaymentList-paymentRatio']" label="付款比例">
+							<jnpf-number-box v-model="dataForm.contractLPaymentList[i].paymentRatio"
+								:disabled="judgeWrite('contractLPaymentList')||judgeWrite('contractlpaymentList-paymentRatio')"
+								@change="changeData('contractlpayment-paymentRatio',i)" :precision="1" addonAfter="%"
+								:controls="false" placeholder="请输入" :step="1">
+							</jnpf-number-box>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpaymentList-price')"
+							:required="requiredList['contractlpaymentList-price']" label="金额">
+							<jnpf-number-box v-model="dataForm.contractLPaymentList[i].price"
+								:disabled="judgeWrite('contractLPaymentList')||judgeWrite('contractlpaymentList-price')"
+								@change="changeData('contractlpayment-price',i)" :precision="2" addonAfter="元"
+								:controls="false" placeholder="请输入" :step="1">
+							</jnpf-number-box>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('contractlpaymentList-remark')"
+							:required="requiredList['contractlpaymentList-remark']" label="备注">
+							<u-input v-model="dataForm.contractLPaymentList[i].remark"
+								:disabled="judgeWrite('contractLPaymentList')||judgeWrite('contractlpaymentList-remark')"
+								@change="changeData('contractlpayment-remark',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="jnpf-table-addBtn" @click="addcontractlpaymentList"
+					v-if="!judgeWrite('contractLPaymentList')">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.contractLPaymentList.length==0?"添加付款节点":"添加"}}</span>
+				</view>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('totalAmount')" :required="requiredList.totalAmount" label="合计金额（人民币）"
+					prop="totalAmount">
+					<jnpf-number-box v-model="dataForm.totalAmount" :disabled="judgeWrite('totalAmount')"
+						@change="changeData('totalAmount',-1)" :precision="2" addonAfter="元" :controls="false"
+						placeholder="数字文本" :step="1">
+					</jnpf-number-box>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('amountCapitalization')" :required="requiredList.amountCapitalization"
+					label="大写金额（人民币）" prop="amountCapitalization">
+					<u-input v-model="dataForm.amountCapitalization" :disabled="judgeWrite('amountCapitalization')"
+						@change="changeData('amountCapitalization',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="其他信息" content="其他信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractRequirement')" :required="requiredList.contractRequirement"
+					label="合同要求" prop="contractRequirement">
+					<u-input v-model="dataForm.contractRequirement" :disabled="judgeWrite('contractRequirement')"
+						@change="changeData('contractRequirement',-1)" input-align='right' placeholder="请输入"
+						type="textarea" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('remark')" :required="requiredList.remark" label="备注" label-width="0"
+					prop="remark">
+					<u-input v-model="dataForm.remark" :disabled="judgeWrite('remark')"
+						@change="changeData('remark',-1)" input-align='right' placeholder="请输入" type="textarea"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="附件信息" content="附件信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractAppendices')" :required="requiredList.contractAppendices"
+					label="合同附件" prop="contractAppendices">
+					<jnpf-file v-model="dataForm.contractAppendices" :disabled="judgeWrite('contractAppendices')"
+						@change="changeData('contractAppendices',-1)" :list="dataForm.contractAppendices"
+						tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
+						pathType="defaultPath" :isAccount="0">
+					</jnpf-file>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('ancillaryDocuments')" :required="requiredList.ancillaryDocuments"
+					label="附属文件" prop="ancillaryDocuments">
+					<jnpf-file v-model="dataForm.ancillaryDocuments" :disabled="judgeWrite('ancillaryDocuments')"
+						@change="changeData('ancillaryDocuments',-1)" :list="dataForm.ancillaryDocuments"
+						tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
+						pathType="defaultPath" :isAccount="0">
+					</jnpf-file>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('transactionAppendices')" :required="requiredList.transactionAppendices"
+					label="关联交易合同（二级）" prop="transactionAppendices">
+					<jnpf-file v-model="dataForm.transactionAppendices" :disabled="judgeWrite('transactionAppendices')"
+						@change="changeData('transactionAppendices',-1)" :list="dataForm.transactionAppendices"
+						tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
+						pathType="defaultPath" :isAccount="0">
+					</jnpf-file>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('transactionAppendices2')" :required="requiredList.transactionAppendices2"
+					label="关联交易合同（三级）" prop="transactionAppendices2">
+					<jnpf-file v-model="dataForm.transactionAppendices2"
+						:disabled="judgeWrite('transactionAppendices2')"
+						@change="changeData('transactionAppendices2',-1)" :list="dataForm.transactionAppendices2"
+						tipText="支持格式：.rar .zip .doc .docx .pdf ，单个文件不能超过20MB" sizeUnit="MB" :fileSize="20" :limit="9"
+						pathType="defaultPath" :isAccount="0">
+					</jnpf-file>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="合同标签" content="合同标签">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('contractLabel')" :required="requiredList.contractLabel" label="合同标签"
+					prop="contractLabel">
+					<jnpf-checkbox v-model="dataForm.contractLabel" :disabled="judgeWrite('contractLabel')"
+						@change="changeData('contractLabel',-1)" optionType="default" direction="horizontal"
+						:props="contractLabelProps" :options="contractLabelOptions">
+					</jnpf-checkbox>
+				</u-form-item>
+			</view>
+		</u-form>
+		<u-modal v-model="show" :content="content" width='70%' border-radius="16"
+			:content-style="{fontSize: '28rpx',padding: '20rpx',lineHeight: '44rpx',textAlign: 'left'}"
+			:titleStyle="{padding: '20rpx'}" :confirm-style="{height: '80rpx',lineHeight: '80rpx'}" :title="title"
+			confirm-text="确定">
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		getDictionaryDataSelector,
+		getDataInterfaceRes,
+		getDefaultCurrentValueUserId,
+		getDefaultCurrentValueDepartmentId
+	} from '@/api/common'
+	import comMixin from '../../../workFlow/workFlowForm/mixin'
+	import {
+		getDateDay,
+		getLaterData,
+		getBeforeData,
+		getBeforeTime,
+		getLaterTime
+	} from '@/components/index.js'
+	import request from '@/utils/request'
+	export default {
+		mixins: [comMixin],
+		data() {
+			return {
+				idList: [],
+				index: 0,
+				actionList: [],
+				actionListLength: false,
+				showAction: false,
+				btnLoading: false,
+				loading: false,
+				text: '提示：测试文本',
+				tableKey: '',
+				dataForm: {
+					id: "",
+					contractType: "1",
+					contractTemplateId: "",
+					contractNumber: '',
+					contractName: '',
+					contractNo: '',
+					contractSignedTime: '',
+					businessId: "",
+					contractPeriodTime: '',
+					contractPeriodTimeEnd: '',
+					deptId: [],
+					subject: "522407918746741061",
+					procurementModel: "",
+					relatedContractId: "",
+					subject2: "",
+					subject3: "",
+					deliveryModel: "",
+					deliveryLocation: '',
+					modeTransport: "",
+					costBearingMian: "",
+					pricingModel: "",
+					totalAmount: 0,
+					amountCapitalization: '',
+					contractRequirement: '',
+					remark: '',
+					contractAppendices: [],
+					ancillaryDocuments: [],
+					transactionAppendices: [],
+					transactionAppendices2: [],
+					contractLabel: [],
+					contractLPriceFormulaList: [],
+					contractLCommodityList: [],
+					contractLFeeClauseList: [],
+					contractLPaymentList: [],
+				},
+				rules: {
+					contractName: [{
+						required: true,
+						message: '合同名称请输入',
+					}, ],
+					contractPeriodTime: [{
+						required: true,
+						message: '有效期开始 请选择',
+					}, ],
+					contractPeriodTimeEnd: [{
+						required: true,
+						message: '有效期结束 请选择',
+					}, ],
+					procurementModel: [{
+						required: true,
+						message: '采购模式请选择',
+					}, ],
+					relatedContractId: [{
+						required: true,
+						message: '关联销售合同请选择',
+					}, ],
+					deliveryModel: [{
+						required: true,
+						message: '交货方式请选择',
+					}, ],
+					deliveryLocation: [{
+						required: true,
+						message: '交货地点 请输入',
+					}, ],
+					modeTransport: [{
+						required: true,
+						message: '运输方式请选择',
+					}, ],
+					costBearingMian: [{
+						required: true,
+						message: '费用承担主体请选择',
+					}, ],
+					pricingModel: [{
+						required: true,
+						message: '定价模式 请选择',
+					}, ],
+					totalAmount: [{
+						required: true,
+						message: '合计金额（人民币）数字文本',
+					}, ],
+					amountCapitalization: [{
+						required: true,
+						message: '大写金额（人民币）请输入',
+					}, ],
+				},
+				contractTypeOptions: [],
+				contractTypeProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				contractTemplateIdColumnOptions: [{
+						"label": "合同模板",
+						"value": "name"
+					},
+					{
+						"label": "合同类型",
+						"value": "type"
+					},
+					{
+						"label": "状态",
+						"value": "status"
+					},
+				],
+				businessIdColumnOptions: [{
+					"label": "名称",
+					"value": "name"
+				}, ],
+				subjectColumnOptions: [{
+						"label": "类型",
+						"value": "subject_basic_type"
+					},
+					{
+						"label": "级别",
+						"value": "calssify"
+					},
+					{
+						"label": "主体名称",
+						"value": "name"
+					},
+					{
+						"label": "社会统一信息代码",
+						"value": "information_code"
+					},
+					{
+						"label": "付款方式",
+						"value": "payment_method"
+					},
+					{
+						"label": "合作方式",
+						"value": "collaboration_method"
+					},
+					{
+						"label": "结算方式",
+						"value": "settlement_method"
+					},
+					{
+						"label": "预付比例",
+						"value": "advance_ratio"
+					},
+					{
+						"label": "账期",
+						"value": "account_period"
+					},
+					{
+						"label": "压款方式",
+						"value": "underpayment_method"
+					},
+					{
+						"label": "保证金方式",
+						"value": "margin_method"
+					},
+					{
+						"label": "逾期利率",
+						"value": "overdue_interest_rate"
+					},
+				],
+				procurementModelOptions: [],
+				procurementModelProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				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",
+					"multiple": false,
+					"children": ""
+				},
+				modeTransportOptions: [],
+				modeTransportProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				costBearingMianOptions: [],
+				costBearingMianProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				pricingModelOptions: [],
+				pricingModelProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				contractLabelOptions: [],
+				contractLabelProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				contractlpriceformulapriceFormulaTypeOptions: [],
+				contractlpriceformulapriceFormulaTypeProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				contractlcommodityproductIdColumnOptions: [{
+						"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",
+					"multiple": false,
+					"children": ""
+				},
+				contractLFeeClausefeeTypeOptions: [],
+				contractLFeeClausefeeTypeProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				contractlpaymentpaymentNodeOptions: [],
+				contractlpaymentpaymentNodeProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				contractlpaymentpaymentMethodOptions: [],
+				contractlpaymentpaymentMethodProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				labelwidth: 130 * 1.5,
+				menuId: '',
+				jurisdictionType: '',
+				ruleList: {
+					contractLPriceFormulaList: {},
+					contractLCommodityList: {},
+					contractLFeeClauseList: {
+						'feeType': '费用类型不能为空',
+					},
+					contractLPaymentList: {},
+				},
+				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: [],
+				},
+				regList: {
+					contractLPriceFormulaList: {
+						priceFormulaCode: [],
+						priceFormulaType: [],
+						fixedProfit1: [],
+						fixedProfit2: [],
+						fixedAmount: [],
+						accountCost: [],
+						handleCost: [],
+						reshipmentCost: [],
+						otherCost1: [],
+						otherCost2: [],
+						otherCost3: [],
+						otherCost4: [],
+						settlementTonnage: [],
+						correspondTonnage: [],
+						saleTonnage: [],
+						taxRate: [],
+						taxRateCustomer: [],
+						taxRateYellowBull: [],
+						taxRateInvoicingCompany: [],
+						fundRate: [],
+					},
+					contractLCommodityList: {
+						productId: [],
+						commodityCode: [],
+						commodityName: [],
+						specifications: [],
+						inventoryUnitId: [],
+						procureUnit: [],
+						number: [],
+						taxRate: [],
+						priceRate: [],
+						totalRate: [],
+					},
+					contractLFeeClauseList: {
+						feeType: [],
+						price: [],
+						remark: [],
+					},
+					contractLPaymentList: {
+						paymentNode: [],
+						paymentMethod: [],
+						paymentRatio: [],
+						price: [],
+						remark: [],
+					},
+				},
+				ableAll: {
+					deptIdableIds: [],
+				},
+				childIndex: -1,
+				dataValue: {},
+				isEdit: false,
+				userInfo: {},
+				formatType: {
+					"yyyy": "yyyy",
+					"yyyy-MM": "yyyy-mm",
+					"yyyy-MM-dd": "yyyy-mm-dd",
+					"yyyy-MM-dd HH:mm": "yyyy-mm-dd hh:MM",
+					"yyyy-MM-dd HH:mm:ss": "yyyy-mm-dd hh:MM:ss",
+					"HH:mm:ss": "hh:MM:ss",
+					"HH:mm": "hh:MM"
+				},
+				content: '',
+				title: '',
+				show: false,
+			}
+		},
+		onLoad(option) {
+			uni.$on('linkPageConfirm', (subVal) => {
+				if (this.tableKey) {
+					for (let i = 0; i < subVal.length; i++) {
+						let t = subVal[i]
+						if (this['get' + this.tableKey]) {
+							this['get' + this.tableKey](t)
+						}
+					}
+					this.childIndex = -1
+					this.collapse()
+				}
+			})
+			this.jurisdictionType = option.jurisdictionType
+			this.menuId = option.menuId
+			this.userInfo = uni.getStorageSync('userInfo') || {}
+			this.dataForm.id = option.id || 0
+			let _title = ""
+			if (option.jurisdictionType == 'btn_edit') {
+				_title = "编辑"
+			}
+			if (option.jurisdictionType == 'btn_detail') {
+				_title = "详情"
+			}
+			if (option.jurisdictionType == 'btn_add') {
+				_title = "新增"
+			}
+			if (_title) {
+				uni.setNavigationBarTitle({
+					title: _title
+				})
+			}
+			this.selfInit()
+			this.initDefaultData()
+			this.dataAll()
+			this.initData()
+			this.dataValue = JSON.parse(JSON.stringify(this.dataForm))
+			this.idList = option.idList ? option.idList.split(",") : []
+			for (let i = 0; i < this.idList.length; i++) {
+				if (this.idList[i] == option.id) {
+					this.index = i;
+				}
+			}
+		},
+		onReady() {
+			this.$nextTick(() => {
+				setTimeout(() => {
+					console.log(this.rules)
+					this.$refs.dataForm.setRules(this.rules);
+				}, 100)
+			})
+		},
+		watch: {
+			dataForm: {
+				handler(val, oldVal) {
+					this.contractlpriceformula()
+					this.contractlcommodity()
+					this.contractLFeeClause()
+					this.contractlpayment()
+				},
+				deep: true
+			}
+		},
+		methods: {
+			handleAction(index) {
+				if (this.actionList[index].id === 'save_add' || this.actionList[index].id === 'save_proceed') {
+					this.submitForm(1)
+				} else {
+					this.calculation(this.actionList[index].id, index)
+				}
+			},
+			calculation(type, index) {
+				if (type === 'upper') {
+					this.index--
+					this.actionList[index + 1].disabled = false
+					if (this.index == 0) this.actionList[index].disabled = true
+				} else {
+					this.index++
+					this.actionList[index - 1].disabled = false
+					if (this.index == this.idList.length - 1) this.actionList[index].disabled = true
+				}
+				this.dataForm.id = this.idList[this.index]
+				this.initData()
+			},
+			changeData(model, index) {
+				this.isEdit = false
+				this.childIndex = index
+				let modelAll = model.split("-");
+				let faceMode = "";
+				for (let i = 0; i < modelAll.length; i++) {
+					faceMode += modelAll[i];
+				}
+				for (let key in this.interfaceRes) {
+					if (key != faceMode) {
+						let faceReList = this.interfaceRes[key]
+						for (let i = 0; i < faceReList.length; i++) {
+							if (faceReList[i].relationField == model) {
+								let options = 'get' + key + 'Options';
+								if (this[options]) {
+									this[options]()
+								}
+								this.changeData(key, index)
+							}
+						}
+					}
+				}
+			},
+			changeDataFormData(type, data, model, index, defaultValue, edit) {
+				if (!edit) {
+					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
+					}
+				}
+			},
+			clickIcon(label, tipLabel) {
+				this.content = tipLabel
+				this.title = label
+				this.show = true
+			},
+			exist() {
+				let title = [];
+				let _ruleList = this.ruleList
+				for (let k in _ruleList) {
+					let childData = this.dataForm[k]
+					childData.forEach((item, index) => {
+						for (let model in _ruleList[k]) {
+							if (item[model] instanceof Array) {
+								if (item[model].length == 0) {
+									title.push(_ruleList[k][model])
+								}
+							} else if (!item[model]) {
+								title.push(_ruleList[k][model])
+							}
+						}
+					})
+				}
+				let _regList = this.regList
+				for (let k in _regList) {
+					let childData = this.dataForm[k]
+					for (let n in _regList[k]) {
+						for (let i = 0; i < _regList[k][n].length; i++) {
+							const element = _regList[k][n][i]
+							if (element.pattern) {
+								element.pattern = element.pattern.toString()
+								let start = element.pattern.indexOf('/')
+								let stop = element.pattern.lastIndexOf('/')
+								let str = element.pattern.substring(start + 1, stop)
+								let reg = new RegExp(str)
+								element.pattern = reg
+							}
+							childData.forEach((item, index) => {
+								if (item[n] && !element.pattern.test(item[n])) {
+									title.push(element.message)
+								}
+							})
+						}
+					}
+				}
+				if (title.length > 0) {
+					return title[0]
+				}
+			},
+			resetForm() {
+				uni.navigateBack()
+			},
+			dataAll() {
+				this.getcontractTypeOptions()
+				this.getprocurementModelOptions()
+				this.getdeliveryModelOptions()
+				this.getmodeTransportOptions()
+				this.getcostBearingMianOptions()
+				this.getpricingModelOptions()
+				this.getcontractLabelOptions()
+				this.getcontractlpriceformulapriceFormulaTypeOptions()
+				this.getcontractLFeeClausefeeTypeOptions()
+				this.getcontractlpaymentpaymentNodeOptions()
+				this.getcontractlpaymentpaymentMethodOptions()
+				this.collapse()
+			},
+			dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+				let timeDataValue = null;
+				let timeValue = Number(timeValueData)
+				if (timeRule) {
+					if (timeType == 1) {
+						timeDataValue = timeValueData ? timeValue : null
+					} 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 && timeValue) {
+						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;
+			},
+			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
+				})
+			},
+			contractlpriceformula() {
+				let table = this.dataForm.contractLPriceFormulaList
+				let summaryField = []
+				let summaryFieldName = {}
+				let data = {}
+				let thousandsField = []
+				for (let i in summaryField) {
+					let map = {}
+					let val = 0
+					for (let j = 0; j < table.length; j++) {
+						let summary = table[j][summaryField[i]];
+						if (summary) {
+							let data = isNaN(summary) ? 0 : Number(summary)
+							val += data
+						}
+					}
+					map.id = summaryField[i];
+					map.name = summaryFieldName[summaryField[i]];
+					map.val = (thousandsField.includes(summaryField[i])) ? Number(val).toLocaleString('zh', {
+						maximumFractionDigits: '2'
+					}) : val;
+					data[summaryField[i]] = map;
+				}
+				return data;
+			},
+			getcontractlpriceformulapriceFormulaTypeOptions() {
+				getDictionaryDataSelector('529925559430414341').then(res => {
+					this.contractlpriceformulapriceFormulaTypeOptions = res.data.list
+				})
+			},
+			contractlcommodity() {
+				let table = this.dataForm.contractLCommodityList
+				let summaryField = []
+				let summaryFieldName = {}
+				let data = {}
+				let thousandsField = []
+				for (let i in summaryField) {
+					let map = {}
+					let val = 0
+					for (let j = 0; j < table.length; j++) {
+						let summary = table[j][summaryField[i]];
+						if (summary) {
+							let data = isNaN(summary) ? 0 : Number(summary)
+							val += data
+						}
+					}
+					map.id = summaryField[i];
+					map.name = summaryFieldName[summaryField[i]];
+					map.val = (thousandsField.includes(summaryField[i])) ? Number(val).toLocaleString('zh', {
+						maximumFractionDigits: '2'
+					}) : val;
+					data[summaryField[i]] = map;
+				}
+				return data;
+			},
+			contractLFeeClause() {
+				let table = this.dataForm.contractLFeeClauseList
+				let summaryField = []
+				let summaryFieldName = {}
+				let data = {}
+				let thousandsField = []
+				for (let i in summaryField) {
+					let map = {}
+					let val = 0
+					for (let j = 0; j < table.length; j++) {
+						let summary = table[j][summaryField[i]];
+						if (summary) {
+							let data = isNaN(summary) ? 0 : Number(summary)
+							val += data
+						}
+					}
+					map.id = summaryField[i];
+					map.name = summaryFieldName[summaryField[i]];
+					map.val = (thousandsField.includes(summaryField[i])) ? Number(val).toLocaleString('zh', {
+						maximumFractionDigits: '2'
+					}) : val;
+					data[summaryField[i]] = map;
+				}
+				return data;
+			},
+			getcontractLFeeClausefeeTypeOptions() {
+				getDictionaryDataSelector('528957381233606661').then(res => {
+					this.contractLFeeClausefeeTypeOptions = res.data.list
+				})
+			},
+			contractlpayment() {
+				let table = this.dataForm.contractLPaymentList
+				let summaryField = []
+				let summaryFieldName = {}
+				let data = {}
+				let thousandsField = []
+				for (let i in summaryField) {
+					let map = {}
+					let val = 0
+					for (let j = 0; j < table.length; j++) {
+						let summary = table[j][summaryField[i]];
+						if (summary) {
+							let data = isNaN(summary) ? 0 : Number(summary)
+							val += data
+						}
+					}
+					map.id = summaryField[i];
+					map.name = summaryFieldName[summaryField[i]];
+					map.val = (thousandsField.includes(summaryField[i])) ? Number(val).toLocaleString('zh', {
+						maximumFractionDigits: '2'
+					}) : val;
+					data[summaryField[i]] = map;
+				}
+				return data;
+			},
+			getcontractlpaymentpaymentNodeOptions() {
+				getDictionaryDataSelector('529219891287294021').then(res => {
+					this.contractlpaymentpaymentNodeOptions = res.data.list
+				})
+			},
+			getcontractlpaymentpaymentMethodOptions() {
+				getDictionaryDataSelector('529220245760507973').then(res => {
+					this.contractlpaymentpaymentMethodOptions = res.data.list
+				})
+			},
+			initData() {
+				this.$nextTick(function() {
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/scm/ContractL/' + this.dataForm.id,
+							method: 'get',
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						})
+					} else {
+						this.initDefaultData()
+					}
+				})
+			},
+			beforeSubmit() {
+				const _data = this.dataList()
+				return _data
+			},
+			initDefaultData() {
+				if (this.userInfo.organizeIdList instanceof Array && this.userInfo.organizeIdList.length > 0) {
+					this.dataForm.deptId = this.userInfo.organizeIdList
+				}
+			},
+			selfInit() {
+				this.$store.commit('base/UPDATE_RELATION_DATA', {})
+				this.dataAll()
+				this.initDefaultData()
+				this.collapse()
+			},
+			selfGetInfo(dataForm) {
+				this.dataForm.id = this.dataForm.id
+				this.dataInfo(dataForm)
+			},
+			addcontractlpriceformulaList() {
+				let value = {}
+				this.tableKey = 'contractLPriceFormulaList';
+				this.getcontractlpriceformulaList(value)
+				this.childIndex = -1
+				this.collapse()
+			},
+			delcontractlpriceformulaList(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.contractLPriceFormulaList.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getcontractlpriceformulaList(value) {
+				let item = {
+					priceFormulaCode: '',
+					priceFormulaType: "",
+					priceFormulaTypeOptions: [],
+					fixedProfit1: '',
+					fixedProfit2: '',
+					fixedAmount: '',
+					accountCost: '',
+					handleCost: '',
+					reshipmentCost: '',
+					otherCost1: '',
+					otherCost2: '',
+					otherCost3: '',
+					otherCost4: '',
+					settlementTonnage: '',
+					correspondTonnage: '',
+					saleTonnage: '',
+					taxRate: '',
+					taxRateCustomer: '',
+					taxRateYellowBull: '',
+					taxRateInvoicingCompany: '',
+					fundRate: '',
+				}
+				let result = {
+					...item,
+					...value
+				}
+				this.dataForm.contractLPriceFormulaList.push(result)
+				this.childIndex = this.dataForm.contractLPriceFormulaList.length - 1
+				this.isEdit = true
+				this.isEdit = false
+			},
+			addcontractlcommodityList() {
+				let value = {}
+				this.tableKey = 'contractLCommodityList';
+				this.getcontractlcommodityList(value)
+				this.childIndex = -1
+				this.collapse()
+			},
+			delcontractlcommodityList(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.contractLCommodityList.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getcontractlcommodityList(value) {
+				let item = {
+					productId: "",
+					commodityCode: '',
+					commodityName: '',
+					specifications: '',
+					inventoryUnitId: '',
+					procureUnit: "",
+					number: '',
+					taxRate: '',
+					priceRate: '',
+					totalRate: '',
+				}
+				let result = {
+					...item,
+					...value
+				}
+				this.dataForm.contractLCommodityList.push(result)
+				this.childIndex = this.dataForm.contractLCommodityList.length - 1
+				this.isEdit = true
+				this.isEdit = false
+			},
+			addcontractLFeeClauseList() {
+				let value = {}
+				this.tableKey = 'contractLFeeClauseList';
+				this.getcontractLFeeClauseList(value)
+				this.childIndex = -1
+				this.collapse()
+			},
+			delcontractLFeeClauseList(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.contractLFeeClauseList.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getcontractLFeeClauseList(value) {
+				let item = {
+					feeType: "",
+					feeTypeOptions: [],
+					price: 0,
+					remark: '',
+				}
+				let result = {
+					...item,
+					...value
+				}
+				this.dataForm.contractLFeeClauseList.push(result)
+				this.childIndex = this.dataForm.contractLFeeClauseList.length - 1
+				this.isEdit = true
+				this.isEdit = false
+			},
+			addcontractlpaymentList() {
+				let value = {}
+				this.tableKey = 'contractLPaymentList';
+				this.getcontractlpaymentList(value)
+				this.childIndex = -1
+				this.collapse()
+			},
+			delcontractlpaymentList(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.contractLPaymentList.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getcontractlpaymentList(value) {
+				let item = {
+					paymentNode: "",
+					paymentNodeOptions: [],
+					paymentMethod: "",
+					paymentMethodOptions: [],
+					paymentRatio: 0,
+					price: 0,
+					remark: '',
+				}
+				let result = {
+					...item,
+					...value
+				}
+				this.dataForm.contractLPaymentList.push(result)
+				this.childIndex = this.dataForm.contractLPaymentList.length - 1
+				this.isEdit = true
+				this.isEdit = false
+			},
+			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
+				this.collapse()
+			},
+			collapse() {
+				setTimeout(() => {}, 1000);
+			},
+		},
+	}
+</script>
+<style>
+	page {
+		background-color: #f0f2f6;
+	}
+</style>
\ No newline at end of file
diff --git a/jnpf-app/pages/scm/form/productWarehouse/index.vue b/jnpf-app/pages/scm/form/productWarehouse/index.vue
new file mode 100644
index 00000000..6bba71c8
--- /dev/null
+++ b/jnpf-app/pages/scm/form/productWarehouse/index.vue
@@ -0,0 +1,1330 @@
+<template>
+	<view class="jnpf-wrap jnpf-wrap-form" v-if="!loading">
+		<u-form :model="dataForm" :rules="rules" ref="dataForm" :errorType="['toast']" label-position="left"
+			label-align="right" :label-width="labelwidth" class="jnpf-form">
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="商品类型" content="商品类型">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('productTypeId')" :required="requiredList.productTypeId" label="商品类型"
+					prop="productTypeId">
+					<jnpf-radio v-model="dataForm.productTypeId" :disabled="judgeWrite('productTypeId')"
+						@change="changeData('productTypeId',-1)" optionType="default" direction="horizontal"
+						:props="productTypeIdProps" :options="productTypeIdOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="基本信息" content="基本信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('photo')" :required="requiredList.photo" label="商品图片" prop="photo">
+					<jnpf-upload v-model="dataForm.photo" :disabled="judgeWrite('photo')"
+						@change="changeData('photo',-1)" tipText="建议尺寸：800 x 800 像素" sizeUnit="MB" :fileSize="10"
+						:limit="9" pathType="defaultPath" :isAccount="0" :value="dataForm.photo">
+					</jnpf-upload>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('code')" :required="requiredList.code" label="商品编码" prop="code">
+					<u-input v-model="dataForm.code" disabled @change="changeData('code',-1)" input-align='right'
+						placeholder="系统自动生成" :style='{"width":"100%"}' readonly>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('name')" :required="requiredList.name" label="商品名称" prop="name">
+					<u-input v-model="dataForm.name" :disabled="judgeWrite('name')" @change="changeData('name',-1)"
+						input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('shortName')" :required="requiredList.shortName" label="商品简称"
+					prop="shortName">
+					<u-input v-model="dataForm.shortName" :disabled="judgeWrite('shortName')"
+						@change="changeData('shortName',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('spec')" :required="requiredList.spec" label="商品规格" prop="spec">
+					<u-input v-model="dataForm.spec" :disabled="judgeWrite('spec')" @change="changeData('spec',-1)"
+						input-align='right' clearable placeholder="请输入" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('inventoryType')" :required="requiredList.inventoryType" label="存货类型"
+					prop="inventoryType">
+					<jnpf-select v-model="dataForm.inventoryType" :disabled="judgeWrite('inventoryType')"
+						@change="changeData('inventoryType',-1)" clearable placeholder="请选择" :props="inventoryTypeProps"
+						:options="inventoryTypeOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('brandId')" :required="requiredList.brandId" label="品牌" prop="brandId">
+					<jnpf-popup-select v-model="dataForm.brandId" :disabled="judgeWrite('brandId')"
+						@change="changeData('brandId',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.brandId" hasPage clearable propsValue="id" popupWidth="800px"
+						popupTitle="选择数据" popupType="dialog" relationField='brand_name' vModel='brandId'
+						:columnOptions="brandIdColumnOptions" interfaceId="518049412669244677" :pageSize="20"
+						placeholder="请选择" type="popup" :style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('productCategoryId')" :required="requiredList.productCategoryId"
+					label="商品分类" prop="productCategoryId">
+					<jnpf-select v-model="dataForm.productCategoryId" :disabled="judgeWrite('productCategoryId')"
+						@change="changeData('productCategoryId',-1)" clearable placeholder="请选择"
+						:props="productCategoryIdProps" :options="productCategoryIdOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('area')" :required="requiredList.area" label="产地" prop="area">
+					<jnpf-city-select v-model="dataForm.area" :disabled="judgeWrite('area')"
+						@change="changeData('area',-1)" selectType="all" clearable placeholder="请选择" :level="2"
+						:style='{"width":"100%"}'>
+					</jnpf-city-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="商品特性" content="商品特性">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('dangerousFlag')" :required="requiredList.dangerousFlag" label="危险品"
+					prop="dangerousFlag">
+					<jnpf-radio v-model="dataForm.dangerousFlag" :disabled="judgeWrite('dangerousFlag')"
+						@change="changeData('dangerousFlag',-1)" optionType="default" direction="horizontal"
+						:props="dangerousFlagProps" :options="dangerousFlagOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('importedFlag')" :required="requiredList.importedFlag" label="进口商品"
+					prop="importedFlag">
+					<jnpf-radio v-model="dataForm.importedFlag" :disabled="judgeWrite('importedFlag')"
+						@change="changeData('importedFlag',-1)" optionType="default" direction="horizontal"
+						:props="importedFlagProps" :options="importedFlagOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('processedFlag')" :required="requiredList.processedFlag" label="加工商品"
+					prop="processedFlag">
+					<jnpf-radio v-model="dataForm.processedFlag" :disabled="judgeWrite('processedFlag')"
+						@change="changeData('processedFlag',-1)" optionType="default" direction="horizontal"
+						:props="processedFlagProps" :options="processedFlagOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('outsourcedFlag')" :required="requiredList.outsourcedFlag" label="委外商品"
+					prop="outsourcedFlag">
+					<jnpf-radio v-model="dataForm.outsourcedFlag" :disabled="judgeWrite('outsourcedFlag')"
+						@change="changeData('outsourcedFlag',-1)" optionType="default" direction="horizontal"
+						:props="outsourcedFlagProps" :options="outsourcedFlagOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="供应链/财务信息" content="供应链/财务信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('firstSupplierId')" :required="requiredList.firstSupplierId" label="首选供应商"
+					prop="firstSupplierId">
+					<jnpf-popup-select v-model="dataForm.firstSupplierId" :disabled="judgeWrite('firstSupplierId')"
+						@change="changeData('firstSupplierId',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.firstSupplierId" clearable propsValue="id" popupWidth="800px"
+						popupTitle="选择数据" popupType="dialog" relationField='fullName' vModel='firstSupplierId'
+						:columnOptions="firstSupplierIdColumnOptions" interfaceId="518050631542375685" :pageSize="20"
+						placeholder="请选择" type="popup" :style='{"width":"100%"}'>
+					</jnpf-popup-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('outputTaxRate')" :required="requiredList.outputTaxRate" label="销项税率"
+					prop="outputTaxRate">
+					<jnpf-select v-model="dataForm.outputTaxRate" :disabled="judgeWrite('outputTaxRate')"
+						@change="changeData('outputTaxRate',-1)" placeholder="请选择" :props="outputTaxRateProps"
+						:options="outputTaxRateOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('inputTaxRate')" :required="requiredList.inputTaxRate" label="进项税率"
+					prop="inputTaxRate">
+					<jnpf-select v-model="dataForm.inputTaxRate" :disabled="judgeWrite('inputTaxRate')"
+						@change="changeData('inputTaxRate',-1)" clearable placeholder="请选择" :props="inputTaxRateProps"
+						:options="inputTaxRateOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('deliveryType')" :required="requiredList.deliveryType" label="配送方式"
+					prop="deliveryType">
+					<jnpf-radio v-model="dataForm.deliveryType" :disabled="judgeWrite('deliveryType')"
+						@change="changeData('deliveryType',-1)" optionType="default" direction="horizontal"
+						:props="deliveryTypeProps" :options="deliveryTypeOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="单位/价格信息" content="单位/价格信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('manyUnitFlag')" :required="requiredList.manyUnitFlag" label="开启多单位"
+					prop="manyUnitFlag">
+					<jnpf-radio v-model="dataForm.manyUnitFlag" :disabled="judgeWrite('manyUnitFlag')"
+						@change="changeData('manyUnitFlag',-1)" optionType="default" direction="horizontal"
+						:props="manyUnitFlagProps" :options="manyUnitFlagOptions">
+					</jnpf-radio>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table" v-if="judgeShow('productunitList')">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.productunitList" :key="i">
+					<view class="jnpf-table-item-title u-flex u-row-between">
+						<text class="jnpf-table-item-title-num">商品单位({{i+1}})</text>
+						<view class="jnpf-table-item-title-action"
+							v-if=" !judgeWrite('productunitList') && dataForm.productunitList.length>0"
+							@click="delproductunitList(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('productunitList-productUnitwarehouseId')"
+							:required="requiredList['productunitList-productUnitwarehouseId']" label="单位名称">
+							<jnpf-select v-model="dataForm.productunitList[i].productUnitwarehouseId"
+								:disabled="judgeWrite('productunitList')||judgeWrite('productunitList-productUnitwarehouseId')"
+								@change="changeData('productunit-productUnitwarehouseId',i)" clearable placeholder="请选择"
+								:props="productunitproductUnitwarehouseIdProps"
+								:options="dataForm.productunitList[i].productUnitwarehouseIdOptions"
+								:style='{"width":"100%"}'>
+							</jnpf-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('productunitList-conversionRules')"
+							:required="requiredList['productunitList-conversionRules']" label="换算规则">
+							<u-input v-model="dataForm.productunitList[i].conversionRules"
+								:disabled="judgeWrite('productunitList')||judgeWrite('productunitList-conversionRules')"
+								@change="changeData('productunit-conversionRules',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('productunitList-productUnitCode')"
+							:required="requiredList['productunitList-productUnitCode']" label="商品单位编码">
+							<u-input v-model="dataForm.productunitList[i].productUnitCode"
+								:disabled="judgeWrite('productunitList')||judgeWrite('productunitList-productUnitCode')"
+								@change="changeData('productunit-productUnitCode',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="jnpf-table-addBtn" @click="addproductunitList" v-if="!judgeWrite('productunitList')">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.productunitList.length==0?"添加商品单位":"添加"}}</span>
+				</view>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('inventoryUnitId')" :required="requiredList.inventoryUnitId" label="库存单位"
+					prop="inventoryUnitId">
+					<jnpf-select v-model="dataForm.inventoryUnitId" :disabled="judgeWrite('inventoryUnitId')"
+						@change="changeData('inventoryUnitId',-1)" clearable placeholder="请选择"
+						:props="inventoryUnitIdProps" :options="inventoryUnitIdOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('orderMainUnitId')" :required="requiredList.orderMainUnitId" label="订货单位"
+					prop="orderMainUnitId">
+					<jnpf-select v-model="dataForm.orderMainUnitId" :disabled="judgeWrite('orderMainUnitId')"
+						@change="changeData('orderMainUnitId',-1)" clearable placeholder="请选择"
+						:props="orderMainUnitIdProps" :options="orderMainUnitIdOptions" :multiple="true"
+						:style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('salesMainUnitId')" :required="requiredList.salesMainUnitId" label="销售单位"
+					prop="salesMainUnitId">
+					<jnpf-select v-model="dataForm.salesMainUnitId" :disabled="judgeWrite('salesMainUnitId')"
+						@change="changeData('salesMainUnitId',-1)" clearable placeholder="请选择"
+						:props="salesMainUnitIdProps" :options="salesMainUnitIdOptions" :multiple="true"
+						:style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('operateUnitId')" :required="requiredList.operateUnitId" label="操作单位"
+					prop="operateUnitId">
+					<jnpf-select v-model="dataForm.operateUnitId" :disabled="judgeWrite('operateUnitId')"
+						@change="changeData('operateUnitId',-1)" clearable placeholder="请选择" :props="operateUnitIdProps"
+						:options="operateUnitIdOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('pricingUnitId')" :required="requiredList.pricingUnitId" label="计价单位"
+					prop="pricingUnitId">
+					<jnpf-select v-model="dataForm.pricingUnitId" :disabled="judgeWrite('pricingUnitId')"
+						@change="changeData('pricingUnitId',-1)" clearable placeholder="请选择" :props="pricingUnitIdProps"
+						:options="pricingUnitIdOptions" :style='{"width":"100%"}'>
+					</jnpf-select>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="销售信息" content="销售信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('salesStart')" :required="requiredList.salesStart" label="开售时间"
+					prop="salesStart">
+					<jnpf-date-time v-model="dataForm.salesStart" :disabled="judgeWrite('salesStart')"
+						@change="changeData('salesStart',-1)" :startTime="dateTime(false,1,1,'','')"
+						:endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd" clearable placeholder="请选择" type="date"
+						:style='{"width":"100%"}'>
+					</jnpf-date-time>
+				</u-form-item>
+			</view>
+
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('salesEnd')" :required="requiredList.salesEnd" label="停售时间 "
+					prop="salesEnd">
+					<jnpf-date-time v-model="dataForm.salesEnd" :disabled="judgeWrite('salesEnd')"
+						@change="changeData('salesEnd',-1)" :startTime="dateTime(false,1,1,'','')"
+						:endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd" clearable placeholder="请选择" type="date"
+						:style='{"width":"100%"}'>
+					</jnpf-date-time>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="库存信息" content="库存信息">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('safetyStock')" :required="requiredList.safetyStock" label="安全库存"
+					prop="safetyStock">
+					<u-input v-model="dataForm.safetyStock" :disabled="judgeWrite('safetyStock')"
+						@change="changeData('safetyStock',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('availableInventory')" :required="requiredList.availableInventory"
+					label="可售库存" prop="availableInventory">
+					<u-input v-model="dataForm.availableInventory" :disabled="judgeWrite('availableInventory')"
+						@change="changeData('availableInventory',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('inventoryDayDown')" :required="requiredList.inventoryDayDown"
+					label="库存天数下限" prop="inventoryDayDown">
+					<u-input v-model="dataForm.inventoryDayDown" :disabled="judgeWrite('inventoryDayDown')"
+						@change="changeData('inventoryDayDown',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('inventoryDayUpper')" :required="requiredList.inventoryDayUpper"
+					label="库存天数上限" prop="inventoryDayUpper">
+					<u-input v-model="dataForm.inventoryDayUpper" :disabled="judgeWrite('inventoryDayUpper')"
+						@change="changeData('inventoryDayUpper',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('inventoryDown')" :required="requiredList.inventoryDown" label="库存下限"
+					prop="inventoryDown">
+					<u-input v-model="dataForm.inventoryDown" :disabled="judgeWrite('inventoryDown')"
+						@change="changeData('inventoryDown',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('inventoryUpper')" :required="requiredList.inventoryUpper" label="库存上限"
+					prop="inventoryUpper">
+					<u-input v-model="dataForm.inventoryUpper" :disabled="judgeWrite('inventoryUpper')"
+						@change="changeData('inventoryUpper',-1)" input-align='right' clearable placeholder="请输入"
+						:style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item>
+					<jnpf-text
+						:textStyle='{"color":"#62A2CB","font-weight":"bold","text-decoration":"none","font-size":16,"line-height":32,"font-style":"normal","text-align":"center"}'
+						value="适配业务范围" content="适配业务范围">
+					</jnpf-text>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 form-item-box">
+				<u-form-item v-if="judgeShow('jnpf_jg_product_business_jnpf_businessLineId')"
+					:required="requiredList.jnpf_jg_product_business_jnpf_businessLineId" label="适配业务范围"
+					prop="jnpf_jg_product_business_jnpf_businessLineId">
+					<jnpf-checkbox v-model="dataForm.jnpf_jg_product_business_jnpf_businessLineId"
+						:disabled="judgeWrite('jnpf_jg_product_business_jnpf_businessLineId')"
+						@change="changeData('jnpf_jg_product_business_jnpf_businessLineId',-1)" optionType="default"
+						direction="horizontal" :props="jnpf_jg_product_business_jnpf_businessLineIdProps"
+						:options="jnpf_jg_product_business_jnpf_businessLineIdOptions">
+					</jnpf-checkbox>
+				</u-form-item>
+			</view>
+		</u-form>
+		<u-modal v-model="show" :content="content" width='70%' border-radius="16"
+			:content-style="{fontSize: '28rpx',padding: '20rpx',lineHeight: '44rpx',textAlign: 'left'}"
+			:titleStyle="{padding: '20rpx'}" :confirm-style="{height: '80rpx',lineHeight: '80rpx'}" :title="title"
+			confirm-text="确定">
+		</u-modal>
+	</view>
+</template>
+
+<script>
+	import {
+		getDictionaryDataSelector,
+		getDataInterfaceRes,
+		getDefaultCurrentValueUserId,
+		getDefaultCurrentValueDepartmentId
+	} from '@/api/common'
+	import comMixin from '../../../workFlow/workFlowForm/mixin'
+	import {
+		getDateDay,
+		getLaterData,
+		getBeforeData,
+		getBeforeTime,
+		getLaterTime
+	} from '@/components/index.js'
+	import request from '@/utils/request'
+	export default {
+		mixins: [comMixin],
+		data() {
+			return {
+				idList: [],
+				index: 0,
+				actionList: [],
+				actionListLength: false,
+				showAction: false,
+				btnLoading: false,
+				loading: false,
+				text: '提示：测试文本',
+				tableKey: '',
+				dataForm: {
+					id: "",
+					productTypeId: "1",
+					photo: [],
+					code: '',
+					name: '',
+					shortName: '',
+					barCode: '',
+					spec: '',
+					inventoryType: "",
+					brandId: "520546789800018053",
+					productCategoryId: "",
+					area: [],
+					dangerousFlag: "0",
+					importedFlag: "0",
+					processedFlag: "0",
+					outsourcedFlag: "0",
+					firstSupplierId: "",
+					outputTaxRate: "",
+					inputTaxRate: "",
+					deliveryType: "",
+					manyUnitFlag: "1",
+					inventoryUnitId: "",
+					orderMainUnitId: [],
+					salesMainUnitId: [],
+					operateUnitId: "",
+					pricingUnitId: "",
+					salesStart: '',
+					salesEnd: '',
+					safetyStock: '',
+					availableInventory: '',
+					inventoryDayDown: '',
+					inventoryDayUpper: '',
+					inventoryDown: '',
+					inventoryUpper: '',
+					creatorTime: "",
+					creatorUserId: "",
+					productbusiness: {
+						businessLineId: [],
+					},
+					jnpf_jg_product_business_jnpf_businessLineId: [],
+					productunitList: [],
+				},
+				rules: {
+					productTypeId: [{
+						required: true,
+						message: '商品类型请至少选择一个',
+					}, ],
+					name: [{
+						required: true,
+						message: '商品名称请输入',
+					}, ],
+					spec: [{
+						required: true,
+						message: '商品规格请输入',
+					}, ],
+					inventoryType: [{
+						required: true,
+						message: '存货类型请选择',
+					}, ],
+					brandId: [{
+						required: true,
+						message: '品牌请至少选择一个',
+					}, ],
+					area: [{
+						required: true,
+						message: '产地请至少选择一个',
+						type: 'array',
+					}, ],
+					dangerousFlag: [{
+						required: true,
+						message: '危险品请至少选择一个',
+					}, ],
+					importedFlag: [{
+						required: true,
+						message: '进口商品请至少选择一个',
+					}, ],
+					processedFlag: [{
+						required: true,
+						message: '加工商品请至少选择一个',
+					}, ],
+					outsourcedFlag: [{
+						required: true,
+						message: '委外商品请至少选择一个',
+					}, ],
+					outputTaxRate: [{
+						required: true,
+						message: '销项税率请选择',
+					}, ],
+					inputTaxRate: [{
+						required: true,
+						message: '进项税率请选择',
+					}, ],
+					deliveryType: [{
+						required: true,
+						message: '配送方式不能为空',
+					}, ],
+					inventoryUnitId: [{
+						required: true,
+						message: '库存单位请选择',
+					}, ],
+					orderMainUnitId: [{
+						required: true,
+						message: '订货单位请至少选择一个',
+						type: 'array',
+					}, ],
+					salesMainUnitId: [{
+						required: true,
+						message: '销售单位请至少选择一个',
+						type: 'array',
+					}, ],
+					operateUnitId: [{
+						required: true,
+						message: '操作单位请选择',
+					}, ],
+					pricingUnitId: [{
+						required: true,
+						message: '计价单位请选择',
+					}, ],
+					salesStart: [{
+						required: true,
+						message: '开售时间请选择',
+					}, ],
+					availableInventory: [{
+						required: true,
+						message: '可售库存请输入',
+					}, ],
+				},
+				productTypeIdOptions: [],
+				productTypeIdProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				inventoryTypeOptions: [],
+				inventoryTypeProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				brandIdColumnOptions: [{
+					"label": "品牌",
+					"value": "brand_name"
+				}, ],
+				productCategoryIdOptions: [],
+				productCategoryIdProps: {
+					"label": "F_FullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				dangerousFlagOptions: [],
+				dangerousFlagProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				importedFlagOptions: [],
+				importedFlagProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				processedFlagOptions: [],
+				processedFlagProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				outsourcedFlagOptions: [],
+				outsourcedFlagProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				firstSupplierIdColumnOptions: [],
+				outputTaxRateOptions: [],
+				outputTaxRateProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				inputTaxRateOptions: [],
+				inputTaxRateProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				deliveryTypeOptions: [],
+				deliveryTypeProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				manyUnitFlagOptions: [],
+				manyUnitFlagProps: {
+					"label": "fullName",
+					"value": "enCode",
+					"multiple": false,
+					"children": ""
+				},
+				inventoryUnitIdOptions: [{
+					"fullName": "选项一",
+					"id": "1"
+				}, {
+					"fullName": "选项二",
+					"id": "2"
+				}],
+				inventoryUnitIdProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				orderMainUnitIdOptions: [{
+					"fullName": "选项一",
+					"id": "1"
+				}, {
+					"fullName": "选项二",
+					"id": "2"
+				}],
+				orderMainUnitIdProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				salesMainUnitIdOptions: [{
+					"fullName": "选项一",
+					"id": "1"
+				}, {
+					"fullName": "选项二",
+					"id": "2"
+				}],
+				salesMainUnitIdProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				operateUnitIdOptions: [{
+					"fullName": "选项一",
+					"id": "1"
+				}, {
+					"fullName": "选项二",
+					"id": "2"
+				}],
+				operateUnitIdProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				pricingUnitIdOptions: [{
+					"fullName": "选项一",
+					"id": "1"
+				}, {
+					"fullName": "选项二",
+					"id": "2"
+				}],
+				pricingUnitIdProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				jnpf_jg_product_business_jnpf_businessLineIdOptions: [],
+				jnpf_jg_product_business_jnpf_businessLineIdProps: {
+					"label": "name",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				productunitproductUnitwarehouseIdOptions: [],
+				productunitproductUnitwarehouseIdProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				labelwidth: 120 * 1.5,
+				menuId: '',
+				jurisdictionType: '',
+				ruleList: {
+					productunitList: {
+						'productUnitwarehouseId': '单位名称不能为空',
+						'conversionRules': '换算规则不能为空',
+						'productUnitCode': '商品单位编码不能为空',
+					},
+				},
+				interfaceRes: {
+					productTypeId: [],
+					photo: [],
+					code: [],
+					name: [],
+					shortName: [],
+					barCode: [],
+					spec: [],
+					inventoryType: [],
+					brandId: [],
+					productCategoryId: [],
+					area: [],
+					dangerousFlag: [],
+					importedFlag: [],
+					processedFlag: [],
+					outsourcedFlag: [],
+					firstSupplierId: [],
+					outputTaxRate: [],
+					inputTaxRate: [],
+					deliveryType: [],
+					manyUnitFlag: [],
+					inventoryUnitId: [],
+					orderMainUnitId: [],
+					salesMainUnitId: [],
+					operateUnitId: [],
+					pricingUnitId: [],
+					salesStart: [],
+					salesEnd: [],
+					safetyStock: [],
+					availableInventory: [],
+					inventoryDayDown: [],
+					inventoryDayUpper: [],
+					inventoryDown: [],
+					inventoryUpper: [],
+					creatorTime: [],
+					creatorUserId: [],
+					jnpf_jg_product_business_jnpf_businessLineId: [],
+					productunitproductUnitwarehouseId: [],
+					productunitconversionRules: [],
+					productunitproductUnitCode: [],
+				},
+				regList: {
+					productunitList: {
+						productUnitwarehouseId: [],
+						conversionRules: [],
+						productUnitCode: [],
+					},
+				},
+				ableAll: {},
+				childIndex: -1,
+				dataValue: {},
+				isEdit: false,
+				userInfo: {},
+				formatType: {
+					"yyyy": "yyyy",
+					"yyyy-MM": "yyyy-mm",
+					"yyyy-MM-dd": "yyyy-mm-dd",
+					"yyyy-MM-dd HH:mm": "yyyy-mm-dd hh:MM",
+					"yyyy-MM-dd HH:mm:ss": "yyyy-mm-dd hh:MM:ss",
+					"HH:mm:ss": "hh:MM:ss",
+					"HH:mm": "hh:MM"
+				},
+				content: '',
+				title: '',
+				show: false,
+			}
+		},
+		onLoad(option) {
+			uni.$on('linkPageConfirm', (subVal) => {
+				if (this.tableKey) {
+					for (let i = 0; i < subVal.length; i++) {
+						let t = subVal[i]
+						if (this['get' + this.tableKey]) {
+							this['get' + this.tableKey](t)
+						}
+					}
+					this.childIndex = -1
+					this.collapse()
+				}
+			})
+			this.jurisdictionType = option.jurisdictionType
+			this.menuId = option.menuId
+			this.userInfo = uni.getStorageSync('userInfo') || {}
+			this.dataForm.id = option.id || 0
+			let _title = ""
+			if (option.jurisdictionType == 'btn_edit') {
+				_title = "编辑"
+			}
+			if (option.jurisdictionType == 'btn_detail') {
+				_title = "详情"
+			}
+			if (option.jurisdictionType == 'btn_add') {
+				_title = "新增"
+			}
+			if (_title) {
+				uni.setNavigationBarTitle({
+					title: _title
+				})
+			}
+			this.selfInit()
+			this.initDefaultData()
+			this.dataAll()
+			this.initData()
+			this.dataValue = JSON.parse(JSON.stringify(this.dataForm))
+			this.idList = option.idList ? option.idList.split(",") : []
+			for (let i = 0; i < this.idList.length; i++) {
+				if (this.idList[i] == option.id) {
+					this.index = i;
+				}
+			}
+		},
+		onReady() {
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.$refs.dataForm.setRules(this.rules);
+				}, 100)
+			})
+		},
+		watch: {
+			dataForm: {
+				handler(val, oldVal) {
+					this.productunit()
+				},
+				deep: true
+			}
+		},
+		methods: {
+			handleAction(index) {
+				if (this.actionList[index].id === 'save_add' || this.actionList[index].id === 'save_proceed') {
+					this.submitForm(1)
+				} else {
+					this.calculation(this.actionList[index].id, index)
+				}
+			},
+			calculation(type, index) {
+				if (type === 'upper') {
+					this.index--
+					this.actionList[index + 1].disabled = false
+					if (this.index == 0) this.actionList[index].disabled = true
+				} else {
+					this.index++
+					this.actionList[index - 1].disabled = false
+					if (this.index == this.idList.length - 1) this.actionList[index].disabled = true
+				}
+				this.dataForm.id = this.idList[this.index]
+				this.initData()
+			},
+			changeData(model, index) {
+				this.isEdit = false
+				this.childIndex = index
+				let modelAll = model.split("-");
+				let faceMode = "";
+				for (let i = 0; i < modelAll.length; i++) {
+					faceMode += modelAll[i];
+				}
+				for (let key in this.interfaceRes) {
+					if (key != faceMode) {
+						let faceReList = this.interfaceRes[key]
+						for (let i = 0; i < faceReList.length; i++) {
+							if (faceReList[i].relationField == model) {
+								let options = 'get' + key + 'Options';
+								if (this[options]) {
+									this[options]()
+								}
+								this.changeData(key, index)
+							}
+						}
+					}
+				}
+			},
+			changeDataFormData(type, data, model, index, defaultValue, edit) {
+				if (!edit) {
+					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
+					}
+				}
+			},
+			clickIcon(label, tipLabel) {
+				this.content = tipLabel
+				this.title = label
+				this.show = true
+			},
+			exist() {
+				let title = [];
+				let _ruleList = this.ruleList
+				for (let k in _ruleList) {
+					let childData = this.dataForm[k]
+					childData.forEach((item, index) => {
+						for (let model in _ruleList[k]) {
+							if (item[model] instanceof Array) {
+								if (item[model].length == 0) {
+									title.push(_ruleList[k][model])
+								}
+							} else if (!item[model]) {
+								title.push(_ruleList[k][model])
+							}
+						}
+					})
+				}
+				let _regList = this.regList
+				for (let k in _regList) {
+					let childData = this.dataForm[k]
+					for (let n in _regList[k]) {
+						for (let i = 0; i < _regList[k][n].length; i++) {
+							const element = _regList[k][n][i]
+							if (element.pattern) {
+								element.pattern = element.pattern.toString()
+								let start = element.pattern.indexOf('/')
+								let stop = element.pattern.lastIndexOf('/')
+								let str = element.pattern.substring(start + 1, stop)
+								let reg = new RegExp(str)
+								element.pattern = reg
+							}
+							childData.forEach((item, index) => {
+								if (item[n] && !element.pattern.test(item[n])) {
+									title.push(element.message)
+								}
+							})
+						}
+					}
+				}
+				if (title.length > 0) {
+					return title[0]
+				}
+			},
+			resetForm() {
+				uni.navigateBack()
+			},
+			dataAll() {
+				this.getproductTypeIdOptions()
+				this.getinventoryTypeOptions()
+				this.getproductCategoryIdOptions()
+				this.getdangerousFlagOptions()
+				this.getimportedFlagOptions()
+				this.getprocessedFlagOptions()
+				this.getoutsourcedFlagOptions()
+				this.getoutputTaxRateOptions()
+				this.getinputTaxRateOptions()
+				this.getdeliveryTypeOptions()
+				this.getmanyUnitFlagOptions()
+				this.getjnpf_jg_product_business_jnpf_businessLineIdOptions()
+				this.getproductunitproductUnitwarehouseIdOptions()
+				this.collapse()
+			},
+			dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+				let timeDataValue = null;
+				let timeValue = Number(timeValueData)
+				if (timeRule) {
+					if (timeType == 1) {
+						timeDataValue = timeValueData ? timeValue : null
+					} 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 && timeValue) {
+						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;
+			},
+			getproductTypeIdOptions() {
+				getDictionaryDataSelector('521699870097015173').then(res => {
+					this.productTypeIdOptions = res.data.list
+				})
+			},
+			getinventoryTypeOptions() {
+				getDictionaryDataSelector('521705509590401413').then(res => {
+					this.inventoryTypeOptions = res.data.list
+				})
+			},
+			getproductCategoryIdOptions() {
+				const edit = this.isEdit
+				const index = this.childIndex
+				let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.productCategoryId))
+				for (let i = 0; i < templateJsonList.length; i++) {
+					let json = templateJsonList[i];
+					if (json.relationField) {
+						let relationFieldAll = json.relationField.split("-");
+						let val = json.defaultValue;
+						if (relationFieldAll.length > 1 && index > -1) {
+							val = this.dataForm[relationFieldAll[0] + 'List'] && this.dataForm[relationFieldAll[0] +
+								'List'].length ? this.dataForm[relationFieldAll[0] + 'List'][index][relationFieldAll[
+								1]] : ''
+						} else {
+							val = this.dataForm[relationFieldAll]
+						}
+						json.defaultValue = val
+					}
+				}
+				let template = {
+					paramList: templateJsonList
+				}
+				getDataInterfaceRes('521594673936990213', template).then(res => {
+					let data = res.data
+					this.productCategoryIdOptions = data
+					if (!edit) return
+					this.changeDataFormData(1, 'productCategoryId', 'productCategoryId', index, '', edit)
+				})
+			},
+			getdangerousFlagOptions() {
+				getDictionaryDataSelector('522424260874993797').then(res => {
+					this.dangerousFlagOptions = res.data.list
+				})
+			},
+			getimportedFlagOptions() {
+				getDictionaryDataSelector('522424260874993797').then(res => {
+					this.importedFlagOptions = res.data.list
+				})
+			},
+			getprocessedFlagOptions() {
+				getDictionaryDataSelector('522424260874993797').then(res => {
+					this.processedFlagOptions = res.data.list
+				})
+			},
+			getoutsourcedFlagOptions() {
+				getDictionaryDataSelector('522424260874993797').then(res => {
+					this.outsourcedFlagOptions = res.data.list
+				})
+			},
+			getoutputTaxRateOptions() {
+				getDictionaryDataSelector('522308907054399493').then(res => {
+					this.outputTaxRateOptions = res.data.list
+				})
+			},
+			getinputTaxRateOptions() {
+				getDictionaryDataSelector('522309142786867205').then(res => {
+					this.inputTaxRateOptions = res.data.list
+				})
+			},
+			getdeliveryTypeOptions() {
+				getDictionaryDataSelector('522318040524652549').then(res => {
+					this.deliveryTypeOptions = res.data.list
+				})
+			},
+			getmanyUnitFlagOptions() {
+				getDictionaryDataSelector('522677338626850821').then(res => {
+					this.manyUnitFlagOptions = res.data.list
+				})
+			},
+			getjnpf_jg_product_business_jnpf_businessLineIdOptions() {
+				const edit = this.isEdit
+				const index = this.childIndex
+				let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes
+					.jnpf_jg_product_business_jnpf_businessLineId))
+				for (let i = 0; i < templateJsonList.length; i++) {
+					let json = templateJsonList[i];
+					if (json.relationField) {
+						let relationFieldAll = json.relationField.split("-");
+						let val = json.defaultValue;
+						if (relationFieldAll.length > 1 && index > -1) {
+							val = this.dataForm[relationFieldAll[0] + 'List'] && this.dataForm[relationFieldAll[0] +
+								'List'].length ? this.dataForm[relationFieldAll[0] + 'List'][index][relationFieldAll[
+								1]] : ''
+						} else {
+							val = this.dataForm[relationFieldAll]
+						}
+						json.defaultValue = val
+					}
+				}
+				let template = {
+					paramList: templateJsonList
+				}
+				getDataInterfaceRes('517979330417001669', template).then(res => {
+					let data = res.data
+					this.jnpf_jg_product_business_jnpf_businessLineIdOptions = data
+					if (!edit) return
+					this.changeDataFormData(1, 'jnpf_jg_product_business_jnpf_businessLineId',
+						'jnpf_jg_product_business_jnpf_businessLineId', index, [], edit)
+				})
+			},
+			productunit() {
+				let table = this.dataForm.productunitList
+				let summaryField = []
+				let summaryFieldName = {}
+				let data = {}
+				let thousandsField = []
+				for (let i in summaryField) {
+					let map = {}
+					let val = 0
+					for (let j = 0; j < table.length; j++) {
+						let summary = table[j][summaryField[i]];
+						if (summary) {
+							let data = isNaN(summary) ? 0 : Number(summary)
+							val += data
+						}
+					}
+					map.id = summaryField[i];
+					map.name = summaryFieldName[summaryField[i]];
+					map.val = (thousandsField.includes(summaryField[i])) ? Number(val).toLocaleString('zh', {
+						maximumFractionDigits: '2'
+					}) : val;
+					data[summaryField[i]] = map;
+				}
+				return data;
+			},
+			getproductunitproductUnitwarehouseIdOptions() {
+				const edit = this.isEdit
+				const index = this.childIndex
+				let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.productunitproductUnitwarehouseId))
+				for (let i = 0; i < templateJsonList.length; i++) {
+					let json = templateJsonList[i];
+					if (json.relationField) {
+						let relationFieldAll = json.relationField.split("-");
+						let val = json.defaultValue;
+						if (relationFieldAll.length > 1 && index > -1) {
+							val = this.dataForm[relationFieldAll[0] + 'List'] && this.dataForm[relationFieldAll[0] +
+								'List'].length ? this.dataForm[relationFieldAll[0] + 'List'][index][relationFieldAll[
+								1]] : ''
+						} else {
+							val = this.dataForm[relationFieldAll]
+						}
+						json.defaultValue = val
+					}
+				}
+				let template = {
+					paramList: templateJsonList
+				}
+				getDataInterfaceRes('522387417454346245', template).then(res => {
+					let data = res.data
+					this.productunitproductUnitwarehouseIdOptions = data
+					if (index == -1) return
+					this.dataForm.productunitList[index].productUnitwarehouseIdOptions = data
+					if (!edit) return
+					this.changeDataFormData(2, 'productunitList', 'productUnitwarehouseId', index, '', edit)
+				})
+			},
+			initData() {
+				this.$nextTick(function() {
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/scm/ProductWarehouse/' + this.dataForm.id,
+							method: 'get',
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						})
+					} else {
+						this.initDefaultData()
+					}
+				})
+			},
+			beforeSubmit() {
+				const _data = this.dataList()
+				return _data
+			},
+			initDefaultData() {},
+			selfInit() {
+				this.$store.commit('base/UPDATE_RELATION_DATA', {})
+				this.dataAll()
+				this.initDefaultData()
+				this.collapse()
+			},
+			selfGetInfo(dataForm) {
+				this.dataForm.id = this.dataForm.id
+				this.dataInfo(dataForm)
+			},
+			addproductunitList() {
+				let value = {}
+				this.tableKey = 'productunitList';
+				this.getproductunitList(value)
+				this.childIndex = -1
+				this.collapse()
+			},
+			delproductunitList(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.productunitList.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getproductunitList(value) {
+				let item = {
+					productUnitwarehouseId: "",
+					productUnitwarehouseIdOptions: [],
+					conversionRules: '',
+					productUnitCode: '',
+				}
+				let result = {
+					...item,
+					...value
+				}
+				this.dataForm.productunitList.push(result)
+				this.childIndex = this.dataForm.productunitList.length - 1
+				this.isEdit = true
+				this.getproductunitproductUnitwarehouseIdOptions()
+				this.isEdit = false
+			},
+			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.productunitList.length; i++) {
+					this.childIndex = i
+					this.getproductunitproductUnitwarehouseIdOptions()
+				}
+				this.childIndex = -1
+				this.collapse()
+			},
+			collapse() {
+				setTimeout(() => {}, 1000);
+			},
+		},
+	}
+</script>
+<style>
+	page {
+		background-color: #f0f2f6;
+	}
+</style>
\ No newline at end of file
diff --git a/jnpf-app/pages/scm/index/contractL/index.vue b/jnpf-app/pages/scm/index/contractL/index.vue
new file mode 100644
index 00000000..7375d1f8
--- /dev/null
+++ b/jnpf-app/pages/scm/index/contractL/index.vue
@@ -0,0 +1,539 @@
+<template>
+    <view class="dynamicModel-list-v">
+        <view class="head-warp com-dropdown">
+            <u-dropdown class="u-dropdown" ref="uDropdown" @open="openData" >
+                <u-dropdown-item title="排序">
+                    <view class="dropdown-slot-content">
+                        <view class="dropdown-slot-content-main">
+                            <u-cell-group>
+                                <u-cell-item @click="cellClick(item)" :arrow="false" :title="item.label"
+                                             v-for="(item, index) in sortOptions" :key="index" :title-style="{color: sortValue == item.value ? '#2979ff' : '#606266' }">
+                                    <u-icon v-if="sortValue == item.value" name="checkbox-mark" color="#2979ff" size="32"></u-icon>
+                                </u-cell-item>
+                            </u-cell-group>
+                        </view>
+                    </view>
+                </u-dropdown-item>
+                <u-dropdown-item title="筛选" >
+                    <view class="dropdown-slot-content">
+                        <view class="dropdown-slot-content-main search-main">
+                            <scroll-view scroll-y="true" style="height: 1000rpx;">
+                                <view class="u-p-l-20 u-p-r-20 search-form">
+                                    <u-form :model="searchForm" ref="searchForm" :errorType="['toast']" label-position="left" label-width="150">
+                                    </u-form>
+                                </view>
+                            </scroll-view>
+                            <view class="buttom-actions">
+                                <u-button class="buttom-btn" @click="reset">重置</u-button>
+                                <u-button class="buttom-btn" type="primary" @click="closeDropdown">检索</u-button>
+                            </view>
+                            <view class="dropdown-slot-bg" @click="$refs.uDropdown.close()"></view>
+                        </view>
+                    </view>
+                </u-dropdown-item>
+            </u-dropdown>
+        </view>
+        <view class="list-warp">
+            <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption" top="100">
+                <view class="list">
+                    <view class="list-box">
+                        <uni-swipe-action ref="swipeAction">
+                            <uni-swipe-action-item v-for="(item, index) in list" :key="item.id" :threshold="0" :right-options="options">
+                                <view class="item" @click="goDetail(item.id,item)">
+                                    <view class="u-line-1 item-cell" v-for="(column,i) in columnList" :key="i">
+                                        <view v-if="column.jnpfKey != 'table'">
+                                            <view class="" v-if="column.jnpfKey == 'relationForm'">
+                                                <text class="listTit u-line-1">{{column.label}}:</text>
+                                                <text class="listContent"
+                                                      @click.stop="relationFormClick(item,column)"
+                                                      style="color: blue;">{{item[column.prop]}}</text>
+                                            </view>
+                                            <view v-else class="u-line-1">
+                                                <text class="listTit u-line-1">{{column.label}}:</text>
+                                                <text class="listContent" v-if="['calculate','inputNumber'].includes(column.jnpfKey) && column.thousands">{{toThousands(item[column.prop],column)}}</text>
+                                                <text class="listContent" v-else>{{item[column.prop]}}</text>
+                                            </view>
+                                        </view>
+                                        <view class="collapse-box u-flex" v-else>
+                                            <tableCell :label="column.label" :childList="item[column.prop]" @cRelationForm="relationFormClick"
+                                                       :children="column.children" ref="tableCell" :pageLen="3"></tableCell>
+                                        </view>
+                                    </view>
+                                    <view class="item-cell">
+                                        <text>审批状态：</text>
+                                        <text :class="getFlowStatus(item.flowState).statusCss">
+                                            {{getFlowStatus(item.flowState).text}}
+                                        </text>
+                                    </view>
+                                </view>
+                                <template v-slot:right>
+                                    <view class="right-option-box">
+                                        <view class="right-option" v-for="(it,i) in options" @click="handleClick(index)"
+                                              :key="i">
+                                            <text>{{it.text}}</text>
+                                        </view>
+                                    </view>
+                                </template>
+                            </uni-swipe-action-item>
+                        </uni-swipe-action>
+                    </view>
+                </view>
+            </mescroll-uni>
+        </view>
+                <view class="com-addBtn" @click="addPage()" >
+                    <u-icon name="plus" size="60" color="#fff" />
+                </view>
+        <u-picker mode="selector" v-model="show" :default-selector="[0]" title="请选择流程" :range="templateList" range-key="fullName" @confirm="confirm"></u-picker>
+    </view>
+</template>
+<script>
+    import {
+        FlowJsonList
+    } from '@/api/workFlow/flowEngine'
+    import resources from '@/libs/resources.js'
+    import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+    import tableCell from '../dynamicModel/components/tableCell.vue'
+    import {getFormById} from '@/api/workFlow/workFlowForm'
+    import {
+        getDictionaryDataSelector,
+        getDataInterfaceRes,
+        getDefaultCurrentValueUserIdAsync,
+        getDefaultCurrentValueDepartmentIdAsync
+    } from '@/api/common'
+    import request from '@/utils/request'
+    export default {
+        mixins: [MescrollMixin],
+        components: {
+            tableCell
+        },
+        data() {
+            return {
+                show: false,
+                templateList: [],
+                sortValue: '',
+                searchForm: {
+            },
+            downOption: {
+                use: true,
+                        auto: false
+            },
+            dataOptions:{
+            },
+            upOption: {
+                page: {
+                    num: 0,
+                            size: 20,
+                    time: null,
+                },
+                empty: {
+                    use: true,
+                            icon: resources.message.nodata,
+                            tip: "暂无数据",
+                            fixed: true,
+                            top: "300rpx",
+                            zIndex: 5,
+                },
+                textNoMore: '没有更多数据',
+                        toTop: {
+                    bottom: 250
+                }
+            },
+            list: [],
+                    appColumnList:[{"border":false,"jnpfKey":"radio","fullName":"合同类型","label":"合同类型","sortable":false,"align":"left","props":{"label":"fullName","value":"enCode"},"optionType":"button","__config__":{"formId":115,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"1","noShow":false,"dataType":"dictionary","dictionaryType":"519483543638772229","tipLabel":" 不同的合同类型可编辑的字段内容不同，合同类型一旦保存不可修改，请选择更匹配你需求的一个。","dragDisabled":false,"className":[],"label":"合同类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_contract","renderKey":1708223263325,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"small","prop":"contractType","width":0,"options":[{"enCode":"1","hasChildren":false,"fullName":"采购合同","id":"522800896036307333","parentId":"0"},{"enCode":"2","hasChildren":false,"fullName":"销售合同","id":"522801008556900741","parentId":"0"},{"enCode":"3","hasChildren":false,"fullName":"仓储合同","id":"522801822901993861","parentId":"0"},{"enCode":"4","hasChildren":false,"fullName":"运输合同","id":"522802010169278853","parentId":"0"},{"enCode":"5","hasChildren":false,"fullName":"服务合同","id":"523045235534594053","parentId":"0"},{"enCode":"6","hasChildren":false,"fullName":"其他合同","id":"523045347023388677","parentId":"0"}],"__vModel__":"contractType","style":{},"disabled":false,"interfaceHasPage":false,"fixed":"none","id":"contractType","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"}],
+            listQuery: {
+                moduleId:'528841438817943557',
+                        sort: 'desc',
+                        sidx: '',
+                        keyword: '',
+                        json: ''
+            },
+            options: [
+                        {
+                            text: '删除',
+                            style: {
+                                backgroundColor: '#dd524d'
+                            }
+                        }
+            ],
+                    sortOptions:[
+            ],
+                    ableAll:{
+            },
+            interfaceRes:{
+            },
+            menuId:'',
+                    enCode: 'contract',
+                    formId: '528841438817943557',
+                    columnList:[],
+                    isTree:false,
+            type:'1',
+                    key:new Date(),
+                    dataValue:{},
+            userInfo:{},
+            firstInitSearchData:false,
+                    thousandsField:[],
+            formatType:{"yyyy":"yyyy","yyyy-MM":"yyyy-mm","yyyy-MM-dd":"yyyy-mm-dd","yyyy-MM-dd HH:mm":"yyyy-mm-dd hh:MM","yyyy-MM-dd HH:mm:ss":"yyyy-mm-dd hh:MM:ss","HH:mm:ss":"hh:MM:ss","HH:mm":"hh:MM"},
+        }
+        },
+        onLoad(e){
+            this.userInfo = uni.getStorageSync('userInfo') || {}
+            this.menuId = e.menuId
+            uni.$on('refresh', () => {
+                this.list = [];
+                this.mescroll.resetUpScroll();
+            })
+            this.dataAll()
+            this.getColumnList()
+            this.getFormById()
+        },
+        onUnload() {
+            uni.$off('refresh')
+        },
+        methods:{
+            toThousands(val, column) {
+                let num = Number(val)
+                let newVal = this.thousandsField.includes(column.__vModel__) ? num.toLocaleString('zh', {maximumFractionDigits: '2',minimumFractionDigits: '2'}): num.toFixed(2);
+                return newVal
+            },
+            getJsonList() {
+                FlowJsonList(this.flowId,'1').then(res => {
+                    this.templateList = res.data;
+                })
+            },
+            getFormById() {
+                getFormById(this.formId).then(res => {
+                    this.flowId = res.data&&res.data.id
+                    this.enCode = res.data&&res.data.enCode
+                    this.getJsonList()
+                })
+            },
+            dataAll(){
+            },
+            openData(e){
+                if(e==1){
+                    //this.reset()
+                }
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+                this.dataValue = JSON.parse(JSON.stringify(this.searchForm))
+            },
+            relationFormClick(item,column) {
+                let vModel = column.__vModel__?column.__vModel__+"_id":column.__vModel__
+                let id = item[vModel]
+                if(vModel){
+                    let [attr,attr1]=vModel.split("_jnpf_")
+                    if(attr&&attr1){
+                        attr = attr.replace('jnpf_','')
+                        id = item[attr]&&item[attr][attr1]
+                    }
+                }
+                let modelId = column.modelId
+                if (!id || !modelId) return
+                let config = {
+                    modelId: modelId,
+                    id: id,
+                    formTitle: '详情',
+                    noShowBtn: 1
+                }
+                this.$nextTick(() => {
+                    const url ='/pages/apply/dynamicModel/detail?config=' + this.base64.encode(JSON.stringify(config),"UTF-8")
+                    uni.navigateTo({
+                        url: url
+                    })
+                })
+            },
+            async upCallback(page) {
+                if(!this.firstInitSearchData) {
+                    await this.initSearchData()
+                    this.firstInitSearchData = true
+                }
+                const query = {
+                    currentPage: page.num,
+                    pageSize: page.size,
+                    menuId : this.menuId,
+                    ...this.listQuery,
+                    ...this.searchForm,
+                    dataType:0,
+                }
+                request({
+                    url: '/api/scm/ContractL/getList',
+                    method: 'post',
+                    data: query,
+                }).then(res => {
+                    let _list = this.columnList.length?res.data.list:[];
+                    this.mescroll.endSuccess(_list.length);
+                    if (page.num == 1) this.list = [];
+                    const list = _list.map(o => ({
+                        show: false,
+                        ...o
+                    }));
+                    this.list = this.list.concat(_list);
+                }).catch(() => {
+                    this.mescroll.endErr();
+                })
+            },
+            handleClick(index, index1) {
+                    const item = this.list[index]
+                if([1,2,3,5].includes(item.flowState)){
+                    this.$u.toast("流程正在审核,请勿删除")
+                            this.list[index].show = false
+                    return
+                }
+                request({
+                    url: '/api/scm/ContractL/' + item.id,
+                    method: 'delete'
+                }).then(res => {
+                    uni.showToast({
+                        title: res.msg,
+                        complete: () => {
+                            this.$u.toast(res.msg)
+                            this.mescroll.resetUpScroll()
+                        }
+                    })
+                })
+            },
+            open(index) {
+                this.list[index].show = true;
+                this.list.map((val, idx) => {
+                    if (index != idx) this.list[idx].show = false;
+                })
+            },
+            search() {
+                if (this.isPreview == '1') return
+                this.searchTimer && clearTimeout(this.searchTimer)
+                this.searchTimer = setTimeout(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                }, 300)
+            },
+    goDetail(id, item) {
+        let flowtaskid = item.flowtaskid
+        let flowState =item.flowState
+        let flowId =item.flowId
+        let btnType = ''
+        let btnList = []
+                btnList.push('btn_edit')
+                btnList.push('btn_detail')
+        if(btnList.includes('btn_detail')){
+            btnType = "btn_detail"
+        }
+        if(btnList.includes('btn_edit')){
+            btnType = "btn_edit"
+        }
+        if(!btnType) return
+        let ids = flowtaskid?flowtaskid:id
+        this.flowId = flowId?flowId:this.templateList[0].id
+        this.jumPage(ids, flowState,btnType)
+    },
+    addPage() {
+        if (!this.templateList.length) return this.$u.toast('流程不存在')
+        if (this.templateList.length > 1) {
+            this.show = true
+        } else {
+            this.flowId = this.templateList[0].id
+            this.jumPage()
+        }
+    },
+    confirm(e) {
+        this.flowId = this.templateList[e[0]].id
+        this.jumPage()
+    },
+    jumPage(id, status,btnType){
+        if (!id && !status) btnType = 'btn_add'
+        let _title=""
+        if(btnType=='btn_add'){
+            _title = "新增"
+        }
+        if(btnType=='btn_detail'){
+            _title = "详情"
+        }
+        if(btnType=='btn_edit'){
+            _title = "编辑"
+        }
+        let opType = '-1'
+        if ([1,2,5].includes(status)) opType = 0
+        const config = {
+            id: id || '',
+            enCode: this.enCode,
+            flowId: this.flowId,
+            formType: 1,
+            type: 1,
+            opType,
+            status: status || '',
+            fullName: _title,
+            jurisdictionType: btnType || ''
+        }
+        uni.navigateTo({
+            url: '/pages/workFlow/flowBefore/index?config=' + this.base64.encode(JSON.stringify(config), "UTF-8")
+        })
+    },
+    getFlowStatus(val) {
+        let status
+        switch (val) {
+            case 0:
+                status = {
+                    text: '等待提交',
+                    statusCss: 'u-type-info'
+                }
+                break;
+            case 1:
+                status = {
+                    text: '等待审核',
+                    statusCss: 'u-type-primary'
+                }
+                break;
+            case 2:
+                status = {
+                    text: '审核通过',
+                    statusCss: 'u-type-success'
+                }
+                break;
+            case 3:
+                status = {
+                    text: '审核驳回',
+                    statusCss: 'u-type-error'
+                }
+                break;
+            case 4:
+                status = {
+                    text: '审核撤回',
+                    statusCss: 'u-type-error'
+                }
+                break;
+            case 5:
+                status = {
+                    text: '审核终止',
+                    statusCss: 'u-type-info'
+                }
+                break;
+            default:
+                status = {
+                    text: '等待提交',
+                    statusCss: 'u-type-info'
+                }
+                break;
+        }
+        return status
+    },
+            getColumnList() {
+                let columnPermissionList = []
+                let _appColumnList =this.appColumnList
+                    for (let i = 0; i < _appColumnList.length; i++) {
+                        columnPermissionList.push(_appColumnList[i])
+                    }
+                this.columnList = this.transformColumnList(columnPermissionList, this.dataOptions)
+            },
+            transformColumnList(columnList, dataOptions) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    let e = columnList[i]
+                    let columProp = e.prop
+                    let label = e.label
+                    let option = null
+                    let options = columProp + "Options"
+                    if (!columProp.includes('-')) {
+                        columProp = columProp
+                        if(this.type=='4'){
+                            columProp = columProp +"_name"
+                        }
+                        if(label.length>4){
+                            label = label.substring(0, 4)
+                        }
+                        e.label = label
+                        e.prop = columProp
+                        e.option = option
+                        list.push(e)
+                    } else {
+                        e.vModel = columProp.split('-')[1]
+                        e.childLabel = e.label.split('-')[1]
+                        options = e.vModel + "Options"
+                        let prop = columProp.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                e.prop = e.prop
+                                e.vModel = e.vModel
+                                if(this.type=='4'){
+                                    e.prop = e.prop+"_name"
+                                    e.vModel = e.vModel+"_name"
+                                }
+                                e.option = option
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                return list
+            },
+            cellClick(item) {
+                if (this.sortValue === item.value) return
+                this.listQuery.sort = item.sort
+                this.listQuery.sidx = item.sidx
+                this.sortValue = item.value
+                this.$refs.uDropdown.close();
+                this.$nextTick(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                })
+            },
+            reset() {
+                this.searchForm = JSON.parse(JSON.stringify(this.dataValue))
+                this.key = new Date()
+            },
+            closeDropdown() {
+                this.$refs.uDropdown.close();
+                this.$nextTick(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                })
+            },
+            dataList(data){
+                let _list =data.list
+                return _list;
+            },
+        },
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #f0f2f6;
+        height: 100%;
+        /* #ifdef MP-ALIPAY */
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        /* #endif */
+    }
+
+    .right-option-box {
+        display: flex;
+        width: max-content;
+
+        .right-option {
+            width: 144rpx;
+            height: 100%;
+            font-size: 16px;
+            color: #fff;
+            background-color: #dd524d;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .more-option {
+            background-color: #1890ff;
+        }
+    }
+</style>
diff --git a/jnpf-app/pages/scm/index/productWarehouse/index.vue b/jnpf-app/pages/scm/index/productWarehouse/index.vue
new file mode 100644
index 00000000..a5eb0cfa
--- /dev/null
+++ b/jnpf-app/pages/scm/index/productWarehouse/index.vue
@@ -0,0 +1,539 @@
+<template>
+    <view class="dynamicModel-list-v">
+        <view class="head-warp com-dropdown">
+            <u-dropdown class="u-dropdown" ref="uDropdown" @open="openData" >
+                <u-dropdown-item title="排序">
+                    <view class="dropdown-slot-content">
+                        <view class="dropdown-slot-content-main">
+                            <u-cell-group>
+                                <u-cell-item @click="cellClick(item)" :arrow="false" :title="item.label"
+                                             v-for="(item, index) in sortOptions" :key="index" :title-style="{color: sortValue == item.value ? '#2979ff' : '#606266' }">
+                                    <u-icon v-if="sortValue == item.value" name="checkbox-mark" color="#2979ff" size="32"></u-icon>
+                                </u-cell-item>
+                            </u-cell-group>
+                        </view>
+                    </view>
+                </u-dropdown-item>
+                <u-dropdown-item title="筛选" >
+                    <view class="dropdown-slot-content">
+                        <view class="dropdown-slot-content-main search-main">
+                            <scroll-view scroll-y="true" style="height: 1000rpx;">
+                                <view class="u-p-l-20 u-p-r-20 search-form">
+                                    <u-form :model="searchForm" ref="searchForm" :errorType="['toast']" label-position="left" label-width="150">
+                                    </u-form>
+                                </view>
+                            </scroll-view>
+                            <view class="buttom-actions">
+                                <u-button class="buttom-btn" @click="reset">重置</u-button>
+                                <u-button class="buttom-btn" type="primary" @click="closeDropdown">检索</u-button>
+                            </view>
+                            <view class="dropdown-slot-bg" @click="$refs.uDropdown.close()"></view>
+                        </view>
+                    </view>
+                </u-dropdown-item>
+            </u-dropdown>
+        </view>
+        <view class="list-warp">
+            <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption" top="100">
+                <view class="list">
+                    <view class="list-box">
+                        <uni-swipe-action ref="swipeAction">
+                            <uni-swipe-action-item v-for="(item, index) in list" :key="item.id" :threshold="0" :right-options="options">
+                                <view class="item" @click="goDetail(item.id,item)">
+                                    <view class="u-line-1 item-cell" v-for="(column,i) in columnList" :key="i">
+                                        <view v-if="column.jnpfKey != 'table'">
+                                            <view class="" v-if="column.jnpfKey == 'relationForm'">
+                                                <text class="listTit u-line-1">{{column.label}}:</text>
+                                                <text class="listContent"
+                                                      @click.stop="relationFormClick(item,column)"
+                                                      style="color: blue;">{{item[column.prop]}}</text>
+                                            </view>
+                                            <view v-else class="u-line-1">
+                                                <text class="listTit u-line-1">{{column.label}}:</text>
+                                                <text class="listContent" v-if="['calculate','inputNumber'].includes(column.jnpfKey) && column.thousands">{{toThousands(item[column.prop],column)}}</text>
+                                                <text class="listContent" v-else>{{item[column.prop]}}</text>
+                                            </view>
+                                        </view>
+                                        <view class="collapse-box u-flex" v-else>
+                                            <tableCell :label="column.label" :childList="item[column.prop]" @cRelationForm="relationFormClick"
+                                                       :children="column.children" ref="tableCell" :pageLen="3"></tableCell>
+                                        </view>
+                                    </view>
+                                    <view class="item-cell">
+                                        <text>审批状态：</text>
+                                        <text :class="getFlowStatus(item.flowState).statusCss">
+                                            {{getFlowStatus(item.flowState).text}}
+                                        </text>
+                                    </view>
+                                </view>
+                                <template v-slot:right>
+                                    <view class="right-option-box">
+                                        <view class="right-option" v-for="(it,i) in options" @click="handleClick(index)"
+                                              :key="i">
+                                            <text>{{it.text}}</text>
+                                        </view>
+                                    </view>
+                                </template>
+                            </uni-swipe-action-item>
+                        </uni-swipe-action>
+                    </view>
+                </view>
+            </mescroll-uni>
+        </view>
+                <view class="com-addBtn" @click="addPage()" >
+                    <u-icon name="plus" size="60" color="#fff" />
+                </view>
+        <u-picker mode="selector" v-model="show" :default-selector="[0]" title="请选择流程" :range="templateList" range-key="fullName" @confirm="confirm"></u-picker>
+    </view>
+</template>
+<script>
+    import {
+        FlowJsonList
+    } from '@/api/workFlow/flowEngine'
+    import resources from '@/libs/resources.js'
+    import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+    import tableCell from '../dynamicModel/components/tableCell.vue'
+    import {getFormById} from '@/api/workFlow/workFlowForm'
+    import {
+        getDictionaryDataSelector,
+        getDataInterfaceRes,
+        getDefaultCurrentValueUserIdAsync,
+        getDefaultCurrentValueDepartmentIdAsync
+    } from '@/api/common'
+    import request from '@/utils/request'
+    export default {
+        mixins: [MescrollMixin],
+        components: {
+            tableCell
+        },
+        data() {
+            return {
+                show: false,
+                templateList: [],
+                sortValue: '',
+                searchForm: {
+            },
+            downOption: {
+                use: true,
+                        auto: false
+            },
+            dataOptions:{
+            },
+            upOption: {
+                page: {
+                    num: 0,
+                            size: 20,
+                    time: null,
+                },
+                empty: {
+                    use: true,
+                            icon: resources.message.nodata,
+                            tip: "暂无数据",
+                            fixed: true,
+                            top: "300rpx",
+                            zIndex: 5,
+                },
+                textNoMore: '没有更多数据',
+                        toTop: {
+                    bottom: 250
+                }
+            },
+            list: [],
+                    appColumnList:[{"border":false,"jnpfKey":"radio","fullName":"商品类型","label":"商品类型","sortable":false,"align":"left","props":{"label":"fullName","value":"enCode"},"optionType":"default","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"radio","defaultValue":"1","noShow":false,"dataType":"dictionary","dictionaryType":"521699870097015173","tipLabel":"","dragDisabled":false,"className":[],"label":"商品类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_product","renderKey":1706584323864,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"small","prop":"productTypeId","options":[{"enCode":"1","hasChildren":false,"fullName":"实物商品","id":"521702297093276037","parentId":"0"},{"enCode":"2","hasChildren":false,"fullName":"虚拟商品","id":"521702388365525381","parentId":"0"},{"enCode":"3","hasChildren":false,"fullName":"设备/器材","id":"521702438097387909","parentId":"0"},{"enCode":"4","hasChildren":false,"fullName":"耗材/辅材","id":"521702500558963077","parentId":"0"}],"__vModel__":"productTypeId","style":{},"disabled":false,"interfaceHasPage":false,"fixed":"none","id":"productTypeId","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"},"direction":"horizontal"}],
+            listQuery: {
+                moduleId:'518014334211720453',
+                        sort: 'desc',
+                        sidx: '',
+                        keyword: '',
+                        json: ''
+            },
+            options: [
+                        {
+                            text: '删除',
+                            style: {
+                                backgroundColor: '#dd524d'
+                            }
+                        }
+            ],
+                    sortOptions:[
+            ],
+                    ableAll:{
+            },
+            interfaceRes:{
+            },
+            menuId:'',
+                    enCode: 'productWarehouse',
+                    formId: '518014334211720453',
+                    columnList:[],
+                    isTree:false,
+            type:'1',
+                    key:new Date(),
+                    dataValue:{},
+            userInfo:{},
+            firstInitSearchData:false,
+                    thousandsField:[],
+            formatType:{"yyyy":"yyyy","yyyy-MM":"yyyy-mm","yyyy-MM-dd":"yyyy-mm-dd","yyyy-MM-dd HH:mm":"yyyy-mm-dd hh:MM","yyyy-MM-dd HH:mm:ss":"yyyy-mm-dd hh:MM:ss","HH:mm:ss":"hh:MM:ss","HH:mm":"hh:MM"},
+        }
+        },
+        onLoad(e){
+            this.userInfo = uni.getStorageSync('userInfo') || {}
+            this.menuId = e.menuId
+            uni.$on('refresh', () => {
+                this.list = [];
+                this.mescroll.resetUpScroll();
+            })
+            this.dataAll()
+            this.getColumnList()
+            this.getFormById()
+        },
+        onUnload() {
+            uni.$off('refresh')
+        },
+        methods:{
+            toThousands(val, column) {
+                let num = Number(val)
+                let newVal = this.thousandsField.includes(column.__vModel__) ? num.toLocaleString('zh', {maximumFractionDigits: '2',minimumFractionDigits: '2'}): num.toFixed(2);
+                return newVal
+            },
+            getJsonList() {
+                FlowJsonList(this.flowId,'1').then(res => {
+                    this.templateList = res.data;
+                })
+            },
+            getFormById() {
+                getFormById(this.formId).then(res => {
+                    this.flowId = res.data&&res.data.id
+                    this.enCode = res.data&&res.data.enCode
+                    this.getJsonList()
+                })
+            },
+            dataAll(){
+            },
+            openData(e){
+                if(e==1){
+                    //this.reset()
+                }
+            },
+            //初始化查询的默认数据
+            async initSearchData() {
+                this.dataValue = JSON.parse(JSON.stringify(this.searchForm))
+            },
+            relationFormClick(item,column) {
+                let vModel = column.__vModel__?column.__vModel__+"_id":column.__vModel__
+                let id = item[vModel]
+                if(vModel){
+                    let [attr,attr1]=vModel.split("_jnpf_")
+                    if(attr&&attr1){
+                        attr = attr.replace('jnpf_','')
+                        id = item[attr]&&item[attr][attr1]
+                    }
+                }
+                let modelId = column.modelId
+                if (!id || !modelId) return
+                let config = {
+                    modelId: modelId,
+                    id: id,
+                    formTitle: '详情',
+                    noShowBtn: 1
+                }
+                this.$nextTick(() => {
+                    const url ='/pages/apply/dynamicModel/detail?config=' + this.base64.encode(JSON.stringify(config),"UTF-8")
+                    uni.navigateTo({
+                        url: url
+                    })
+                })
+            },
+            async upCallback(page) {
+                if(!this.firstInitSearchData) {
+                    await this.initSearchData()
+                    this.firstInitSearchData = true
+                }
+                const query = {
+                    currentPage: page.num,
+                    pageSize: page.size,
+                    menuId : this.menuId,
+                    ...this.listQuery,
+                    ...this.searchForm,
+                    dataType:0,
+                }
+                request({
+                    url: '/api/scm/ProductWarehouse/getList',
+                    method: 'post',
+                    data: query,
+                }).then(res => {
+                    let _list = this.columnList.length?res.data.list:[];
+                    this.mescroll.endSuccess(_list.length);
+                    if (page.num == 1) this.list = [];
+                    const list = _list.map(o => ({
+                        show: false,
+                        ...o
+                    }));
+                    this.list = this.list.concat(_list);
+                }).catch(() => {
+                    this.mescroll.endErr();
+                })
+            },
+            handleClick(index, index1) {
+                    const item = this.list[index]
+                if([1,2,3,5].includes(item.flowState)){
+                    this.$u.toast("流程正在审核,请勿删除")
+                            this.list[index].show = false
+                    return
+                }
+                request({
+                    url: '/api/scm/ProductWarehouse/' + item.id,
+                    method: 'delete'
+                }).then(res => {
+                    uni.showToast({
+                        title: res.msg,
+                        complete: () => {
+                            this.$u.toast(res.msg)
+                            this.mescroll.resetUpScroll()
+                        }
+                    })
+                })
+            },
+            open(index) {
+                this.list[index].show = true;
+                this.list.map((val, idx) => {
+                    if (index != idx) this.list[idx].show = false;
+                })
+            },
+            search() {
+                if (this.isPreview == '1') return
+                this.searchTimer && clearTimeout(this.searchTimer)
+                this.searchTimer = setTimeout(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                }, 300)
+            },
+    goDetail(id, item) {
+        let flowtaskid = item.flowtaskid
+        let flowState =item.flowState
+        let flowId =item.flowId
+        let btnType = ''
+        let btnList = []
+                btnList.push('btn_edit')
+                btnList.push('btn_detail')
+        if(btnList.includes('btn_detail')){
+            btnType = "btn_detail"
+        }
+        if(btnList.includes('btn_edit')){
+            btnType = "btn_edit"
+        }
+        if(!btnType) return
+        let ids = flowtaskid?flowtaskid:id
+        this.flowId = flowId?flowId:this.templateList[0].id
+        this.jumPage(ids, flowState,btnType)
+    },
+    addPage() {
+        if (!this.templateList.length) return this.$u.toast('流程不存在')
+        if (this.templateList.length > 1) {
+            this.show = true
+        } else {
+            this.flowId = this.templateList[0].id
+            this.jumPage()
+        }
+    },
+    confirm(e) {
+        this.flowId = this.templateList[e[0]].id
+        this.jumPage()
+    },
+    jumPage(id, status,btnType){
+        if (!id && !status) btnType = 'btn_add'
+        let _title=""
+        if(btnType=='btn_add'){
+            _title = "新增"
+        }
+        if(btnType=='btn_detail'){
+            _title = "详情"
+        }
+        if(btnType=='btn_edit'){
+            _title = "编辑"
+        }
+        let opType = '-1'
+        if ([1,2,5].includes(status)) opType = 0
+        const config = {
+            id: id || '',
+            enCode: this.enCode,
+            flowId: this.flowId,
+            formType: 1,
+            type: 1,
+            opType,
+            status: status || '',
+            fullName: _title,
+            jurisdictionType: btnType || ''
+        }
+        uni.navigateTo({
+            url: '/pages/workFlow/flowBefore/index?config=' + this.base64.encode(JSON.stringify(config), "UTF-8")
+        })
+    },
+    getFlowStatus(val) {
+        let status
+        switch (val) {
+            case 0:
+                status = {
+                    text: '等待提交',
+                    statusCss: 'u-type-info'
+                }
+                break;
+            case 1:
+                status = {
+                    text: '等待审核',
+                    statusCss: 'u-type-primary'
+                }
+                break;
+            case 2:
+                status = {
+                    text: '审核通过',
+                    statusCss: 'u-type-success'
+                }
+                break;
+            case 3:
+                status = {
+                    text: '审核驳回',
+                    statusCss: 'u-type-error'
+                }
+                break;
+            case 4:
+                status = {
+                    text: '审核撤回',
+                    statusCss: 'u-type-error'
+                }
+                break;
+            case 5:
+                status = {
+                    text: '审核终止',
+                    statusCss: 'u-type-info'
+                }
+                break;
+            default:
+                status = {
+                    text: '等待提交',
+                    statusCss: 'u-type-info'
+                }
+                break;
+        }
+        return status
+    },
+            getColumnList() {
+                let columnPermissionList = []
+                let _appColumnList =this.appColumnList
+                    for (let i = 0; i < _appColumnList.length; i++) {
+                        columnPermissionList.push(_appColumnList[i])
+                    }
+                this.columnList = this.transformColumnList(columnPermissionList, this.dataOptions)
+            },
+            transformColumnList(columnList, dataOptions) {
+                let list = []
+                for (let i = 0; i < columnList.length; i++) {
+                    let e = columnList[i]
+                    let columProp = e.prop
+                    let label = e.label
+                    let option = null
+                    let options = columProp + "Options"
+                    if (!columProp.includes('-')) {
+                        columProp = columProp
+                        if(this.type=='4'){
+                            columProp = columProp +"_name"
+                        }
+                        if(label.length>4){
+                            label = label.substring(0, 4)
+                        }
+                        e.label = label
+                        e.prop = columProp
+                        e.option = option
+                        list.push(e)
+                    } else {
+                        e.vModel = columProp.split('-')[1]
+                        e.childLabel = e.label.split('-')[1]
+                        options = e.vModel + "Options"
+                        let prop = columProp.split('-')[0]
+                        let label = e.label.split('-')[0]
+                        let newItem = {
+                            align: "center",
+                            jnpfKey: "table",
+                            prop,
+                            label,
+                            children: []
+                        }
+                        if (!list.some(o => o.prop === prop)) list.push(newItem)
+                        for (let i = 0; i < list.length; i++) {
+                            if (list[i].prop === prop) {
+                                e.prop = e.prop
+                                e.vModel = e.vModel
+                                if(this.type=='4'){
+                                    e.prop = e.prop+"_name"
+                                    e.vModel = e.vModel+"_name"
+                                }
+                                e.option = option
+                                list[i].children.push(e)
+                                break
+                            }
+                        }
+                    }
+                }
+                return list
+            },
+            cellClick(item) {
+                if (this.sortValue === item.value) return
+                this.listQuery.sort = item.sort
+                this.listQuery.sidx = item.sidx
+                this.sortValue = item.value
+                this.$refs.uDropdown.close();
+                this.$nextTick(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                })
+            },
+            reset() {
+                this.searchForm = JSON.parse(JSON.stringify(this.dataValue))
+                this.key = new Date()
+            },
+            closeDropdown() {
+                this.$refs.uDropdown.close();
+                this.$nextTick(() => {
+                    this.list = [];
+                    this.mescroll.resetUpScroll();
+                })
+            },
+            dataList(data){
+                let _list =data.list
+                return _list;
+            },
+        },
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background-color: #f0f2f6;
+        height: 100%;
+        /* #ifdef MP-ALIPAY */
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        /* #endif */
+    }
+
+    .right-option-box {
+        display: flex;
+        width: max-content;
+
+        .right-option {
+            width: 144rpx;
+            height: 100%;
+            font-size: 16px;
+            color: #fff;
+            background-color: #dd524d;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        .more-option {
+            background-color: #1890ff;
+        }
+    }
+</style>
diff --git a/jnpf-app/pages/workFlow/flowBefore/form.vue b/jnpf-app/pages/workFlow/flowBefore/form.vue
index ee46b780..1f44013c 100644
--- a/jnpf-app/pages/workFlow/flowBefore/form.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/form.vue
@@ -1,50 +1,91 @@
 <template>
-	<view>
-		<template v-if="config.formType == 1">
-			<crmOrder ref="form" @eventReceiver="eventReceiver" v-if="config.formEnCode==='crmOrder'" />
-			<leaveApply ref="form" @eventReceiver="eventReceiver" v-if="config.formEnCode==='leaveApply'" />
-			<salesOrder ref="form" @eventReceiver="eventReceiver" v-if="config.formEnCode==='salesOrder'" />
-			<kehuguanli ref="form" @eventReceiver="eventReceiver" v-if="config.formEnCode==='kehuguanli'" />
-			<gysgl ref="form" @eventReceiver="eventReceiver" v-if="config.formEnCode==='gysgl'" />
-			<fwsgl ref="form" @eventReceiver="eventReceiver" v-if="config.formEnCode==='fwsgl'" />
-		</template>
-		<template v-if="config.formType == 2">
-			<dynamicForm ref="form" @eventReceiver="eventReceiver" @setBtnLoad="setBtnLoad" />
-		</template>
-	</view>
+  <view>
+    <template v-if="config.formType == 1">
+      <crmOrder
+        ref="form"
+        @eventReceiver="eventReceiver"
+        v-if="config.formEnCode === 'crmOrder'"
+      />
+      <leaveApply
+        ref="form"
+        @eventReceiver="eventReceiver"
+        v-if="config.formEnCode === 'leaveApply'"
+      />
+      <salesOrder
+        ref="form"
+        @eventReceiver="eventReceiver"
+        v-if="config.formEnCode === 'salesOrder'"
+      />
+      <kehuguanli
+        ref="form"
+        @eventReceiver="eventReceiver"
+        v-if="config.formEnCode === 'kehuguanli'"
+      />
+      <gysgl
+        ref="form"
+        @eventReceiver="eventReceiver"
+        v-if="config.formEnCode === 'gysgl'"
+      />
+      <fwsgl
+        ref="form"
+        @eventReceiver="eventReceiver"
+        v-if="config.formEnCode === 'fwsgl'"
+      />
+      <contract
+        ref="form"
+        @eventReceiver="eventReceiver"
+        v-if="config.formEnCode === 'contract'"
+      />
+	  <productWarehouse
+	    ref="form"
+	    @eventReceiver="eventReceiver"
+	    v-if="config.formEnCode === 'productWarehouse'"
+	  />
+    </template>
+    <template v-if="config.formType == 2">
+      <dynamicForm
+        ref="form"
+        @eventReceiver="eventReceiver"
+        @setBtnLoad="setBtnLoad"
+      />
+    </template>
+  </view>
 </template>
 
 <script>
-	import dynamicForm from '@/pages/workFlow/workFlowForm/dynamicForm'
-	import salesOrder from '@/pages/workFlow/workFlowForm/salesOrder'
-	import leaveApply from '@/pages/workFlow/workFlowForm/leaveApply'
-	import crmOrder from '@/pages/workFlow/workFlowForm/crmOrder'
-	import kehuguanli from '@/pages/scm/form/subjectbasic/customerIndex.vue'
-	import gysgl from '@/pages/scm/form/subjectbasic/supplierIndex.vue'
-	import fwsgl from '@/pages/scm/form/subjectbasic/serviceIndex.vue'
-	export default {
-		components: {
-			crmOrder,
-			dynamicForm,
-			leaveApply,
-			salesOrder,
-			kehuguanli,
-			gysgl,
-			fwsgl,
-		},
-		props: {
-			config: {
-				type: Object,
-				default: () => {}
-			},
-		},
-		methods: {
-			eventReceiver(formData, eventType) {
-				this.$emit('eventReceiver', formData, eventType)
-			},
-			setBtnLoad(val) {
-				this.$emit('setBtnLoad', val)
-			}
-		}
-	}
+import dynamicForm from "@/pages/workFlow/workFlowForm/dynamicForm";
+import salesOrder from "@/pages/workFlow/workFlowForm/salesOrder";
+import leaveApply from "@/pages/workFlow/workFlowForm/leaveApply";
+import crmOrder from "@/pages/workFlow/workFlowForm/crmOrder";
+import kehuguanli from "@/pages/scm/form/subjectbasic/customerIndex.vue";
+import gysgl from "@/pages/scm/form/subjectbasic/supplierIndex.vue";
+import fwsgl from "@/pages/scm/form/subjectbasic/serviceIndex.vue";
+import contract from "@/pages/scm/form/contractL/index.vue";
+import productWarehouse from "@/pages/scm/form/productWarehouse/index.vue";
+export default {
+  components: {
+    crmOrder,
+    dynamicForm,
+    leaveApply,
+    salesOrder,
+    kehuguanli,
+    gysgl,
+    contract,
+	productWarehouse
+  },
+  props: {
+    config: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  methods: {
+    eventReceiver(formData, eventType) {
+      this.$emit("eventReceiver", formData, eventType);
+    },
+    setBtnLoad(val) {
+      this.$emit("setBtnLoad", val);
+    },
+  },
+};
 </script>