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

导出功能，短信登录，领料模块优化审批

This commit is contained in:
zhouzy062 2024-01-10 16:29:46 +08:00
parent 32ee5fcae8
commit 49320db995
36 changed files with 723 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-ui/src/api/claimAndRefund/receive.js
View File

@ -148,6 +148,14 @@ export function auditLeaseByCompany(params = {} ){
data:params
})
}
// 领料审核 拒绝
export function rejectLeaseByCompany(params = {}){
return request({
url: '/base/tm_task/rejectLeaseByCompany',
method: 'post',
data: params
})
}
// 获取 物品类型
export function getUseTypeTreee(params = {}){

23
sgzb-ui/src/api/login.js
View File

@ -61,3 +61,26 @@ export function getCodeImg() {
timeout: 20000
})
}
// 短信验证码
export function sendCode(data) {
return request({
url: '/auth/sendCode',
headers: {
isToken: false
},
method: 'post',
data: data
})
}
// 短信验证码--登录
export function checkCode(data) {
return request({
url: '/auth/checkCode',
headers: {
isToken: false
},
method: 'post',
data: data
})
}

2
sgzb-ui/src/permission.js
View File

@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/register']
const whiteList = ['/login', '/register','/auth/sendCode']
router.beforeEach((to, from, next) => {
NProgress.start()

25
sgzb-ui/src/store/modules/user.js
View File

@ -1,4 +1,4 @@
import { login, logout, getInfo, refreshToken } from '@/api/login'
import { login, logout, getInfo, refreshToken,checkCode } from '@/api/login'
import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
const user = {
@ -55,6 +55,29 @@ const user = {
})
})
},
// 验证码 登录
textLogin({ commit }, userInfo) {
console.log(userInfo)
let params = {
phone:userInfo.phone,
code:userInfo.textCode
}
return new Promise((resolve, reject) => {
checkCode(params).then(res => {
console.log(res)
if(res.code==200){
let data = res.data
setToken(data.access_token)
commit('SET_TOKEN', data.access_token)
setExpiresIn(data.expires_in)
commit('SET_EXPIRES_IN', data.expires_in)
resolve()
}
}).catch(error => {
reject(error)
})
})
},
// 获取用户信息
GetInfo({ commit, state }) {

10
sgzb-ui/src/views/base/assetAttributeAllocation/index.vue
View File

@ -80,7 +80,7 @@
size="mini"
@click="handleImport"
>导入</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
@ -89,7 +89,7 @@
size="mini"
@click="handleExport"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
@ -373,9 +373,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/user/export', {
...this.queryParams
}, `user_${new Date().getTime()}.xlsx`)
// this.download('system/user/export', {
// ...this.queryParams
// }, `user_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {

10
sgzb-ui/src/views/base/assetAttributeManagement/index.vue
View File

@ -27,7 +27,7 @@
@click="handleAdd"
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="warning"
plain
@ -35,7 +35,7 @@
size="mini"
@click="handleExport"
>导出</el-button>
</el-col> -->
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="danger"
@ -283,9 +283,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

10
sgzb-ui/src/views/base/comeAndGo/index.vue
View File

@ -54,7 +54,7 @@
>人员配置</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="warning"
plain
@ -62,7 +62,7 @@
size="mini"
@click="handleExport"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@ -403,9 +403,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
}

10
sgzb-ui/src/views/base/project/index.vue
View File

@ -27,7 +27,7 @@
@click="handleAdd"
>新建</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="warning"
plain
@ -35,7 +35,7 @@
size="mini"
@click="handleExport"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -315,9 +315,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

14
sgzb-ui/src/views/base/section/index.vue
View File

@ -43,7 +43,7 @@
>新增</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="warning"
plain
@ -51,7 +51,7 @@
size="mini"
@click="handleExport"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
@ -64,7 +64,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="lotId" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="标段工程名称"
align="center"
@ -344,7 +344,7 @@ export default {
status: "0",
remark: undefined
};
// this.resetForm("form");
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
@ -411,9 +411,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

10
sgzb-ui/src/views/base/unit/index.vue
View File

@ -27,7 +27,7 @@
@click="handleAdd"
>新建</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="warning"
plain
@ -35,7 +35,7 @@
size="mini"
@click="handleExport"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -248,9 +248,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
}
};

8
sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
View File

@ -86,7 +86,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -262,8 +261,7 @@ export default {
pageNum: 1,
pageSize: 10,
keyWord: undefined,
dictType: undefined,
status: undefined
},
// 表单参数
form: {},
@ -480,9 +478,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/agreementInfo/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `协议_${new Date().getTime()}.xlsx`)
},
}
};

40
sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
View File

@ -67,7 +67,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@ -103,12 +102,27 @@
size="mini"
type="text"
icon="el-icon-edit"
@click="handleView(scope.row)"
>查看</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.taskStatus==30"
@click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.taskStatus==98 || scope.row.taskStatus==99 || scope.row.taskStatus==100"
@click="handleUpdate(scope.row)"
>驳回提交</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="scope.row.taskStatus==30"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
@ -319,6 +333,12 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.$router.push("/claimAndRefund/receive/receiveApplyAdd");
this.$router.push({
path:'/claimAndRefund/receive/receiveApplyAdd',
query:{
isEdit:true
}
})
// this.reset();
// this.open = true;
// this.title = "添加字典类型";
@ -329,12 +349,22 @@ export default {
this.single = selection.length!=1
this.multiple = !selection.length
},
handleView(row) {
this.$router.push({
path:'/claimAndRefund/receive/receiveApplyAdd',
query:{
taskId:row.taskId,
isEdit:false
}
})
},
/** 修改按钮操作 */
handleUpdate(row) {
this.$router.push({
path:'/claimAndRefund/receive/receiveApplyAdd',
query:{
taskId:row.taskId
taskId:row.taskId,
isEdit:true
}
})
},
@ -381,9 +411,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

30
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -76,6 +76,8 @@
plain
icon="el-icon-plus"
size="mini"
v-if="isEdit=='true'"
:disabled="multiple"
@click="handleAdd"
>保存</el-button>
</el-col>
@ -103,11 +105,11 @@
<el-table v-loading="loading" :data="leaseApplyDetails" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="120" />
<el-table-column label="类型名称" prop="typeCn" width="200" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" prop="guigeCn" width="200" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" prop="unitCn" width="100" />
<el-table-column label="预领数量" align="center" prop="createTime" width="180">
<el-table-column label="序号" type="index" width="80" />
<el-table-column label="类型名称" prop="typeCn" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" prop="unitCn"/>
<el-table-column label="预领数量" align="center" prop="createTime">
<template slot-scope="scope">
<el-input
v-model.number="scope.row.preNum"
@ -119,7 +121,7 @@
/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="createTime" width="180">
<el-table-column label="备注" align="center" prop="createTime">
<template slot-scope="scope">
<el-input
v-model="scope.row.remark"
@ -130,8 +132,8 @@
/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" v-if="isEdit=='true'">
<template slot-scope="scope">
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
@ -198,6 +200,7 @@ export default {
menuNodeAll: false,
deptExpand: true,
deptNodeAll: false,
isEdit:'true',
// 日期范围
dateRange: [],
// 数据范围选项
@ -326,6 +329,9 @@ export default {
this.GetTaskDetail(this.$route.query.taskId)
this.taskId = this.$route.query.taskId
}
this.isEdit = this.$route.query.isEdit;
// console.log(typeof(this.isEdit))
// this.$set('isEdit',this.$route.query.isEdit)
},
methods: {
@ -520,6 +526,8 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.queryParams.leaseApplyDetails = selection
this.single = selection.length != 1
this.multiple = !selection.length
},
// 更多操作触发
handleCommand(command, row) {
@ -634,9 +642,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/role/export', {
...this.queryParams
}, `role_${new Date().getTime()}.xlsx`)
// this.download('system/role/export', {
// ...this.queryParams
// }, `role_${new Date().getTime()}.xlsx`)
},

97
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -105,12 +105,12 @@
</el-row>
<div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;">
<div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;" v-if="queryParams.taskStatus<33">
<el-button type="primary" @click="agree">同意</el-button>
<!-- <el-button >拒绝</el-button>-->
<el-button @click="refuse">驳回</el-button>
</div>
<!-- 同意 -->
<el-dialog title="审核意见" :visible.sync="examineVisible">
<el-input placeholder="请输入审核意见" v-model="queryParams.companyAuditRemarks "></el-input>
<div slot="footer" class="dialog-footer">
@ -118,12 +118,20 @@
<el-button type="primary" @click="handelExamine(true)">确 定</el-button>
</div>
</el-dialog>
<!-- 驳回 -->
<el-dialog title="审核意见" :visible.sync="refuseVisible">
<el-input placeholder="请输入审核意见" v-model="queryParams.companyAuditRemarks "></el-input>
<div slot="footer" class="dialog-footer">
<el-button @click="handelRefuse(false)">取 消</el-button>
<el-button type="primary" @click="handelRefuse(true)">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { auditLeaseByCompany, getTaskDetail } from '@/api/claimAndRefund/receive'
import { auditLeaseByCompany, getTaskDetail,rejectLeaseByCompany } from '@/api/claimAndRefund/receive'
import {mapState} from 'vuex'
export default {
name: "Dict",
@ -151,7 +159,7 @@ export default {
}
],
examineVisible:false,
refuseVisible:false,
// 遮罩层
loading: false,
// 选中数组
@ -235,7 +243,6 @@ export default {
}else {
this.queryParams.companyAuditRemarks = ''
}
this.examineVisible = type
},
//审核 同意
@ -245,8 +252,11 @@ export default {
params.leaseApplyInfoList.forEach(v => {
this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
this.$set(v,'companyAuditBy',this.user.id)
this.$set(v,'examineStatusId',params.examineStatusId)
})
params.updateTime = params.updateTimes
params.createTime = params.createTimes
console.log(params)
const res = await auditLeaseByCompany(params)
if(res.code == 200){
this.examineVisible = false
@ -255,6 +265,49 @@ export default {
console.log('subAuditLeaseByCompany ==================',res)
},
//审核 驳回
refuse(){
this.refuseVisible = true
},
handelRefuse(type){
if(type){
this.refuseAuditLeaseByCompany()
}else {
this.queryParams.companyAuditRemarks = ''
}
this.refuseVisible = type
},
//审核 驳回
async refuseAuditLeaseByCompany(){
const params = JSON.parse(JSON.stringify(this.queryParams))
if(params.taskStatus==30){
params.taskStatus=98;
params.examineStatusId=98
}
if(params.taskStatus==31){
params.taskStatus=99;
params.examineStatusId=99
}
if(params.taskStatus==32){
params.taskStatus=100;
params.examineStatusId=100
}
params.updateTime = params.updateTimes
params.createTime = params.createTimes
params.leaseApplyInfoList.forEach(v => {
this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
this.$set(v,'companyAuditBy',this.user.id)
this.$set(v,'examineStatusId',params.examineStatusId)
})
console.log(params)
const res = await rejectLeaseByCompany(params)
if(res.code == 200){
this.examineVisible = false
this.$router.back()
}
console.log('subAuditLeaseByCompany ==================',res)
},
/** 查询字典类型列表 */
async getData(taskId) {
const res = await getTaskDetail({
@ -266,16 +319,36 @@ export default {
this.$set(v,'applyFor',this.queryParams.applyFor)
this.$set(v,'updateTimes',this.queryParams.updateTimes)
this.$set(v,'taskName',this.queryParams.taskName)
this.$set(v,'createTime',this.queryParams.createTimes)
this.$set(v,'updateTime',this.queryParams.updateTimes)
})
for (let i=0; i < this.flowPath.length; i++ ){
if(this.flowPath[i].id == this.queryParams.examineStatusId){
this.flowPath[i].type = 'primary'
this.flowPath[i].icon = 'el-icon-more'
break
}else {
if(this.flowPath[i].id < this.queryParams.examineStatusId){
this.flowPath[i].color = '#0bbd87'
this.flowPath[i].icon = 'el-icon-check'
}
if(this.flowPath[i].id == this.queryParams.examineStatusId){
this.flowPath[i].type = 'primary'
this.flowPath[i].color = "#1890ff"
this.flowPath[i].icon = 'el-icon-more'
break
}
}
if(this.queryParams.examineStatusId==98){
// this.flowPath[0].type = 'error'
this.flowPath[0].color = 'red'
this.flowPath[0].icon = 'el-icon-close'
}
if(this.queryParams.examineStatusId==99){
// this.flowPath[1].type = 'error'
this.flowPath[1].color = 'red'
this.flowPath[1].icon = 'el-icon-close'
}
if(this.queryParams.examineStatusId==100){
// this.flowPath[2].type = 'error'
this.flowPath[2].color = 'red'
this.flowPath[2].icon = 'el-icon-close'
}
},
// 取消按钮

20
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -49,7 +49,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@ -57,7 +57,7 @@
size="mini"
@click="handleAdd"
>新建</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
@ -65,7 +65,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@ -99,13 +98,18 @@
<template slot-scope="scope">
<el-button
v-if=" scope.row "
size="mini"
type="text"
icon="el-icon-document-checked"
@click="handleExamine(scope.row)"
v-if="Number(scope.row.examineStatusId)<33&&Number(scope.row.examineStatusId)>29"
>审批</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-document-checked"
@click="handleExamine(scope.row)"
>查看</el-button>
<el-button
size="mini"
type="text"
@ -421,9 +425,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

5
sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
View File

@ -142,7 +142,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button
>
</el-col>
@ -806,9 +805,9 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/backApply/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `退料申请单_${new Date().getTime()}.xlsx`)
},
getDialogList() {
let params = {

13
sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
View File

@ -677,10 +677,10 @@ export default {
const isNum = this.queryParams.leaseApplyDetails.some(
(item) => item.num == '' || item.num == undefined
);
if (isRemark) {
this.$message.error('备注不能为空！');
return;
}
// if (isRemark) {
// this.$message.error('备注不能为空！');
// return;
// }
if (isNum) {
this.$message.error('退料数量不能为空！');
return;
@ -692,7 +692,10 @@ export default {
message: '申请成功'
})
setTimeout(() => {
this.$router.back()
// this.$router.back()
}, 1000)
}
}

5
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -145,7 +145,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button
>
</el-col>
@ -764,9 +763,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/backApply/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `退料审核单_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

7
sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
View File

@ -105,7 +105,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button
>
</el-col>
@ -592,9 +591,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

7
sgzb-ui/src/views/claimAndRefund/returnAbnormal/returnAbnormal.vue
View File

@ -102,7 +102,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出数据</el-button
>
</el-col>
@ -492,9 +491,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

142
sgzb-ui/src/views/login.vue
View File

@ -18,17 +18,7 @@
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
</el-input>
</el-form-item>
<el-form-item prop="phone" v-if="activeName=='phone'">
<el-input
v-model="loginForm.phone"
type="text"
auto-complete="off"
placeholder="手机号"
>
<svg-icon slot="prefix" icon-class="phone" class="el-input__icon input-icon"/>
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-form-item prop="password" v-if="activeName=='account'">
<el-input
v-model="loginForm.password"
type="password"
@ -39,7 +29,7 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
</el-input>
</el-form-item>
<el-form-item prop="code" v-if="captchaEnabled">
<el-form-item prop="code" v-if="captchaEnabled && activeName=='account'">
<el-input
v-model="loginForm.code"
auto-complete="off"
@ -53,22 +43,72 @@
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
</div>
</el-form-item>
<!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>-->
<el-form-item style="width:100%;">
<el-form-item style="width:100%;" v-if="activeName=='account'">
<el-button
:loading="loading"
size="medium"
type="primary"
style="width:100%;"
@click.native.prevent="handleLogin"
>
<span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span>
</el-button>
<div style="float: right;" v-if="register">
<!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>-->
<router-link class="link-type" :to="'/register'">立即注册</router-link>
</div>
</el-form-item>
<el-form-item prop="phone" v-if="activeName=='phone'">
<el-input
v-model="loginForm.phone"
type="text"
:readonly="readonlyFlag"
@focus="handleInputClick"
auto-complete="off"
placeholder="手机号"
>
<svg-icon slot="prefix" icon-class="phone" class="el-input__icon input-icon"/>
</el-input>
</el-form-item>
<el-form-item prop="textCode" v-if="activeName=='phone'">
<el-input
v-model="loginForm.textCode"
auto-complete="off"
placeholder="验证码"
style="width: 63%"
>
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
</el-input>
<div class="login-code">
<!-- <div class="login-code-img" style="border: 1px solid rgb(220, 223, 230);" @click="getTextCode">获取验证码</div> -->
<div class="login-code-img" style="border: 1px solid rgb(220, 223, 230);" v-show="show === 1" @click="getTextCode">获取验证码</div>
<div class="login-code-img" style="border: 1px solid rgb(220, 223, 230);" v-show="show === 2">{{ count }} s</div>
<div class="login-code-img" style="border: 1px solid rgb(220, 223, 230);" v-show="show === 3" @click="getTextCode">重发</div>
</div>
</el-form-item>
<el-form-item style="width:100%;" v-if="activeName=='phone'">
<el-button
:loading="loading"
size="medium"
type="primary"
style="width:100%;"
@click.native.prevent="textLogin"
>
<span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span>
</el-button>
<div style="float: right;" v-if="register">
<!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>-->
<router-link class="link-type" :to="'/register'">立即注册</router-link>
</div>
</el-form-item>
</el-form>
</div>
</div>
@ -80,7 +120,7 @@
</template>
<script>
import {getCodeImg} from "@/api/login";
import {getCodeImg,sendCode} from "@/api/login";
import Cookies from "js-cookie";
import {encrypt, decrypt} from '@/utils/jsencrypt'
@ -90,8 +130,8 @@ export default {
return {
codeUrl: "",
loginForm: {
username: "admin",
password: "admin123",
username: "",
password: "",
phone: '',
rememberMe: false,
code: "",
@ -104,6 +144,9 @@ export default {
phone: [
{required: true, trigger: "blur", message: "请输入您的手机号"}
],
textCode: [
{required: true, trigger: "blur", message: "请输入短信验证码"}
],
password: [
{required: true, trigger: "blur", message: "请输入您的密码"}
],
@ -116,6 +159,10 @@ export default {
register: false,
redirect: undefined,
activeName: 'account',
readonlyFlag: true,
show: 1,
count: '',
timer: null
};
},
watch: {
@ -140,6 +187,67 @@ export default {
}
});
},
//防止手机号自动充填
handleInputClick(){
this.readonlyFlag = false
},
//获取短信验证码
getTextCode() {
const regExp = /^1[3456789]\d{9}$/;
if (regExp.test(this.loginForm.phone)) {
console.log('手机号格式正确');
sendCode({phone:this.loginForm.phone}).then(res => {
if(res.code==200){
this.$modal.msgSuccess("发送成功");
const TIME_COUNT = 10
if (!this.timer) {
this.count = TIME_COUNT
this.show = 2
this.timer = setInterval(() => {
if (this.count > 0 && this.count <= TIME_COUNT) {
this.count--
} else {
this.show = 3
clearInterval(this.timer)
this.timer = null
}
}, 1000)
}
}
});
} else {
this.$modal.msgError("手机号格式不正确");
}
},
textLogin(){
// checkCode
console.log(this.loginForm)
this.$refs.loginForm.validate(valid => {
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, {expires: 30});
Cookies.set("password", encrypt(this.loginForm.password), {expires: 30});
Cookies.set('rememberMe', this.loginForm.rememberMe, {expires: 30});
} else {
Cookies.remove("username");
Cookies.remove("password");
Cookies.remove('rememberMe');
}
console.log(this.loginForm)
this.$store.dispatch("textLogin", this.loginForm).then(() => {
this.$router.push({path: this.redirect || "/"}).catch(() => {
});
}).catch(() => {
this.loading = false;
});
}
});
},
getCookie() {
const username = Cookies.get("username");
const password = Cookies.get("password");

5
sgzb-ui/src/views/repairTest/brokenExamine/index.vue
View File

@ -139,7 +139,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button
>
</el-col>
@ -809,9 +808,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/scrap/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `报废审核_${new Date().getTime()}.xlsx`)
},
}
};

12
sgzb-ui/src/views/repairTest/repair/index.vue
View File

@ -132,17 +132,15 @@
>提交审核</el-button
>
</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-hasPermi="['store:labelType:export']"
>导出</el-button
>
</el-col> -->
>导出</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
@ -858,11 +856,11 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
"system/dict/type/export",
"base/repair/export",
{
...this.queryParams,
},
`type_${new Date().getTime()}.xlsx`
`维修单_${new Date().getTime()}.xlsx`
);
},
internalRepair(row) {

4
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

@ -808,9 +808,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/details/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `试验检验单_${new Date().getTime()}.xlsx`)
},
}
};

6
sgzb-ui/src/views/store/label/labelBindingHistory.vue
View File

@ -410,9 +410,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

129
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
View File

@ -104,6 +104,7 @@
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.purchasingStatus!='已入库'&&scope.row.purchasingStatus!='已验收合格'"
@click="handleAccept(scope.row)"
>验收</el-button>
<el-button
@ -113,10 +114,19 @@
v-if="scope.row.purchasingStatus=='已验收合格'"
@click="handleCode(scope.row)"
>编码管理</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.purchasingStatus=='已验收合格'||scope.row.purchasingStatus=='已入库'"
@click="handlePrint(scope.row)"
>验收单</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="scope.row.purchasingStatus!='已入库'"
@click="handleDelete(scope.row)"
>删除</el-button>
</template>
@ -155,17 +165,104 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 验收单弹窗 -->
<el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body>
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
到货验收单
</div>
<div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>工程名称：</span>
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>验收单编号：</span>{{ printData.code }}
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>合同名称：</span>
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>合同编号：</span>
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>验收地点：</span>
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>供应商：</span><span v-if="printTableData.length>0">{{ printTableData[0].supplier }}</span>
</div>
</div>
<el-table :data="printTableData" class="table" style="margin-top: 20px" height="400">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="类型名称" align="center" prop="machineTypeName" />
<el-table-column label="规格型号" align="center" prop="specificationType" />
<el-table-column label="计量单位" align="center" prop="" />
<el-table-column label="采购数量" align="center" prop="purchaseNum" />
<el-table-column label="已验收数量" align="center" prop="" />
<el-table-column label="本次验收数量" align="center" prop="checkNum" />
<el-table-column label="累积验收数量" align="center" prop="" />
<el-table-column label="验收日期" align="center" prop="" />
<el-table-column label="合格证及技术资料" align="center" prop="" />
<el-table-column label="包装" align="center" prop="" />
</el-table>
<div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;">
<div class="item" style="width: 50%;">
<div>
<span>接收单位验收意见：</span>
</div>
<div>
<span>验收人：</span>
</div>
<div>
<span>接收单位（章）：</span>
</div>
<div>
<span>验收负责人： 年 月 日</span>
</div>
</div>
<div class="item" style="width: 50%;">
<div>
<span>供应商：</span>
</div>
<div>
<span>供应商（章）：</span>
</div>
<div>
<span>验收负责人： 年 月 日</span>
</div>
</div>
<!-- <div class="item" style="width: 25%;">
<span>经办人：</span>
</div> -->
</div>
</vue-easy-print>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="print">打 印</el-button>
<el-button @click="openPrint = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { listPurchaseCheckInfo } from "@/api/store/newBuy";
import { listPurchaseCheckInfo,getPurchaseCheckInfo } from "@/api/store/newBuy";
import vueEasyPrint from 'vue-easy-print';
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
components:{vueEasyPrint},
data() {
return {
// 遮罩层
@ -194,6 +291,9 @@ export default {
pageSize: 10,
name: undefined,
},
openPrint: false,
printData:{},
printTableData:[],
// 表单参数
form: {},
// 表单校验
@ -303,12 +403,31 @@ export default {
let query = { taskId:row.taskId }
this.$router.replace({ path: "/store/newBuy/newDevicesAccept", query });
},
//编码管理
handleCode(row) {
let query = { taskId:row.taskId }
this.$router.replace({ path: "/store/newBuy/newDevicesCode", query });
},
//获取验收单数据
getPrintTable(taskId){
getPurchaseCheckInfo({taskId:taskId}).then(response => {
this.printData = response.data;
this.printTableData = response.data.checkDetailsList;
}
);
},
//查看验收单
handlePrint(row) {
// this.query.taskId = row.taskId
this.getPrintTable(row.taskId)
this.openPrint = true
this.title = "宁夏送变电工程有限公司";
},
//打印
print(){
this.$refs.remarksPrintRef.print();
},
/** 删除按钮操作 */
@ -323,9 +442,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/purchaseCheckInfo/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `新购工机具验收_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

162
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -65,7 +65,6 @@
icon="el-icon-plus"
size="mini"
:disabled="single"
@click="handleAdd"
v-hasPermi="['system:dict:add']"
>入库审核</el-button>
</el-col> -->
@ -91,7 +90,7 @@
<!-- v-hasPermi="['system:dict:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="warning"
plain
@ -100,7 +99,7 @@
@click="handleExport"
v-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -114,7 +113,8 @@
<el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
<el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true" width="250"/>
<el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="发布人员" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="入库时间" align="center" prop="updateTime" :show-overflow-tooltip="true"/>
<el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="taskStatus">
@ -132,6 +132,13 @@
icon="el-icon-edit"
@click="handleView(scope.row)"
>查看</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="scope.row.taskStatus=='28'"
@click="handlePrint(scope.row)"
>入库单</el-button>
<el-button
size="mini"
type="text"
@ -158,10 +165,7 @@
@pagination="getList"
/>
<!-- 添加或修改参数配置对话框 -->
<!--审批对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="关键字" prop="dictName">
@ -303,6 +307,63 @@
</el-dialog>
<!-- 入库单弹窗 -->
<el-dialog :visible.sync="openPrint" width="800px" append-to-body>
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
入库单
</div>
<div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;">
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>工程名称：</span>{{ printData.unitName }}
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>日期：</span>{{ printData.proName }}
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>领料单号</span>{{ printData.updateTimes }}
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>车辆信息：</span>{{ printData.agreementCode }}
</div>
</div>
<el-table :data="printTableData" class="table" style="margin-top: 20px" height="400">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="类型名称" align="center" prop="typeName" />
<el-table-column label="规格型号" align="center" prop="specificationType" />
<el-table-column label="计量单位" align="center" prop="" />
<el-table-column label="数量" align="center" prop="checkNum" />
<el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="出库方式" align="center" prop="manageTypeName" /> -->
</el-table>
<div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;">
<div class="item" style="width: 25%;">
<span>审核：</span>
</div>
<div class="item" style="width: 25%;">
<span>库管员：</span>
</div>
<div class="item" style="width: 25%;">
<span>经办人：</span>
</div>
</div>
</vue-easy-print>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="print">打 印</el-button>
<el-button @click="openPrint = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
@ -310,9 +371,11 @@
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { getRepairedDetailList, inputByType } from "@/api/store/warehousing";
import { getPutInList,getPutinDetailsList ,changePutinStatus} from "@/api/store/newBuy";
import vueEasyPrint from 'vue-easy-print';
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
components:{vueEasyPrint},
data() {
return {
// 遮罩层
@ -339,6 +402,9 @@ export default {
title: "",
// 是否显示弹出层
open: false,
openPrint: false,
printData:{},
printTableData:[],
showHandle: true,
// 日期范围
dateRange: [],
@ -353,7 +419,6 @@ export default {
query: {
pageNum: 1,
pageSize: 10,
},
// 表单参数
form: {},
@ -425,12 +490,7 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
// this.reset();
this.open = true;
this.title = "添加字典类型";
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item)
@ -446,14 +506,8 @@ export default {
this.showHandle = true
this.title = "审核";
},
//查看
handleView(row) {
this.query.taskId = row.taskId
this.getDialogTable()
this.open = true;
this.showHandle = false
this.title = "查看";
},
//通过
pass(row) {
console.log(row)
console.log(this.query.taskId)
@ -504,7 +558,7 @@ export default {
}
});
},
//拒绝
refused(row) {
console.log(row)
console.log(this.query.taskId)
@ -556,7 +610,6 @@ export default {
}
});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
@ -577,6 +630,34 @@ export default {
}
});
},
//查看操作
handleView(row) {
this.query.taskId = row.taskId
this.getDialogTable()
this.open = true;
this.showHandle = false
this.title = "查看";
},
//获取入库单数据
getPrintTable(taskId){
getPutinDetailsList({taskId:taskId}).then(response => {
this.printTableData = response.rows;
// this.dialogTotal = response.total;
}
);
},
//查看入库单
handlePrint(row) {
this.query.taskId = row.taskId
this.getPrintTable(row.taskId)
this.openPrint = true
this.title = "入库单";
},
//打印
print(){
this.$refs.remarksPrintRef.print();
},
/** 删除按钮操作 */
handleDelete(row) {
const dictIds = row.dictId || this.ids;
@ -589,9 +670,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/purchaseCheckInfo/putInExport', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `新购工机具入库_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {
@ -603,3 +684,30 @@ export default {
}
};
</script>
<style lang="scss" scoped>
.print{
.title{
text-align: center;
font-weight: 600;
font-size: 16px;
}
.info{
margin-top: 10px;
display: flex;
flex-wrap: wrap;
.item{
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
}
}
.fillIn{
margin-top: 15px;
display: flex;
justify-content: space-between;
}
}
</style>

33
sgzb-ui/src/views/store/shelves/shelvesConfig.vue
View File

@ -43,6 +43,13 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-form-item>
</el-form>
@ -89,16 +96,16 @@
<!-- v-hasPermi="['system:user:import']"-->
<!-- >导入</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['system:user:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
</el-row>
@ -528,9 +535,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/user/export', {
...this.queryParams
}, `user_${new Date().getTime()}.xlsx`)
// this.download('system/user/export', {
// ...this.queryParams
// }, `user_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {

13
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -83,6 +83,13 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-form-item>
</el-form>
@ -582,9 +589,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
}

11
sgzb-ui/src/views/store/tools/keeper.vue
View File

@ -93,7 +93,7 @@
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
</el-col>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
@ -101,9 +101,8 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
@ -580,9 +579,9 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download('system/user/export', {
...this.queryParams
}, `user_${new Date().getTime()}.xlsx`)
// this.download('system/user/export', {
// ...this.queryParams
// }, `user_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {

15
sgzb-ui/src/views/store/tools/repair.vue
View File

@ -104,6 +104,15 @@
v-hasPermi="['system:user:export']"
>导出</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
@ -580,9 +589,9 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download('system/user/export', {
...this.queryParams
}, `user_${new Date().getTime()}.xlsx`)
// this.download('system/user/export', {
// ...this.queryParams
// }, `user_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {

11
sgzb-ui/src/views/store/tools/toolsSupplier.vue
View File

@ -50,16 +50,15 @@
<!-- v-hasPermi="['store:labelType:remove']"-->
<!-- >删除</el-button>-->
<!-- </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-hasPermi="['store:labelType:export']"
>导出</el-button>
</el-col> -->
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
@ -373,9 +372,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

7
sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
View File

@ -99,7 +99,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -462,9 +461,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
// this.download('system/dict/type/export', {
// ...this.queryParams
// }, `type_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

9
sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
View File

@ -92,16 +92,15 @@
<!-- v-hasPermi="['system:dict:remove']"-->
<!-- >删除</el-button>-->
<!-- </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-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -467,9 +466,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/returnOfMaterialsInfo/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `机具退料入库_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

9
sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
View File

@ -91,16 +91,15 @@
<!-- v-hasPermi="['system:dict:remove']"-->
<!-- >删除</el-button>-->
<!-- </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-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col> -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -594,9 +593,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('system/dict/type/export', {
this.download('material/RepairTestInput/export', {
...this.queryParams
}, `type_${new Date().getTime()}.xlsx`)
}, `修试入库_${new Date().getTime()}.xlsx`)
},
/** 刷新缓存按钮操作 */
handleRefreshCache() {

7
sgzb-ui/vue.config.js
View File

@ -35,11 +35,12 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//192.168.0.14
target: `http://112.29.103.165:21624`,//线上环境
// target: `http://112.29.103.165:21626`,//线上环境-重庆
target: `http://112.29.103.165:21624`,//线上环境-宁夏
// target: `http://192.168.0.14:21624`,//线上环境
// target: `http://192.168.5.12:8080`,//丁
// target: `http://10.40.92.102:8080`,//丁/
// target: `http://10.40.92.21:8080`,
// target: `http://10.40.92.126:8080`,//高
// target: `http://10.40.92.104:8080`,//亮
// target: `http://192.168.0.166:8080`,//刘川