仇子明 / bxhd-vue3 · 提交

转到一个项目

作者 xiaoqiu
提交 476dfbe463086e989715dd307ae8158986296674 1 个父辈 d64691ee

更新了品牌和型号的数据导入

内嵌 并排对比
正在显示 7 个修改的文件 包含 37 行增加 和 29 行删除
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 type="primary" 29 type="primary"
30 plain 30 plain
31 icon="Plus" 31 icon="Plus"
32 - v-hasPermi="['system:role:add']" 32 + v-hasPermi="['system:vehiclebrand:add']"
33 @click="handleAdd" 33 @click="handleAdd"
34 >新增</el-button 34 >新增</el-button
35 > 35 >
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 plain 40 plain
41 icon="Delete" 41 icon="Delete"
42 :disabled="multiple" 42 :disabled="multiple"
43 - v-hasPermi="['system:role:remove']" 43 + v-hasPermi="['system:vehiclebrand:delete']"
44 @click="handleDelete" 44 @click="handleDelete"
45 >删除</el-button 45 >删除</el-button
46 > 46 >
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 plain 51 plain
52 icon="Upload" 52 icon="Upload"
53 @click="handleImport" 53 @click="handleImport"
54 - v-hasPermi="['system:user:import']" 54 + v-hasPermi="['system:vehiclebrand:import']"
55 >导入</el-button 55 >导入</el-button
56 > 56 >
57 </el-col> 57 </el-col>
@@ -65,12 +65,8 @@ @@ -65,12 +65,8 @@
65 @selection-change="handleSelectionChange" 65 @selection-change="handleSelectionChange"
66 > 66 >
67 <el-table-column type="selection" width="55" align="center" /> 67 <el-table-column type="selection" width="55" align="center" />
68 - <el-table-column  
69 - label="序号"  
70 - prop="policyId"  
71 - width="120"  
72 - align="center"  
73 - /> 68 + <el-table-column label="序号" width="55" type="index" />
  69 + <el-table-column label="品牌编号" prop="id" width="120" align="center" />
74 <el-table-column label="车辆品牌" prop="name" align="center" /> 70 <el-table-column label="车辆品牌" prop="name" align="center" />
75 <el-table-column label="操作时间" align="center"> 71 <el-table-column label="操作时间" align="center">
76 <template #default="{ row }"> 72 <template #default="{ row }">
@@ -117,7 +113,7 @@ @@ -117,7 +113,7 @@
117 </template> 113 </template>
118 </el-dialog> 114 </el-dialog>
119 115
120 - <!-- 用户导入对话框 --> 116 + <!-- 品牌导入对话框 -->
121 <el-dialog 117 <el-dialog
122 :title="upload.title" 118 :title="upload.title"
123 v-model="upload.open" 119 v-model="upload.open"
@@ -188,7 +184,7 @@ const upload = reactive({ @@ -188,7 +184,7 @@ const upload = reactive({
188 // 设置上传的请求头部 184 // 设置上传的请求头部
189 headers: { Authorization: "Bearer " + getToken() }, 185 headers: { Authorization: "Bearer " + getToken() },
190 // 上传的地址 186 // 上传的地址
191 - url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData", 187 + url: import.meta.env.VITE_APP_BASE_API + "/system/vehicle/brand/importData",
192 }); 188 });
193 const dataList = ref([]); 189 const dataList = ref([]);
194 const open = ref(false); 190 const open = ref(false);
@@ -234,19 +230,19 @@ const handleFileSuccess = (response, file, fileList) => { @@ -234,19 +230,19 @@ const handleFileSuccess = (response, file, fileList) => {
234 "导入结果", 230 "导入结果",
235 { dangerouslyUseHTMLString: true } 231 { dangerouslyUseHTMLString: true }
236 ); 232 );
237 - // getList(); 233 + getList();
238 }; 234 };
239 /** 导入按钮操作 */ 235 /** 导入按钮操作 */
240 function handleImport() { 236 function handleImport() {
241 - upload.title = "型号导入"; 237 + upload.title = "品牌导入";
242 upload.open = true; 238 upload.open = true;
243 } 239 }
244 /** 下载模板操作 */ 240 /** 下载模板操作 */
245 function importTemplate() { 241 function importTemplate() {
246 proxy.download( 242 proxy.download(
247 - "system/user/importTemplate", 243 + "/system/vehicle/brand/importTemplate",
248 {}, 244 {},
249 - `user_template_${new Date().getTime()}.xlsx` 245 + `brand_template_${new Date().getTime()}.xlsx`
250 ); 246 );
251 } 247 }
252 /** 添加车辆性质 */ 248 /** 添加车辆性质 */
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 type="primary" 38 type="primary"
39 plain 39 plain
40 icon="Plus" 40 icon="Plus"
41 - v-hasPermi="['system:role:add']" 41 + v-hasPermi="['system:vehiclemodel:add']"
42 @click="handleAdd" 42 @click="handleAdd"
43 >新增</el-button 43 >新增</el-button
44 > 44 >
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 plain 49 plain
50 icon="Delete" 50 icon="Delete"
51 :disabled="multiple" 51 :disabled="multiple"
52 - v-hasPermi="['system:role:remove']" 52 + v-hasPermi="['system:vehiclemodel:delete']"
53 @click="handleDelete" 53 @click="handleDelete"
54 >删除</el-button 54 >删除</el-button
55 > 55 >
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 plain 60 plain
61 icon="Upload" 61 icon="Upload"
62 @click="handleImport" 62 @click="handleImport"
63 - v-hasPermi="['system:user:import']" 63 + v-hasPermi="['system:vehiclemodel:import']"
64 >导入</el-button 64 >导入</el-button
65 > 65 >
66 </el-col> 66 </el-col>
@@ -213,7 +213,7 @@ const upload = reactive({ @@ -213,7 +213,7 @@ const upload = reactive({
213 // 设置上传的请求头部 213 // 设置上传的请求头部
214 headers: { Authorization: "Bearer " + getToken() }, 214 headers: { Authorization: "Bearer " + getToken() },
215 // 上传的地址 215 // 上传的地址
216 - url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData", 216 + url: import.meta.env.VITE_APP_BASE_API + "/system/vehicle/model/importData",
217 }); 217 });
218 const dataList = ref([]); 218 const dataList = ref([]);
219 const open = ref(false); 219 const open = ref(false);
@@ -266,7 +266,7 @@ const handleFileSuccess = (response, file, fileList) => { @@ -266,7 +266,7 @@ const handleFileSuccess = (response, file, fileList) => {
266 "导入结果", 266 "导入结果",
267 { dangerouslyUseHTMLString: true } 267 { dangerouslyUseHTMLString: true }
268 ); 268 );
269 - // getList(); 269 + getList();
270 }; 270 };
271 /** 导入按钮操作 */ 271 /** 导入按钮操作 */
272 function handleImport() { 272 function handleImport() {
@@ -276,9 +276,9 @@ function handleImport() { @@ -276,9 +276,9 @@ function handleImport() {
276 /** 下载模板操作 */ 276 /** 下载模板操作 */
277 function importTemplate() { 277 function importTemplate() {
278 proxy.download( 278 proxy.download(
279 - "system/user/importTemplate", 279 + "/system/vehicle/model/importTemplate",
280 {}, 280 {},
281 - `user_template_${new Date().getTime()}.xlsx` 281 + `model_template_${new Date().getTime()}.xlsx`
282 ); 282 );
283 } 283 }
284 /** 添加车辆性质 */ 284 /** 添加车辆性质 */
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 type="primary" 6 type="primary"
7 plain 7 plain
8 icon="Plus" 8 icon="Plus"
9 - v-hasPermi="['system:role:add']" 9 + v-hasPermi="['system:vehiclenature:add']"
10 @click="handleAdd" 10 @click="handleAdd"
11 >新增</el-button 11 >新增</el-button
12 > 12 >
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 plain 17 plain
18 icon="Delete" 18 icon="Delete"
19 :disabled="multiple" 19 :disabled="multiple"
20 - v-hasPermi="['system:role:remove']" 20 + v-hasPermi="['system:vehiclenature:delete']"
21 @click="handleDelete" 21 @click="handleDelete"
22 >删除</el-button 22 >删除</el-button
23 > 23 >
@@ -2,7 +2,12 @@ @@ -2,7 +2,12 @@
2 <div class="app-container"> 2 <div class="app-container">
3 <el-row :gutter="10" class="mb8"> 3 <el-row :gutter="10" class="mb8">
4 <el-col :span="1.5"> 4 <el-col :span="1.5">
5 - <el-button type="primary" plain icon="Plus" @click="handleAdd" 5 + <el-button
  6 + type="primary"
  7 + plain
  8 + icon="Plus"
  9 + v-hasPermi="['system:licenseplattype:add']"
  10 + @click="handleAdd"
6 >新增</el-button 11 >新增</el-button
7 > 12 >
8 </el-col> 13 </el-col>
@@ -11,6 +16,7 @@ @@ -11,6 +16,7 @@
11 type="danger" 16 type="danger"
12 plain 17 plain
13 icon="Delete" 18 icon="Delete"
  19 + v-hasPermi="['system:licenseplattype:delete']"
14 :disabled="multiple" 20 :disabled="multiple"
15 @click="handleDelete" 21 @click="handleDelete"
16 >删除</el-button 22 >删除</el-button
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 type="primary" 29 type="primary"
30 plain 30 plain
31 icon="Plus" 31 icon="Plus"
32 - v-hasPermi="['system:role:add']" 32 + v-hasPermi="['system:vehicletype:add']"
33 @click="handleAdd" 33 @click="handleAdd"
34 >新增</el-button 34 >新增</el-button
35 > 35 >
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 plain 40 plain
41 icon="Delete" 41 icon="Delete"
42 :disabled="multiple" 42 :disabled="multiple"
43 - v-hasPermi="['system:role:remove']" 43 + v-hasPermi="['system:vehicletype:delete']"
44 @click="handleDelete" 44 @click="handleDelete"
45 >删除</el-button 45 >删除</el-button
46 > 46 >
@@ -2,7 +2,12 @@ @@ -2,7 +2,12 @@
2 <div class="app-container"> 2 <div class="app-container">
3 <el-row :gutter="10" class="mb8"> 3 <el-row :gutter="10" class="mb8">
4 <el-col :span="1.5"> 4 <el-col :span="1.5">
5 - <el-button type="primary" plain icon="Plus" @click="handleAdd" 5 + <el-button
  6 + type="primary"
  7 + plain
  8 + icon="Plus"
  9 + v-hasPermi="['system:requirements:add']"
  10 + @click="handleAdd"
6 >新增</el-button 11 >新增</el-button
7 > 12 >
8 </el-col> 13 </el-col>
@@ -11,6 +16,7 @@ @@ -11,6 +16,7 @@
11 type="danger" 16 type="danger"
12 plain 17 plain
13 icon="Delete" 18 icon="Delete"
  19 + v-hasPermi="['system:requirements:delete']"
14 :disabled="multiple" 20 :disabled="multiple"
15 @click="handleDelete" 21 @click="handleDelete"
16 >删除</el-button 22 >删除</el-button
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 type="primary" 10 type="primary"
11 plain 11 plain
12 icon="Plus" 12 icon="Plus"
13 - v-hasPermi="['system:role:add']" 13 + v-hasPermi="['system:rule:add']"
14 @click="handleAdd" 14 @click="handleAdd"
15 >新增</el-button 15 >新增</el-button
16 > 16 >