From 878d999b470039dbe65191aa9452fe89457724b5 Mon Sep 17 00:00:00 2001 From: yedejiamingshi <540057894@qq.com> Date: Thu, 2 Jan 2025 15:59:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=9C=E4=BA=8B=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=20=E5=88=A0=E9=99=A4=E5=9C=BA=E5=9C=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=82=20=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=B4=A0=E6=9D=90bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/configure/uniTemplate/detail.vue | 26 +-- .../production/setting/miniProConfig.vue | 151 +++++++++--------- 2 files changed, 93 insertions(+), 84 deletions(-) diff --git a/src/views/configure/uniTemplate/detail.vue b/src/views/configure/uniTemplate/detail.vue index 65dc610..27d2c81 100644 --- a/src/views/configure/uniTemplate/detail.vue +++ b/src/views/configure/uniTemplate/detail.vue @@ -222,6 +222,7 @@ - 全部 - {{ item.groupName }} + 全部 + {{ item.groupName }}
暂无分组数据
@@ -246,11 +247,11 @@ v-for="(item, index) in materialList" :key="index" class="material-item" :class="{ 'item-active': item.selected }" - @click.native="clickMaterialItem(index)" + @click.native="clickMaterialItem($event, index, item.selected)" >
- {{ item.materialName }} + {{ item.materialName }}
@@ -260,7 +261,7 @@ :total="materialTotal" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" - @pagination="getMaterialList()" + @pagination="getMaterialList(null, false)" />
@@ -540,8 +541,11 @@ this.materialGroupList = data; }); }, - getMaterialList(id) { + getMaterialList(id, resetPage) { this.queryParams.groupId = id; + if (resetPage) { + this.queryParams.pageNo = 1; + } this.loadingMaterial = Loading.service({ text: '加载中...', target: '.right-container' }); getMaterialManagementPage(this.queryParams).then(( { data: { list, total } } ) => { this.materialList = list.map((item) => { @@ -560,7 +564,10 @@ this.selectMaterialVisible = false; this.materialList = []; this.materialTotal = 0; - + // 重置分页 + this.queryParams.pageNo = 1; + this.queryGroupParams.groupName = null; + this.selectedMaterialUrl = ''; }, // 确认选择素材 submitselectMaterial() { @@ -575,9 +582,10 @@ this.selectedMaterialUrl = ''; }, // 确认选择素材 - clickMaterialItem(index) { + clickMaterialItem(event, index, checked) { + event.preventDefault(); const item = this.materialList[index]; - if (!item.selected) { + if (!checked) { this.selectedMaterialUrl = item.materialUrl; } else { this.selectedMaterialUrl = ''; diff --git a/src/views/production/setting/miniProConfig.vue b/src/views/production/setting/miniProConfig.vue index 34810a7..d938810 100644 --- a/src/views/production/setting/miniProConfig.vue +++ b/src/views/production/setting/miniProConfig.vue @@ -56,6 +56,7 @@
+ + // @@ -101,8 +101,10 @@ + --> + @@ -188,7 +189,6 @@ @@ -237,6 +237,7 @@ + -->
@@ -876,29 +877,29 @@ } }); // 农事计划 - this.farmingPlans = farmingPlans.map((item, index)=>{ - item.isExpand = false; - if(index == 0) item.isExpand = true; - // item.scanShow = true; - item.tableData = []; - item.farmingJobs?.map((job, index) => { - job.indexKey = index; - // job.scanShow = true; - item.tableData.push({ - jobType: job.operateDetails[0].content, - inputsName: job.operateDetails[1].content, - inputsBatchId: job.operateDetails[2].content, - jobDate: job.operateDetails[3].content, - jobWorker: job.operateDetails[4].content, - jobImage: job.operateDetails[5].content, - jobVideo: job.operateDetails[6].content, - remarks: job.operateDetails[7].content, - scanShow: job.scanShow, - indexKey: index, - }); - }); - return item; - }); + // this.farmingPlans = farmingPlans.map((item, index)=>{ + // item.isExpand = false; + // if(index == 0) item.isExpand = true; + // // item.scanShow = true; + // item.tableData = []; + // item.farmingJobs?.map((job, index) => { + // job.indexKey = index; + // // job.scanShow = true; + // item.tableData.push({ + // jobType: job.operateDetails[0].content, + // inputsName: job.operateDetails[1].content, + // inputsBatchId: job.operateDetails[2].content, + // jobDate: job.operateDetails[3].content, + // jobWorker: job.operateDetails[4].content, + // jobImage: job.operateDetails[5].content, + // jobVideo: job.operateDetails[6].content, + // remarks: job.operateDetails[7].content, + // scanShow: job.scanShow, + // indexKey: index, + // }); + // }); + // return item; + // }); // 检验检疫 this.inspections = inspections.map((item, index)=>{ @@ -929,7 +930,7 @@ // 查询模板 this.getTraceTemplate(goodsId); // 查询地块列表 - this.getLandInfoList(belongBusinessId); + // this.getLandInfoList(belongBusinessId); }).catch(() => { loading.close(); }); @@ -1936,51 +1937,51 @@ }; }); - const farmingPlans = this.farmingPlans.map((plan, index) => { - const { tableData, } = plan; - const farmingJobs = plan.farmingJobs?.map((item, iIndex) => { - item.operateDetails.map((detail, i) => { - if (detail.title === '说明') { - detail.content = tableData[iIndex].remarks; - } - if (detail.title === "任务类型") { - detail.content = tableData[iIndex].jobType; - } - if (detail.title === "投入品名称") { - detail.content = tableData[iIndex].inputsName; - } - if (detail.title === "作业日期") { - detail.content = tableData[iIndex].jobDate; - } - if (detail.title === "作业员工") { - detail.content = tableData[iIndex].jobWorker; - } - detail.sort = i; - }); - return { - ...item, - scanShow: tableData[iIndex].scanShow, - }; - }); - return { - ...plan, - sort: index, - farmingJobs, - }; - }); - - const envTypeConfigs = []; - this.landInfos?.map((land, index) => { - this.deviceInfo.envTypes[land.value]?.map(item => { - const { configId, id, } = item; - const srcEnvTypes = this.deviceInfo.srcEnvTypes[land.value]?.filter(src => src.id == id); - envTypeConfigs.push({ - id: configId || srcEnvTypes ? srcEnvTypes[0]?.configId : null, - landId: land.value, - envTypeId: id, - }); - }); - }); + // const farmingPlans = this.farmingPlans.map((plan, index) => { + // const { tableData, } = plan; + // const farmingJobs = plan.farmingJobs?.map((item, iIndex) => { + // item.operateDetails.map((detail, i) => { + // if (detail.title === '说明') { + // detail.content = tableData[iIndex].remarks; + // } + // if (detail.title === "任务类型") { + // detail.content = tableData[iIndex].jobType; + // } + // if (detail.title === "投入品名称") { + // detail.content = tableData[iIndex].inputsName; + // } + // if (detail.title === "作业日期") { + // detail.content = tableData[iIndex].jobDate; + // } + // if (detail.title === "作业员工") { + // detail.content = tableData[iIndex].jobWorker; + // } + // detail.sort = i; + // }); + // return { + // ...item, + // scanShow: tableData[iIndex].scanShow, + // }; + // }); + // return { + // ...plan, + // sort: index, + // farmingJobs, + // }; + // }); + + // const envTypeConfigs = []; + // this.landInfos?.map((land, index) => { + // this.deviceInfo.envTypes[land.value]?.map(item => { + // const { configId, id, } = item; + // const srcEnvTypes = this.deviceInfo.srcEnvTypes[land.value]?.filter(src => src.id == id); + // envTypeConfigs.push({ + // id: configId || srcEnvTypes ? srcEnvTypes[0]?.configId : null, + // landId: land.value, + // envTypeId: id, + // }); + // }); + // }); const params = { id, @@ -1990,9 +1991,9 @@ goodsInfo, goodsVerifys, linkInfos, - farmingPlans, + // farmingPlans, inspections, - envTypeConfigs, + // envTypeConfigs, }; const loading = Loading.service({ text: '加载中...', target: '.setting-main' });