From a17f375679a733b1c3bca91dfe6b3e57335ec2e2 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Mon, 13 May 2024 17:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=9F=BA=E5=9C=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=A8=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jnpf-app/pages.json                           |  12 +
 .../form/businessLine1/produceLineIndex.vue   | 814 ++++++++++++++++++
 .../form/businessLine1/workshopLineIndex.vue  | 757 ++++++++++++++++
 .../pages/scm/index/businessLine1/index.vue   | 539 ++++++++++++
 jnpf-app/pages/workFlow/flowBefore/form.vue   |  17 +-
 .../controller/BusinessLine1Controller.java   |   4 +-
 .../controller/BusinessLineController.java    |   2 +-
 .../model/businessline/BusinessLineForm.java  |   2 +-
 8 files changed, 2143 insertions(+), 4 deletions(-)
 create mode 100644 jnpf-app/pages/scm/form/businessLine1/produceLineIndex.vue
 create mode 100644 jnpf-app/pages/scm/form/businessLine1/workshopLineIndex.vue
 create mode 100644 jnpf-app/pages/scm/index/businessLine1/index.vue

diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json
index 1b8cdd25..846a0421 100644
--- a/jnpf-app/pages.json
+++ b/jnpf-app/pages.json
@@ -472,6 +472,18 @@
 					"style": {
 						"navigationBarTitleText": ""
 					}
+				},
+				{
+					"path": "businessLine1/workshopLineIndex",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "businessLine1/produceLineIndex",
+					"style": {
+						"navigationBarTitleText": ""
+					}
 				}
 			]
 		},
diff --git a/jnpf-app/pages/scm/form/businessLine1/produceLineIndex.vue b/jnpf-app/pages/scm/form/businessLine1/produceLineIndex.vue
new file mode 100644
index 00000000..b37cb55f
--- /dev/null
+++ b/jnpf-app/pages/scm/form/businessLine1/produceLineIndex.vue
@@ -0,0 +1,814 @@
+<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="left" :label-width="labelwidth" class="jnpf-form">
+			<view class="u-p-l-20 u-p-r-20 ">
+				<u-form-item>
+					<jnpf-group value="基础信息" content="基础信息" contentPosition="left">
+					</jnpf-group>
+				</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('simpleName')" :required="requiredList.simpleName" label=" 简称/英文名"
+					prop="simpleName">
+					<u-input v-model="dataForm.simpleName" :disabled="judgeWrite('simpleName')"
+						@change="changeData('simpleName',-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('type')" :required="requiredList.type" label="类型" prop="type">
+					<jnpf-select v-model="dataForm.type" :disabled="judgeWrite('type')" @change="changeData('type',-1)"
+						clearable placeholder="请选择" :props="typeProps" :options="typeOptions" :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('parentId')" :required="requiredList.parentId" label="所属工厂"
+					prop="parentId">
+					<jnpf-select v-model="dataForm.parentId" :disabled="judgeWrite('parentId')"
+						@change="changeData('parentId',-1)" clearable placeholder="请选择" :props="parentIdProps"
+						:options="parentIdOptions" :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('workshopId')" :required="requiredList.workshopId" label="所属车间"
+					prop="workshopId">
+					<jnpf-select v-model="dataForm.workshopId" :disabled="judgeWrite('workshopId')"
+						@change="changeData('workshopId',-1)" clearable placeholder="请选择" :props="workshopIdProps"
+						:options="workshopIdOptions" :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('workshopId')" :required="requiredList.workshopId" label="所属车间"
+					prop="workshopId">
+					<jnpf-popup-select v-model="dataForm.workshopId" :disabled="judgeWrite('workshopId')"
+						@change="changeData('workshopId',-1)" :rowIndex="null" :formData="dataForm"
+						:templateJson="interfaceRes.workshopId" hasPage clearable propsValue="id" popupWidth="800px"
+						popupTitle="选择数据" popupType="dialog" relationField='name' vModel='workshopId'
+						:columnOptions="workshopIdColumnOptions" interfaceId="521948662406847621" :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('status')" :required="requiredList.status" label="状态" prop="status">
+					<jnpf-radio v-model="dataForm.status" :disabled="judgeWrite('status')"
+						@change="changeData('status',-1)" optionType="button" direction="horizontal"
+						:props="statusProps" :options="statusOptions" :style='{"width":"100%"}'>
+					</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('description')" :required="requiredList.description" label="描述"
+					prop="description">
+					<u-input v-model="dataForm.description" :disabled="judgeWrite('description')"
+						@change="changeData('description',-1)" input-align='right' clearable placeholder="请输入"
+						type="textarea" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 ">
+				<u-form-item>
+					<jnpf-group value="联系人信息" content="联系人信息" contentPosition="left">
+					</jnpf-group>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table" v-if="judgeShow('businesscontact1List')">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.businesscontact1List" :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('businesscontact1List') && dataForm.businesscontact1List.length>0"
+							@click="delbusinesscontact1List(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('businesscontact1List-contactType')"
+							:required="requiredList['businesscontact1List-contactType']" label="类型">
+							<jnpf-select v-model="dataForm.businesscontact1List[i].contactType"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-contactType')"
+								@change="changeData('businesscontact1-contactType',i)" clearable placeholder="请选择"
+								:props="businesscontact1contactTypeProps" :options="businesscontact1contactTypeOptions"
+								: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('businesscontact1List-name')"
+							:required="requiredList['businesscontact1List-name']" label="姓名">
+							<u-input v-model="dataForm.businesscontact1List[i].name"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-name')"
+								@change="changeData('businesscontact1-name',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('businesscontact1List-phone')"
+							:required="requiredList['businesscontact1List-phone']" label="手机号">
+							<u-input v-model="dataForm.businesscontact1List[i].phone"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-phone')"
+								@change="changeData('businesscontact1-phone',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('businesscontact1List-landline')"
+							:required="requiredList['businesscontact1List-landline']" label="座机">
+							<u-input v-model="dataForm.businesscontact1List[i].landline"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-landline')"
+								@change="changeData('businesscontact1-landline',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('businesscontact1List-email')"
+							:required="requiredList['businesscontact1List-email']" label="邮箱">
+							<u-input v-model="dataForm.businesscontact1List[i].email"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-email')"
+								@change="changeData('businesscontact1-email',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('businesscontact1List-fax')"
+							:required="requiredList['businesscontact1List-fax']" label="传真">
+							<u-input v-model="dataForm.businesscontact1List[i].fax"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-fax')"
+								@change="changeData('businesscontact1-fax',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('businesscontact1List-lastModifyTime')"
+							:required="requiredList['businesscontact1List-lastModifyTime']" label="更新时间">
+							<u-input v-model="dataForm.businesscontact1List[i].lastModifyTime"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-lastModifyTime')"
+								@change="changeData('businesscontact1-lastModifyTime',i)" input-align='right' clearable
+								placeholder="请输入" :style='{"width":"100%"}'>
+							</u-input>
+						</u-form-item>
+					</view>
+				</view>
+				<view class="jnpf-table-addBtn" @click="addbusinesscontact1List"
+					v-if="!judgeWrite('businesscontact1List')">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.businesscontact1List.length==0?"添加":"添加"}}</span>
+				</view>
+			</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: "",
+					code: '',
+					name: '',
+					simpleName: '',
+					type: "",
+					parentId: "",
+					workshopId: "",
+					status: "",
+					description: '',
+					businesscontact1List: [],
+				},
+				rules: {
+					name: [{
+						required: true,
+						message: '生产线名称请输入',
+					}, ],
+					type: [{
+						required: true,
+						message: '类型请选择',
+					}, ],
+					parentId: [{
+						required: true,
+						message: '所属工厂请选择',
+					}, ],
+					workshopId: [{
+						required: true,
+						message: '所属车间请选择',
+					}, ],
+					status: [{
+						required: true,
+						message: '状态不能为空',
+					}, ],
+				},
+				typeOptions: [],
+				typeProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				parentIdOptions: [],
+				parentIdProps: {
+					"label": "name",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				workshopIdOptions: [],
+				workshopIdProps: {
+					"label": "name",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				      workshopIdColumnOptions:[
+				        {
+				        "label":"车间",
+				        "value":"name"
+				        },
+				        {
+				        "label":"编码",
+				        "value":"code"
+				        },
+				    ],
+				statusOptions: [{
+					"fullName": "启用",
+					"id": "1"
+				}, {
+					"fullName": "禁用",
+					"id": "2"
+				}],
+				statusProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				businesscontact1contactTypeOptions: [],
+				businesscontact1contactTypeProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				labelwidth: 100 * 1.5,
+				menuId: '',
+				jurisdictionType: '',
+				ruleList: {
+					businesscontact1List: {
+						'contactType': '类型不能为空',
+						'name': '姓名不能为空',
+						'phone': '手机号不能为空',
+						'email': '邮箱不能为空',
+					},
+				},
+				interfaceRes: {
+					code: [],
+					name: [],
+					simpleName: [],
+					type: [],
+					parentId: [],
+					workshopId: [],
+					status: [],
+					description: [],
+					businesscontact1contactType: [],
+					businesscontact1name: [],
+					businesscontact1phone: [],
+					businesscontact1landline: [],
+					businesscontact1email: [],
+					businesscontact1fax: [],
+					businesscontact1lastModifyTime: [],
+				},
+				regList: {
+					businesscontact1List: {
+						contactType: [],
+						name: [],
+						phone: [],
+						landline: [],
+						email: [],
+						fax: [],
+						lastModifyTime: [],
+					},
+				},
+				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;
+				}
+			}
+			if (!option.id) {
+				this.actionList.push({
+					text: '确定并新增',
+					id: 'save_add'
+				})
+			} else {
+				let upper = {
+					text: '上一条',
+					id: 'upper',
+					disabled: this.index == 0 ? true : false
+				}
+				this.actionList.push(upper)
+				let lower = {
+					text: '下一条',
+					id: 'lower',
+					disabled: this.index == this.idList.length - 1 ? true : false
+				}
+				this.actionList.push(lower)
+				this.actionList.push({
+					text: '确定并继续',
+					id: 'save_proceed'
+				})
+				this.collapse()
+			}
+		},
+		onReady() {
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.$refs.dataForm.setRules(this.rules);
+				}, 100)
+			})
+		},
+		watch: {
+			dataForm: {
+				handler(val, oldVal) {
+					this.businesscontact1()
+				},
+				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.gettypeOptions()
+				this.getparentIdOptions()
+				this.getworkshopIdOptions()
+				this.getbusinesscontact1contactTypeOptions()
+				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;
+			},
+			gettypeOptions() {
+				getDictionaryDataSelector('521639458429212677').then(res => {
+					this.typeOptions = res.data.list
+				})
+			},
+			getparentIdOptions() {
+				const edit = this.isEdit
+				const index = this.childIndex
+				let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.parentId))
+				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('521651055751075845', template).then(res => {
+					let data = res.data
+					this.parentIdOptions = data
+					if (!edit) return
+					this.changeDataFormData(1, 'parentId', 'parentId', index, '', edit)
+				})
+			},
+			getworkshopIdOptions() {
+				const edit = this.isEdit
+				const index = this.childIndex
+				let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.workshopId))
+				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('521948662406847621', template).then(res => {
+				// 	let data = res.data
+				// 	this.workshopIdOptions = data
+				// 	if (!edit) return
+				// 	this.changeDataFormData(1, 'workshopId', 'workshopId', index, '', edit)
+				// })
+			},
+			businesscontact1() {
+				let table = this.dataForm.businesscontact1List
+				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;
+			},
+			getbusinesscontact1contactTypeOptions() {
+				getDictionaryDataSelector('517959233023509701').then(res => {
+					this.businesscontact1contactTypeOptions = res.data.list
+				})
+			},
+			initData() {
+				this.$nextTick(function() {
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/scm/BusinessLine1/' + 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)
+			},
+			addbusinesscontact1List() {
+				let value = {}
+				this.tableKey = 'businesscontact1List';
+				this.getbusinesscontact1List(value)
+				this.childIndex = -1
+				this.collapse()
+			},
+			delbusinesscontact1List(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.businesscontact1List.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getbusinesscontact1List(value) {
+				let item = {
+					contactType: "",
+					contactTypeOptions: [],
+					name: '',
+					phone: '',
+					landline: '',
+					email: '',
+					fax: '',
+					lastModifyTime: '',
+				}
+				let result = {
+					...item,
+					...value
+				}
+				this.dataForm.businesscontact1List.push(result)
+				this.childIndex = this.dataForm.businesscontact1List.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.businesscontact1List.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/businessLine1/workshopLineIndex.vue b/jnpf-app/pages/scm/form/businessLine1/workshopLineIndex.vue
new file mode 100644
index 00000000..ca989ea4
--- /dev/null
+++ b/jnpf-app/pages/scm/form/businessLine1/workshopLineIndex.vue
@@ -0,0 +1,757 @@
+<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="left" :label-width="labelwidth" class="jnpf-form">
+			<view class="u-p-l-20 u-p-r-20 ">
+				<u-form-item>
+					<jnpf-group value="基础信息" content="基础信息" contentPosition="left">
+					</jnpf-group>
+				</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('simpleName')" :required="requiredList.simpleName" label=" 简称/英文名"
+					prop="simpleName">
+					<u-input v-model="dataForm.simpleName" :disabled="judgeWrite('simpleName')"
+						@change="changeData('simpleName',-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('type')" :required="requiredList.type" label="类型" prop="type">
+					<jnpf-select v-model="dataForm.type" :disabled="judgeWrite('type')" @change="changeData('type',-1)"
+						clearable placeholder="请选择" :props="typeProps" :options="typeOptions" :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('parentId')" :required="requiredList.parentId" label="所属工厂/基地"
+					prop="parentId">
+					<jnpf-select v-model="dataForm.parentId" :disabled="judgeWrite('parentId')"
+						@change="changeData('parentId',-1)" clearable placeholder="请选择" :props="parentIdProps"
+						:options="parentIdOptions" :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('workshopArea')" :required="requiredList.workshopArea" label="车间面积"
+					prop="workshopArea">
+					<u-input v-model="dataForm.workshopArea" :disabled="judgeWrite('workshopArea')"
+						@change="changeData('workshopArea',-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('status')" :required="requiredList.status" label="状态" prop="status">
+					<jnpf-radio v-model="dataForm.status" :disabled="judgeWrite('status')"
+						@change="changeData('status',-1)" optionType="button" direction="horizontal"
+						:props="statusProps" :options="statusOptions" :style='{"width":"100%"}'>
+					</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('description')" :required="requiredList.description" label="描述"
+					prop="description">
+					<u-input v-model="dataForm.description" :disabled="judgeWrite('description')"
+						@change="changeData('description',-1)" input-align='right' clearable placeholder="请输入"
+						type="textarea" :style='{"width":"100%"}'>
+					</u-input>
+				</u-form-item>
+			</view>
+			<view class="u-p-l-20 u-p-r-20 ">
+				<u-form-item>
+					<jnpf-group value="联系人信息" content="联系人信息" contentPosition="left">
+					</jnpf-group>
+				</u-form-item>
+			</view>
+			<view class="jnpf-table" v-if="judgeShow('businesscontact1List')">
+				<view class="jnpf-table-item" v-for="(item,i) in dataForm.businessContactList" :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('businesscontact1List') && dataForm.businessContactList.length>0"
+							@click="delbusinesscontact1List(i)">删除</view>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('businesscontact1List-contactType')"
+							:required="requiredList['businesscontact1List-contactType']" label="类型">
+							<jnpf-select v-model="dataForm.businessContactList[i].contactType"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-contactType')"
+								@change="changeData('businesscontact1-contactType',i)" clearable placeholder="请选择"
+								:props="businesscontact1contactTypeProps" :options="businesscontact1contactTypeOptions"
+								: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('businesscontact1List-name')"
+							:required="requiredList['businesscontact1List-name']" label="姓名">
+							<jnpf-user-select v-model="dataForm.businessContactList[i].name"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-name')"
+								@change="changeData('businesscontact1-name',i)" selectType="all"
+								:ableIds="ableAll.businesscontact1nameableIds" clearable placeholder="请选择"
+								:style='{"width":"100%"}'>
+							</jnpf-user-select>
+						</u-form-item>
+					</view>
+					<view class="u-p-l-20 u-p-r-20 form-item-box">
+						<u-form-item v-if="judgeShow('businesscontact1List-phone')"
+							:required="requiredList['businesscontact1List-phone']" label="手机号">
+							<u-input v-model="dataForm.businessContactList[i].phone"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-phone')"
+								@change="changeData('businesscontact1-phone',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('businesscontact1List-landline')"
+							:required="requiredList['businesscontact1List-landline']" label="座机">
+							<u-input v-model="dataForm.businessContactList[i].landline"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-landline')"
+								@change="changeData('businesscontact1-landline',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('businesscontact1List-email')"
+							:required="requiredList['businesscontact1List-email']" label="邮箱">
+							<u-input v-model="dataForm.businessContactList[i].email"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-email')"
+								@change="changeData('businesscontact1-email',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('businesscontact1List-fax')"
+							:required="requiredList['businesscontact1List-fax']" label="传真">
+							<u-input v-model="dataForm.businessContactList[i].fax"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-fax')"
+								@change="changeData('businesscontact1-fax',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('businesscontact1List-creatorTime')"
+							:required="requiredList['businesscontact1List-creatorTime']" label="更新时间">
+							<jnpf-date-time v-model="dataForm.businessContactList[i].creatorTime"
+								:disabled="judgeWrite('businesscontact1List')||judgeWrite('businesscontact1List-creatorTime')"
+								@change="changeData('businesscontact1-creatorTime',i)"
+								: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>
+				<view class="jnpf-table-addBtn" @click="addbusinesscontact1List"
+					v-if="!judgeWrite('businesscontact1List')">
+					<u-icon name="plus" color="#2979ff"></u-icon>
+					<span>{{dataForm.businessContactList.length==0?"添加":"添加"}}</span>
+				</view>
+			</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: "",
+					code: '',
+					name: '',
+					simpleName: '',
+					type: "",
+					parentId: "",
+					workshopArea: '',
+					status: "",
+					description: '',
+					businessContactList: [],
+				},
+				rules: {
+					name: [{
+						required: true,
+						message: '车间名称请输入',
+					}, ],
+					type: [{
+						required: true,
+						message: '类型请选择',
+					}, ],
+					parentId: [{
+						required: true,
+						message: '所属工厂/基地请选择',
+					}, ],
+					status: [{
+						required: true,
+						message: '状态不能为空',
+					}, ],
+				},
+				typeOptions: [],
+				typeProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				parentIdOptions: [],
+				parentIdProps: {
+					"label": "name",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				statusOptions: [{
+					"fullName": "启用",
+					"id": "1"
+				}, {
+					"fullName": "禁用",
+					"id": "2"
+				}],
+				statusProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				businesscontact1contactTypeOptions: [],
+				businesscontact1contactTypeProps: {
+					"label": "fullName",
+					"value": "id",
+					"multiple": false,
+					"children": ""
+				},
+				labelwidth: 100 * 1.5,
+				menuId: '',
+				jurisdictionType: '',
+				ruleList: {
+					businessContactList: {
+						'contactType': '类型不能为空',
+						'name': '姓名不能为空',
+						'phone': '手机号不能为空',
+						'email': '邮箱不能为空',
+					},
+				},
+				interfaceRes: {
+					code: [],
+					name: [],
+					simpleName: [],
+					type: [],
+					parentId: [],
+					workshopArea: [],
+					status: [],
+					description: [],
+					businesscontact1contactType: [],
+					businesscontact1name: [],
+					businesscontact1phone: [],
+					businesscontact1landline: [],
+					businesscontact1email: [],
+					businesscontact1fax: [],
+					businesscontact1creatorTime: [],
+				},
+				regList: {
+					businessContactList: {
+						contactType: [],
+						name: [],
+						phone: [],
+						landline: [],
+						email: [],
+						fax: [],
+						creatorTime: [],
+					},
+				},
+				ableAll: {
+					businesscontact1nameableIds: [],
+				},
+				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;
+				}
+			}
+			if (!option.id) {
+				this.actionList.push({
+					text: '确定并新增',
+					id: 'save_add'
+				})
+			} else {
+				let upper = {
+					text: '上一条',
+					id: 'upper',
+					disabled: this.index == 0 ? true : false
+				}
+				this.actionList.push(upper)
+				let lower = {
+					text: '下一条',
+					id: 'lower',
+					disabled: this.index == this.idList.length - 1 ? true : false
+				}
+				this.actionList.push(lower)
+				this.actionList.push({
+					text: '确定并继续',
+					id: 'save_proceed'
+				})
+				this.collapse()
+			}
+		},
+		onReady() {
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.$refs.dataForm.setRules(this.rules);
+				}, 100)
+			})
+		},
+		watch: {
+			dataForm: {
+				handler(val, oldVal) {
+					this.businesscontact1()
+				},
+				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.gettypeOptions()
+				this.getparentIdOptions()
+				this.getbusinesscontact1contactTypeOptions()
+				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;
+			},
+			gettypeOptions() {
+				getDictionaryDataSelector('521639387734218757').then(res => {
+					this.typeOptions = res.data.list
+				})
+			},
+			getparentIdOptions() {
+				const edit = this.isEdit
+				const index = this.childIndex
+				let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.parentId))
+				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('521651055751075845', template).then(res => {
+					let data = res.data
+					this.parentIdOptions = data
+					if (!edit) return
+					this.changeDataFormData(1, 'parentId', 'parentId', index, '', edit)
+				})
+			},
+			businesscontact1() {
+				let table = this.dataForm.businessContactList
+				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;
+			},
+			getbusinesscontact1contactTypeOptions() {
+				getDictionaryDataSelector('517959233023509701').then(res => {
+					this.businesscontact1contactTypeOptions = res.data.list
+				})
+			},
+			initData() {
+				this.$nextTick(function() {
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/scm/BusinessLine1/' + 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)
+			},
+			addbusinesscontact1List() {
+				let value = {}
+				this.tableKey = 'businessContactList';
+				this.getbusinesscontact1List(value)
+				this.childIndex = -1
+				this.collapse()
+			},
+			delbusinesscontact1List(index) {
+				var that = this
+				uni.showModal({
+					title: '提示',
+					content: '确认删除该条信息吗？',
+					success: function(res) {
+						if (res.confirm) {
+							that.dataForm.businessContactList.splice(index, 1);
+							that.collapse()
+						}
+					}
+				})
+			},
+			getbusinesscontact1List(value) {
+				let item = {
+					contactType: "",
+					contactTypeOptions: [],
+					name: '',
+					phone: '',
+					landline: '',
+					email: '',
+					fax: '',
+					creatorTime: "",
+				}
+				let result = {
+					...item,
+					...value
+				}
+				this.dataForm.businessContactList.push(result)
+				this.dataForm.businessContactList[this.dataForm.businessContactList.length - 1].creatorTime = new Date()
+					.getTime()
+				this.childIndex = this.dataForm.businessContactList.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.businessContactList.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/index/businessLine1/index.vue b/jnpf-app/pages/scm/index/businessLine1/index.vue
new file mode 100644
index 00000000..0b29edd3
--- /dev/null
+++ b/jnpf-app/pages/scm/index/businessLine1/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:[{"jnpfKey":"billRule","fullName":"业务线编号","label":"业务线编号","sortable":false,"align":"left","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","noShow":false,"tipLabel":"","dragDisabled":false,"rule":"rukudanhao","className":[],"label":"业务线编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_business_line","renderKey":1705561324245,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"入库单号","tag":"JnpfInput","span":8},"readonly":true,"prop":"code","__vModel__":"code","style":{"width":"100%"},"fixed":"none","placeholder":"系统自动生成","id":"code"},{"clearable":true,"jnpfKey":"input","suffixIcon":"","fullName":"业务线名称","label":"业务线名称","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"业务线名称","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_business_line","renderKey":1705561361587,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":true,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"name","__vModel__":"name","showPassword":false,"style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请输入","id":"name","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"jnpfKey":"input","suffixIcon":"","fullName":"业务线简称","label":"业务线简称","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"业务线简称","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_business_line","renderKey":1705561373234,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"simpleName","__vModel__":"simpleName","showPassword":false,"style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请输入","id":"simpleName","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"类型","label":"类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"517662753159119813","tipLabel":"","dragDisabled":false,"className":[],"label":"类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_business_line","renderKey":1705561384493,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"type","options":[{"enCode":"1","hasChildren":false,"fullName":"业务线","id":"517662857341436869","parentId":"0"},{"enCode":"2","hasChildren":false,"fullName":"业务组","id":"517662885212586949","parentId":"0"},{"enCode":"3","hasChildren":false,"fullName":"事业群","id":"517662927826715589","parentId":"0"},{"enCode":"4","hasChildren":false,"fullName":"品牌","id":"517662957383975877","parentId":"0"}],"__vModel__":"type","style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请选择","id":"type","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"所属分类","label":"所属分类","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"dictionary","dictionaryType":"517664069117805509","tipLabel":"","dragDisabled":false,"className":[],"label":"所属分类","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_business_line","renderKey":1705561409060,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"industry","options":[{"enCode":"1","hasChildren":false,"fullName":"贸易","id":"517664146741789637","parentId":"0"},{"enCode":"2","hasChildren":false,"fullName":"加工","id":"517664192858162117","parentId":"0"},{"enCode":"3","hasChildren":false,"fullName":"服务","id":"517664222537057221","parentId":"0"},{"enCode":"4","hasChildren":false,"fullName":"其他","id":"517664257400112069","parentId":"0"}],"__vModel__":"industry","style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请选择","id":"industry","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"所在城市","label":"所在城市","sortable":false,"align":"left","__config__":{"formId":106,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"所在城市","trigger":"change","showLabel":true,"required":true,"tableName":"jg_business_line","renderKey":1705561449107,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"city","__vModel__":"city","style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请选择","id":"city","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"成立时间","label":"成立时间","sortable":false,"align":"left","__config__":{"endRelationField":"","dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_business_line","renderKey":1705561482275,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":107,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"成立时间","trigger":"change","startTimeRule":false,"endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"prop":"establishDate","__vModel__":"establishDate","style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请选择","id":"establishDate","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}},{"clearable":true,"jnpfKey":"textarea","fullName":"描述","label":"描述","sortable":false,"align":"left","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":110,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"描述","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_business_line","renderKey":1705561564509,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"description","__vModel__":"description","style":{"width":"100%"},"disabled":false,"fixed":"none","placeholder":"请输入","id":"description","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n    // 在此编写代码\n    \n}"}}],
+            listQuery: {
+                moduleId:'521634040684484613',
+                        sort: 'desc',
+                        sidx: '',
+                        keyword: '',
+                        json: ''
+            },
+            options: [
+                        {
+                            text: '删除',
+                            style: {
+                                backgroundColor: '#dd524d'
+                            }
+                        }
+            ],
+                    sortOptions:[
+            ],
+                    ableAll:{
+            },
+            interfaceRes:{
+            },
+            menuId:'',
+                    enCode: 'workshopLine',
+                    formId: '521634040684484613',
+                    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/BusinessLine1/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/BusinessLine1/' + 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 0417d7c4..25717f4c 100644
--- a/jnpf-app/pages/workFlow/flowBefore/form.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/form.vue
@@ -66,6 +66,16 @@
 	    @eventReceiver="eventReceiver"
 	    v-if="config.formEnCode === 'warehousingInspection'"
 	  />
+	  <workshopLine
+	    ref="form"
+	    @eventReceiver="eventReceiver"
+	    v-if="config.formEnCode === 'workshopLine'"
+	  />
+	  <produceLine
+	    ref="form"
+	    @eventReceiver="eventReceiver"
+	    v-if="config.formEnCode === 'produceLine'"
+	  />
     </template>
     <template v-if="config.formType == 2">
       <dynamicForm
@@ -92,6 +102,9 @@ import saleOrder from "@/pages/scm/form/businessOrder/saleIndex.vue";
 import energyConsumption from "@/pages/scm/form/energyConsumption/index.vue";
 import bom from "@/pages/scm/form/bom/index.vue";
 import warehousingInspection from "@/pages/scm/form/warehousingInspection/index.vue";
+import workshopLine from "@/pages/scm/form/businessLine1/workshopLineIndex.vue";
+import produceLine from "@/pages/scm/form/businessLine1/produceLineIndex.vue";
+
 export default {
   components: {
     crmOrder,
@@ -106,7 +119,9 @@ export default {
 	saleOrder,
 	energyConsumption,
 	bom,
-	warehousingInspection
+	warehousingInspection,
+	workshopLine,
+	produceLine
   },
   props: {
     config: {
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine1Controller.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine1Controller.java
index 88f0dd3d..8d80401e 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine1Controller.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine1Controller.java
@@ -657,7 +657,9 @@ uniqueModel.setFlowId(visualImportModel.getFlowId());         ExcelImportModel e
         //副表数据
         //子表数据
         List<BusinessContact1Entity> businessContact1List = businessLine1Service.getBusinessContact1List(entity.getId());
-        businessLine1Map.put("businessContact1List",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List)));
+//        businessLine1Map.put("businessContact1List",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List)));
+        businessLine1Map.put("businessContactList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List)));
+
         businessLine1Map = generaterSwapUtil.swapDataForm(businessLine1Map,BusinessLine1Constant.getFormData(),BusinessLine1Constant.TABLEFIELDKEY,BusinessLine1Constant.TABLERENAMES);
         return ActionResult.success(businessLine1Map);
     }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java
index 845877ae..bcd1c882 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLineController.java
@@ -215,7 +215,7 @@ public class BusinessLineController {
             else if (businessLineForm.getDiffFlag().equals("5")){
                 //新增业务线 的生产线
                 businessLineForm.setDiffFlag("6");
-                businessLineForm.setParentId(businessLineForm.getWorkshopId());
+                businessLineForm.setWorkshopId(businessLineForm.getWorkshopId());
             }
             businessLineService.saveOrUpdate(businessLineForm, id ,true);
         }catch(Exception e){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLineForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLineForm.java
index db0843b8..b1044d74 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLineForm.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessline/BusinessLineForm.java
@@ -104,7 +104,7 @@ public class BusinessLineForm  {
     @TableField("WORKSHOP_AREA")
     private String workshopArea;
 
-    /** 车间面积 **/
+    /** 车间父id **/
     @TableField("WORKSHOP_ID")
     private String workshopId;
 }