bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2025-03-08 13:23:41 +08:00
parent f086b07a06 d7fa9ce7b1
commit dc731edb2e
5 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/lease/apply.js
View File

@ -79,6 +79,15 @@ export function applySend(data) {
}) })
} }
// 领用申请发布-终止
export function applyEnd(data) {
return request({
url: '/material/leaseTask/endPublish',
method: 'post',
data: data,
})
}
// 领料申请-批量发布 // 领料申请-批量发布
export function applySendAll(data) { export function applySendAll(data) {
return request({ return request({

19
src/views/business/businessHandlingRecord/index.vue
View File

@ -68,8 +68,8 @@
<el-tag v-if="scope.row.taskStatus == '0'" type="warning" size="mini" style="margin-right: 5px"> <el-tag v-if="scope.row.taskStatus == '0'" type="warning" size="mini" style="margin-right: 5px">
待审核 待审核
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.taskStatus == '1'" size="mini" style="margin-right: 5px">审核中</el-tag> <el-tag v-else-if="scope.row.taskStatus == '6'" size="mini" style="margin-right: 5px">审核中</el-tag>
<el-tag v-else-if="scope.row.taskStatus == '2'" type="success" size="mini" style="margin-right: 5px"> <el-tag v-else-if="scope.row.taskStatus == '1' || scope.row.taskStatus == '3' || scope.row.taskStatus == '4'" type="success" size="mini" style="margin-right: 5px">
已完成 已完成
</el-tag> </el-tag>
<el-tag v-else-if="scope.row.taskStatus == '5'" size="mini" style="margin-right: 5px">待提交</el-tag> <el-tag v-else-if="scope.row.taskStatus == '5'" size="mini" style="margin-right: 5px">待提交</el-tag>
@ -280,9 +280,9 @@ export default {
}, },
// 考勤状态 // 考勤状态
statusOptions: [ statusOptions: [
{ label: '待审核', value: '1' }, { label: '待审核', value: '0' },
{ label: '审核中', value: '2' }, { label: '审核中', value: '6' },
{ label: '已完成', value: '3' } { label: '已完成', value: '1' }
], ],
total: 0, // 总条数 total: 0, // 总条数
// 表头 // 表头
@ -387,7 +387,7 @@ export default {
}) })
}, },
// 导出数据 // 导出数据
handleExport() { /*handleExport() {
try { try {
let fileName = `数据_${new Date().getTime()}.xLsx` let fileName = `数据_${new Date().getTime()}.xLsx`
let url = '' let url = ''
@ -397,6 +397,13 @@ export default {
} catch (error) { } catch (error) {
console.log('导出数据失败', error) console.log('导出数据失败', error)
} }
},*/
handleExport() {
this.download(
"/material/leaseTask/exportLeaseRecord",
{ ...this.queryParams },
`领用记录数据_${new Date().getTime()}.xlsx`
);
}, },
// 打印 // 打印
print() { print() {

24
src/views/business/leasePublish/component/addToolsApply.vue
View File

@ -34,7 +34,7 @@
{{ leaseApplyData.code }} {{ leaseApplyData.code }}
</div> </div>
</div> </div>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -44,14 +44,14 @@
@click="handleSend" @click="handleSend"
>发布</el-button >发布</el-button
> >
<el-button <!-- <el-button
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
>导出数据</el-button >导出数据</el-button
> >-->
</el-col> </el-col>
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-if="isEdit">导出</el-button> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-if="isEdit">导出</el-button>
@ -95,7 +95,7 @@
v-model.number="scope.row.num" v-model.number="scope.row.num"
controls-position="right" type="number" controls-position="right" type="number"
v-if="scope.row.pendingNum!=0" v-if="scope.row.pendingNum!=0"
style="width: 100%" style="width: 100%"
:min="0" @change="handleChange(scope.row)" :min="0" @change="handleChange(scope.row)"
></el-input> ></el-input>
</template> </template>
@ -286,7 +286,7 @@ export default {
numTemp: 0, numTemp: 0,
items: [], items: [],
// 表单校验 // 表单校验
rules: { rules: {
unitId: [ unitId: [
@ -357,7 +357,7 @@ export default {
for (const item of this.leaseList) { for (const item of this.leaseList) {
this.$set(item, 'num', item.pendingNum); this.$set(item, 'num', item.pendingNum);
this.$set(item, 'newTypeId', item.typeId); this.$set(item, 'newTypeId', item.typeId);
const optionsResponse = await getTypeOptions({ typeId: item.thirdTypeId }); const optionsResponse = await getTypeOptions({ typeId: item.thirdTypeId });
const typeOptions = optionsResponse.data.map((type) => ({ const typeOptions = optionsResponse.data.map((type) => ({
value: type.typeId, value: type.typeId,
@ -373,7 +373,7 @@ export default {
this.$forceUpdate(); // 强制刷新组件 this.$forceUpdate(); // 强制刷新组件
} }
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.items = []; this.items = [];
@ -401,7 +401,7 @@ export default {
if(row.num > row.pendingNum){ if(row.num > row.pendingNum){
this.$message.error('领料数量不能大于待发布数量') this.$message.error('领料数量不能大于待发布数量')
this.$set(row, 'num', row.pendingNum) this.$set(row, 'num', row.pendingNum)
} }
if (row.num < 1) { if (row.num < 1) {
this.$set(row, 'num', 1) this.$set(row, 'num', 1)
@ -417,7 +417,7 @@ export default {
if (valid) { if (valid) {
let leaseApplyInfo = { let leaseApplyInfo = {
unitId: this.maForm.unitId, unitId: this.maForm.unitId,
leasePerson: this.maForm.leasePerson, leasePerson: this.maForm.leasePerson,
phone: this.maForm.phone, phone: this.maForm.phone,
taskId:this.leaseApplyData.taskId, taskId:this.leaseApplyData.taskId,
projectId: this.leaseApplyData.leaseProjectId, projectId: this.leaseApplyData.leaseProjectId,
@ -437,20 +437,20 @@ export default {
this.loading = false; this.loading = false;
}); });
} }
}) })
}, },
cancel() { cancel() {
this.numTemp = 0; this.numTemp = 0;
this.$refs.maForm.resetFields(); this.$refs.maForm.resetFields();
this.openView = false; this.openView = false;
}, },
closeView() { closeView() {
this.numTemp = 0; this.numTemp = 0;
this.$refs.maForm.resetFields(); this.$refs.maForm.resetFields();
this.openView = false; this.openView = false;
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */

30
src/views/business/leasePublish/component/homeApply.vue
View File

@ -33,8 +33,9 @@
filterable filterable
style="width: 240px" style="width: 240px"
> >
<el-option label="未完成" value="0"></el-option> <el-option label="未完成" value="1"></el-option>
<el-option label="已完成" value="1"></el-option> <el-option label="已终结" value="2"></el-option>
<el-option label="已完成" value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -85,16 +86,16 @@
<el-table-column label="备注" align="center" width="100" prop="remark" :show-overflow-tooltip="true"/> <el-table-column label="备注" align="center" width="100" prop="remark" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" width="300" fixed="right"> <el-table-column label="操作" align="center" width="300" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" style="margin-bottom: 10px" type="normal" <el-button size="mini" style="margin-bottom: 10px" type="normal"
@click="handleView(scope.row)" @click="handleView(scope.row)"
>查看</el-button> >查看</el-button>
<el-button size="mini" style="margin-bottom: 10px" type="success" <el-button size="mini" style="margin-bottom: 10px" type="success"
v-if="scope.row.taskStatusName != '已完成'" v-if="scope.row.taskStatusName == '未完成'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>发布</el-button> >发布</el-button>
<el-button size="mini" type="danger" <el-button size="mini" type="danger"
v-if="scope.row.taskStatusName != '已完成'" v-if="scope.row.taskStatusName == '未完成'"
@click="handleStop(scope.row)" @click="handleStop(scope.row)"
>终止</el-button> >终止</el-button>
<el-button size="mini" type="warning" <el-button size="mini" type="warning"
@click="handleLld(scope.row)" @click="handleLld(scope.row)"
@ -261,6 +262,7 @@ import {
getListLeaseApply, getListLeaseApply,
applySend, applySend,
applySendAll, applySendAll,
applyEnd,
} from "@/api/lease/apply"; } from "@/api/lease/apply";
import { import {
getLeasePublishList, getLeasePublishList,
@ -299,7 +301,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
time: null, //申请时间 time: null, //申请时间
keyWord: "", keyWord: "",
taskStatus: null, //状态 taskStatus: null, //状态
}, },
@ -321,7 +323,7 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
// 多选框选中数据 // 多选框选中数据
@ -349,7 +351,7 @@ export default {
keyWord: this.queryParams.keyWord, keyWord: this.queryParams.keyWord,
taskStatus: this.queryParams.taskStatus, taskStatus: this.queryParams.taskStatus,
startTime: this.queryParams.time && this.queryParams.time[0], startTime: this.queryParams.time && this.queryParams.time[0],
endTime: this.queryParams.time && this.queryParams.time[1], endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum, pageNum: this.queryParams.pageNum,
}; };
@ -396,9 +398,9 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
"/material/lease_apply_info/export", "/material/leaseTask/exportPublish",
{ ...this.queryParams }, { ...this.queryParams },
`领料申请_${new Date().getTime()}.xlsx` `领料申请发布_${new Date().getTime()}.xlsx`
); );
}, },
@ -408,7 +410,7 @@ export default {
this.$modal this.$modal
.confirm("是否确认终止所选择的数据项？") .confirm("是否确认终止所选择的数据项？")
.then(function () { .then(function () {
// return applySend(param); return applyEnd(param);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();

10
src/views/business/leasePublish/component/queryToolsApply.vue
View File

@ -34,7 +34,7 @@
{{ leaseApplyData.code }} {{ leaseApplyData.code }}
</div> </div>
</div> </div>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -297,7 +297,7 @@ export default {
this.taskId = this.queryTaskId; this.taskId = this.queryTaskId;
this.id = this.queryId; this.id = this.queryId;
this.getTaskInfo(); this.getTaskInfo();
}, },
methods: { methods: {
/** 转换菜单数据结构 */ /** 转换菜单数据结构 */
@ -346,9 +346,9 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
"/material/purchase_check_info/exportDetails", "/material/leaseTask/exportPublishDetails",
{ taskId: this.taskId }, { id: this.id },
`新购到货详情_${new Date().getTime()}.xlsx` `领用申请发布详情_${new Date().getTime()}.xlsx`
); );
}, },