From 090611a71d0e6bef9db2731fb97b1eafcfd6c7e0 Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Wed, 31 Jul 2024 01:44:09 +0800
Subject: [PATCH] 1

---
 src/views/baseSpecialAction/dynamicModel/list/Form.vue | 50 ++++++++++++++++++++++++++------------------------
 src/views/baseSpecialhandle/index.vue                  |  5 +++--
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/views/baseSpecialAction/dynamicModel/list/Form.vue b/src/views/baseSpecialAction/dynamicModel/list/Form.vue
index f68b40c..66866c1 100644
--- a/src/views/baseSpecialAction/dynamicModel/list/Form.vue
+++ b/src/views/baseSpecialAction/dynamicModel/list/Form.vue
@@ -1,24 +1,22 @@
 <template>
   <div>
-    <template>
-      <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false"
-        :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll
-        :width="formConf.generalWidth">
-        <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm"
-          :setFormData="setFormData" :setShowOrHide="setShowOrHide" :setRequired="setRequired"
-          :setDisabled="setDisabled" :setFieldOptions="setFieldOptions"/>
-        <span slot="footer" class="dialog-footer">
-          <template v-if="formConf.hasPrintBtn && formConf.printId && dataForm.id && false">
-            <el-button type="primary" @click="print">
-              {{formConf.printButtonText||'打 印'}}
-            </el-button>
-          </template>
-          <el-button @click="visible = false">{{formConf.cancelButtonText||'取 消'}}</el-button>
-          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
-            {{formConf.confirmButtonText||'确 定'}}</el-button>
-        </span>
-      </el-dialog>
-    </template>
+
+    <el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" :visible.sync="visible"
+      class="NCC-dialog NCC-dialog_center" lock-scroll :width="formConf.generalWidth">
+      <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm" :setFormData="setFormData"
+        :setShowOrHide="setShowOrHide" :setRequired="setRequired" :setDisabled="setDisabled"
+        :setFieldOptions="setFieldOptions" v-if="!loading"/>
+      <span slot="footer" class="dialog-footer">
+        <template v-if="formConf.hasPrintBtn && formConf.printId && dataForm.id && false">
+          <el-button type="primary" @click="print">
+            {{ formConf.printButtonText || '打 印' }}
+          </el-button>
+        </template>
+        <el-button @click="visible = false">{{ formConf.cancelButtonText || '取 消' }}</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
+          {{ formConf.confirmButtonText || '确 定' }}</el-button>
+      </span>
+    </el-dialog>
     <!-- <template>
       <transition name="el-zoom-in-center">
         <div class="NCC-preview-main">
@@ -82,23 +80,25 @@ export default {
       this.printBrowseVisible = true
     },
     init(formConf, modelId, id, isPreview, useFormPermission) {
-    
       this.formConf = deepClone(JSON.parse(formConf))
-      var formConf  = this.formConf;
       this.modelId = modelId
       this.isPreview = isPreview
       this.useFormPermission = useFormPermission
       this.dataForm.id = id || ''
-      debugger
       this.getFormOperates()
       this.loading = true
       this.$nextTick(() => {
         if (this.dataForm.id) {
           getModelInfo(modelId, this.dataForm.id).then(res => {
+            this.dataForm = {
+              id: '',
+              data: ''
+            };
             this.dataForm = res.data
             if (!this.dataForm.data) return
             this.formData = JSON.parse(this.dataForm.data)
-            this.fillFormData(formConf, this.formData)
+            console.log(  this.formData);
+            this.fillFormData(this.formConf, this.formData)
             this.$nextTick(() => {
               this.visible = true
               this.loading = false
@@ -106,7 +106,7 @@ export default {
           })
         } else {
           this.formData = {}
-          this.fillFormData(formConf, this.formData)
+          this.fillFormData(this.formConf, this.formData)
           this.visible = true
           this.loading = false
         }
@@ -149,6 +149,8 @@ export default {
       this.dataForm.data = JSON.stringify(data)
       const formMethod = this.dataForm.id ? updateModel : createModel
       formMethod(this.modelId, this.dataForm).then(res => {
+        console.info(res);
+        alert(res.data.Id);
         this.$message({
           message: res.msg,
           type: 'success',
diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue
index ced8f21..a16a8cd 100644
--- a/src/views/baseSpecialhandle/index.vue
+++ b/src/views/baseSpecialhandle/index.vue
@@ -49,7 +49,7 @@
         </div>
       </div>
     </div>
-    <NCCForm v-show="dialogVisible" ref="NCCForm" @refresh="refresh" />
+    <NCCForm v-if="dialogVisible" ref="NCCForm" @refresh="refresh" />
     <!-- <el-dialog title="专项行动处理" :visible.sync="dialogVisible" fullscreen :modal="false">
         <iframe 
           :src="nestedPageUrl" 
@@ -135,7 +135,8 @@ export default {
     },
     toFillForm(row) {
       this.dialogVisible = true;
-      var  Itemid= "";//数据id，没有的话就是新增 ，有的话就是修改
+      var  Itemid= "588014226493146373";//数据id，没有的话就是新增 ，有的话就是修改
+      Itemid="";
       var  modelId=row.formId;//关联的表单id
       var isPreview = false;//固定死，值不变
       var useFormPermission = false;//固定死，值不变
--
libgit2 0.21.4