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

Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2025-07-25 18:42:51 +08:00
parent 92e23028ca 979248e1fa
commit 0f1bee7070
6 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/materialsStation/index.js
View File

@ -274,6 +274,15 @@ export function getApplyInfo(id) {
})
}
// 获取领料单
export function getPickListApi(data) {
return request({
url: '/material/material_lease_apply_info/getPickList',
method: 'get',
params: data
})
}
// 领料申请-删除
export function applyRemove(ids) {
return request({

2
src/utils/request.js
View File

@ -24,7 +24,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: process.env.VUE_APP_BASE_API,
// 超时
timeout: 15000
timeout: 30000
})
// request 拦截器

65
src/views/material/lease/materialConfirm/index.vue
View File

@ -68,13 +68,11 @@
<el-table-column label="租赁单位" align="center" prop="unitName" width="180px" />
<el-table-column label="租赁工程" align="center" prop="projectName" width="180px" />
<el-table-column label="协议号" align="center" prop="agreementCode" width="140px" show-overflow-tooltip />
<el-table-column
label="租赁申请单号"
align="center"
prop="code"
width="140px"
show-overflow-tooltip
></el-table-column>
<el-table-column label="租赁申请单号" align="center" prop="code" width="140px" show-overflow-tooltip>
<template slot-scope="{ row }">
<span>{{ row.code || row.businessCode }}</span>
</template>
</el-table-column>
<el-table-column
label="申请数量"
@ -186,9 +184,11 @@
</template>
</el-table-column>
<!-- 操作 -->
<el-table-column label="操作" align="center" width="240" v-if="!isView">
<el-table-column label="操作" align="center" width="240">
<template slot-scope="{ row }">
<el-button v-if="row.isConfirm != 2" type="primary" size="mini" @click="handleConfirm(row)">确认</el-button>
<el-button v-if="row.isConfirm != 2 && !isView" type="primary" size="mini" @click="handleConfirm(row)">
确认
</el-button>
<el-button type="" size="mini" @click="openBills(row)">领料单</el-button>
<el-button type="" size="mini" @click="openPass(row)">出门证</el-button>
</template>
@ -278,22 +278,22 @@
<div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
<div class="item" style="width: 23%; display: flex; align-items: center; flex-wrap: wrap">
<div style="width: 25%">审核：</div>
<div
style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
v-if="approveSignList.length > 0"
>
<div
style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
v-if="approveSignList.length > 0"
style="width: 80%; margin-left: 20px; height: 40px"
v-for="(item, index) in approveSignList"
:key="index"
>
<div
style="width: 80%; margin-left: 20px; height: 40px"
v-for="(item, index) in approveSignList"
:key="index"
>
<img
:src="item.outSignUrl"
:class="{ 'is-rotate': item.outSignType == 0 }"
style="width: 40px; height: 90px; max-width: 100%"
alt=""
/>
</div>
<img
:src="item.outSignUrl"
:class="{ 'is-rotate': item.outSignType == 0 }"
style="width: 40px; height: 90px; max-width: 100%"
alt=""
/>
</div>
</div>
</div>
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
@ -336,14 +336,18 @@
<div class="item" style="width: 28%; display: flex; align-items: center">
<div style="width: 25%">库管：</div>
<div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" v-if="kgSignList.length > 0">
<img
<div
style="width: 80%; margin-left: 20px; height: 40px"
v-for="(item, index) in kgSignList"
:key="index"
:src="item.outSignUrl"
style="width: 50px; height: 100px"
:style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
alt=""
/>
>
<img
:src="item.outSignUrl"
:class="{ 'is-rotate': item.outSignType == 0 }"
style="width: 40px; height: 90px; max-width: 100%"
alt=""
/>
</div>
</div>
</div>
<div class="item" style="width: 25%; display: flex; align-items: center">
@ -741,4 +745,7 @@ export default {
border-collapse: collapse;
}
}
.is-rotate {
transform: rotate(-90deg);
}
</style>

2
src/views/material/ma/type/index.vue
View File

@ -688,7 +688,7 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="addTitle === '修改' && this.levelTemp == 2">
<el-form-item label="是否绑定班组" prop="keeperUserId">
<el-form-item label="是否绑定班组长" prop="keeperUserId">
<el-select style="width: 100%" v-model="addFormParams.keeperUserId">
<el-option v-for="(item, index) in teamLeaderList" :key="index" :label="item.keeperUserName" :value="item.keeperUserId" />
</el-select>

10
src/views/materialsStation/toolsLease/apply/component/homeApply.vue
View File

@ -195,11 +195,12 @@
</div>
<div class="item" style="width: 50%; display: flex; align-items: center; flex-wrap: wrap">
<div style="display: flex; align-items: center">
<div style="width: 50px">领料：</div>
<div style="width: 50px;margin-right: 18px">领料：</div>
<img
v-if="leaseApplyData.leaseSignUrl"
:src="leaseApplyData.leaseSignUrl"
style="width: 50px; height: 110px; transform: rotate(-90deg)"
style="width: 40px; height: 90px"
:style="{transform: leaseApplyData.leaseSignType == 0 ? 'rotate(-90deg)' : ''}"
alt=""
/>
</div>
@ -256,7 +257,7 @@
</template>
<script>
import { getListLeaseApply, getApplyInfo, applyRemove } from '@/api/materialsStation'
import { getListLeaseApply, getPickListApi, applyRemove } from '@/api/materialsStation'
import vueEasyPrint from 'vue-easy-print'
import printJS from 'print-js'
@ -367,8 +368,7 @@ export default {
this.leaseApplyDetails = []
this.leaseApplyData = {}
this.open = true
var ids = row.id
const res = await getApplyInfo(ids)
const res = await getPickListApi({ id: row.id })
this.leaseApplyDetails = res.data.leaseApplyDetailsList
this.leaseApplyData = res.data.leaseApplyInfo
},

10
src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
View File

@ -186,11 +186,12 @@
</div>
<div class="item" style="width: 50%; display: flex; align-items: center; flex-wrap: wrap">
<div style="display: flex; align-items: center">
<div style="width: 50px">领料：</div>
<div style="width: 50px;margin-right: 18px">领料：</div>
<img
v-if="leaseApplyData.leaseSignUrl"
:src="leaseApplyData.leaseSignUrl"
style="width: 70px; height: 50px"
style="width: 40px; height: 90px"
:style="{transform: leaseApplyData.leaseSignType == 0 ? 'rotate(-90deg)' : ''}"
alt=""
/>
</div>
@ -247,7 +248,7 @@
</template>
<script>
import { getListLeaseApply, getApplyInfo, applyRemove } from '@/api/materialsStation'
import { getListLeaseApply, getPickListApi, applyRemove } from '@/api/materialsStation'
import vueEasyPrint from 'vue-easy-print'
import printJS from 'print-js'
@ -359,8 +360,7 @@ export default {
this.leaseApplyData = {}
this.title = '领料单'
this.open = true
var ids = row.id
const res = await getApplyInfo(ids)
const res = await getPickListApi({ id: row.id})
this.leaseApplyDetails = res.data.leaseApplyDetailsList
this.leaseApplyData = res.data.leaseApplyInfo
},