From b7ce4df611c11605aef94dac1b7056be5138b792 Mon Sep 17 00:00:00 2001
From: tian <3072314689@qq.com>
Date: 星期二, 23 九月 2025 19:38:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveFrontEnd

---
 src/views/archiveProjectName/index.vue |  131 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 124 insertions(+), 7 deletions(-)

diff --git a/src/views/archiveProjectName/index.vue b/src/views/archiveProjectName/index.vue
index 53e0793..f4647af 100644
--- a/src/views/archiveProjectName/index.vue
+++ b/src/views/archiveProjectName/index.vue
@@ -1,6 +1,30 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="椤圭洰鍚嶇О" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="璇疯緭鍏ラ」鐩悕绉�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="鍏徃鍚嶇О" prop="companyName">
+        <el-input
+          v-model="queryParams.companyName"
+          placeholder="璇疯緭鍏ュ叕鍙稿悕绉�"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="椤圭洰璐熻矗浜�" prop="createPerson">
+        <el-input
+          v-model="queryParams.createPerson"
+          placeholder="璇疯緭鍏ラ」鐩礋璐d汉"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -50,6 +74,35 @@
           v-hasPermi="['system:projectName:export']"
         >瀵煎嚭</el-button>
       </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExportTemplate"
+          v-hasPermi="['system:category:export']"
+        >瀵煎叆妯℃澘涓嬭浇</el-button>
+      </el-col>
+
+        <el-col :span="1.5">
+
+        <el-upload
+          action=""
+
+          class="upload-demo"
+          :show-file-list="false"
+          :http-request="handleImport"
+              accept=".xlsx,.xls"
+
+        >
+          <el-button size="mini"   type="primary"
+                     plain
+                     icon="el-icon-top">瀵煎叆</el-button>
+
+        </el-upload>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -57,6 +110,9 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
       <el-table-column label="椤圭洰鍚嶇О" align="center" prop="name" />
+            <el-table-column label="鍏徃鍚嶇О" align="center" prop="companyName" />
+      <el-table-column label="椤圭洰璐熻矗浜�" align="center" prop="createPerson" />
+
       <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -88,8 +144,14 @@
     <!-- 娣诲姞鎴栦慨鏀广�愯濉啓鍔熻兘鍚嶇О銆戝璇濇 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="椤圭洰鍚嶇О" prop="name">
-          <el-input v-model="form.name"  placeholder="璇疯緭鍏ュ唴瀹�" />
+        <el-form-item label="椤圭洰鍚嶇О" prop="name" required>
+          <el-input v-model="form.name" placeholder="璇疯緭鍏ュ唴瀹�" />
+        </el-form-item>
+        <el-form-item label="鍏徃鍚嶇О" prop="companyName" required>
+          <el-input v-model="form.companyName" placeholder="璇疯緭鍏ュ叕鍙稿悕绉�" />
+        </el-form-item>
+        <el-form-item label="椤圭洰璐熻矗浜�" prop="createPerson" required>
+          <el-input v-model="form.createPerson" placeholder="璇疯緭鍏ラ」鐩礋璐d汉" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -101,7 +163,7 @@
 </template>
 
 <script>
-import { listName, getName, delName, addName, updateName } from "@/api/system/projectName"
+import { listName, getName, enload,delName, addName, updateName } from "@/api/system/projectName"
 
 export default {
   name: "Name",
@@ -129,12 +191,23 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        name: null
+        name: null,
+        companyName: null,
+        createPerson: null
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
+        name: [
+          { required: true, message: '璇疯緭鍏ラ」鐩悕绉�', trigger: 'blur' }
+        ],
+        companyName: [
+          { required: true, message: '璇疯緭鍏ュ叕鍙稿悕绉�', trigger: 'blur' }
+        ],
+        createPerson: [
+          { required: true, message: '璇疯緭鍏ラ」鐩礋璐d汉', trigger: 'blur' }
+        ]
       }
     }
   },
@@ -147,6 +220,7 @@
       this.loading = true
       listName(this.queryParams).then(response => {
         this.nameList = response.data.data
+        console.log(response.data.data)
         this.total = response.data.total
         this.loading = false
       })
@@ -160,7 +234,9 @@
     reset() {
       this.form = {
         id: null,
-        name: null
+        name: null,
+        companyName: null,
+        createPerson: null
       }
       this.resetForm("form")
     },
@@ -195,7 +271,7 @@
         this.form = response.data
         console.log(response)
         this.open = true
-        this.title = "淇敼椤圭洰鍚嶇О"
+        this.title = "淇敼椤圭洰鍐呭"
       })
     },
     /** 鎻愪氦鎸夐挳 */
@@ -233,6 +309,47 @@
       this.download('system/projectName/export', {
         ...this.queryParams
       }, `name_${new Date().getTime()}.xlsx`)
+    },
+    /** 瀵煎叆妯℃澘涓嬭浇鎿嶄綔*/
+    handleExportTemplate()
+    {
+      this.download('/system/projectName/model', {
+
+      }, `projectName_${new Date().getTime()}.xlsx`)
+    },
+    
+      /** 瀵煎叆鎿嶄綔*/
+    async handleImport({file}){
+   // 妫�鏌ユ枃浠剁被鍨嬫槸鍚︿负xlsx
+  // if (!params.file.name.endsWith('.xlsx')) {
+  //   this.$message.error('璇蜂笂浼�.xlsx鏍煎紡鐨勬枃浠�');
+  //   return;
+  // }
+  const formData = new FormData();
+  formData.append('file', file);
+  console.log(file)
+
+  // 鏄剧ず鍔犺浇涓姸鎬�
+  const loading = this.$loading({
+    lock: true,
+    text: '涓婁紶涓�...',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
+
+  enload(formData, {
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  }).then(response => {
+    loading.close();
+    this.$message.success('瀵煎叆鎴愬姛');
+    this.getList();
+  }).catch(error => {
+    loading.close();
+    this.$message.error('瀵煎叆澶辫触: ' + (error.message || '鏈煡閿欒'));
+  });
+
     }
   }
 }

--
Gitblit v1.9.1