From 7e40205d7f40dcfaad7f4c81bb13329983d3730b Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期一, 24 十月 2022 13:56:45 +0800
Subject: [PATCH] 修改
---
src/views/specialWorkSystem/workTicket/wdsqjl/index.vue | 8 ++--
src/views/system/personShiftManage/scheduleManage/schedule/index.vue | 18 ++++-----
src/views/system/personShiftManage/scheduleManage/strategy/index.vue | 17 ++++----
src/views/specialWorkSystem/foundationSet/goods/index.vue | 3 +
src/api/specialWorkSystem/workApply/index.ts | 9 ++++
src/views/specialWorkSystem/workTicket/wdsq/index.vue | 6 +-
src/views/specialWorkSystem/workTicket/wdsp/index.vue | 2
7 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/src/api/specialWorkSystem/workApply/index.ts b/src/api/specialWorkSystem/workApply/index.ts
index 4575477..1286cbe 100644
--- a/src/api/specialWorkSystem/workApply/index.ts
+++ b/src/api/specialWorkSystem/workApply/index.ts
@@ -130,6 +130,15 @@
});
},
+ // 查询所有进度
+ getAllStatus: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/work/apply/others/view`,
+ method: 'post',
+ data: data
+ });
+ },
+
// 获取图片上传路径
getUploadUrl: (name: string) => {
return request({
diff --git a/src/views/specialWorkSystem/foundationSet/goods/index.vue b/src/views/specialWorkSystem/foundationSet/goods/index.vue
index 116b215..558de0c 100644
--- a/src/views/specialWorkSystem/foundationSet/goods/index.vue
+++ b/src/views/specialWorkSystem/foundationSet/goods/index.vue
@@ -226,7 +226,7 @@
<el-form-item label="物资标准配置">
<el-tabs tab-position="left" class="demo-tabs" type="border-card">
<el-tab-pane v-for="(item,index) in allList" :label="item.materialTypeName" :key="index">
- <div class="tab-i" v-for="(i,x) in item.list" :key="x">
+ <div class="tab-i" v-for="(i,x) in item.list" :key="x" v-if="item.list && item.list.length>0">
<el-checkbox :label="i.materialName" v-model="checkData[index].list[x].checked">
</el-checkbox>
<el-form v-if="checkData[index].list[x].checked" :model="checkData[index].list[x]" label-width="100px" ref="addListRef" :rules="addListRules">
@@ -246,6 +246,7 @@
</el-form-item>
</el-form>
</div>
+ <div v-else>暂无物资配置数据</div>
</el-tab-pane>
</el-tabs>
<div v-if="chosenIndex != null" style="color: #79bbff">注：修改配置数据须重新填写配置</div>
diff --git a/src/views/specialWorkSystem/workTicket/wdsp/index.vue b/src/views/specialWorkSystem/workTicket/wdsp/index.vue
index 39b7ba9..84dfa62 100644
--- a/src/views/specialWorkSystem/workTicket/wdsp/index.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsp/index.vue
@@ -301,7 +301,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'apply'
+ path: 'zysq'
});
};
diff --git a/src/views/specialWorkSystem/workTicket/wdsq/index.vue b/src/views/specialWorkSystem/workTicket/wdsq/index.vue
index 7d480b5..4bad406 100644
--- a/src/views/specialWorkSystem/workTicket/wdsq/index.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsq/index.vue
@@ -321,7 +321,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'apply'
+ path: 'zysq'
});
};
@@ -471,10 +471,10 @@
axios.post(import.meta.env.VITE_API_URL + `/work/apply/printing`,data,{headers:{'Content-Type': 'application/json','Authorization': `${Cookies.get('token')}`,'uid':`${Cookies.get('uid')}`},responseType: 'blob'}).then(res=>{
if (res) {
const link = document.createElement('a')
- let blob = new Blob([res.data],{type: 'application/pdf'})
+ let blob = new Blob([res.data],{type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'})
link.style.display = "none";
link.href = URL.createObjectURL(blob); // 创建URL
- link.setAttribute("download", state.downLoadName + "作业证.pdf");
+ link.setAttribute("download", state.downLoadName + "作业证.docx");
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
diff --git a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
index 2ffbcfd..796dd3e 100644
--- a/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
+++ b/src/views/specialWorkSystem/workTicket/wdsqjl/index.vue
@@ -342,7 +342,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'apply'
+ path: 'zysq'
});
};
@@ -442,7 +442,7 @@
// 查询进度方法
const getStatus = async (data: any) => {
- let res = await workApplyApi().getStatus(data);
+ let res = await workApplyApi().getAllStatus(data);
if (res.data.code === '200') {
state.approveInfo = JSON.parse(JSON.stringify(res.data.data));
state.approveInfo.operators = Array.from(state.approveInfo.operators, ({ operatorUname }) => operatorUname);
@@ -473,10 +473,10 @@
axios.post(import.meta.env.VITE_API_URL + `/work/apply/printing`,data,{headers:{'Content-Type': 'application/json','Authorization': `${Cookies.get('token')}`,'uid':`${Cookies.get('uid')}`},responseType: 'blob'}).then(res=>{
if (res) {
const link = document.createElement('a')
- let blob = new Blob([res.data],{type: 'application/pdf'})
+ let blob = new Blob([res.data],{type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'})
link.style.display = "none";
link.href = URL.createObjectURL(blob); // 创建URL
- link.setAttribute("download", state.downLoadName + "作业证.pdf");
+ link.setAttribute("download", state.downLoadName + "作业证.docx");
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
diff --git a/src/views/system/personShiftManage/scheduleManage/schedule/index.vue b/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
index 782352c..008fb17 100644
--- a/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
+++ b/src/views/system/personShiftManage/scheduleManage/schedule/index.vue
@@ -16,14 +16,13 @@
<el-col :span="12" class="mainCardBtn">
<el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord = true">新增</el-button>
<!-- <el-button type="warning" :icon="Edit" size="default" plain>修改</el-button>-->
- <el-button type="danger" :icon="Delete" size="default" plain @click="deleteBatchBtn">删除</el-button>
+<!-- <el-button type="danger" :icon="Delete" size="default" plain @click="deleteBatchBtn">删除</el-button>-->
</el-col>
<el-button type="primary" :icon="Refresh" size="default" @click="reLoadData()" />
</el-row>
<el-table ref="multipleTableRef" :data="tableData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="100" />
<el-table-column property="groupName" label="班组名称" />
- <el-table-column property="groupMembers" label="班组人员" width="180" :show-overflow-tooltip="true" />
+ <el-table-column property="groupMembers" label="班组人员" :show-overflow-tooltip="true" />
<el-table-column property="groupInfo" label="描述" />
<el-table-column fixed="right" label="操作" align="center" width="250">
<template #default="scope">
@@ -391,11 +390,11 @@
};
// 批量删除
- const deleteBatchBtn = async () => {
- ElMessage({
- type: 'warning',
- message: '抱歉，本页面暂不支持批量删除'
- });
+ // const deleteBatchBtn = async () => {
+ // ElMessage({
+ // type: 'warning',
+ // message: '抱歉，本页面暂不支持批量删除'
+ // });
// if (state.deleteArr.length > 0) {
// state.deleteSetDialog = true
// } else {
@@ -404,7 +403,7 @@
// message: '请先选择要删除的记录'
// });
// }
- };
+ // };
// const conFirmDeleteBatch = async () => {
// let res = await teamManageApi().deletBatchRecord({ids: state.deleteArr});
@@ -482,7 +481,6 @@
getListByPage,
reLoadData,
deleteRecord,
- deleteBatchBtn,
handleSizeChange,
handleCurrentChange,
confirmAddRecord,
diff --git a/src/views/system/personShiftManage/scheduleManage/strategy/index.vue b/src/views/system/personShiftManage/scheduleManage/strategy/index.vue
index 1bfcc22..a781a2f 100644
--- a/src/views/system/personShiftManage/scheduleManage/strategy/index.vue
+++ b/src/views/system/personShiftManage/scheduleManage/strategy/index.vue
@@ -16,12 +16,12 @@
<el-col :span="12" class="mainCardBtn">
<el-button type="primary" :icon="Plus" size="default" @click="dialogAddRecord = true">新增</el-button>
<!-- <el-button type="warning" :icon="Edit" size="default" plain>修改</el-button>-->
- <el-button type="danger" :icon="Delete" size="default" plain @click="deleteBatchBtn">删除</el-button>
+<!-- <el-button type="danger" :icon="Delete" size="default" plain @click="deleteBatchBtn">删除</el-button>-->
</el-col>
<el-button type="primary" :icon="Refresh" size="default" @click="reLoadData()" />
</el-row>
<el-table ref="multipleTableRef" :data="tableData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="100" />
+<!-- <el-table-column type="selection" width="100" />-->
<el-table-column property="groupStrategyName" label="班组策略名称" />
<el-table-column property="timeStrategy" label="时间策略" width="180" :show-overflow-tooltip="true" />
<el-table-column property="cycleName" label="循环类型" :show-overflow-tooltip="true" />
@@ -483,11 +483,11 @@
};
// 批量删除
- const deleteBatchBtn = async () => {
- ElMessage({
- type: 'warning',
- message: '抱歉，本页面暂不支持批量删除'
- });
+ // const deleteBatchBtn = async () => {
+ // ElMessage({
+ // type: 'warning',
+ // message: '抱歉，本页面暂不支持批量删除'
+ // });
// if (state.deleteArr.length > 0) {
// state.deleteSetDialog = true
// } else {
@@ -496,7 +496,7 @@
// message: '请先选择要删除的记录'
// });
// }
- };
+ // };
// const conFirmDeleteBatch = async () => {
// let res = await timeStrategyApi().deletBatchRecord({ids: state.deleteArr});
@@ -579,7 +579,6 @@
getListByPage,
reLoadData,
deleteRecord,
- deleteBatchBtn,
handleSizeChange,
handleCurrentChange,
confirmAddRecord,
--
Gitblit v1.9.2