From ec14cbabf72c03107a8483e06157e38e3265bbee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 24 Nov 2023 16:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=9C=E9=98=B3=E4=B8=BB=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E7=BC=96=E8=BE=91=E4=B8=BB=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WinIn.FasterZ.Wms.Fe/README.md                | 22 ++++++-
 .../components/addEditFromApiPop/index.vue    | 60 +++++++++++--------
 2 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/WinIn.FasterZ.Wms.Fe/README.md b/WinIn.FasterZ.Wms.Fe/README.md
index 4208571d9..14ad2d778 100644
--- a/WinIn.FasterZ.Wms.Fe/README.md
+++ b/WinIn.FasterZ.Wms.Fe/README.md
@@ -123,4 +123,24 @@ validType           type仅等于input时：实时keyUp校验，类型如下：
 pointNumberFixed    组合上方validType值仅等于pointNumber时：
                     小数点后方保留位数,如不填写默认为100位
 <validType>+<pointNumberFixed>示例：
-{ type:"input", label:"金额", prop:"money", validType:'pointNumber',pointNumberFixed:2},
\ No newline at end of file
+{ type:"input", label:"金额", prop:"money", validType:'pointNumber',pointNumberFixed:2},
+
+[urlOpion示例]
+// 添加页面需要配置位置
+// 示例数据
+export const TestSchool = {
+    baseURL:'TestSchool/base',//主表-列表
+    detailURL:'app/test-school',//主表-明细 + 明细-查看主表
+    detailListURL:'TestStudentDetail/base',//明细-列表,
+    // parentURL:null,//明细-查看主表:特殊接口，如果没有则走detailURL
+    // deleteURL:null,//删除特殊URL
+    // addURL:null,//新增特殊URL
+    // editURL:null,//编辑特殊URL
+    // exportURL:'exportURL',//导出特殊URL
+    //有主表的子表单页的主表信息接口,如果不填默认为当前的detailURL去掉‘-Detail’
+    // mainShowMasterUrl:null,
+    //有主表的子表单页的主表链接参数，如果没有默认为‘masterId’
+    // mainShowMasterId:'masterId',
+    //有主表的子表单页的主表显示列转义路由，如果没有默认为当前路由去掉‘Detail’
+    // masterRoute:null,
+}
\ No newline at end of file
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
index 0a7163d1e..ed541aace 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/addEditFromApiPop/index.vue
@@ -391,34 +391,44 @@ export default {
     submitHandle(){
       this.$refs.addEditFrom_Ref.validate((valid) => {
         if(this.submitForm){
-          this.submitForm(valid,this.formData,this.handleType,this.formItemData,this.formRules)
+          this.submitForm(valid,this.formData,this.flexTableData,this.handleType,this.formItemData,this.formRules,this.detailFormRules)
           return
         }
         if (valid) {
-          this.formData.details = this.flexTableData
-          this.Loading.addEditApiLoading = true
-          // 新增
-          if(this.handleType == 'add'){
-            ApiTypePost(
-              this.formData, 
-              this.currentDtos.C.actionsUrl
-            ).then(res => {
-              this.changeActive(1)
-            }).catch(err => {
-              this.changeActive(2)
-            })
-          }
-          // 编辑
-          else{
-            ApiTypePut(
-              this.formData, 
-              this.formData.id, 
-              this.currentDtos.U.actionsUrl
-            ).then(res => {
-              this.changeActive(1)
-            }).catch(err => {
-              this.changeActive(2)
-            })
+          if(this.isHaveDetail() && (!this.flexTableData || this.flexTableData.length <=0 )){
+            this.$confirm('您还未编辑子表信息, 是否确定提交?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.formData.details = this.flexTableData
+              this.Loading.addEditApiLoading = true
+              // 新增
+              if(this.handleType == 'add'){
+                ApiTypePost(
+                  this.formData, 
+                  this.currentDtos.C.actionsUrl
+                ).then(res => {
+                  this.changeActive(1)
+                }).catch(err => {
+                  this.changeActive(2)
+                })
+              }
+              // 编辑
+              else{
+                ApiTypePut(
+                  this.formData, 
+                  this.formData.id, 
+                  this.currentDtos.U.actionsUrl
+                ).then(res => {
+                  this.changeActive(1)
+                }).catch(err => {
+                  this.changeActive(2)
+                })
+              }
+            }).catch(() => {
+      
+            });
           }
         } else {
           return false;