From d0136913a2c74a44f5bb30327ebbb3fd85e24fce Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 23 一月 2024 10:56:30 +0800
Subject: [PATCH] 修改了很多

---
 ruoyi-ui/src/views/marry/index.vue |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index d7e8608..722e443 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"  id="printable-content">
     <!--    鍥炲埌椤堕儴-->
     <el-backtop :bottom="150" :right="30">
       <el-button type="primary" circle
@@ -144,6 +144,15 @@
                 @click="handleExport"
                 v-hasPermi="['family:note:export']"
               >瀵煎嚭</el-button></el-col>
+
+            <el-col style="padding-top: 10px;">
+              <el-button
+                plain
+                style="width: 80px;height: 32px;background: #FFDDE3;"
+                v-print="'#printable-content'"
+                v-hasPermi="['family:note:export']"
+              >鎵撳嵃</el-button></el-col>
+
 
           </el-row>
 
@@ -610,7 +619,10 @@
       // 鏃ユ湡鑼冨洿
       dateRange: [],
       // 鏁版嵁鑼冨洿閫夐」
-      fot:[".jpg",".jif"],
+      // 鏁版嵁鑼冨洿閫夐」
+      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
       fileList:[
       ],
       fileListOther:[
@@ -759,10 +771,11 @@
       //涓汉淇℃伅
       listMarry(this.queryParams).then(response => {
 
-          if(response.data.length == 0){
+          if(response.data.length === 0){
             this.loading = false;
             this.marryList={};
             this.oldSpouseList = {};
+            console.log(this.marryList)
           }
           else{
             this.marryList = response.data;
@@ -913,12 +926,14 @@
 
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
     submitDataScope: function() {
+      let _this = this
       this.$refs["elForm"].validate(valid => {
         if (valid) {
-
+          console.log(this.formDat)
           addMarryOld(this.formDat).then(response => {
             // marryList.oldSpouseList.push(this.formDat);
             this.$modal.msgSuccess("鏂板鎴愬姛");
+            _this.formDat = {}
             this.open = false;
             this.getList();
           });

--
Gitblit v1.9.1