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

测试问题修改

This commit is contained in:
BianLzhaoMin 2024-04-20 14:54:26 +08:00
parent 3efa283b3c
commit 97e554d6ac
3 changed files with 1026 additions and 1353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

521
sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue
View File

@ -1,13 +1,6 @@
<template> <template>
<div class="app-container" id="constructionSite"> <div class="app-container" id="constructionSite">
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字" prop="keyWord">
<el-input <el-input
v-model="queryParams.keyWord" v-model="queryParams.keyWord"
@ -19,11 +12,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="单位名称" prop="unitId"> <el-form-item label="单位名称" prop="unitId">
<el-select <el-select v-model="queryParams.unitId" placeholder="请选择单位名称" clearable>
v-model="queryParams.unitId"
placeholder="请选择单位名称"
clearable
>
<el-option <el-option
v-for="item in unitList" v-for="item in unitList"
:key="item.unitId" :key="item.unitId"
@ -34,12 +23,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程名称" prop="lotId"> <el-form-item label="工程名称" prop="lotId">
<el-select <el-select v-model="queryParams.lotId" filterable placeholder="请选择工程名称" clearable>
v-model="queryParams.lotId"
filterable
placeholder="请选择工程名称"
clearable
>
<el-option <el-option
v-for="item in projectList" v-for="item in projectList"
:key="item.projectId" :key="item.projectId"
@ -69,172 +53,72 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="完成情况" prop="status"> <el-form-item label="完成情况" prop="status">
<el-select <el-select v-model="queryParams.status" filterable placeholder="请选择完成情况" clearable>
v-model="queryParams.status" <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
filterable
placeholder="请选择完成情况"
clearable
>
<el-option
v-for="item in statusList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">直转申请</el-button>
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>直转申请</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col> </el-col>
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></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" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column <el-table-column label="转让方单位名称" align="center" prop="backUnitName" :show-overflow-tooltip="true" />
label="转让方单位名称" <el-table-column label="转让方工程名称" align="center" prop="backProName" :show-overflow-tooltip="true" />
align="center" <el-table-column label="接收方单位名称" align="center" prop="leaseUnitName" :show-overflow-tooltip="true" />
prop="backUnitName" <el-table-column label="接收方工程名称" align="center" prop="leaseProName" :show-overflow-tooltip="true" />
:show-overflow-tooltip="true" <el-table-column label="转让方联系人及电话" align="center" prop="backMan" :show-overflow-tooltip="true">
/>
<el-table-column
label="转让方工程名称"
align="center"
prop="backProName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="接收方单位名称"
align="center"
prop="leaseUnitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="接收方工程名称"
align="center"
prop="leaseProName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="转让方联系人及电话"
align="center"
prop="backMan"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div <div>
>{{ scope.row.backMan || '/' }} {{ scope.row.backMan || '/' }}
<span v-if="scope.row.backMan && scope.row.backPhone" <span v-if="scope.row.backMan && scope.row.backPhone">:</span>
>:</span {{ scope.row.backPhone || '/' }}
>{{ scope.row.backPhone || '/' }}</div </div>
>
<!-- <span>{{ scope.row.backMan || '/'}}</span><span>{{ scope.row.backPhone || '/' }}</span> --> <!-- <span>{{ scope.row.backMan || '/'}}</span><span>{{ scope.row.backPhone || '/' }}</span> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="接收方联系人及电话" align="center" prop="leaseMan" :show-overflow-tooltip="true">
label="接收方联系人及电话"
align="center"
prop="leaseMan"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div <div>
>{{ scope.row.leaseMan || '/' }} {{ scope.row.leaseMan || '/' }}
<span v-if="scope.row.leaseMan && scope.row.leasePhone" <span v-if="scope.row.leaseMan && scope.row.leasePhone">:</span>
>:</span {{ scope.row.leasePhone || '/' }}
>{{ scope.row.leasePhone || '/' }}</div </div>
>
<!-- <span>{{ scope.row.leaseMan || '/'}}</span><span>{{ scope.row.leasePhone || '/' }}</span> --> <!-- <span>{{ scope.row.leaseMan || '/'}}</span><span>{{ scope.row.leasePhone || '/' }}</span> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="办理时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
label="办理时间" <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
align="center"
prop="createTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="状态"
align="center"
prop="status"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status == 0">待审批</span> <span v-if="scope.row.status == 0">待审批</span>
<span v-if="scope.row.status == 1" style="color: #02a7f0" <span v-if="scope.row.status == 1" style="color: #02a7f0">审批同意</span>
>审批同意</span <span v-if="scope.row.status == 2" style="color: red">审批拒绝</span>
>
<span v-if="scope.row.status == 2" style="color: red"
>审批拒绝</span
>
</template> </template>
</el-table-column> </el-table-column>
<!-- <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 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
label="操作"
align="center"
class-name="small-padding fixed-width"
width="250"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" @click="handleView(scope.row)" <el-button size="mini" @click="handleView(scope.row)">查看</el-button>
>查看</el-button <el-button size="mini" type="primary" v-if="scope.row.status == 0" @click="handleExame(scope.row)">
> 审核
<el-button </el-button>
size="mini" <el-button size="mini" type="info" @click="handlePrint(scope.row)">直转单</el-button>
type="primary"
v-if="scope.row.status == 0"
@click="handleExame(scope.row)"
>审核</el-button
>
<el-button
size="mini"
type="info"
@click="handlePrint(scope.row)"
>直转单</el-button
>
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
@ -254,21 +138,8 @@
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
:title="title" <el-form :model="dialogParams" ref="dialogForm" :rules="rules" size="small" :inline="true" label-width="100px">
:visible.sync="open"
width="1200px"
append-to-body
:close-on-click-modal="false"
>
<el-form
:model="dialogParams"
ref="dialogForm"
:rules="rules"
size="small"
:inline="true"
label-width="100px"
>
<el-row> <el-row>
<el-form-item label="退料单位" prop="backUnitId"> <el-form-item label="退料单位" prop="backUnitId">
<el-select <el-select
@ -280,13 +151,7 @@
placeholder="请选择" placeholder="请选择"
:disabled="handleState == 1" :disabled="handleState == 1"
> >
<el-option <el-option v-for="item in backUnitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
v-for="item in backUnitList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="退料工程" prop="backProId"> <el-form-item label="退料工程" prop="backProId">
@ -299,13 +164,7 @@
placeholder="请选择" placeholder="请选择"
:disabled="handleState == 1" :disabled="handleState == 1"
> >
<el-option <el-option v-for="item in backProjectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
v-for="item in backProjectList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="退料协议编号" prop="backAgreementCode"> <el-form-item label="退料协议编号" prop="backAgreementCode">
@ -351,13 +210,7 @@
placeholder="请选择" placeholder="请选择"
:disabled="handleState == 1" :disabled="handleState == 1"
> >
<el-option <el-option v-for="item in leaseUnitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
v-for="item in leaseUnitList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="领料工程" prop="leaseProId"> <el-form-item label="领料工程" prop="leaseProId">
@ -375,14 +228,10 @@
: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 <el-form-item label="领料协议编号" prop="leaseAgreementCode">
label="领料协议编号"
prop="leaseAgreementCode"
>
<el-input <el-input
v-model="dialogParams.leaseAgreementCode" v-model="dialogParams.leaseAgreementCode"
placeholder="请输入领料协议编号" placeholder="请输入领料协议编号"
@ -425,61 +274,20 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetDialogQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-row> </el-row>
</el-form> </el-form>
<el-table <el-table v-loading="dialogLoading" :data="deviceList" height="350px" @selection-change="handleSelectionChange">
v-loading="dialogLoading"
:data="deviceList"
height="350px"
@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 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
label="机具名称" <el-table-column label="机具规格" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
align="center" <el-table-column label="编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
prop="typeName" <el-table-column label="当前在用量" align="center" prop="useNum" :show-overflow-tooltip="true" />
:show-overflow-tooltip="true" <el-table-column label="直转数量" align="center" class-name="small-padding fixed-width" width="200">
/>
<el-table-column
label="机具规格"
align="center"
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="编码"
align="center"
prop="maCode"
:show-overflow-tooltip="true"
/>
<el-table-column
label="当前在用量"
align="center"
prop="useNum"
: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-input-number <el-input-number
v-model="scope.row.directNum" v-model="scope.row.directNum"
@ -499,21 +307,11 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div <div slot="footer" class="dialog-footer" style="text-align: center" v-if="handleState == 0">
slot="footer"
class="dialog-footer"
style="text-align: center"
v-if="handleState == 0"
>
<el-button type="primary" @click="submitForm">保存</el-button> <el-button type="primary" @click="submitForm">保存</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
<div <div slot="footer" class="dialog-footer" style="text-align: right" v-if="handleState == 2">
slot="footer"
class="dialog-footer"
style="text-align: right"
v-if="handleState == 2"
>
<el-button type="primary" @click="pass">同意</el-button> <el-button type="primary" @click="pass">同意</el-button>
<el-button type="danger" @click="refuse">不同意</el-button> <el-button type="danger" @click="refuse">不同意</el-button>
</div> </div>
@ -523,118 +321,38 @@
<el-dialog :visible.sync="openPrint" width="1000px" append-to-body> <el-dialog :visible.sync="openPrint" width="1000px" 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 <div class="title" style="text-align: center; font-weight: 600; font-size: 16px">直转单</div>
class="title" <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
style=" <div class="item" style="width: 40%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
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: 40%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>退料单位：</span> <span>退料单位：</span>
{{ dialogParams.backUnitName }} {{ dialogParams.backUnitName }}
</div> </div>
<div <div class="item" style="width: 60%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
class="item"
style="
width: 60%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>退料工程：</span> <span>退料工程：</span>
{{ dialogParams.backProName }} {{ dialogParams.backProName }}
</div> </div>
<div <div class="item" style="width: 40%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
class="item"
style="
width: 40%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>领料单位：</span> <span>领料单位：</span>
{{ dialogParams.leaseUnitName }} {{ dialogParams.leaseUnitName }}
</div> </div>
<div <div class="item" style="width: 60%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
class="item"
style="
width: 60%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>领料工程：</span> <span>领料工程：</span>
{{ dialogParams.leaseProName }} {{ dialogParams.leaseProName }}
</div> </div>
</div> </div>
<div style="width: 100%"> <div style="width: 100%">
<el-table <el-table :data="deviceList" class="table" border style="margin-top: 20px; padding: 1px; width: 100%">
:data="deviceList"
class="table"
border
style="margin-top: 20px; padding: 1px; width: 100%"
>
<!-- <el-table-column type="selection" width="55" align="center" />--> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column <el-table-column label="序号" align="center" type="index" />
label="序号" <el-table-column label="机具名称" align="center" prop="typeName" />
align="center" <el-table-column label="规格型号" align="center" prop="typeModelName" />
type="index" <el-table-column label="计量单位" align="center" prop="unitName" />
/> <el-table-column label="设备编码" align="center" prop="maCode" />
<el-table-column <el-table-column label="直转数量" align="center" prop="directNum" />
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="maCode"
/>
<el-table-column
label="直转数量"
align="center"
prop="directNum"
/>
</el-table> </el-table>
</div> </div>
<div <div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
class="fillIn"
style="
margin-top: 30px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 25%"> <div class="item" style="width: 25%">
<span>审核：</span> <span>审核：</span>
</div> </div>
@ -656,24 +374,24 @@
</template> </template>
<script> <script>
import { import {
getUnitList, getUnitList,
getProjectList, getProjectList,
getProData, getProData,
getUnitData, getUnitData,
getAgreementInfoById, getAgreementInfoById,
} from '@/api/claimAndRefund/receive' } from '@/api/claimAndRefund/receive'
import { import {
getWorkSiteList, getWorkSiteList,
getUseringData, getUseringData,
submitWorkSite, submitWorkSite,
getDetailInfo, getDetailInfo,
passWorkSite, passWorkSite,
refuseWorkSite, refuseWorkSite,
} from '@/api/claimAndRefund/constructionSite' } from '@/api/claimAndRefund/constructionSite'
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: 'ConstructionSite', name: 'ConstructionSite',
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
components: { vueEasyPrint }, components: { vueEasyPrint },
@ -783,19 +501,19 @@
//获取单位类型 ,getUnitList, getProjectList //获取单位类型 ,getUnitList, getProjectList
getUnitList() { getUnitList() {
getUnitList().then((response) => { getUnitList().then(response => {
this.unitList = response.data this.unitList = response.data
}) })
}, },
getProjectList() { getProjectList() {
getProjectList().then((response) => { getProjectList().then(response => {
this.projectList = response.data this.projectList = response.data
}) })
}, },
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.loading = true this.loading = true
getWorkSiteList(this.queryParams).then((response) => { getWorkSiteList(this.queryParams).then(response => {
this.tableList = response.rows this.tableList = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
@ -850,10 +568,7 @@
}, },
// 获取 协议id // 获取 协议id
async GetAgreementInfoById() { async GetAgreementInfoById() {
if ( if (this.dialogParams.backUnitId && this.dialogParams.backProId) {
this.dialogParams.backUnitId &&
this.dialogParams.backProId
) {
const params = { const params = {
unitId: this.dialogParams.backUnitId, unitId: this.dialogParams.backUnitId,
projectId: this.dialogParams.backProId, projectId: this.dialogParams.backProId,
@ -867,8 +582,7 @@
this.GetProData() this.GetProData()
} else { } else {
this.dialogParams.backAgreementId = res.data.agreementId this.dialogParams.backAgreementId = res.data.agreementId
this.dialogParams.backAgreementCode = this.dialogParams.backAgreementCode = res.data.agreementCode
res.data.agreementCode
this.getDialogList() this.getDialogList()
} }
} }
@ -881,11 +595,11 @@
let param = { let param = {
agreementId: this.dialogParams.backAgreementId, agreementId: this.dialogParams.backAgreementId,
} }
getUseringData(param).then((response) => { getUseringData(param).then(response => {
// console.log(response) // console.log(response)
if (response.code == 200) { if (response.code == 200) {
this.deviceList = response.rows this.deviceList = response.rows
this.deviceList.forEach((item) => { this.deviceList.forEach(item => {
this.$set(item, 'directNum', 1) this.$set(item, 'directNum', 1)
}) })
this.dialogLoading = false this.dialogLoading = false
@ -917,10 +631,7 @@
}, },
// 获取 协议id // 获取 协议id
async GetAgreementInfoById2() { async GetAgreementInfoById2() {
if ( if (this.dialogParams.leaseUnitId && this.dialogParams.leaseProId) {
this.dialogParams.leaseUnitId &&
this.dialogParams.leaseProId
) {
const params = { const params = {
unitId: this.dialogParams.leaseUnitId, unitId: this.dialogParams.leaseUnitId,
projectId: this.dialogParams.leaseProId, projectId: this.dialogParams.leaseProId,
@ -936,16 +647,8 @@
} else { } else {
// this.dialogParams.leaseAgreementId = res.data.agreementId; // this.dialogParams.leaseAgreementId = res.data.agreementId;
// this.dialogParams.leaseAgreementCode = res.data.agreementCode; // this.dialogParams.leaseAgreementCode = res.data.agreementCode;
this.$set( this.$set(this.dialogParams, 'leaseAgreementId', res.data.agreementId)
this.dialogParams, this.$set(this.dialogParams, 'leaseAgreementCode', res.data.agreementCode)
'leaseAgreementId',
res.data.agreementId,
)
this.$set(
this.dialogParams,
'leaseAgreementCode',
res.data.agreementCode,
)
} }
} }
}, },
@ -965,14 +668,14 @@
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.selectedList = selection.map((item) => item) this.selectedList = selection.map(item => item)
// console.log(this.selectedList) // console.log(this.selectedList)
this.single = selection.length != 1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function () { submitForm: function () {
this.$refs['dialogForm'].validate((valid) => { this.$refs['dialogForm'].validate(valid => {
if (valid) { if (valid) {
if (this.selectedList.length > 0) { if (this.selectedList.length > 0) {
let arr = [] let arr = []
@ -989,7 +692,7 @@
directApplyInfoDetails: arr, directApplyInfoDetails: arr,
} }
console.log(param) console.log(param)
submitWorkSite(param).then((response) => { submitWorkSite(param).then(response => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess('新增成功') this.$modal.msgSuccess('新增成功')
this.open = false this.open = false
@ -1012,39 +715,23 @@
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleExame(row) { handleExame(row) {
console.log(row) console.log(row, '审核')
let param = { id: row.id } let param = { id: row.id }
this.getDetail(param) this.getDetail(param)
this.open = true this.open = true
this.handleState = 2 this.handleState = 2
}, },
getDetail(param) { getDetail(param) {
getDetailInfo(param).then((res) => { getDetailInfo(param).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.dialogParams = res.data this.dialogParams = res.data
this.$set( this.$set(this.dialogParams, 'backUnitId', Number(res.data.backUnitId))
this.dialogParams, this.$set(this.dialogParams, 'backProId', Number(res.data.backProId))
'backUnitId',
Number(res.data.backUnitId),
)
this.$set(
this.dialogParams,
'backProId',
Number(res.data.backProId),
)
// this.$set(this.dialogParams,'backAgreementCode',res.data.tagreementCode) // this.$set(this.dialogParams,'backAgreementCode',res.data.tagreementCode)
this.$set( this.$set(this.dialogParams, 'leaseUnitId', Number(res.data.leaseUnitId))
this.dialogParams, this.$set(this.dialogParams, 'leaseProId', Number(res.data.leaseProId))
'leaseUnitId',
Number(res.data.leaseUnitId),
)
this.$set(
this.dialogParams,
'leaseProId',
Number(res.data.leaseProId),
)
this.deviceList = res.data.directApplyDetails this.deviceList = res.data.directApplyDetails
this.deviceList.forEach((item) => { this.deviceList.forEach(item => {
item.typeModelName = item.modelName item.typeModelName = item.modelName
// item.num = item.useNum // item.num = item.useNum
}) })
@ -1054,7 +741,7 @@
pass() { pass() {
// console.log(this.dialogParams) // console.log(this.dialogParams)
let data = this.dialogParams let data = this.dialogParams
let backList = this.deviceList.map((item) => { let backList = this.deviceList.map(item => {
item.status = 0 item.status = 0
item.typeCode = item.modelName item.typeCode = item.modelName
item.preNum = item.directNum item.preNum = item.directNum
@ -1078,7 +765,7 @@
backApplyDetails: backList, backApplyDetails: backList,
} }
// console.log(backApplyInfo,'backApplyInfo------') // console.log(backApplyInfo,'backApplyInfo------')
let leaseList = this.deviceList.map((item) => { let leaseList = this.deviceList.map(item => {
item.status = 0 item.status = 0
item.typeCn = item.typeName item.typeCn = item.typeName
item.guigeCn = item.modelName item.guigeCn = item.modelName
@ -1110,7 +797,7 @@
backApplyInfo: backApplyInfo, backApplyInfo: backApplyInfo,
leaseApplyInfo: leaseApplyInfo, leaseApplyInfo: leaseApplyInfo,
} }
passWorkSite(param).then((res) => { passWorkSite(param).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.open = false this.open = false
this.$modal.msgSuccess('操作成功') this.$modal.msgSuccess('操作成功')
@ -1125,7 +812,7 @@
let param = { let param = {
id: this.dialogParams.id, id: this.dialogParams.id,
} }
refuseWorkSite(param).then((res) => { refuseWorkSite(param).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.open = false this.open = false
this.$modal.msgSuccess('操作成功') this.$modal.msgSuccess('操作成功')
@ -1165,14 +852,14 @@
{ {
...this.queryParams, ...this.queryParams,
}, },
`type_${new Date().getTime()}.xlsx`, `type_${new Date().getTime()}.xlsx`
) )
}, },
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.print { .print {
.title { .title {
text-align: center; text-align: center;
font-weight: 600; font-weight: 600;
@ -1196,9 +883,9 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
} }
::v-deep.el-table .fixed-width .el-button--mini { ::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important; width: 60px !important;
margin-bottom: 10px; margin-bottom: 10px;
} }
</style> </style>

186
sgzb-ui/src/views/stquery/backRecord.vue
View File

@ -1,46 +1,49 @@
<template> <template>
<div class="app-container" id="backRecord"> <div class="app-container" id="backRecord">
<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="退料日期"> <el-form-item label="退料日期" prop="time">
<el-date-picker <el-date-picker
v-model="queryParams.time" v-model="queryParams.time"
type="daterange" type="daterange"
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-form-item>
<el-form-item label="往来单位">
<el-select v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择">
<el-option
v-for="item in unitList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工程名称">
<el-select v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
<el-option
v-for="item in proList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="协议号" prop="agreementCode">
<el-input
v-model="queryParams.agreementCode"
placeholder="请输入协议号"
clearable
:maxlength="20"
style="width: 240px" style="width: 240px"
@keyup.enter.native="handleQuery" ></el-date-picker>
/>
</el-form-item> </el-form-item>
<el-form-item label="往来单位" prop="unitId">
<el-select
v-model="queryParams.unitId"
clearable
@change="GetProData"
style="width: 240px"
placeholder="请选择"
>
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程名称" prop="proId">
<el-select
v-model="queryParams.proId"
clearable
@change="GetUnitData"
style="width: 240px"
placeholder="请选择"
>
<el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="协议号" prop="agreementCode"> -->
<!-- <el-input -->
<!-- v-model="queryParams.agreementCode" -->
<!-- placeholder="请输入协议号" -->
<!-- clearable -->
<!-- :maxlength="20" -->
<!-- style="width: 240px" -->
<!-- @keyup.enter.native="handleQuery" -->
<!-- /> -->
<!-- </el-form-item> -->
<el-form-item label="机具名称" prop="typeName"> <el-form-item label="机具名称" prop="typeName">
<el-input <el-input
v-model="queryParams.typeName" v-model="queryParams.typeName"
@ -72,27 +75,18 @@
/> />
</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 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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</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-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList">
<!-- <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" />
@ -108,24 +102,21 @@
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
:page-sizes="[5,10,15,20,30]" :page-sizes="[5, 10, 15, 20, 30]"
@pagination="getList" @pagination="getList"
/> />
</div> </div>
</template> </template>
<script> <script>
import { backRecord,exportList,getUnitData,getProData } from "@/api/stquery/backRecord"; import { backRecord, exportList, getUnitData, getProData } from '@/api/stquery/backRecord'
export default { export default {
name: "backRecord", name: 'backRecord',
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { return {
@ -153,98 +144,101 @@ export default {
dictType: undefined, dictType: undefined,
status: undefined, status: undefined,
time:null, //申请时间 time: null, //申请时间
unitId:null, //来往单位id unitId: null, //来往单位id
proId:null, //工程id proId: null, //工程id
typeName: '',
typeModelName: '',
keyWord: '',
types: 1, // 1申请列表 2审核列表 types: 1, // 1申请列表 2审核列表
}, },
unitList:[], //来往单位集合 unitList: [], //来往单位集合
proList:[], //工程集合 proList: [], //工程集合
}; }
}, },
created() { created() {
this.getList(); this.getList()
this.getUnitList(); this.getUnitList()
this.getProList(); this.getProList()
}, },
methods: { methods: {
// 获取 申请列表 // 获取 申请列表
async getList() { async getList() {
this.loading = true; this.loading = true
const params = { const params = {
unitId:this.queryParams.unitId, unitId: this.queryParams.unitId,
proId:this.queryParams.proId, proId: this.queryParams.proId,
keyWord:this.queryParams.keyWord, keyWord: this.queryParams.keyWord,
agreementCode:this.queryParams.agreementCode, agreementCode: this.queryParams.agreementCode,
typeName:this.queryParams.typeName, typeName: this.queryParams.typeName,
typeModelName:this.queryParams.typeModelName, typeModelName: this.queryParams.typeModelName,
startTime:this.queryParams.time && this.queryParams.time[0], startTime: this.queryParams.time && this.queryParams.time[0],
endTime:this.queryParams.time && this.queryParams.time[1], endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum pageNum: this.queryParams.pageNum,
} }
const res = await backRecord(params) const res = await backRecord(params)
this.loading = false; this.loading = false
this.leaseAuditList = res.data.rows; this.leaseAuditList = res.data.rows
this.total = res.data.total; this.total = res.data.total
}, },
// 获取 来往单位 列表数据 // 获取 来往单位 列表数据
async getUnitList(){ async getUnitList() {
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
console.log('GetUnitData ======================',res) console.log('GetUnitData ======================', res)
}, },
// 获取 工程名称 列表数据 // 获取 工程名称 列表数据
async getProList(){ async getProList() {
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
console.log('GetProData ======================',res) console.log('GetProData ======================', res)
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
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.dateRange = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('material/backRecord/export', { this.download(
...this.queryParams 'material/backRecord/export',
}, `综合查询_退料记录_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
},
} `综合查询_退料记录_${new Date().getTime()}.xlsx`
}; )
},
},
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini { ::v-deep.el-table .fixed-width .el-button--mini {

152
sgzb-ui/src/views/stquery/leaseRecord.vue
View File

@ -8,27 +8,30 @@
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> style="width: 240px"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="往来单位"> <el-form-item label="往来单位">
<el-select v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择"> <el-select
<el-option v-model="queryParams.unitId"
v-for="item in unitList" clearable
:key="item.id" @change="GetProData"
:label="item.name" style="width: 240px"
:value="item.id"> placeholder="请选择"
</el-option> >
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程名称"> <el-form-item label="工程名称">
<el-select v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择"> <el-select
<el-option v-model="queryParams.proId"
v-for="item in proList" clearable
:key="item.id" @change="GetUnitData"
:label="item.name" style="width: 240px"
:value="item.id"> placeholder="请选择"
</el-option> >
<el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="机具名称" prop="typeName"> <el-form-item label="机具名称" prop="typeName">
@ -62,27 +65,18 @@
/> />
</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 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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</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-table v-loading="loading" :data="leaseAuditList"> <el-table v-loading="loading" :data="leaseAuditList">
<!-- <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" />
@ -99,24 +93,21 @@
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
:page-sizes="[5,10,15,20,30]" :page-sizes="[5, 10, 15, 20, 30]"
@pagination="getList" @pagination="getList"
/> />
</div> </div>
</template> </template>
<script> <script>
import { leaseRecord,exportList,getUnitData,getProData } from "@/api/stquery/stquery"; import { leaseRecord, exportList, getUnitData, getProData } from '@/api/stquery/stquery'
export default { export default {
name: "leaseRecord", name: 'leaseRecord',
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
data() { data() {
return { return {
@ -144,99 +135,100 @@ export default {
dictType: undefined, dictType: undefined,
status: undefined, status: undefined,
time:null, //申请时间 time: null, //申请时间
unitId:null, //来往单位id unitId: null, //来往单位id
proId:null, //工程id proId: null, //工程id
types: 1, // 1申请列表 2审核列表 types: 1, // 1申请列表 2审核列表
}, },
unitList:[], //来往单位集合 unitList: [], //来往单位集合
proList:[], //工程集合 proList: [], //工程集合
}; }
}, },
created() { created() {
this.getList(); this.getList()
this.getUnitList(); this.getUnitList()
this.getProList(); this.getProList()
}, },
methods: { methods: {
// 获取 申请列表 // 获取 申请列表
async getList() { async getList() {
this.loading = true; this.loading = true
const params = { const params = {
unitId:this.queryParams.unitId, unitId: this.queryParams.unitId,
proId:this.queryParams.proId, proId: this.queryParams.proId,
keyWord:this.queryParams.keyWord, keyWord: this.queryParams.keyWord,
typeName:this.queryParams.typeName, typeName: this.queryParams.typeName,
typeModelName:this.queryParams.typeModelName, typeModelName: this.queryParams.typeModelName,
startTime:this.queryParams.time && this.queryParams.time[0], startTime: this.queryParams.time && this.queryParams.time[0],
endTime:this.queryParams.time && this.queryParams.time[1], endTime: this.queryParams.time && this.queryParams.time[1],
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
pageNum: this.queryParams.pageNum pageNum: this.queryParams.pageNum,
} }
const res = await leaseRecord(params) const res = await leaseRecord(params)
this.loading = false; this.loading = false
this.leaseAuditList = res.data.rows; this.leaseAuditList = res.data.rows
this.total = res.data.total; this.total = res.data.total
}, },
// 获取 来往单位 列表数据 // 获取 来往单位 列表数据
async getUnitList(){ async getUnitList() {
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
console.log('GetUnitData ======================',res) console.log('GetUnitData ======================', res)
}, },
// 获取 工程名称 列表数据 // 获取 工程名称 列表数据
async getProList(){ async getProList() {
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
console.log('GetProData ======================',res) console.log('GetProData ======================', res)
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
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.dateRange = []
this.resetForm("queryForm"); this.resetForm('queryForm')
this.getUnitList(); this.getUnitList()
this.getProList(); this.getProList()
this.handleQuery(); this.handleQuery()
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('material/leaseRecord/export', { this.download(
...this.queryParams 'material/leaseRecord/export',
}, `综合查询_领料记录_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
},
} `综合查询_领料记录_${new Date().getTime()}.xlsx`
}; )
},
},
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini { ::v-deep.el-table .fixed-width .el-button--mini {