转群功能优化
This commit is contained in:
parent
9a1eff0fc6
commit
1fd3521d34
@ -38,11 +38,11 @@
|
|||||||
<el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.id" />
|
<el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.id" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="状态" prop="status">
|
<!-- <el-form-item label="状态" prop="status">
|
||||||
<el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
|
<el-select v-model="queryParams.status" style="width: 150px;" placeholder="请选择状态" clearable>
|
||||||
<el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
|
<el-option v-for="dict in status" :key="dict.value" :label="dict.label" :value="dict.value" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||||
@ -85,20 +85,20 @@
|
|||||||
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
|
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
|
||||||
<el-table-column label="转群原因" align="center" prop="reasonText" min-width="120" />
|
<el-table-column label="转群原因" align="center" prop="reasonText" min-width="120" />
|
||||||
<el-table-column label="技术员" align="center" prop="technician" />
|
<el-table-column label="技术员" align="center" prop="technician" />
|
||||||
<el-table-column label="状态" align="center" prop="status">
|
<!-- <el-table-column label="状态" align="center" prop="status">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :options="status" :value="scope.row.status" />
|
<dict-tag :options="status" :value="scope.row.status" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column> -->
|
||||||
<el-table-column label="备注" align="center" prop="comment" min-width="120" />
|
<el-table-column label="备注" align="center" prop="comment" min-width="120" />
|
||||||
<el-table-column label="创建人" align="center" prop="createBy" />
|
<el-table-column label="创建人" align="center" prop="createBy" />
|
||||||
|
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160" fixed="right">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="160" fixed="right">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
|
<!-- <el-button link type="primary" icon="Edit" @click="handleApprove(scope.row)"
|
||||||
v-hasPermi="['trans_group:trans_group:approve']">
|
v-hasPermi="['trans_group:trans_group:approve']">
|
||||||
审批
|
审批
|
||||||
</el-button>
|
</el-button> -->
|
||||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||||
v-hasPermi="['trans_group:trans_group:remove']">
|
v-hasPermi="['trans_group:trans_group:remove']">
|
||||||
删除
|
删除
|
||||||
@ -178,7 +178,7 @@
|
|||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<!-- 审批对话框 -->
|
<!-- 审批对话框 -->
|
||||||
<el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
|
<!-- <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
|
||||||
<el-form ref="approveFormRef" :model="approveForm" label-width="120px">
|
<el-form ref="approveFormRef" :model="approveForm" label-width="120px">
|
||||||
<el-form-item label="耳号">
|
<el-form-item label="耳号">
|
||||||
<el-input v-model="displayManageTags" disabled />
|
<el-input v-model="displayManageTags" disabled />
|
||||||
@ -214,7 +214,7 @@
|
|||||||
<el-button type="danger" @click="handleApproveReject">驳回</el-button>
|
<el-button type="danger" @click="handleApproveReject">驳回</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog> -->
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@ -240,9 +240,9 @@ const title = ref('');
|
|||||||
const daterangeTransDate = ref([]);
|
const daterangeTransDate = ref([]);
|
||||||
const daterangeCreateTime = ref([]);
|
const daterangeCreateTime = ref([]);
|
||||||
const eventTypeOptions = trans_group_event_type || [];
|
const eventTypeOptions = trans_group_event_type || [];
|
||||||
const approveDialog = ref(false);
|
// const approveDialog = ref(false);
|
||||||
const approveForm = ref({});
|
// const approveForm = ref({});
|
||||||
const displayManageTags = ref('');
|
// const displayManageTags = ref('');
|
||||||
const sheepOptions = ref([]);
|
const sheepOptions = ref([]);
|
||||||
const sheepfoldOptions = ref([]);
|
const sheepfoldOptions = ref([]);
|
||||||
const sheepfoldNameMap = ref({});
|
const sheepfoldNameMap = ref({});
|
||||||
@ -699,38 +699,38 @@ function handleExport() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 审核
|
// 审核
|
||||||
function handleApprove(row) {
|
//function handleApprove(row) {
|
||||||
approveForm.value = { ...row };
|
// approveForm.value = { ...row };
|
||||||
approveDialog.value = true;
|
// approveDialog.value = true;
|
||||||
displayManageTags.value = row.manageTags;
|
// displayManageTags.value = row.manageTags;
|
||||||
}
|
// }
|
||||||
|
|
||||||
// 审批同意
|
// 审批同意
|
||||||
function handleApproveAgree() {
|
// function handleApproveAgree() {
|
||||||
if (typeof approveForm.value.foldTo !== 'number') {
|
// if (typeof approveForm.value.foldTo !== 'number') {
|
||||||
approveForm.value.foldTo = Number(approveForm.value.foldTo);
|
// approveForm.value.foldTo = Number(approveForm.value.foldTo);
|
||||||
}
|
// }
|
||||||
|
|
||||||
approveForm.value.status = 1;
|
// approveForm.value.status = 1;
|
||||||
approveScTransGroup(approveForm.value).then(() => {
|
// approveScTransGroup(approveForm.value).then(() => {
|
||||||
approveDialog.value = false;
|
// approveDialog.value = false;
|
||||||
proxy.$modal.msgSuccess('审批通过,羊只所在羊舍已更新');
|
// proxy.$modal.msgSuccess('审批通过,羊只所在羊舍已更新');
|
||||||
getList();
|
// getList();
|
||||||
}).catch(error => {
|
// }).catch(error => {
|
||||||
proxy.$modal.msgError(`审批失败:${error.message}`);
|
// proxy.$modal.msgError(`审批失败:${error.message}`);
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
|
|
||||||
function handleApproveReject() {
|
// function handleApproveReject() {
|
||||||
approveForm.value.status = 2;
|
// approveForm.value.status = 2;
|
||||||
approveScTransGroup(approveForm.value).then(() => {
|
// approveScTransGroup(approveForm.value).then(() => {
|
||||||
approveDialog.value = false;
|
// approveDialog.value = false;
|
||||||
proxy.$modal.msgSuccess('审批已驳回');
|
// proxy.$modal.msgSuccess('审批已驳回');
|
||||||
getList();
|
// getList();
|
||||||
}).catch(error => {
|
// }).catch(error => {
|
||||||
proxy.$modal.msgError(`审批失败:${error.message}`);
|
// proxy.$modal.msgError(`审批失败:${error.message}`);
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
|
|
||||||
//加载羊舍数据
|
//加载羊舍数据
|
||||||
function loadSheepfold() {
|
function loadSheepfold() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user