zhangbowen
/
trace-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除农事作业 删除场地信息。 模板配置选择素材bug修复

Browse Source
master
张博文 5 months ago
parent 43a10db83a
commit 878d999b47
2 changed files with 93 additions and 84 deletions
Show Stats Download Patch File Download Diff File

26
src/views/configure/uniTemplate/detail.vue
Unescape Escape View File

@ -222,6 +222,7 @@
<!-- 选择素材弹窗 -->
<el-dialog
title="选择素材"
v-if="selectMaterialVisible"
:visible.sync="selectMaterialVisible"
width="1300px"
:before-close="closeSelectMaterial"
@ -232,8 +233,8 @@
<div class="left-container">
<el-input v-model="queryGroupParams.groupName" placeholder="请输入分组名称" @keyup.enter.native="getMaterialGroup()"></el-input>
<el-menu v-if="materialGroupList.length > 0" default-active="all">
<el-menu-item index="all" @click="getMaterialList()">全部</el-menu-item>
<el-menu-item v-for="item in materialGroupList" :key="item.id" :index="String(item.id)" @click="getMaterialList(item.id)">{{ item.groupName }}</el-menu-item>
<el-menu-item index="all" @click="getMaterialList(null, true)">全部</el-menu-item>
<el-menu-item v-for="item in materialGroupList" :key="item.id" :index="String(item.id)" @click="getMaterialList(item.id, true)">{{ item.groupName }}</el-menu-item>
</el-menu>
<div style="margin-top: 20px; text-align: center;" v-else>暂无分组数据</div>
</div>
@ -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)"
>
<img :src="item.materialUrl" fit="contain" style="width: 100%; height: 160px;">
<div style="padding: 5px 14px;">
<el-checkbox v-model="item.selected">{{ item.materialName }}</el-checkbox>
<el-checkbox v-model="item.selected" @click.native.stop="clickMaterialItem($event, index, !item.selected)">{{ item.materialName }}</el-checkbox>
</div>
</el-card>
</div>
@ -260,7 +261,7 @@
:total="materialTotal"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getMaterialList()"
@pagination="getMaterialList(null, false)"
/>
</div>
<div v-else>
@ -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 = '';

151
src/views/production/setting/miniProConfig.vue
Unescape Escape View File

@ -56,6 +56,7 @@
</div>
<!-- ///////////////////////////////////////// 产地信息 ///////////////////////////////////////// -->
<!--
<div class="app-container-search main-bgcolor main-radius setting-container" v-loading="envDataLoading">
<div class="setting-title flex-jcenter">
<div class="">产地信息</div>
@ -92,8 +93,7 @@
v-for="item in deviceInfo.monitorObj[currentLandInfoId]"
:key="item.monitorCode"
>
<!--
<video :src="item.url" ></video>-->
// <video :src="item.url" ></video>
<Monitor v-if="currentMonitorCode == item.monitorCode" :monitorUrl="item.url" :playerId="item.monitorCode" @refresh="refreshMonitorList"/>
</el-tab-pane>
</el-tabs>
@ -101,8 +101,10 @@
<EmptyTable />
</div>
</div>
-->
<!-- ///////////////////////////////////////// 农事活动 ///////////////////////////////////////// -->
<!--
<div class="app-container-search main-bgcolor main-radius setting-container">
<div class="setting-title flex-jcenter">
<div class="">
@ -180,7 +182,6 @@
<el-table-column prop="jobDate" label="作业日期">
<template slot-scope="{ row }">
<div class="flex-acenter">
<!-- <span>{{ row.jobDate }}</span> -->
<el-input v-model="row.jobDate" placeholder="请输入作业日期"></el-input>
</div>
</template>
@ -188,7 +189,6 @@
<el-table-column prop="jobWorker" label="作业员工">
<template slot-scope="{ row }">
<div class="flex-acenter">
<!-- <span>{{ row.jobWorker }}</span> -->
<el-input v-model="row.jobWorker" placeholder="请输入作业员工"></el-input>
</div>
</template>
@ -237,6 +237,7 @@
<EmptyTable />
</div>
</div>
-->
<!-- ///////////////////////////////////////// 商品认证 ///////////////////////////////////////// -->
<div class="app-container-search main-bgcolor main-radius setting-container">
@ -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' });

Write Preview
Loading…
Cancel
Save