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

fix:修改

This commit is contained in:
jackal 2024-04-18 13:58:13 +08:00
parent af01245488
commit a242f47045
2 changed files with 880 additions and 988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue
View File

@ -13,18 +13,22 @@
<div class="order_box">
<div class="order_box_one">
<div>
<span>工程名称：</span><span>{{ rowObj.lotName }}</span>
<span>工程名称：</span>
<span>{{ rowObj.lotName }}</span>
</div>
<div>
<span>退料时间：</span><span>{{ rowObj.backTime }}</span>
<span>退料时间：</span>
<span>{{ rowObj.backTime }}</span>
</div>
</div>
<div class="order_box_one">
<div>
<span>退料单位：</span><span>{{ rowObj.unitName }}</span>
<span>退料单位：</span>
<span>{{ rowObj.unitName }}</span>
</div>
<div>
<span>编号：</span><span>{{ rowObj.code }}</span>
<span>编号：</span>
<span>{{ rowObj.code }}</span>
</div>
</div>
</div>
@ -36,6 +40,40 @@
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column type="expand">
<template slot-scope="scope">
<div class="nested-table-container">
<el-table :data="scope.row.maTypeDetails" style="width: 100%">
<!-- 子表格的列 -->
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="类型名称"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="预领数量"
align="center"
prop="partNum"
:show-overflow-tooltip="true"
/>
</el-table>
</div>
</template>
</el-table-column>
<el-table-column
label="规格型号"
align="center"
@ -48,8 +86,7 @@
class-name="small-padding fixed-width"
width="200"
prop="num"
>
</el-table-column>
></el-table-column>
<!-- <el-table-column prop="remarks" label="备注" align="center">
<template slot-scope="scope">
<span
@ -78,14 +115,10 @@
</div>
<el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
<el-table-column label="序号" align="center" prop="dictId" />
<el-table-column prop="name" label="名称" align="center">
</el-table-column>
<el-table-column prop="type" label="规格型号" align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center">
</el-table-column>
<el-table-column prop="number" label="数量" align="center">
</el-table-column>
<el-table-column prop="name" label="名称" align="center"></el-table-column>
<el-table-column prop="type" label="规格型号" align="center"></el-table-column>
<el-table-column prop="unit" label="单位" align="center"></el-table-column>
<el-table-column prop="number" label="数量" align="center"></el-table-column>
</el-table>
</vue-easy-print>
</div>
@ -96,55 +129,55 @@
</el-dialog>
</template>
<script>
import vueEasyPrint from 'vue-easy-print';
import { getViewByApply,materialReturnNoteByExamine } from "@/api/claimAndRefund/return.js"
import vueEasyPrint from 'vue-easy-print'
import { getViewByApply, materialReturnNoteByExamine } from '@/api/claimAndRefund/return.js'
export default {
components: { vueEasyPrint, },
components: { vueEasyPrint },
props: {
// 弹窗是否显示
isShowFlag: {
type: Boolean,
default: false
default: false,
},
// 对应操作数据键值
priKey: {
type: [String, Number],
default: ""
default: '',
},
//弹窗标题
dialogTitle: {
type: String,
default: ""
default: '',
},
rowObj: {
type: Object,
default: {}
}
default: {},
},
},
watch: {
isShowFlag(val) {
if (val) {
this.init();
}
this.init()
}
},
},
computed: {
dialogShowFlag: {
get() {
return this.isShowFlag;
return this.isShowFlag
},
set(v) {
this.$emit("update:isShowFlag", v);
}
}
this.$emit('update:isShowFlag', v)
},
},
},
data() {
return {
fullscreenLoading: false,
tableData: [],
open: false,
title: ""
};
title: '',
}
},
methods: {
init() {
@ -159,18 +192,18 @@ export default {
},
// 取消按钮
cancel() {
this.dialogShowFlag = false;
this.dialogShowFlag = false
},
print() {
this.$refs.printRef.print();
this.$refs.printRef.print()
},
remarksClick() {
this.title = '查看'
this.open = true
},
remarksPrint() {
this.$refs.remarksPrintRef.print();
}
this.$refs.remarksPrintRef.print()
},
// submit() {
// this.$refs["dynamicValidateForm"].validate(valid => {
@ -183,8 +216,8 @@ export default {
// }
// });
// }
},
}
};
</script>
<style lang="scss" scoped>
.order_box {

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

@ -25,13 +25,7 @@
style="width: 240px"
placeholder="请选择"
>
<el-option
v-for="item in unitList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
<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">
@ -43,13 +37,7 @@
style="width: 240px"
placeholder="请选择"
>
<el-option
v-for="item in proList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
<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="typeId">
@ -64,8 +52,7 @@
}"
@change="handleNodeClick"
aria-placeholder="请选择极具类型"
>
</el-cascader>
></el-cascader>
</el-form-item>
<el-form-item label="协议号" prop="agreementCode">
<el-input
@ -88,8 +75,7 @@
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
></el-option>
</el-select>
</el-form-item>
@ -101,37 +87,18 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery"
>重置</el-button
>
<el-button type="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>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="handleExam"
:disabled="multiple"
>批量审核</el-button
>
<el-button type="primary" plain size="mini" @click="handleExam" :disabled="multiple">批量审核</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@ -143,93 +110,29 @@
>
</el-col>-->
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
<el-button type="success" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="typeList"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center"
:selectable="selectable"
/>
<el-table-column
label="序号"
sortable
align="center"
type="index"
/>
<el-table-column
label="退料单号"
align="center"
prop="code"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料工程"
align="center"
prop="lotName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料机具"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="退料人员"
align="center"
prop="backPerson"
:show-overflow-tooltip="true"
/>
<el-table-column
label="联系电话"
align="center"
prop="phone"
:show-overflow-tooltip="true"
/>
<el-table-column
label="申请时间"
align="center"
prop="backTime"
:show-overflow-tooltip="true"
/>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :selectable="selectable" />
<el-table-column label="序号" sortable align="center" type="index" />
<el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" />
<el-table-column label="退料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="退料工程" align="center" prop="lotName" :show-overflow-tooltip="true" />
<el-table-column label="退料机具" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="退料人员" align="center" prop="backPerson" :show-overflow-tooltip="true" />
<el-table-column label="联系电话" align="center" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="申请时间" align="center" prop="backTime" :show-overflow-tooltip="true" />
<el-table-column
label="协议号"
align="center"
prop="agreementCode"
: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">
<template slot-scope="scope">
<div>
<!-- 暂时全部未否 -->
@ -237,18 +140,12 @@
</div>
</template>
</el-table-column>
<el-table-column
label="退料状态"
align="center"
:show-overflow-tooltip="true"
>
<el-table-column label="退料状态" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<!-- 状态
37-待审核
38-已审核-->
<el-button type="text" v-if="scope.row.applyStatus == '0'">
待审核
</el-button>
<el-button type="text" v-if="scope.row.applyStatus == '0'">待审核</el-button>
<el-button
type="text"
style="color: #67c23a"
@ -256,9 +153,7 @@
scope.row.applyStatus == '1' ||
scope.row.applyStatus == '3'
"
>
退料通过
</el-button>
>退料通过</el-button>
<!-- <el-button type="text" v-if="scope.row.taskStatus == '39'">
退料核查
</el-button>-->
@ -269,38 +164,19 @@
scope.row.applyStatus == '2' ||
scope.row.applyStatus == '4'
"
>
退料驳回
</el-button>
<el-button
type="text"
style="color: #67c23a"
v-if="scope.row.taskStatus == '40'"
>
退料完成
</el-button>
>退料驳回</el-button>
<el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '40'">退料完成</el-button>
</template>
</el-table-column>
<el-table-column
label="不通过原因"
align="center"
prop="dictName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="250"
>
<el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
<template slot-scope="scope">
<el-button
size="mini"
plain
icon="el-icon-zoom-in"
@click="handleSee(scope.row, 'see')"
>查看</el-button
>
>查看</el-button>
<el-button
size="mini"
type="primary"
@ -308,8 +184,7 @@
v-if="scope.row.applyStatus == '0'"
v-hasPermi="['receive:examine:nbry-jjfgs']"
@click="handleUpdate(scope.row, 'update')"
>审批</el-button
>
>审批</el-button>
<el-button
size="mini"
type="primary"
@ -317,14 +192,8 @@
v-if="scope.row.applyStatus == '0'"
v-hasPermi="['receive:examine:nbry-sbfgs']"
@click="handleUpdate(scope.row, 'update')"
>审批</el-button
>
<el-button
size="mini"
type="info"
@click="handlePrint(scope.row)"
>退料单</el-button
>
>审批</el-button>
<el-button size="mini" type="info" @click="handlePrint(scope.row)">退料单</el-button>
</template>
</el-table-column>
</el-table>
@ -338,12 +207,7 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="1000px"
append-to-body
>
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form
:model="dialogQueryParams"
ref="queryForm1"
@ -388,8 +252,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="选择时间"
>
</el-date-picker>
></el-date-picker>
</el-form-item>
</el-row>
<el-row>
@ -423,19 +286,8 @@
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery1"
>查询</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="resetQuery1"
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery1">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery1">重置</el-button>
</el-form-item>
</el-row>
</el-form>
@ -443,6 +295,13 @@
<el-table v-loading="loading" :data="loadingList" height="400px">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column type="expand">
<template slot-scope="scope">
<div class="nested-table-container">
<el-table :data="scope.row.maTypeDetails" style="width: 100%">
<!-- 子表格的列 -->
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="类型名称"
align="center"
@ -452,9 +311,26 @@
<el-table-column
label="规格型号"
align="center"
prop="typeCode"
prop="typeModelName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="预领数量"
align="center"
prop="partNum"
:show-overflow-tooltip="true"
/>
</el-table>
</div>
</template>
</el-table-column>
<el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
<el-table-column
label="退料数量"
align="center"
@ -513,10 +389,7 @@
>
<div class="submit_box">
<div>
<i
class="el-icon-circle-check"
style="color: #ff9900; font-size: 30px"
></i>
<i class="el-icon-circle-check" style="color: #ff9900; font-size: 30px"></i>
</div>
<div class="submit_box_title">
<div>{{ openTextOne }}</div>
@ -525,9 +398,7 @@
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">返回</el-button>
<el-button type="primary" @click="submitOpenOneForm()"
>确定</el-button
>
<el-button type="primary" @click="submitOpenOneForm()">确定</el-button>
</div>
</el-dialog>
@ -540,10 +411,7 @@
>
<div class="submit_box_two">
<div>
<i
class="el-icon-circle-check"
style="color: #00c196; font-size: 30px"
></i>
<i class="el-icon-circle-check" style="color: #00c196; font-size: 30px"></i>
</div>
<div class="submit_box_title">{{ openTextThree }}</div>
</div>
@ -553,14 +421,7 @@
</template>
<script>
import {
listType,
getType,
delType,
addType,
updateType,
refreshCache,
} from '@/api/system/dict/type'
import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
import {
getBackAuditList,
getViewByExamine,
@ -568,11 +429,7 @@
ApiBackApplyRefuse,
} from '@/api/claimAndRefund/return.js'
import { getInfo, h } from '@/api/login'
import {
getUnitData,
getProData,
getAgreementInfoById,
} from '@/api/claimAndRefund/receive.js'
import { getUnitData, getProData, getAgreementInfoById } from '@/api/claimAndRefund/receive.js'
import dialogForm from './dialogFormExame.vue'
// 10:42开始日期startTime,结束日期endTime 机具类型typeId
// http://localhost/claimAndRefund/return/returnApply
@ -727,10 +584,8 @@
// 多选框选中数据
handleSelectionChange(selection) {
this.checkResultOne = selection.every(
(item) => item.taskStatus !== '38',
)
this.ids = selection.map((item) => item.id)
this.checkResultOne = selection.every(item => item.taskStatus !== '38')
this.ids = selection.map(item => item.id)
this.single = selection.length != 1
this.multiple = !selection.length
},
@ -775,11 +630,11 @@
keyWord: this.dialogQueryParams.keyWord,
badId: this.rowObj.badId,
}
getViewByExamine(params).then((res) => {
this.loadingList = res.rows;
getViewByExamine(params).then(res => {
this.loadingList = res.rows
this.loadingList.forEach(item => {
if (!item.num) {
item.num = item.preNum;
item.num = item.preNum
}
})
this.loadingTotal = res.total
@ -803,9 +658,7 @@
},
/** 提交按钮 同意 */
submitForm() {
const isNum = this.loadingList.some(
(item) => item.num == '' || item.num == undefined,
)
const isNum = this.loadingList.some(item => item.num == '' || item.num == undefined)
if (isNum) {
this.$message.error('退料数量不能为空！')
return
@ -813,46 +666,50 @@
let params = {
ids: this.rowObj.id,
backApplyDetails:this.loadingList
backApplyDetails: this.loadingList,
}
// console.log(params)
ApiBackApplyAudit(params).then(res => {
ApiBackApplyAudit(params)
.then(res => {
if (res.code == 200) {
this.open = false
this.getList()
}
}).catch(() => { })
})
.catch(() => {})
},
/** 提交按钮 拒绝 */
submitForm2() {
const isNum = this.loadingList.some(
(item) => item.num == '' || item.num == undefined
);
const isNum = this.loadingList.some(item => item.num == '' || item.num == undefined)
if (isNum) {
this.$message.error('退料数量不能为空！');
return;
this.$message.error('退料数量不能为空！')
return
}
let params = {
ids: this.rowObj.id
ids: this.rowObj.id,
}
ApiBackApplyRefuse(params).then(res => {
ApiBackApplyRefuse(params)
.then(res => {
if (res.code == 200) {
this.open = false
this.getList()
}
}).catch(() => { })
})
.catch(() => {})
},
handleAdd() {
let params = {
ids: this.rowObj.id
ids: this.rowObj.id,
}
ApiBackApplyAudit(params).then(res => {
ApiBackApplyAudit(params)
.then(res => {
if (res.code == 200) {
this.open = false
this.$message.error(res.msg);
this.$message.error(res.msg)
this.getList()
}
}).catch(() => { })
})
.catch(() => {})
},
selectable(row) {
if (row.taskStatus == 37) {
@ -862,7 +719,7 @@
}
},
checkNum(row) {
const maxNum = row.preNum;
const maxNum = row.preNum
if (row.num <= 1) {
row.num = 1
} else if (row.num >= maxNum) {
@ -871,15 +728,17 @@
},
handleExam() {
let params = {
ids: this.ids.join(',')
ids: this.ids.join(','),
}
ApiBackApplyAudit(params).then(res => {
ApiBackApplyAudit(params)
.then(res => {
if (res.code == 200) {
this.ids = []
this.$message.error(res.msg);
this.$message.error(res.msg)
this.getList()
}
}).catch(() => { })
})
.catch(() => {})
},
/** 删除按钮操作 */
@ -903,7 +762,7 @@
{
...this.queryParams,
},
`退料审核单_${new Date().getTime()}.xlsx`,
`退料审核单_${new Date().getTime()}.xlsx`
)
},
/** 刷新缓存按钮操作 */
@ -914,7 +773,7 @@
})
},
InitIGetInfo() {
getInfo().then((res) => {
getInfo().then(res => {
this.companyId = res.user.companyId
this.getList()
})