仇子明 / bxhd-vue3 · 提交

转到一个项目

作者 xiaoqiu
提交 d64691ee4d115ea025c6ef5b3c13b869a1a54eee 1 个父辈 309e11f6

优化更新了保单部分的显示，添加了员工在岗

内嵌 并排对比
正在显示 5 个修改的文件 包含 83 行增加 和 43 行删除
@@ -64,7 +64,13 @@ @@ -64,7 +64,13 @@
64 width="150" 64 width="150"
65 align="center" 65 align="center"
66 /> 66 />
67 - <el-table-column label="车架号" prop="frameNumber" align="center" /> 67 + <el-table-column
  68 + label="车架号"
  69 + prop="frameNumber"
  70 + width="180"
  71 + align="center"
  72 + :show-overflow-tooltip="true"
  73 + />
68 <el-table-column 74 <el-table-column
69 label="车主姓名" 75 label="车主姓名"
70 prop="name" 76 prop="name"
@@ -78,7 +84,7 @@ @@ -78,7 +84,7 @@
78 align="center" 84 align="center"
79 /> 85 />
80 <el-table-column 86 <el-table-column
81 - label="操作时间" 87 + label="作废时间"
82 align="center" 88 align="center"
83 prop="distributionTime" 89 prop="distributionTime"
84 width="160" 90 width="160"
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 }}</span> 82 }}</span>
83 </template> 83 </template>
84 </el-table-column> 84 </el-table-column>
85 - <el-table-column label="操作时间" prop="policyTime" width="160" /> 85 + <el-table-column label="办结时间" prop="policyTime" width="160" />
86 <el-table-column 86 <el-table-column
87 label="办理人" 87 label="办理人"
88 prop="companyEmployeeUserName" 88 prop="companyEmployeeUserName"
@@ -18,9 +18,10 @@ @@ -18,9 +18,10 @@
18 /> 18 />
19 <el-table-column 19 <el-table-column
20 label="车架号" 20 label="车架号"
21 - width="250" 21 + width="180"
22 prop="frameNumber" 22 prop="frameNumber"
23 align="center" 23 align="center"
  24 + :show-overflow-tooltip="true"
24 /> 25 />
25 <el-table-column 26 <el-table-column
26 label="车主姓名" 27 label="车主姓名"
@@ -74,38 +75,29 @@ @@ -74,38 +75,29 @@
74 /> 75 />
75 <el-table-column label="操作" align="center" width="360" fixed="right"> 76 <el-table-column label="操作" align="center" width="360" fixed="right">
76 <template #default="{ row }"> 77 <template #default="{ row }">
77 - <el-button type="primary" v-hasPermi="['policy:pending:continue']">{{  
78 - row.orderProgress === "已承接" ? "承接回馈" : "承接"  
79 - }}</el-button>  
80 - <el-button type="primary" v-hasPermi="['policy:pending:sharing']"  
81 - >分配</el-button  
82 - >  
83 - <el-button type="primary" v-hasPermi="['policy:pending:transfer']"  
84 - >转办</el-button  
85 - >  
86 <el-button 78 <el-button
87 type="primary" 79 type="primary"
88 v-show="hasRole" 80 v-show="hasRole"
89 - @click="handleSuccess(0, row.taskId)" 81 + @click.stop="handleSuccess(0, row.taskId)"
90 >通过</el-button 82 >通过</el-button
91 > 83 >
92 <el-button 84 <el-button
93 type="primary" 85 type="primary"
94 v-show="hasRole" 86 v-show="hasRole"
95 - @click="handleFallback(1, row.taskId)" 87 + @click.stop="handleFallback(1, row.taskId)"
96 >退回</el-button 88 >退回</el-button
97 > 89 >
98 <el-button 90 <el-button
99 type="primary" 91 type="primary"
100 v-show="hasRole" 92 v-show="hasRole"
101 - @click="handleVoid(2, row.taskId)" 93 + @click.stop="handleVoid(2, row.taskId)"
102 >作废</el-button 94 >作废</el-button
103 > 95 >
104 <el-button 96 <el-button
105 type="primary" 97 type="primary"
106 v-show="hasRole" 98 v-show="hasRole"
107 - @click="handleAuthCompany(0, row.taskId)"  
108 - >分配承保公司</el-button 99 + @click.stop="handleAuthCompany(0, row.taskId)"
  100 + >分配</el-button
109 > 101 >
110 </template> 102 </template>
111 </el-table-column> 103 </el-table-column>
@@ -254,6 +246,7 @@ const loading = ref(false); @@ -254,6 +246,7 @@ const loading = ref(false);
254 const total = ref(0); 246 const total = ref(0);
255 const title = ref("保单信息"); 247 const title = ref("保单信息");
256 const open = ref(false); 248 const open = ref(false);
  249 +const timerReason = ref(null);
257 const form = ref({}); 250 const form = ref({});
258 const hasRole = computed(() => { 251 const hasRole = computed(() => {
259 return proxy.$auth.hasRole("associationemployee"); 252 return proxy.$auth.hasRole("associationemployee");
@@ -403,7 +396,10 @@ function submitForm() { @@ -403,7 +396,10 @@ function submitForm() {
403 } 396 }
404 397
405 const getMsg = (val) => { 398 const getMsg = (val) => {
406 - deprecatedForm.value.deprecatedReason = val; 399 + clearTimeout(timerReason.value);
  400 + timerReason.value = setTimeout(() => {
  401 + deprecatedForm.value.deprecatedReaso = val;
  402 + }, 1000);
407 }; 403 };
408 404
409 getList(); 405 getList();
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 width="180" 20 width="180"
21 prop="frameNumber" 21 prop="frameNumber"
22 align="center" 22 align="center"
  23 + :show-overflow-tooltip="true"
23 /> 24 />
24 <el-table-column 25 <el-table-column
25 label="车主姓名" 26 label="车主姓名"
@@ -271,7 +272,7 @@ @@ -271,7 +272,7 @@
271 <el-input 272 <el-input
272 v-model="form.licensePlateNumber" 273 v-model="form.licensePlateNumber"
273 placeholder="请输入车牌号" 274 placeholder="请输入车牌号"
274 - :disabled="hasRole" 275 + :disabled="!hasRole"
275 /> 276 />
276 </el-form-item> 277 </el-form-item>
277 </el-col> 278 </el-col>
@@ -279,7 +280,7 @@ @@ -279,7 +280,7 @@
279 <el-form-item label="车架号" prop="frameNumber"> 280 <el-form-item label="车架号" prop="frameNumber">
280 <el-input 281 <el-input
281 v-model="form.frameNumber" 282 v-model="form.frameNumber"
282 - :disabled="hasRole" 283 + :disabled="!hasRole"
283 placeholder="请输入车架号" 284 placeholder="请输入车架号"
284 /> 285 />
285 </el-form-item> 286 </el-form-item>
@@ -290,7 +291,7 @@ @@ -290,7 +291,7 @@
290 <el-form-item label="车主姓名" prop="name"> 291 <el-form-item label="车主姓名" prop="name">
291 <el-input 292 <el-input
292 v-model="form.name" 293 v-model="form.name"
293 - :disabled="hasRole" 294 + :disabled="!hasRole"
294 placeholder="请输入车主姓名" 295 placeholder="请输入车主姓名"
295 /> 296 />
296 </el-form-item> 297 </el-form-item>
@@ -299,7 +300,7 @@ @@ -299,7 +300,7 @@
299 <el-form-item label="联系电话" prop="phone"> 300 <el-form-item label="联系电话" prop="phone">
300 <el-input 301 <el-input
301 v-model="form.phone" 302 v-model="form.phone"
302 - :disabled="hasRole" 303 + :disabled="!hasRole"
303 placeholder="请输入联系电话" 304 placeholder="请输入联系电话"
304 /> 305 />
305 </el-form-item> 306 </el-form-item>
@@ -308,7 +309,11 @@ @@ -308,7 +309,11 @@
308 <el-row> 309 <el-row>
309 <el-col :span="12"> 310 <el-col :span="12">
310 <el-form-item label="车辆类型" prop="vehicleType"> 311 <el-form-item label="车辆类型" prop="vehicleType">
311 - <el-select v-model="form.vehicleTypeId" style="width: 230px"> 312 + <el-select
  313 + v-model="form.vehicleTypeId"
  314 + :disabled="!hasRole"
  315 + style="width: 230px"
  316 + >
312 <el-option 317 <el-option
313 v-for="item in carTypeOption" 318 v-for="item in carTypeOption"
314 :key="item.id" 319 :key="item.id"
@@ -320,7 +325,11 @@ @@ -320,7 +325,11 @@
320 </el-col> 325 </el-col>
321 <el-col :span="12"> 326 <el-col :span="12">
322 <el-form-item label="车辆使用性质" prop="vehicleNature"> 327 <el-form-item label="车辆使用性质" prop="vehicleNature">
323 - <el-select v-model="form.vehicleNatureId" style="width: 230px"> 328 + <el-select
  329 + v-model="form.vehicleNatureId"
  330 + :disabled="!hasRole"
  331 + style="width: 230px"
  332 + >
324 <el-option 333 <el-option
325 v-for="item in carNatureOption" 334 v-for="item in carNatureOption"
326 :key="item.id" 335 :key="item.id"
@@ -336,7 +345,7 @@ @@ -336,7 +345,7 @@
336 <el-form-item label="核定载客数" prop="passengersNumber"> 345 <el-form-item label="核定载客数" prop="passengersNumber">
337 <el-input 346 <el-input
338 v-model="form.passengersNumber" 347 v-model="form.passengersNumber"
339 - :disabled="hasRole" 348 + :disabled="!hasRole"
340 placeholder="请输入核定载客数" 349 placeholder="请输入核定载客数"
341 /> 350 />
342 </el-form-item> 351 </el-form-item>
@@ -345,7 +354,7 @@ @@ -345,7 +354,7 @@
345 <el-form-item label="核定载质量" prop="passengerCapacity"> 354 <el-form-item label="核定载质量" prop="passengerCapacity">
346 <el-input 355 <el-input
347 v-model="form.passengerCapacity" 356 v-model="form.passengerCapacity"
348 - :disabled="hasRole" 357 + :disabled="!hasRole"
349 placeholder="请输入核定载质量" 358 placeholder="请输入核定载质量"
350 /> 359 />
351 </el-form-item> 360 </el-form-item>
@@ -356,14 +365,18 @@ @@ -356,14 +365,18 @@
356 <el-form-item label="排量毫升" prop="emissions"> 365 <el-form-item label="排量毫升" prop="emissions">
357 <el-input 366 <el-input
358 v-model="form.emissions" 367 v-model="form.emissions"
359 - :disabled="hasRole"  
360 - placeholder="请输入办理人" 368 + :disabled="!hasRole"
  369 + placeholder="请输入排量毫升"
361 /> 370 />
362 </el-form-item> 371 </el-form-item>
363 </el-col> 372 </el-col>
364 <el-col v-if="isCustom" :span="12"> 373 <el-col v-if="isCustom" :span="12">
365 <el-form-item label="中文品牌" prop="vehicleBrand"> 374 <el-form-item label="中文品牌" prop="vehicleBrand">
366 - <el-select v-model="form.vehicleBrandId" style="width: 230px"> 375 + <el-select
  376 + v-model="form.vehicleBrandId"
  377 + :disabled="!hasRole"
  378 + style="width: 230px"
  379 + >
367 <el-option 380 <el-option
368 v-for="item in carBrandOption" 381 v-for="item in carBrandOption"
369 :key="item.id" 382 :key="item.id"
@@ -377,7 +390,7 @@ @@ -377,7 +390,7 @@
377 <el-form-item label="中文品牌" prop="vehicleBrand"> 390 <el-form-item label="中文品牌" prop="vehicleBrand">
378 <el-input 391 <el-input
379 v-model="form.customizeVehicleBrand" 392 v-model="form.customizeVehicleBrand"
380 - :disabled="hasRole" 393 + :disabled="!hasRole"
381 placeholder="中文品牌" 394 placeholder="中文品牌"
382 /> 395 />
383 </el-form-item> 396 </el-form-item>
@@ -388,7 +401,7 @@ @@ -388,7 +401,7 @@
388 <el-form-item label="车辆型号" prop="customizeVehicleModel"> 401 <el-form-item label="车辆型号" prop="customizeVehicleModel">
389 <el-input 402 <el-input
390 v-model="form.customizeVehicleModel" 403 v-model="form.customizeVehicleModel"
391 - :disabled="hasRole" 404 + :disabled="!hasRole"
392 placeholder="请输入车辆型号" 405 placeholder="请输入车辆型号"
393 /> 406 />
394 </el-form-item> 407 </el-form-item>
@@ -397,8 +410,8 @@ @@ -397,8 +410,8 @@
397 <el-form-item label="准牵引准质量" prop="tractionMass"> 410 <el-form-item label="准牵引准质量" prop="tractionMass">
398 <el-input 411 <el-input
399 v-model="form.tractionMass" 412 v-model="form.tractionMass"
400 - :disabled="hasRole"  
401 - placeholder="请输入办理人" 413 + :disabled="!hasRole"
  414 + placeholder="请输入准牵引准质量"
402 /> 415 />
403 </el-form-item> 416 </el-form-item>
404 </el-col> 417 </el-col>
@@ -408,6 +421,7 @@ @@ -408,6 +421,7 @@
408 <el-form-item label="号牌种类" prop="customizeVehicleModel"> 421 <el-form-item label="号牌种类" prop="customizeVehicleModel">
409 <el-select 422 <el-select
410 v-model="form.lincensePlateTypeId" 423 v-model="form.lincensePlateTypeId"
  424 + :disabled="!hasRole"
411 style="width: 230px" 425 style="width: 230px"
412 > 426 >
413 <el-option 427 <el-option
@@ -421,7 +435,11 @@ @@ -421,7 +435,11 @@
421 </el-col> 435 </el-col>
422 <el-col :span="12"> 436 <el-col :span="12">
423 <el-form-item label="保险需求" prop="requirements"> 437 <el-form-item label="保险需求" prop="requirements">
424 - <el-select v-model="form.requirementsId" style="width: 230px"> 438 + <el-select
  439 + v-model="form.requirementsId"
  440 + :disabled="!hasRole"
  441 + style="width: 230px"
  442 + >
425 <el-option 443 <el-option
426 v-for="item in needOption" 444 v-for="item in needOption"
427 :key="item.id" 445 :key="item.id"
@@ -15,6 +15,12 @@ @@ -15,6 +15,12 @@
15 <el-radio label="1">女</el-radio> 15 <el-radio label="1">女</el-radio>
16 </el-radio-group> 16 </el-radio-group>
17 </el-form-item> 17 </el-form-item>
  18 + <el-form-item label="在岗状态">
  19 + <el-radio-group v-model="user.jobStatus">
  20 + <el-radio label="0">在岗</el-radio>
  21 + <el-radio label="1">离岗</el-radio>
  22 + </el-radio-group>
  23 + </el-form-item>
18 <el-form-item> 24 <el-form-item>
19 <el-button type="primary" @click="submit">保存</el-button> 25 <el-button type="primary" @click="submit">保存</el-button>
20 <el-button type="danger" @click="close">关闭</el-button> 26 <el-button type="danger" @click="close">关闭</el-button>
@@ -27,30 +33,44 @@ import { updateUserProfile } from "@/api/system/user"; @@ -27,30 +33,44 @@ import { updateUserProfile } from "@/api/system/user";
27 33
28 const props = defineProps({ 34 const props = defineProps({
29 user: { 35 user: {
30 - type: Object  
31 - } 36 + type: Object,
  37 + },
32 }); 38 });
33 39
34 const { proxy } = getCurrentInstance(); 40 const { proxy } = getCurrentInstance();
35 41
36 const rules = ref({ 42 const rules = ref({
37 nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }], 43 nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
38 - email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],  
39 - phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }], 44 + email: [
  45 + { required: true, message: "邮箱地址不能为空", trigger: "blur" },
  46 + {
  47 + type: "email",
  48 + message: "请输入正确的邮箱地址",
  49 + trigger: ["blur", "change"],
  50 + },
  51 + ],
  52 + phonenumber: [
  53 + { required: true, message: "手机号码不能为空", trigger: "blur" },
  54 + {
  55 + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
  56 + message: "请输入正确的手机号码",
  57 + trigger: "blur",
  58 + },
  59 + ],
40 }); 60 });
41 61
42 /** 提交按钮 */ 62 /** 提交按钮 */
43 function submit() { 63 function submit() {
44 - proxy.$refs.userRef.validate(valid => { 64 + proxy.$refs.userRef.validate((valid) => {
45 if (valid) { 65 if (valid) {
46 - updateUserProfile(props.user).then(response => { 66 + updateUserProfile(props.user).then((response) => {
47 proxy.$modal.msgSuccess("修改成功"); 67 proxy.$modal.msgSuccess("修改成功");
48 }); 68 });
49 } 69 }
50 }); 70 });
51 -}; 71 +}
52 /** 关闭按钮 */ 72 /** 关闭按钮 */
53 function close() { 73 function close() {
54 proxy.$tab.closePage(); 74 proxy.$tab.closePage();
55 -}; 75 +}
56 </script> 76 </script>