Commit 47d53c852ae9bee3cae49e81a782b86505f38618

Authored by Dunfa Jiang
1 parent 17722d4d

fix;修改部分逻辑

... ... @@ -4,9 +4,13 @@
4 4 <el-descriptions-item label="任务ID:">{{
5 5 detailData.id
6 6 }}</el-descriptions-item>
7   - <el-descriptions-item label="任务名称:">{{
8   - detailData.name
9   - }}</el-descriptions-item>
  7 + <el-descriptions-item label="任务名称:">
  8 + <el-input
  9 + style="width: 200px"
  10 + v-model="taskName"
  11 + placeholder="请输入任务名称"
  12 + />
  13 + </el-descriptions-item>
10 14 <el-descriptions-item label="对应营业厅:">{{
11 15 detailData.businessName
12 16 }}</el-descriptions-item>
... ... @@ -358,6 +362,7 @@ const { queryParams, form, rules } = toRefs(data);
358 362 const open = ref(false);
359 363 const title = ref("");
360 364 const deviceTypeList = ref([]);
  365 +const taskName = ref([]);
361 366
362 367 const getDeviceTypeList = () => {
363 368 deviceTypeQueryList(
... ... @@ -484,7 +489,7 @@ const scanCodeCallback = (callback) => {
484 489 reset();
485 490 open.value = true;
486 491 title.value = "扫码录入";
487   - form.value.name = "name" + new Date().getTime();
  492 + form.value.name = taskName.value;
488 493 form.value.businessId = data.businessId;
489 494 form.value.businessName = data.businessName;
490 495 form.value.barcode = data.barcode;
... ... @@ -527,7 +532,7 @@ const confirmAddTask = () => {
527 532 return;
528 533 }
529 534 const data = {
530   - name: "任务" + new Date().getTime(),
  535 + name: taskName.value,
531 536 businessId: dataList.value[0].businessId,
532 537 specList: localStoreTableData.map((item) => ({
533 538 businessId: item.businessId,
... ... @@ -538,15 +543,20 @@ const confirmAddTask = () => {
538 543 };
539 544 if (proxy.$route.query.scanTaskId) {
540 545 data.id = detailData.value.id;
541   - data.name = detailData.value.name;
  546 + data.name = taskName.value;
542 547 data.businessId = detailData.value.businessId;
543 548 data.specList = data.specList.concat(
544   - dataList.value.map((item) => ({
545   - businessId: item.businessId,
546   - deviceTypeId: item.deviceTypeId,
547   - barcode: item.barcode,
548   - quantity: item.quantity,
549   - }))
  549 + dataList.value
  550 + .filter(
  551 + (filterItem) => localStoreTableData.map(local=>local.id).indexOf(filterItem.id) == -1
  552 + )
  553 + .map((item) => ({
  554 + id:item.id,
  555 + businessId: item.businessId,
  556 + deviceTypeId: item.deviceTypeId,
  557 + barcode: item.barcode,
  558 + quantity: item.quantity,
  559 + }))
550 560 );
551 561 taskLoading.value = true;
552 562 editScanTask(data)
... ... @@ -643,6 +653,7 @@ const detailData = ref({});
643 653 const getDetail = () => {
644 654 scanTaskdetal(proxy.$route.query.scanTaskId).then((res) => {
645 655 detailData.value = res.data;
  656 + taskName.value = detailData.value.name;
646 657 });
647 658 };
648 659
... ... @@ -661,9 +672,7 @@ const handleDelete = (row) => {
661 672 let localStoreTableData = localStorage.getItem("localStoreTableData")
662 673 ? JSON.parse(localStorage.getItem("localStoreTableData"))
663 674 : [];
664   - const target = localStoreTableData.find(
665   - (item) => item.id === row.id
666   - );
  675 + const target = localStoreTableData.find((item) => item.id === row.id);
667 676 if (!proxy.$route.query.scanTaskId || target) {
668 677 localStoreTableData = localStoreTableData.filter(
669 678 (item) => item.id !== row.id
... ...
Please register or login to post a comment