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 <el-dialog
title="选择素材" title="选择素材"
v-if="selectMaterialVisible"
:visible.sync="selectMaterialVisible" :visible.sync="selectMaterialVisible"
width="1300px" width="1300px"
:before-close="closeSelectMaterial" :before-close="closeSelectMaterial"
@ -232,8 +233,8 @@
<div class="left-container"> <div class="left-container">
<el-input v-model="queryGroupParams.groupName" placeholder="请输入分组名称" @keyup.enter.native="getMaterialGroup()"></el-input> <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 v-if="materialGroupList.length > 0" default-active="all">
<el-menu-item index="all" @click="getMaterialList()">全部</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)">{{ item.groupName }}</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> </el-menu>
<div style="margin-top: 20px; text-align: center;" v-else>暂无分组数据</div> <div style="margin-top: 20px; text-align: center;" v-else>暂无分组数据</div>
</div> </div>
@ -246,11 +247,11 @@
v-for="(item, index) in materialList" v-for="(item, index) in materialList"
:key="index" class="material-item" :key="index" class="material-item"
:class="{ 'item-active': item.selected }" :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;"> <img :src="item.materialUrl" fit="contain" style="width: 100%; height: 160px;">
<div style="padding: 5px 14px;"> <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> </div>
</el-card> </el-card>
</div> </div>
@ -260,7 +261,7 @@
:total="materialTotal" :total="materialTotal"
:page.sync="queryParams.pageNo" :page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getMaterialList()" @pagination="getMaterialList(null, false)"
/> />
</div> </div>
<div v-else> <div v-else>
@ -540,8 +541,11 @@
this.materialGroupList = data; this.materialGroupList = data;
}); });
}, },
getMaterialList(id) { getMaterialList(id, resetPage) {
this.queryParams.groupId = id; this.queryParams.groupId = id;
if (resetPage) {
this.queryParams.pageNo = 1;
}
this.loadingMaterial = Loading.service({ text: '加载中...', target: '.right-container' }); this.loadingMaterial = Loading.service({ text: '加载中...', target: '.right-container' });
getMaterialManagementPage(this.queryParams).then(( { data: { list, total } } ) => { getMaterialManagementPage(this.queryParams).then(( { data: { list, total } } ) => {
this.materialList = list.map((item) => { this.materialList = list.map((item) => {
@ -560,7 +564,10 @@
this.selectMaterialVisible = false; this.selectMaterialVisible = false;
this.materialList = []; this.materialList = [];
this.materialTotal = 0; this.materialTotal = 0;
// 重置分页
this.queryParams.pageNo = 1;
this.queryGroupParams.groupName = null;
this.selectedMaterialUrl = '';
}, },
// 确认选择素材 // 确认选择素材
submitselectMaterial() { submitselectMaterial() {
@ -575,9 +582,10 @@
this.selectedMaterialUrl = ''; this.selectedMaterialUrl = '';
}, },
// 确认选择素材 // 确认选择素材
clickMaterialItem(index) { clickMaterialItem(event, index, checked) {
event.preventDefault();
const item = this.materialList[index]; const item = this.materialList[index];
if (!item.selected) { if (!checked) {
this.selectedMaterialUrl = item.materialUrl; this.selectedMaterialUrl = item.materialUrl;
} else { } else {
this.selectedMaterialUrl = ''; this.selectedMaterialUrl = '';

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

@ -56,6 +56,7 @@
</div> </div>
<!-- ///////////////////////////////////////// 产地信息 ///////////////////////////////////////// --> <!-- ///////////////////////////////////////// 产地信息 ///////////////////////////////////////// -->
<!--
<div class="app-container-search main-bgcolor main-radius setting-container" v-loading="envDataLoading"> <div class="app-container-search main-bgcolor main-radius setting-container" v-loading="envDataLoading">
<div class="setting-title flex-jcenter"> <div class="setting-title flex-jcenter">
<div class="">产地信息</div> <div class="">产地信息</div>
@ -92,8 +93,7 @@
v-for="item in deviceInfo.monitorObj[currentLandInfoId]" v-for="item in deviceInfo.monitorObj[currentLandInfoId]"
:key="item.monitorCode" :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"/> <Monitor v-if="currentMonitorCode == item.monitorCode" :monitorUrl="item.url" :playerId="item.monitorCode" @refresh="refreshMonitorList"/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -101,8 +101,10 @@
<EmptyTable /> <EmptyTable />
</div> </div>
</div> </div>
-->
<!-- ///////////////////////////////////////// 农事活动 ///////////////////////////////////////// --> <!-- ///////////////////////////////////////// 农事活动 ///////////////////////////////////////// -->
<!--
<div class="app-container-search main-bgcolor main-radius setting-container"> <div class="app-container-search main-bgcolor main-radius setting-container">
<div class="setting-title flex-jcenter"> <div class="setting-title flex-jcenter">
<div class=""> <div class="">
@ -180,7 +182,6 @@
<el-table-column prop="jobDate" label="作业日期"> <el-table-column prop="jobDate" label="作业日期">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="flex-acenter"> <div class="flex-acenter">
<!-- <span>{{ row.jobDate }}</span> -->
<el-input v-model="row.jobDate" placeholder="请输入作业日期"></el-input> <el-input v-model="row.jobDate" placeholder="请输入作业日期"></el-input>
</div> </div>
</template> </template>
@ -188,7 +189,6 @@
<el-table-column prop="jobWorker" label="作业员工"> <el-table-column prop="jobWorker" label="作业员工">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="flex-acenter"> <div class="flex-acenter">
<!-- <span>{{ row.jobWorker }}</span> -->
<el-input v-model="row.jobWorker" placeholder="请输入作业员工"></el-input> <el-input v-model="row.jobWorker" placeholder="请输入作业员工"></el-input>
</div> </div>
</template> </template>
@ -237,6 +237,7 @@
<EmptyTable /> <EmptyTable />
</div> </div>
</div> </div>
-->
<!-- ///////////////////////////////////////// 商品认证 ///////////////////////////////////////// --> <!-- ///////////////////////////////////////// 商品认证 ///////////////////////////////////////// -->
<div class="app-container-search main-bgcolor main-radius setting-container"> <div class="app-container-search main-bgcolor main-radius setting-container">
@ -876,29 +877,29 @@
} }
}); });
// 农事计划 // 农事计划
this.farmingPlans = farmingPlans.map((item, index)=>{ // this.farmingPlans = farmingPlans.map((item, index)=>{
item.isExpand = false; // item.isExpand = false;
if(index == 0) item.isExpand = true; // if(index == 0) item.isExpand = true;
// item.scanShow = true; // // item.scanShow = true;
item.tableData = []; // item.tableData = [];
item.farmingJobs?.map((job, index) => { // item.farmingJobs?.map((job, index) => {
job.indexKey = index; // job.indexKey = index;
// job.scanShow = true; // // job.scanShow = true;
item.tableData.push({ // item.tableData.push({
jobType: job.operateDetails[0].content, // jobType: job.operateDetails[0].content,
inputsName: job.operateDetails[1].content, // inputsName: job.operateDetails[1].content,
inputsBatchId: job.operateDetails[2].content, // inputsBatchId: job.operateDetails[2].content,
jobDate: job.operateDetails[3].content, // jobDate: job.operateDetails[3].content,
jobWorker: job.operateDetails[4].content, // jobWorker: job.operateDetails[4].content,
jobImage: job.operateDetails[5].content, // jobImage: job.operateDetails[5].content,
jobVideo: job.operateDetails[6].content, // jobVideo: job.operateDetails[6].content,
remarks: job.operateDetails[7].content, // remarks: job.operateDetails[7].content,
scanShow: job.scanShow, // scanShow: job.scanShow,
indexKey: index, // indexKey: index,
}); // });
}); // });
return item; // return item;
}); // });
// 检验检疫 // 检验检疫
this.inspections = inspections.map((item, index)=>{ this.inspections = inspections.map((item, index)=>{
@ -929,7 +930,7 @@
// 查询模板 // 查询模板
this.getTraceTemplate(goodsId); this.getTraceTemplate(goodsId);
// 查询地块列表 // 查询地块列表
this.getLandInfoList(belongBusinessId); // this.getLandInfoList(belongBusinessId);
}).catch(() => { }).catch(() => {
loading.close(); loading.close();
}); });
@ -1936,51 +1937,51 @@
}; };
}); });
const farmingPlans = this.farmingPlans.map((plan, index) => { // const farmingPlans = this.farmingPlans.map((plan, index) => {
const { tableData, } = plan; // const { tableData, } = plan;
const farmingJobs = plan.farmingJobs?.map((item, iIndex) => { // const farmingJobs = plan.farmingJobs?.map((item, iIndex) => {
item.operateDetails.map((detail, i) => { // item.operateDetails.map((detail, i) => {
if (detail.title === '说明') { // if (detail.title === '说明') {
detail.content = tableData[iIndex].remarks; // detail.content = tableData[iIndex].remarks;
} // }
if (detail.title === "任务类型") { // if (detail.title === "任务类型") {
detail.content = tableData[iIndex].jobType; // detail.content = tableData[iIndex].jobType;
} // }
if (detail.title === "投入品名称") { // if (detail.title === "投入品名称") {
detail.content = tableData[iIndex].inputsName; // detail.content = tableData[iIndex].inputsName;
} // }
if (detail.title === "作业日期") { // if (detail.title === "作业日期") {
detail.content = tableData[iIndex].jobDate; // detail.content = tableData[iIndex].jobDate;
} // }
if (detail.title === "作业员工") { // if (detail.title === "作业员工") {
detail.content = tableData[iIndex].jobWorker; // detail.content = tableData[iIndex].jobWorker;
} // }
detail.sort = i; // detail.sort = i;
}); // });
return { // return {
...item, // ...item,
scanShow: tableData[iIndex].scanShow, // scanShow: tableData[iIndex].scanShow,
}; // };
}); // });
return { // return {
...plan, // ...plan,
sort: index, // sort: index,
farmingJobs, // farmingJobs,
}; // };
}); // });
const envTypeConfigs = []; // const envTypeConfigs = [];
this.landInfos?.map((land, index) => { // this.landInfos?.map((land, index) => {
this.deviceInfo.envTypes[land.value]?.map(item => { // this.deviceInfo.envTypes[land.value]?.map(item => {
const { configId, id, } = item; // const { configId, id, } = item;
const srcEnvTypes = this.deviceInfo.srcEnvTypes[land.value]?.filter(src => src.id == id); // const srcEnvTypes = this.deviceInfo.srcEnvTypes[land.value]?.filter(src => src.id == id);
envTypeConfigs.push({ // envTypeConfigs.push({
id: configId || srcEnvTypes ? srcEnvTypes[0]?.configId : null, // id: configId || srcEnvTypes ? srcEnvTypes[0]?.configId : null,
landId: land.value, // landId: land.value,
envTypeId: id, // envTypeId: id,
}); // });
}); // });
}); // });
const params = { const params = {
id, id,
@ -1990,9 +1991,9 @@
goodsInfo, goodsInfo,
goodsVerifys, goodsVerifys,
linkInfos, linkInfos,
farmingPlans, // farmingPlans,
inspections, inspections,
envTypeConfigs, // envTypeConfigs,
}; };
const loading = Loading.service({ text: '加载中...', target: '.setting-main' }); const loading = Loading.service({ text: '加载中...', target: '.setting-main' });

Write Preview
Loading…
Cancel
Save