From a8d7042ee9c7e7c2c7b722f481ca03d823b0ff42 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Wed, 10 Apr 2024 16:22:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DesignForm/public/form/form.vue           |  2 +-
 .../DesignForm/tableListPage/formPageCont.vue | 17 +++++++++++++-
 .../DesignForm/tableListPage/index.vue        | 23 +++++++++++++++----
 src/types/components.d.ts                     | 10 --------
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue
index 9a3e912fd..e0d107649 100644
--- a/src/components/DesignForm/public/form/form.vue
+++ b/src/components/DesignForm/public/form/form.vue
@@ -940,7 +940,7 @@ const saveEditFormInfo = (type: string, res: any) => {
  */
 const draftSubmit = (params = {}) => {
 	// let apiUrl = "/systemapi/task_management/newcust_form_editdata"
-	let apiUrl ="/systemapi/task_management/add_customer_form"
+	let apiUrl ="/systemapi/task_management/editCustomerTable"
 	if (props.isSearch || !apiUrl || loading.value) {
 		if (!props.isSearch && !apiUrl) {
 			console.error(
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index de6431edd..6a5413093 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -27,6 +27,10 @@ const props = defineProps({
 		type:Number,
 		default:1
 	},
+	operState:{
+		type:Number,
+		default:1
+	},
 	pageInfo:{
 		type:Object,
 		default(){
@@ -100,7 +104,16 @@ const getCustomrrFormInfo = () => {
 					.then((data:any) =>{
 						if(data.code == 0){
 							if (data.data == 3 || data.data == 4){
-								formState.formData.list.push(submitButtonEs)
+								// formState.formData.list.push(submitButtonEs)
+								if(props.operState == 2){
+										formState.formData.list.push(afreshSubmitButton)
+								}else if(props.operState == 3){
+										formState.formData.list.push(editFormCont)
+								}else if(props.operState == 4){
+										formState.formData.list.push(draftSubmitButton)
+								}else if(props.operState == 5){
+									formState.formData.list.push(submitButtonEs)
+								}
 							}
 						}
 					})
@@ -145,6 +158,8 @@ const drawerBeforeClose = () => {
 	// emits("getmytodolist")
 	// emits("update:isshow", false);
 }
+//提交审批
+const sendDraftSubmit = (type: string,val?:any) => {}
 </script>
 <template>
 	<el-drawer
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index e3473252c..6e1a3f546 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -70,7 +70,7 @@ const emits = defineEmits<{
     (e: 'selectionChange', row: any): void
     (e: 'btnClick', btn: any, row?: any): void // 列表上面及表格列表里添加删除按钮事件
 }>()
-
+const operState = ref<number>(1)	//操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
 const idList = ref<string[]>([])
 const designStore = useDesignFormStore()
 const route = useRoute()
@@ -328,6 +328,19 @@ const lookPageInfo = (val:any) => {
 
 const editInfo = (val:any) => {
 	console.log('修改数据!',val)
+	operState.value = 5;
+	tablePageClass.value = 2;
+	pageInfoCont.value = val
+	drawerWith.value = container.value?.clientWidth
+	lookPageInfoIsShow.value = true;
+}
+/**
+@ 作者: 秦东
+@ 时间: 2024-04-10 15:32:55
+@ 功能: 提交审批
+*/
+const submitApproval = (val:any) => {
+	operState.value = 4
 	tablePageClass.value = 2;
 	pageInfoCont.value = val
 	drawerWith.value = container.value?.clientWidth
@@ -472,7 +485,7 @@ const editInfo = (val:any) => {
 										content="提交审批"
 										placement="top-end"
 									>
-										<el-button type="success" size="small" class="fa fa-send-o"  />
+										<el-button type="success" size="small" class="fa fa-send-o"   @click="submitApproval(scope.row)" />
 									</el-tooltip>
 
 									<el-tooltip
@@ -597,7 +610,7 @@ const editInfo = (val:any) => {
 					/>
 				</div>
 			</el-col>
-			<el-col :span="24"  style="display:black">
+			<el-col :span="24"  style="display:none">
 			
 				{{ tableDataList}}
 			</el-col>
@@ -610,7 +623,7 @@ const editInfo = (val:any) => {
 								content="提交审批"
 								placement="top-end"
 							>
-								<el-button type="success" size="small" class="fa fa-send-o"  />
+								<el-button type="success" size="small" class="fa fa-send-o" />
 							</el-tooltip>
 
 							<el-tooltip
@@ -663,7 +676,7 @@ const editInfo = (val:any) => {
 			
 			</el-col>
 		</el-row>
-		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" @getPageData="getPageData" />
+		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
 	</div>
 </template>
 <style  lang='scss' scoped>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 1a2fef63a..7630d66c7 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -31,7 +31,6 @@ declare module '@vue/runtime-core' {
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
@@ -71,7 +70,6 @@ declare module '@vue/runtime-core' {
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
@@ -111,15 +109,7 @@ declare module '@vue/runtime-core' {
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
-    IEpDelete: typeof import('~icons/ep/delete')['default']
-    IEpEdit: typeof import('~icons/ep/edit')['default']
-    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
-    IEpOperation: typeof import('~icons/ep/operation')['default']
-    IEpPlus: typeof import('~icons/ep/plus')['default']
-    IEpRefresh: typeof import('~icons/ep/refresh')['default']
-    IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
-    IEpUser: typeof import('~icons/ep/user')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
     List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']