优化日期查询 重置清空查询问题

This commit is contained in:
BianLzhaoMin 2024-04-11 11:30:14 +08:00
parent ab0426e0f8
commit ffaf9ccc18
7 changed files with 2308 additions and 1619 deletions

View File

@ -414,7 +414,7 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.queryParams.time = []
this.resetForm('queryForm') this.resetForm('queryForm')
this.handleQuery() this.handleQuery()
}, },

View File

@ -1,6 +1,13 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="80px"
>
<el-form-item label="申请日期" prop="time"> <el-form-item label="申请日期" prop="time">
<el-date-picker <el-date-picker
v-model="queryParams.time" v-model="queryParams.time"
@ -8,26 +15,43 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="往来单位" prop="unitId"> <el-form-item label="往来单位" prop="unitId">
<el-select v-model="queryParams.unitId" filterable clearable @change="GetProData" style="width: 240px" placeholder="请选择"> <el-select
v-model="queryParams.unitId"
filterable
clearable
@change="GetProData"
style="width: 240px"
placeholder="请选择"
>
<el-option <el-option
v-for="item in unitList" v-for="item in unitList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程名称" prop="proId"> <el-form-item label="工程名称" prop="proId">
<el-select v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择"> <el-select
v-model="queryParams.proId"
filterable
clearable
@change="GetUnitData"
style="width: 240px"
placeholder="请选择"
>
<el-option <el-option
v-for="item in proList" v-for="item in proList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -41,10 +65,20 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-form-item> </el-form-item>
</el-form> </el-form>
@ -65,7 +99,8 @@
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--> <!-- <el-button-->
@ -77,74 +112,164 @@
<!-- v-hasPermi="['store:labelType:remove']"--> <!-- v-hasPermi="['store:labelType:remove']"-->
<!-- >刷新缓存</el-button>--> <!-- >刷新缓存</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="leaseAuditList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="leaseAuditList"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> label="领料单号"
<el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" /> align="center"
<el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" /> prop="code"
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" /> />
<el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" /> label="领料单位"
<el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" /> align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料工程"
align="center"
prop="proName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="协议号"
align="center"
prop="agreementCode"
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料人"
align="center"
prop="leasePerson"
:show-overflow-tooltip="true"
/>
<el-table-column
label="联系电话"
align="center"
prop="leasePhone"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请人"
align="center"
prop="applyFor"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请时间"
align="center"
prop="createTimes"
:show-overflow-tooltip="true"
/>
<el-table-column
label="任务状态"
align="center"
prop="taskName"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />--> <!-- <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
<el-table-column label="备注" align="center" :show-overflow-tooltip="true"> <el-table-column
label="备注"
align="center"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.leaseApplyInfoList[0].remark }}</span> <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width" fixed="right"> <el-table-column
label="操作"
align="left"
width="250"
class-name="small-padding fixed-width"
fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" @click="handleView(scope.row)"
size="mini" >查看</el-button
@click="handleView(scope.row)" >
>查看</el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:fgs']" v-hasPermi="['receive:examine:fgs']"
v-if="Number(scope.row.examineStatusId) == 30" v-if="Number(scope.row.examineStatusId) == 30"
>审批</el-button> >审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:sgb']" v-hasPermi="['receive:examine:sgb']"
v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='8'||scope.row.leaseApplyInfoList[0].status=='6')" v-if="
>审批</el-button> Number(scope.row.examineStatusId) == 31 &&
(scope.row.leaseApplyInfoList[0].status == '0' ||
scope.row.leaseApplyInfoList[0].status == '7' ||
scope.row.leaseApplyInfoList[0].status == '8' ||
scope.row.leaseApplyInfoList[0].status == '6')
"
>审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:ajb']" v-hasPermi="['receive:examine:ajb']"
v-if="Number(scope.row.examineStatusId)==31 && (scope.row.leaseApplyInfoList[0].status=='0'||scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='6'||scope.row.leaseApplyInfoList[0].status=='8')" v-if="
>审批</el-button> Number(scope.row.examineStatusId) == 31 &&
(scope.row.leaseApplyInfoList[0].status == '0' ||
scope.row.leaseApplyInfoList[0].status == '5' ||
scope.row.leaseApplyInfoList[0].status == '6' ||
scope.row.leaseApplyInfoList[0].status == '8')
"
>审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row, 'jjfgs')" @click="handleExamine(scope.row, 'jjfgs')"
v-hasPermi="['receive:examine:nbry-jjfgs']" v-hasPermi="['receive:examine:nbry-jjfgs']"
v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')" v-if="
>审批</el-button> Number(scope.row.examineStatusId) == 32 &&
(scope.row.leaseApplyInfoList[0].status == '5' ||
scope.row.leaseApplyInfoList[0].status == '7' ||
scope.row.leaseApplyInfoList[0].status == '4' ||
scope.row.leaseApplyInfoList[0].status == '2')
"
>审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row, 'sbfgs')" @click="handleExamine(scope.row, 'sbfgs')"
v-hasPermi="['receive:examine:nbry-sbfgs']" v-hasPermi="['receive:examine:nbry-sbfgs']"
v-if="Number(scope.row.examineStatusId)==32 && (scope.row.leaseApplyInfoList[0].status=='5'||scope.row.leaseApplyInfoList[0].status=='7'||scope.row.leaseApplyInfoList[0].status=='4'||scope.row.leaseApplyInfoList[0].status=='2')" v-if="
>审批</el-button> Number(scope.row.examineStatusId) == 32 &&
(scope.row.leaseApplyInfoList[0].status == '5' ||
scope.row.leaseApplyInfoList[0].status == '7' ||
scope.row.leaseApplyInfoList[0].status == '4' ||
scope.row.leaseApplyInfoList[0].status == '2')
"
>审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="info" type="info"
@click="openLld(scope.row)" @click="openLld(scope.row)"
>领料单</el-button> >领料单</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -159,52 +284,132 @@
<!-- 领料单弹窗 --> <!-- 领料单弹窗 -->
<el-dialog :visible.sync="open" width="800px" append-to-body> <el-dialog :visible.sync="open" width="800px" append-to-body>
<div style="height: 500px;overflow-y: scroll;padding: 0 20px;"> <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
<vue-easy-print tableShow ref="remarksPrintRef" class="print"> <vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div class="title" style="text-align: center;font-weight: 600;font-size: 16px;"> <div
class="title"
style="
text-align: center;
font-weight: 600;
font-size: 16px;
"
>
领料单 领料单
</div> </div>
<div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;"> <div
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> 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>{{ leaseApplyData.unitName }} <span>领料单位</span>{{ leaseApplyData.unitName }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>工程名称</span>{{ leaseApplyData.proName }} <span>工程名称</span>{{ leaseApplyData.proName }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>时间</span>{{ leaseApplyData.updateTimes }} <span>时间</span>{{ leaseApplyData.updateTimes }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>编号</span>{{ leaseApplyData.code }} <span>编号</span>{{ leaseApplyData.code }}
</div> </div>
</div> </div>
<el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px;padding: 1px"> <el-table
:data="leaseApplyDetails"
class="table"
border
style="margin-top: 20px; padding: 1px"
>
<!-- <el-table-column type="selection" width="55" align="center" />--> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" /> <el-table-column
<el-table-column label="类型名称" align="center" prop="typeName" /> label="序号"
<el-table-column label="规格型号" align="center" prop="typeModelName" /> align="center"
<el-table-column label="计量单位" align="center" prop="unitName" /> type="index"
<el-table-column label="预领数量" align="center" prop="preNum" /> />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column
<el-table-column label="出库方式" align="center" prop="manageTypeName" /> label="类型名称"
align="center"
prop="typeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeModelName"
/>
<el-table-column
label="计量单位"
align="center"
prop="unitName"
/>
<el-table-column
label="预领数量"
align="center"
prop="preNum"
/>
<el-table-column
label="备注"
align="center"
prop="remark"
/>
<el-table-column
label="出库方式"
align="center"
prop="manageTypeName"
/>
</el-table> </el-table>
<div class="fillIn" style="margin-top: 30px;display: flex;justify-content: space-between;"> <div
<div class="item" style="width: 25%;"> class="fillIn"
style="
margin-top: 30px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 25%">
<span>审核</span> <span>审核</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<span>领料</span> <span>领料</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<span>仓库</span> <span>仓库</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<span>操作人</span> <span>操作人</span>
</div> </div>
</div> </div>
</vue-easy-print> </vue-easy-print>
</div> </div>
<div slot="footer" class="dialog-footer" style="text-align: center"> <div slot="footer" class="dialog-footer" style="text-align: center">
@ -212,18 +417,26 @@
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import {
import { getLeaseManageListAll, getUnitData, getProData, getLeaseListAll } from '@/api/claimAndRefund/receive' listType,
getType,
delType,
addType,
updateType,
refreshCache,
} from '@/api/system/dict/type'
import {
getLeaseManageListAll,
getUnitData,
getProData,
getLeaseListAll,
} from '@/api/claimAndRefund/receive'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import vueEasyPrint from 'vue-easy-print'; import vueEasyPrint from 'vue-easy-print'
export default { export default {
// name: "ReceiveManage", // name: "ReceiveManage",
data() { data() {
@ -243,7 +456,7 @@ export default {
// //
typeList: [], typeList: [],
// //
title: "", title: '',
// //
open: false, open: false,
// //
@ -260,7 +473,7 @@ export default {
pageSize: 10, pageSize: 10,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined status: undefined,
}, },
user: {}, user: {},
unitList: [], unitList: [],
@ -273,29 +486,41 @@ export default {
// //
rules: { rules: {
dictName: [ dictName: [
{ required: true, message: "字典名称不能为空", trigger: "blur" } {
required: true,
message: '字典名称不能为空',
trigger: 'blur',
},
], ],
dictType: [ dictType: [
{ required: true, message: "字典类型不能为空", trigger: "blur" } {
] required: true,
message: '字典类型不能为空',
trigger: 'blur',
},
],
}, },
peopleOpen: false, peopleOpen: false,
noticeOpen: false, noticeOpen: false,
nform: { nform: {
notice:'' notice: '',
}, },
nrules: { nrules: {
notice: [ notice: [
{ required: true, message: "通知内容不能为空", trigger: "blur" } {
] required: true,
message: '通知内容不能为空',
trigger: 'blur',
},
],
}, },
deptName: undefined, deptName: undefined,
// //
leaseApplyDetails: [], leaseApplyDetails: [],
// //
leaseApplyData:{} leaseApplyData: {},
}; }
}, },
created() { created() {
this.GetUserInfo() this.GetUserInfo()
@ -311,27 +536,28 @@ export default {
const res = await getInfo() const res = await getInfo()
this.user = res.user this.user = res.user
// console.log(this.user) // console.log(this.user)
this.getList(); this.getList()
}, },
/** 查询列表 */ /** 查询列表 */
async getList() { async getList() {
this.loading = true; this.loading = true
const params = { const params = {
unitId: this.queryParams.unitId, unitId: this.queryParams.unitId,
projectId: this.queryParams.proId, projectId: this.queryParams.proId,
keyWord: this.queryParams.keyword, keyWord: this.queryParams.keyword,
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],
types: this.queryParams.types, types: this.queryParams.types,
souceBy: 0, souceBy: 0,
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum pageNum: this.queryParams.pageNum,
} }
const res = await getLeaseManageListAll(params) const res = await getLeaseManageListAll(params)
this.loading = false; this.loading = false
console.log('getList ============', res) console.log('getList ============', res)
this.leaseAuditList = res.data.rows; this.leaseAuditList = res.data.rows
// this.leaseAuditList.forEach((item,index)=>{ // this.leaseAuditList.forEach((item,index)=>{
// console.log(item.leaseApplyInfoList) // console.log(item.leaseApplyInfoList)
// if(item.leaseApplyInfoList.length>0){ // if(item.leaseApplyInfoList.length>0){
@ -343,13 +569,13 @@ export default {
// }) // })
console.log(this.leaseAuditList) console.log(this.leaseAuditList)
this.total = res.data.total; this.total = res.data.total
}, },
// //
async GetUnitData() { async GetUnitData() {
const params = { const params = {
id:this.queryParams.proId id: this.queryParams.proId,
} }
const res = await getUnitData(params) const res = await getUnitData(params)
this.unitList = res.data this.unitList = res.data
@ -357,17 +583,16 @@ export default {
// //
async GetProData() { async GetProData() {
const params = { const params = {
id:this.queryParams.unitId id: this.queryParams.unitId,
} }
const res = await getProData(params) const res = await getProData(params)
this.proList = res.data this.proList = res.data
}, },
// //
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// //
reset() { reset() {
@ -375,24 +600,24 @@ export default {
dictId: undefined, dictId: undefined,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: "0", status: '0',
remark: undefined remark: undefined,
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = []; this.queryParams.time = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
handleNotice() { handleNotice() {
this.noticeOpen = true; this.noticeOpen = true
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
@ -403,19 +628,19 @@ export default {
}, },
handleExamine(row, type) { handleExamine(row, type) {
this.$tab.closeOpenPage({ this.$tab.closeOpenPage({
path:"/claimAndRefund/receive/receiveExamine", path: '/claimAndRefund/receive/receiveExamine',
query: { query: {
taskId:row.taskId taskId: row.taskId,
} },
}); })
}, },
handleView(row) { handleView(row) {
this.$tab.closeOpenPage({ this.$tab.closeOpenPage({
path:"/claimAndRefund/receive/receiveExamine?isView=true", path: '/claimAndRefund/receive/receiveExamine?isView=true',
query: { query: {
taskId:row.taskId taskId: row.taskId,
} },
}); })
}, },
// //
async openLld(row) { async openLld(row) {
@ -426,79 +651,88 @@ export default {
this.leaseApplyDetails = res.rows[0].leaseApplyDetails this.leaseApplyDetails = res.rows[0].leaseApplyDetails
this.leaseApplyData = res.rows[0] this.leaseApplyData = res.rows[0]
console.log('this.leaseApplyData ============',this.leaseApplyData) console.log(
'this.leaseApplyData ============',
this.leaseApplyData,
)
}, },
// //
print() { print() {
this.$refs.remarksPrintRef.print(); this.$refs.remarksPrintRef.print()
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.dictId) this.ids = selection.map((item) => item.dictId)
this.single = selection.length != 1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
const dictId = row.dictId || this.ids const dictId = row.dictId || this.ids
getType(dictId).then(response => { getType(dictId).then((response) => {
this.form = response.data; this.form = response.data
this.open = true; this.open = true
this.title = "验收"; this.title = '验收'
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if (this.form.dictId != undefined) { if (this.form.dictId != undefined) {
updateType(this.form).then(response => { updateType(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addType(this.form).then(response => { addType(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const dictIds = row.dictId || this.ids; const dictIds = row.dictId || this.ids
this.$modal.confirm('是否确认删除该数据项?').then(function() { this.$modal
return delType(dictIds); .confirm('是否确认删除该数据项?')
}).then(() => { .then(function () {
this.getList(); return delType(dictIds)
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('base/tm_task/applyExport', { this.download(
...this.queryParams 'base/tm_task/applyExport',
}, `领料审批单_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`领料审批单_${new Date().getTime()}.xlsx`,
)
}, },
/** 刷新缓存按钮操作 */ /** 刷新缓存按钮操作 */
handleRefreshCache() { handleRefreshCache() {
refreshCache().then(() => { refreshCache().then(() => {
this.$modal.msgSuccess("刷新成功"); this.$modal.msgSuccess('刷新成功')
this.$store.dispatch('dict/cleanDict'); this.$store.dispatch('dict/cleanDict')
}); })
},
},
} }
}
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.print { .print {
.title { .title {
text-align: center; text-align: center;

View File

@ -1,6 +1,13 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="80px"
>
<el-form-item label="申请日期" prop="time"> <el-form-item label="申请日期" prop="time">
<el-date-picker <el-date-picker
v-model="queryParams.time" v-model="queryParams.time"
@ -8,26 +15,43 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="往来单位" prop="unitId"> <el-form-item label="往来单位" prop="unitId">
<el-select v-model="queryParams.unitId" filterable clearable @change="GetProData" style="width: 240px" placeholder="请选择"> <el-select
v-model="queryParams.unitId"
filterable
clearable
@change="GetProData"
style="width: 240px"
placeholder="请选择"
>
<el-option <el-option
v-for="item in unitList" v-for="item in unitList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程名称" prop="proId"> <el-form-item label="工程名称" prop="proId">
<el-select v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择"> <el-select
v-model="queryParams.proId"
filterable
clearable
@change="GetUnitData"
style="width: 240px"
placeholder="请选择"
>
<el-option <el-option
v-for="item in proList" v-for="item in proList"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -41,10 +65,20 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-form-item> </el-form-item>
</el-form> </el-form>
@ -65,7 +99,8 @@
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--> <!-- <el-button-->
@ -77,61 +112,137 @@
<!-- v-hasPermi="['store:labelType:remove']"--> <!-- v-hasPermi="['store:labelType:remove']"-->
<!-- >刷新缓存</el-button>--> <!-- >刷新缓存</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="leaseAuditList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="leaseAuditList"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true"> label="领料单号"
align="center"
prop="code"
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料类型"
align="center"
prop="leaseType"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.leaseType == 0">工程租赁</span> <span v-if="scope.row.leaseType == 0">工程租赁</span>
<span v-if="scope.row.leaseType == 1">长期领用</span> <span v-if="scope.row.leaseType == 1">长期领用</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" /> label="领料单位"
<el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" /> align="center"
<el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" /> prop="unitName"
<el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" /> />
<el-table-column label="预计领料时间" align="center" prop="estimateLeaseTime" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" /> label="领料工程"
<el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" /> align="center"
prop="proName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="协议号"
align="center"
prop="agreementCode"
:show-overflow-tooltip="true"
/>
<el-table-column
label="领料人"
align="center"
prop="leasePerson"
:show-overflow-tooltip="true"
/>
<el-table-column
label="联系电话"
align="center"
prop="leasePhone"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请人"
align="center"
prop="applyFor"
:show-overflow-tooltip="true"
/>
<el-table-column
label="预计领料时间"
align="center"
prop="estimateLeaseTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请时间"
align="center"
prop="createTimes"
:show-overflow-tooltip="true"
/>
<el-table-column
label="任务状态"
align="center"
prop="taskName"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />--> <!-- <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
<el-table-column label="备注" align="center" :show-overflow-tooltip="true"> <el-table-column
label="备注"
align="center"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.leaseApplyInfoList[0].remark }}</span> <span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="left" width="250" class-name="small-padding fixed-width" fixed="right"> <el-table-column
label="操作"
align="left"
width="250"
class-name="small-padding fixed-width"
fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" @click="handleView(scope.row)"
size="mini" >查看</el-button
@click="handleView(scope.row)" >
>查看</el-button>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:fgs']" v-hasPermi="['receive:examine:fgs']"
v-if="Number(scope.row.examineStatusId)==31||Number(scope.row.examineStatusId)==117" v-if="
>审批</el-button> Number(scope.row.examineStatusId) == 31 ||
Number(scope.row.examineStatusId) == 117
"
>审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:nbs']" v-hasPermi="['receive:examine:nbs']"
v-if="Number(scope.row.examineStatusId) == 32" v-if="Number(scope.row.examineStatusId) == 32"
>审批</el-button> >审批</el-button
>
<el-button <el-button
size="mini" size="mini"
type="info" type="info"
@click="openLld(scope.row)" @click="openLld(scope.row)"
>领料单</el-button> >领料单</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -146,52 +257,132 @@
<!-- 领料单弹窗 --> <!-- 领料单弹窗 -->
<el-dialog :visible.sync="open" width="800px" append-to-body> <el-dialog :visible.sync="open" width="800px" append-to-body>
<div style="height: 500px;overflow-y: scroll;padding: 0 20px;"> <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
<vue-easy-print tableShow ref="remarksPrintRef" class="print"> <vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div class="title" style="text-align: center;font-weight: 600;font-size: 16px;"> <div
class="title"
style="
text-align: center;
font-weight: 600;
font-size: 16px;
"
>
领料单 领料单
</div> </div>
<div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;"> <div
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> 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>{{ leaseApplyData.unitName }} <span>领料单位</span>{{ leaseApplyData.unitName }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>工程名称</span>{{ leaseApplyData.proName }} <span>工程名称</span>{{ leaseApplyData.proName }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>时间</span>{{ leaseApplyData.updateTimes }} <span>时间</span>{{ leaseApplyData.updateTimes }}
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>编号</span>{{ leaseApplyData.code }} <span>编号</span>{{ leaseApplyData.code }}
</div> </div>
</div> </div>
<el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px;padding: 1px"> <el-table
:data="leaseApplyDetails"
class="table"
border
style="margin-top: 20px; padding: 1px"
>
<!-- <el-table-column type="selection" width="55" align="center" />--> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" /> <el-table-column
<el-table-column label="类型名称" align="center" prop="typeName" /> label="序号"
<el-table-column label="规格型号" align="center" prop="typeModelName" /> align="center"
<el-table-column label="计量单位" align="center" prop="unitName" /> type="index"
<el-table-column label="预领数量" align="center" prop="preNum" /> />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column
<el-table-column label="出库方式" align="center" prop="manageTypeName" /> label="类型名称"
align="center"
prop="typeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeModelName"
/>
<el-table-column
label="计量单位"
align="center"
prop="unitName"
/>
<el-table-column
label="预领数量"
align="center"
prop="preNum"
/>
<el-table-column
label="备注"
align="center"
prop="remark"
/>
<el-table-column
label="出库方式"
align="center"
prop="manageTypeName"
/>
</el-table> </el-table>
<div class="fillIn" style="margin-top: 30px;display: flex;justify-content: space-between;"> <div
<div class="item" style="width: 25%;"> class="fillIn"
style="
margin-top: 30px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 25%">
<span>审核</span> <span>审核</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<span>领料</span> <span>领料</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<span>仓库</span> <span>仓库</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<span>操作人</span> <span>操作人</span>
</div> </div>
</div> </div>
</vue-easy-print> </vue-easy-print>
</div> </div>
<div slot="footer" class="dialog-footer" style="text-align: center"> <div slot="footer" class="dialog-footer" style="text-align: center">
@ -199,18 +390,26 @@
<el-button @click="open = false"> </el-button> <el-button @click="open = false"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import {
import { getLeaseManageListAllCq, getUnitData, getProData, getLeaseListAllCq } from '@/api/claimAndRefund/receive' listType,
getType,
delType,
addType,
updateType,
refreshCache,
} from '@/api/system/dict/type'
import {
getLeaseManageListAllCq,
getUnitData,
getProData,
getLeaseListAllCq,
} from '@/api/claimAndRefund/receive'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import vueEasyPrint from 'vue-easy-print'; import vueEasyPrint from 'vue-easy-print'
export default { export default {
// name: "ReceiveManage", // name: "ReceiveManage",
data() { data() {
@ -230,7 +429,7 @@ export default {
// //
typeList: [], typeList: [],
// //
title: "", title: '',
// //
open: false, open: false,
// //
@ -247,7 +446,7 @@ export default {
pageSize: 10, pageSize: 10,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined status: undefined,
}, },
user: {}, user: {},
unitList: [], unitList: [],
@ -260,29 +459,41 @@ export default {
// //
rules: { rules: {
dictName: [ dictName: [
{ required: true, message: "字典名称不能为空", trigger: "blur" } {
required: true,
message: '字典名称不能为空',
trigger: 'blur',
},
], ],
dictType: [ dictType: [
{ required: true, message: "字典类型不能为空", trigger: "blur" } {
] required: true,
message: '字典类型不能为空',
trigger: 'blur',
},
],
}, },
peopleOpen: false, peopleOpen: false,
noticeOpen: false, noticeOpen: false,
nform: { nform: {
notice:'' notice: '',
}, },
nrules: { nrules: {
notice: [ notice: [
{ required: true, message: "通知内容不能为空", trigger: "blur" } {
] required: true,
message: '通知内容不能为空',
trigger: 'blur',
},
],
}, },
deptName: undefined, deptName: undefined,
// //
leaseApplyDetails: [], leaseApplyDetails: [],
// //
leaseApplyData:{} leaseApplyData: {},
}; }
}, },
created() { created() {
this.GetUserInfo() this.GetUserInfo()
@ -298,27 +509,28 @@ export default {
const res = await getInfo() const res = await getInfo()
this.user = res.user this.user = res.user
// console.log(this.user) // console.log(this.user)
this.getList(); this.getList()
}, },
/** 查询列表 */ /** 查询列表 */
async getList() { async getList() {
this.loading = true; this.loading = true
const params = { const params = {
unitId: this.queryParams.unitId, unitId: this.queryParams.unitId,
projectId: this.queryParams.proId, projectId: this.queryParams.proId,
keyWord: this.queryParams.keyword, keyWord: this.queryParams.keyword,
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],
types: this.queryParams.types, types: this.queryParams.types,
souceBy: 0, souceBy: 0,
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum pageNum: this.queryParams.pageNum,
} }
const res = await getLeaseManageListAllCq(params) const res = await getLeaseManageListAllCq(params)
this.loading = false; this.loading = false
console.log('getList ============', res) console.log('getList ============', res)
this.leaseAuditList = res.data.rows; this.leaseAuditList = res.data.rows
// this.leaseAuditList.forEach((item,index)=>{ // this.leaseAuditList.forEach((item,index)=>{
// console.log(item.leaseApplyInfoList) // console.log(item.leaseApplyInfoList)
// if(item.leaseApplyInfoList.length>0){ // if(item.leaseApplyInfoList.length>0){
@ -330,13 +542,13 @@ export default {
// }) // })
console.log(this.leaseAuditList) console.log(this.leaseAuditList)
this.total = res.data.total; this.total = res.data.total
}, },
// //
async GetUnitData() { async GetUnitData() {
const params = { const params = {
id:this.queryParams.proId id: this.queryParams.proId,
} }
const res = await getUnitData(params) const res = await getUnitData(params)
this.unitList = res.data this.unitList = res.data
@ -344,17 +556,16 @@ export default {
// //
async GetProData() { async GetProData() {
const params = { const params = {
id:this.queryParams.unitId id: this.queryParams.unitId,
} }
const res = await getProData(params) const res = await getProData(params)
this.proList = res.data this.proList = res.data
}, },
// //
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// //
reset() { reset() {
@ -362,24 +573,24 @@ export default {
dictId: undefined, dictId: undefined,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: "0", status: '0',
remark: undefined remark: undefined,
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = []; this.queryParams.time = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
handleNotice() { handleNotice() {
this.noticeOpen = true; this.noticeOpen = true
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
@ -390,19 +601,19 @@ export default {
}, },
handleExamine(row, type) { handleExamine(row, type) {
this.$tab.closeOpenPage({ this.$tab.closeOpenPage({
path:"/claimAndRefund/receiveByCq/receiveExamine", path: '/claimAndRefund/receiveByCq/receiveExamine',
query: { query: {
taskId:row.taskId taskId: row.taskId,
} },
}); })
}, },
handleView(row) { handleView(row) {
this.$tab.closeOpenPage({ this.$tab.closeOpenPage({
path:"/claimAndRefund/receiveByCq/receiveExamine?isView=true", path: '/claimAndRefund/receiveByCq/receiveExamine?isView=true',
query: { query: {
taskId:row.taskId taskId: row.taskId,
} },
}); })
}, },
// //
async openLld(row) { async openLld(row) {
@ -413,79 +624,88 @@ export default {
this.leaseApplyDetails = res.rows[0].leaseApplyDetails this.leaseApplyDetails = res.rows[0].leaseApplyDetails
this.leaseApplyData = res.rows[0] this.leaseApplyData = res.rows[0]
console.log('this.leaseApplyData ============',this.leaseApplyData) console.log(
'this.leaseApplyData ============',
this.leaseApplyData,
)
}, },
// //
print() { print() {
this.$refs.remarksPrintRef.print(); this.$refs.remarksPrintRef.print()
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.dictId) this.ids = selection.map((item) => item.dictId)
this.single = selection.length != 1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
const dictId = row.dictId || this.ids const dictId = row.dictId || this.ids
getType(dictId).then(response => { getType(dictId).then((response) => {
this.form = response.data; this.form = response.data
this.open = true; this.open = true
this.title = "验收"; this.title = '验收'
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if (this.form.dictId != undefined) { if (this.form.dictId != undefined) {
updateType(this.form).then(response => { updateType(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addType(this.form).then(response => { addType(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const dictIds = row.dictId || this.ids; const dictIds = row.dictId || this.ids
this.$modal.confirm('是否确认删除该数据项?').then(function() { this.$modal
return delType(dictIds); .confirm('是否确认删除该数据项?')
}).then(() => { .then(function () {
this.getList(); return delType(dictIds)
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('base/tm_task/applyExport', { this.download(
...this.queryParams 'base/tm_task/applyExport',
}, `领料审批单_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`领料审批单_${new Date().getTime()}.xlsx`,
)
}, },
/** 刷新缓存按钮操作 */ /** 刷新缓存按钮操作 */
handleRefreshCache() { handleRefreshCache() {
refreshCache().then(() => { refreshCache().then(() => {
this.$modal.msgSuccess("刷新成功"); this.$modal.msgSuccess('刷新成功')
this.$store.dispatch('dict/cleanDict'); this.$store.dispatch('dict/cleanDict')
}); })
},
},
} }
}
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.print { .print {
.title { .title {
text-align: center; text-align: center;

View File

@ -726,7 +726,7 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.queryParams.time = []
// this.resetForm("queryForm"); // this.resetForm("queryForm");
this.$refs.queryForm.resetFields() this.$refs.queryForm.resetFields()
this.$refs.mychildSon.inputValue = '' this.$refs.mychildSon.inputValue = ''

View File

@ -720,7 +720,7 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.queryParams.time = []
// this.resetForm("queryForm"); // this.resetForm("queryForm");
this.$refs.queryForm.resetFields() this.$refs.queryForm.resetFields()
this.initSelectData() this.initSelectData()

View File

@ -577,7 +577,7 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.queryParams.time = []
this.resetForm('queryForm') this.resetForm('queryForm')
this.handleQuery() this.handleQuery()
}, },

View File

@ -1,6 +1,13 @@
<template> <template>
<div class="app-container" id="newDevicesWarehousing"> <div class="app-container" id="newDevicesWarehousing">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="日期"> <el-form-item label="日期">
<el-date-picker <el-date-picker
v-model="queryParams.time" v-model="queryParams.time"
@ -8,7 +15,8 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -16,7 +24,8 @@
<el-select <el-select
v-model="queryParams.typeId" v-model="queryParams.typeId"
placeholder="请选择设备类型" placeholder="请选择设备类型"
clearable filterable clearable
filterable
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -39,8 +48,19 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-form-item> </el-form-item>
</el-form> </el-form>
@ -53,20 +73,61 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dict:export']" v-hasPermi="['system:dict:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="tableList"> <el-table v-loading="loading" :data="tableList">
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" align="center" type="index" width="55px"/> <el-table-column
<el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" /> label="序号"
<el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" /> align="center"
<el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" /> type="index"
<el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true" width="250"/> width="55px"
<el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100"/> />
<el-table-column label="提交时间" align="center" prop="createTime" :show-overflow-tooltip="true"/> <el-table-column
label="采购单号"
align="center"
prop="code"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购日期"
align="center"
prop="purchaseTime"
:show-overflow-tooltip="true"
/>
<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="createTime"
:show-overflow-tooltip="true"
/>
<el-table-column label="采购状态" align="center" prop="taskStatus"> <el-table-column label="采购状态" align="center" prop="taskStatus">
<template slot-scope="scope"> <template slot-scope="scope">
@ -77,14 +138,25 @@
<span v-if="scope.row.taskStatus == '107'">入库驳回</span> <span v-if="scope.row.taskStatus == '107'">入库驳回</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200"> label="备注"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
icon="el-icon-zoom-in" icon="el-icon-zoom-in"
@click="handleView(scope.row)" @click="handleView(scope.row)"
>查看</el-button> >查看</el-button
>
<el-button <el-button
size="mini" size="mini"
@ -92,7 +164,8 @@
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.taskStatus == '26'" v-if="scope.row.taskStatus == '26'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>审核</el-button> >审核</el-button
>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="info"--> <!-- type="info"-->
@ -120,8 +193,20 @@
/> />
<!--审批对话框 --> <!--审批对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog
<el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px"> :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"> <el-form-item label="关键字" prop="dictName">
<el-input <el-input
v-model="query.dictName" v-model="query.dictName"
@ -133,7 +218,13 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button> <el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleDialogQuery"
>查询</el-button
>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> --> <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -145,7 +236,8 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="passAll" @click="passAll"
>批量通过</el-button> >批量通过</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -154,7 +246,8 @@
size="mini" size="mini"
@click="refusedAll" @click="refusedAll"
:disabled="multiple" :disabled="multiple"
>批量不通过</el-button> >批量不通过</el-button
>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
@ -167,15 +260,51 @@
<!-- >导出</el-button>--> <!-- >导出</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
</el-row> </el-row>
<el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400"> <el-table
<el-table-column type="selection" width="55" align="center" :selectable="selectable"/> v-loading="loading"
:data="detailTableList"
@selection-change="handleSelectionChange"
height="400"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="selectable"
/>
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" /> label="机具类型"
<el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" /> align="center"
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" width="200"/> prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="specificationType"
:show-overflow-tooltip="true"
/>
<el-table-column
label="数量"
align="center"
prop="checkNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="编号"
align="center"
prop="maCode"
:show-overflow-tooltip="true"
width="200"
/>
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column
label="不通过原因"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status == '0'">待审核</span> <span v-if="scope.row.status == '0'">待审核</span>
@ -186,20 +315,28 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle" width="150"> <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
v-if="showHandle"
width="150"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status == '0'" v-if="scope.row.status == '0'"
@click="pass(scope.row)" @click="pass(scope.row)"
>通过</el-button> >通过</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status == '0'" v-if="scope.row.status == '0'"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button> >不通过</el-button
>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
@ -218,86 +355,169 @@
:limit.sync="query.pageSize" :limit.sync="query.pageSize"
@pagination="getDialogTable" @pagination="getDialogTable"
/> />
</el-dialog> </el-dialog>
<!-- 入库单弹窗 --> <!-- 入库单弹窗 -->
<el-dialog :visible.sync="openPrint" width="900px" append-to-body> <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
<div style="height: 600px; overflow-y: scroll">
<div style="height: 600px;overflow-y: scroll;">
<vue-easy-print tableShow ref="remarksPrintRef" class="print"> <vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
<div class="title" style="text-align: center;font-weight: 600;font-size: 16px;"> class="title"
style="
text-align: center;
font-weight: 600;
font-size: 16px;
"
>
入库单 入库单
</div> </div>
<div class="info" style="margin-top: 10px;display: flex;flex-wrap: wrap;"> <div
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> 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> <span>工程名称</span>
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>日期</span> <span>日期</span>
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>领料单号</span> <span>领料单号</span>
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>车辆信息</span> <span>车辆信息</span>
</div> </div>
</div> </div>
<el-table :data="printTableData" class="table" style="margin-top: 20px;;padding-bottom: 1px;padding-right:1px;" border> <el-table
:data="printTableData"
class="table"
style="
margin-top: 20px;
padding-bottom: 1px;
padding-right: 1px;
"
border
>
<!-- <el-table-column type="selection" width="55" align="center" />--> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" /> <el-table-column
<el-table-column label="类型名称" align="center" prop="typeName" /> label="序号"
<el-table-column label="规格型号" align="center" prop="specificationType" /> align="center"
<el-table-column label="计量单位" align="center" prop="unitName" /> type="index"
<el-table-column label="数量" align="center" prop="checkNum" /> />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column
label="类型名称"
align="center"
prop="typeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="specificationType"
/>
<el-table-column
label="计量单位"
align="center"
prop="unitName"
/>
<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-column label="出库方式" align="center" prop="manageTypeName" /> -->
</el-table> </el-table>
<div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;"> <div
<div class="item" style="width: 25%;"> class="fillIn"
style="
margin-top: 20px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 25%">
<span>审核</span> <span>审核</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<span>库管员</span> <span>库管员</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<span>经办人</span> <span>经办人</span>
</div> </div>
<div class="item" style="width: 25%;"> <div class="item" style="width: 25%">
<!-- <span>经办人</span> --> <!-- <span>经办人</span> -->
</div> </div>
</div> </div>
</vue-easy-print> </vue-easy-print>
</div> </div>
<div slot="footer" class="dialog-footer" style="text-align: center"> <div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="print"> </el-button> <el-button type="primary" @click="print"> </el-button>
<el-button @click="openPrint = false"> </el-button> <el-button @click="openPrint = false"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import {
import {getRepairedDetailList, getTypeList, inputByType} from "@/api/store/warehousing"; listType,
import { getPutInList,getPutinDetailsList ,changePutinStatus,warehousingEntry} from "@/api/store/newDevicesServiceCenterList"; getType,
import vueEasyPrint from 'vue-easy-print'; delType,
addType,
updateType,
refreshCache,
} from '@/api/system/dict/type'
import {
getRepairedDetailList,
getTypeList,
inputByType,
} from '@/api/store/warehousing'
import {
getPutInList,
getPutinDetailsList,
changePutinStatus,
warehousingEntry,
} from '@/api/store/newDevicesServiceCenterList'
import vueEasyPrint from 'vue-easy-print'
export default { export default {
// name: "NewDevicesWarehousing", // name: "NewDevicesWarehousing",
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
@ -325,7 +545,7 @@ export default {
tableList: [], tableList: [],
detailTableList: [], detailTableList: [],
// //
title: "", title: '',
// //
open: false, open: false,
openPrint: false, openPrint: false,
@ -340,7 +560,7 @@ export default {
pageSize: 10, pageSize: 10,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined status: undefined,
}, },
query: { query: {
pageNum: 1, pageNum: 1,
@ -351,63 +571,68 @@ export default {
// //
rules: { rules: {
dictName: [ dictName: [
{ required: true, message: "字典名称不能为空", trigger: "blur" } {
required: true,
message: '字典名称不能为空',
trigger: 'blur',
},
], ],
dictType: [ dictType: [
{ required: true, message: "字典类型不能为空", trigger: "blur" } {
] required: true,
message: '字典类型不能为空',
trigger: 'blur',
},
],
},
} }
};
}, },
created() { created() {
this.getList(); this.getList()
this.getTypeList(); this.getTypeList()
}, },
methods: { methods: {
getTypeList() { getTypeList() {
getTypeList({level:'3'}).then(response => { getTypeList({ level: '3' }).then((response) => {
this.typeList = response.data; this.typeList = response.data
} })
); getTypeList({ level: '4' }).then((response) => {
getTypeList({level:'4'}).then(response => { this.modelList = response.data
this.modelList = response.data; })
}
);
}, },
/** 查询字典类型列表 */ /** 查询字典类型列表 */
getList() { getList() {
this.loading = true; this.loading = true
const params = { const params = {
keyWord: this.queryParams.keyWord, keyWord: this.queryParams.keyWord,
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],
typeId: this.queryParams.typeId, typeId: this.queryParams.typeId,
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum pageNum: this.queryParams.pageNum,
} }
getPutInList(this.addDateRange(params)).then(response => { getPutInList(this.addDateRange(params)).then((response) => {
this.tableList = response.rows; this.tableList = response.rows
this.total = response.total; this.total = response.total
this.loading = false; this.loading = false
} })
);
}, },
getDialogTable() { getDialogTable() {
this.loading = true; this.loading = true
getPutinDetailsList(this.query).then(response => { getPutinDetailsList(this.query).then((response) => {
this.detailTableList = response.rows; this.detailTableList = response.rows
this.dialogTotal = response.total; this.dialogTotal = response.total
this.loading = false; this.loading = false
} })
);
}, },
// //
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// //
reset() { reset() {
@ -415,25 +640,26 @@ export default {
dictId: undefined, dictId: undefined,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: "0", status: '0',
remark: undefined remark: undefined,
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleDialogQuery() { handleDialogQuery() {
this.query.pageNum = 1; this.query.pageNum = 1
this.getDialogTable(); this.getDialogTable()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.queryParams.time = []
this.handleQuery(); this.resetForm('queryForm')
this.handleQuery()
}, },
// //
selectable(row) { selectable(row) {
@ -446,7 +672,7 @@ export default {
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item) this.ids = selection.map((item) => item)
this.single = selection.length != 1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
@ -455,16 +681,16 @@ export default {
// this.reset(); // this.reset();
this.query.taskId = row.taskId this.query.taskId = row.taskId
this.getDialogTable() this.getDialogTable()
this.open = true; this.open = true
this.showHandle = true this.showHandle = true
this.title = "审核"; this.title = '审核'
}, },
// //
pass(row) { pass(row) {
console.log(row) console.log(row)
console.log(this.query.taskId) console.log(this.query.taskId)
row.taskId = this.query.taskId; row.taskId = this.query.taskId
let obj = { let obj = {
taskId: this.query.taskId, taskId: this.query.taskId,
maId: row.maId, maId: row.maId,
@ -476,48 +702,48 @@ export default {
let param = { let param = {
taskId: this.query.taskId, taskId: this.query.taskId,
checkResult: '1', checkResult: '1',
inputRecordList:[obj] inputRecordList: [obj],
} }
changePutinStatus(param).then(response => { changePutinStatus(param).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess('审批成功')
this.getDialogTable(); this.getDialogTable()
this.getList() this.getList()
} else { } else {
this.$modal.msgSuccess("审批失败"); this.$modal.msgSuccess('审批失败')
} }
}); })
}, },
passAll() { passAll() {
// console.log(this.query.taskId) // console.log(this.query.taskId)
// console.log(this.ids) // console.log(this.ids)
this.ids.forEach(item => { this.ids.forEach((item) => {
item.taskId = this.query.taskId; item.taskId = this.query.taskId
// item.typeId= item.typeId // item.typeId= item.typeId
// item.maId= item.maId // item.maId= item.maId
item.inputNum = item.checkNum item.inputNum = item.checkNum
// item.maCode= item.maCode // item.maCode= item.maCode
}); })
let param = { let param = {
taskId: this.query.taskId, taskId: this.query.taskId,
checkResult: '1', checkResult: '1',
inputRecordList:this.ids inputRecordList: this.ids,
} }
changePutinStatus(param).then(response => { changePutinStatus(param).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess('审批成功')
this.getDialogTable(); this.getDialogTable()
this.getList() this.getList()
} else { } else {
this.$modal.msgSuccess("审批失败"); this.$modal.msgSuccess('审批失败')
} }
}); })
}, },
// //
refused(row) { refused(row) {
// console.log(row) // console.log(row)
// console.log(this.query.taskId) // console.log(this.query.taskId)
row.taskId = this.query.taskId; row.taskId = this.query.taskId
let obj = { let obj = {
taskId: this.query.taskId, taskId: this.query.taskId,
maId: row.maId, maId: row.maId,
@ -529,117 +755,126 @@ export default {
let param = { let param = {
taskId: this.query.taskId, taskId: this.query.taskId,
checkResult: '2', checkResult: '2',
inputRecordList:[obj] inputRecordList: [obj],
} }
changePutinStatus(param).then(response => { changePutinStatus(param).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess('审批成功')
this.getDialogTable(); this.getDialogTable()
this.getList() this.getList()
} else { } else {
this.$modal.msgSuccess("审批失败"); this.$modal.msgSuccess('审批失败')
} }
}); })
}, },
refusedAll() { refusedAll() {
// console.log(this.query.taskId) // console.log(this.query.taskId)
// console.log(this.ids) // console.log(this.ids)
this.ids.forEach(item => { this.ids.forEach((item) => {
item.taskId = this.query.taskId; item.taskId = this.query.taskId
// item.typeId= item.typeId // item.typeId= item.typeId
// item.maId= item.maId // item.maId= item.maId
item.inputNum = item.checkNum item.inputNum = item.checkNum
// item.maCode= item.maCode // item.maCode= item.maCode
}); })
let param = { let param = {
taskId: this.query.taskId, taskId: this.query.taskId,
checkResult: '2', checkResult: '2',
inputRecordList:this.ids inputRecordList: this.ids,
} }
changePutinStatus(param).then(response => { changePutinStatus(param).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess('审批成功')
this.getDialogTable(); this.getDialogTable()
this.getList() this.getList()
} else { } else {
this.$modal.msgSuccess("审批失败"); this.$modal.msgSuccess('审批失败')
} }
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if (this.form.dictId != undefined) { if (this.form.dictId != undefined) {
updateType(this.form).then(response => { updateType(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addType(this.form).then(response => { addType(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
// //
handleView(row) { handleView(row) {
this.query.taskId = row.taskId this.query.taskId = row.taskId
this.getDialogTable() this.getDialogTable()
this.open = true; this.open = true
this.showHandle = false this.showHandle = false
this.title = "查看"; this.title = '查看'
}, },
// //
getPrintTable(taskId) { getPrintTable(taskId) {
warehousingEntry({taskId:taskId}).then(response => { warehousingEntry({ taskId: taskId }).then((response) => {
this.printTableData = response.data; this.printTableData = response.data
// this.dialogTotal = response.total; // this.dialogTotal = response.total;
} })
);
}, },
// //
handlePrint(row) { handlePrint(row) {
this.query.taskId = row.taskId this.query.taskId = row.taskId
this.getPrintTable(row.taskId) this.getPrintTable(row.taskId)
this.openPrint = true this.openPrint = true
this.title = "入库单"; this.title = '入库单'
}, },
// //
print() { print() {
this.$refs.remarksPrintRef.print(); this.$refs.remarksPrintRef.print()
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const dictIds = row.dictId || this.ids; const dictIds = row.dictId || this.ids
this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?').then(function() { this.$modal
return delType(dictIds); .confirm(
}).then(() => { '是否确认删除字典编号为"' + dictIds + '"的数据项?',
this.getList(); )
this.$modal.msgSuccess("删除成功"); .then(function () {
}).catch(() => {}); return delType(dictIds)
})
.then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
})
.catch(() => {})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('material/purchaseCheckInfo/putInExport', { this.download(
...this.queryParams 'material/purchaseCheckInfo/putInExport',
}, `新购工机具入库_${new Date().getTime()}.xlsx`) {
...this.queryParams,
},
`新购工机具入库_${new Date().getTime()}.xlsx`,
)
}, },
/** 刷新缓存按钮操作 */ /** 刷新缓存按钮操作 */
handleRefreshCache() { handleRefreshCache() {
refreshCache().then(() => { refreshCache().then(() => {
this.$modal.msgSuccess("刷新成功"); this.$modal.msgSuccess('刷新成功')
this.$store.dispatch('dict/cleanDict'); this.$store.dispatch('dict/cleanDict')
}); })
},
},
} }
}
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.print { .print {