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

优化

This commit is contained in:
bb_pan 2025-04-18 10:29:18 +08:00
parent d02ec45f57
commit 22f562c0b2
4 changed files with 219 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
append-to-body append-to-body
width="800px" width="800px"
> >
<div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;"> <div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;font-size: 13px;">
<vue-easy-print tableShow ref="printRef"> <vue-easy-print tableShow ref="printRef">
<div class="order_box"> <div class="order_box">
<div class="order_box_one"> <div class="order_box_one">
@ -32,7 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;"> <el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;font-size: 13px">
<el-table-column label="编号" align="center" type="index" /> <el-table-column label="编号" align="center" type="index" />
<el-table-column <el-table-column
label="类型名称" label="类型名称"

32
sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
View File

@ -158,15 +158,17 @@
</el-button> </el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" v-if="!isView"
plain type="warning"
icon="el-icon-download" plain
size="mini" icon="el-icon-download"
@click="handleExport" size="mini"
>导出</el-button> @click="handleExport"
</el-col> --> >导出</el-button
>
</el-col>
</el-row> </el-row>
<el-table <el-table
@ -821,9 +823,13 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
// this.download('system/role/export', { this.download(
// ...this.queryParams 'base/tm_task/exportLeaseApplyListAll',
// }, `role_${new Date().getTime()}.xlsx`) {
taskId: this.taskId,
},
`领料任务详情_${new Date().getTime()}.xlsx`,
)
}, },
checkNum(row) { checkNum(row) {
@ -853,7 +859,6 @@ export default {
} else { } else {
this.handleData(val) this.handleData(val)
} }
}, },
handleData(val) { handleData(val) {
let nodes = null let nodes = null
@ -907,7 +912,6 @@ export default {
} catch (error) { } catch (error) {
console.log('🚀 ~ handleDeviceType ~ error:', error) console.log('🚀 ~ handleDeviceType ~ error:', error)
} }
}, },
//// 将数据处理成 表格中需要的数据 //// 将数据处理成 表格中需要的数据
handelTableItemData(node) { handelTableItemData(node) {

218
sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
View File

@ -190,10 +190,10 @@
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="单位类型" label="单位类型"
align="center" align="center"
prop="typeId" prop="typeId"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="领料工程" label="领料工程"
@ -251,8 +251,10 @@
scope.row.taskStatus == 98 scope.row.taskStatus == 98
" "
>{{ >{{
scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0] (scope.row.leaseApplyInfoList &&
.companyAuditRemark || '' scope.row.leaseApplyInfoList[0]
.companyAuditRemark) ||
''
}} }}
</span> </span>
<span <span
@ -261,7 +263,9 @@
scope.row.taskStatus == 99 scope.row.taskStatus == 99
" "
>{{ >{{
scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].deptAuditRemark || (scope.row.leaseApplyInfoList &&
scope.row.leaseApplyInfoList[0]
.deptAuditRemark) ||
'' ''
}} }}
</span> </span>
@ -271,7 +275,9 @@
scope.row.taskStatus == 100 scope.row.taskStatus == 100
" "
>{{ >{{
scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark || (scope.row.leaseApplyInfoList &&
scope.row.leaseApplyInfoList[0]
.directAuditRemark) ||
'' ''
}} }}
</span> </span>
@ -281,19 +287,28 @@
scope.row.taskStatus < 98 scope.row.taskStatus < 98
" "
>{{ >{{
scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark || (scope.row.leaseApplyInfoList &&
scope.row.leaseApplyInfoList[0]
.directAuditRemark) ||
'' ''
}}</span }}</span
> >
<span v-if="scope.row.taskStatus > 100">{{ <span v-if="scope.row.taskStatus > 100">{{
scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark || '' (scope.row.leaseApplyInfoList &&
scope.row.leaseApplyInfoList[0]
.directAuditRemark) ||
''
}}</span> }}</span>
<!-- <span v-else>{{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> --> <!-- <span v-else>{{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" show-overflow-tooltip> <el-table-column label="备注" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.leaseApplyInfoList && scope.row.leaseApplyInfoList[0].remark || '' }} {{
(scope.row.leaseApplyInfoList &&
scope.row.leaseApplyInfoList[0].remark) ||
''
}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="180">
@ -337,6 +352,13 @@
style="color: #f56c6c" style="color: #f56c6c"
>删除</el-button >删除</el-button
> >
<el-button
icon="el-icon-tickets"
style="color: #67c23a"
type="text"
@click="openLld(scope.row)"
>领料单</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -349,10 +371,147 @@
:page-sizes="[5, 10, 15, 20, 30]" :page-sizes="[5, 10, 15, 20, 30]"
@pagination="getList" @pagination="getList"
/> />
<!-- 领料单弹窗 -->
<el-dialog :visible.sync="open" width="800px" append-to-body>
<div style="height: 500px; overflow-y: scroll; padding: 0 20px">
<vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div
class="title"
style="
text-align: center;
font-weight: 600;
font-size: 16px;
"
>
领料单
</div>
<div
class="info"
style="margin-top: 10px; display: flex; flex-wrap: wrap"
>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>领料单位：</span>{{ leaseApplyData.unitName }}
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>工程名称：</span>{{ leaseApplyData.proName }}
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>时间：</span>{{ leaseApplyData.updateTimes }}
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>编号：</span>{{ leaseApplyData.code }}
</div>
</div>
<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
label="序号"
align="center"
type="index"
/>
<el-table-column
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>
<div
class="fillIn"
style="
margin-top: 30px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 25%">
<span>审核：</span>
</div>
<div class="item" style="width: 25%">
<span>领料：</span>
</div>
<div class="item" style="width: 25%">
<span>仓库：</span>
</div>
<div class="item" style="width: 25%">
<span>操作人：</span>
</div>
</div>
</vue-easy-print>
</div>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="print">打 印</el-button>
<el-button @click="open = false">关 闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import vueEasyPrint from 'vue-easy-print'
import { import {
listType, listType,
getType, getType,
@ -366,10 +525,12 @@ import {
getUnitData, getUnitData,
getProData, getProData,
deleteTask, deleteTask,
getLeaseListAll,
} from '@/api/claimAndRefund/receive' } from '@/api/claimAndRefund/receive'
export default { export default {
// name: "ReceiveApply", // name: "ReceiveApply",
components: { vueEasyPrint },
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
props: { props: {
routerParams: { routerParams: {
@ -381,6 +542,8 @@ export default {
}, },
data() { data() {
return { return {
open: false,
leaseApplyData: {}, // 领料单数据
// 遮罩层 // 遮罩层
loading: false, loading: false,
// 选中数组 // 选中数组
@ -461,15 +624,15 @@ export default {
const res = await getLeaseAuditListAll(params) const res = await getLeaseAuditListAll(params)
console.log('🚀 ~ getList ~ res:', res) console.log('🚀 ~ getList ~ res:', res)
res.data.rows.forEach(item => { res.data.rows.forEach((item) => {
switch (item.typeId) { switch (item.typeId) {
case '0': case '0':
item.typeId = '内部单位'; item.typeId = '内部单位'
break; break
case '1': case '1':
item.typeId = '外部单位'; item.typeId = '外部单位'
break; break
} }
}) })
this.loading = false this.loading = false
this.leaseAuditList = res.data.rows this.leaseAuditList = res.data.rows
@ -629,6 +792,21 @@ export default {
this.$store.dispatch('dict/cleanDict') this.$store.dispatch('dict/cleanDict')
}) })
}, },
//打开领料单
async openLld(row) {
this.open = true
const res = await getLeaseListAll({ taskId: row.taskId })
this.leaseApplyDetails = res.rows[0].leaseApplyDetails
this.leaseApplyData = res.rows[0]
console.log('this.leaseApplyData ============', this.leaseApplyData)
},
// 领料单 打印
print() {
this.$refs.remarksPrintRef.print()
},
}, },
watch: { watch: {
$route: { $route: {

2
sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -1199,7 +1199,7 @@ export default {
handleExportOuter() { handleExportOuter() {
this.download( this.download(
'base/leaseOutDetails/exportOutboundOrder', 'base/leaseOutDetails/exportOutboundOrder',
{ parentId: this.outboundParams.parentId }, { ...this.outboundParams },
`出库单_${new Date().getTime()}.xlsx`, `出库单_${new Date().getTime()}.xlsx`,
) )
}, },