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

领料单样式优化

This commit is contained in:
bb_pan 2025-07-27 16:00:23 +08:00
parent 38e8c8232c
commit 809f413386
4 changed files with 104 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/material/lease/apply/component/homeApply.vue
View File

@ -110,9 +110,9 @@
> >
发布 发布
</el-button> </el-button>
<el-button size="mini" type="warning" v-if="scope.row.taskStatus != 1" @click="handleLld(scope.row)"> <!-- <el-button size="mini" type="warning" v-if="scope.row.taskStatus != 1" @click="handleLld(scope.row)">
领料单 领料单
</el-button> </el-button> -->
<el-button size="mini" type="warning" @click="handlePrint(scope.row)" v-if="scope.row.taskStatus == 4"> <el-button size="mini" type="warning" @click="handlePrint(scope.row)" v-if="scope.row.taskStatus == 4">
出库检验单 出库检验单
</el-button> </el-button>

25
src/views/material/lease/clerkConfirmation/index.vue
View File

@ -275,15 +275,15 @@
</tbody> </tbody>
</table> </table>
<div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between"> <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
<div class="item" style="width: 23%; display: flex; align-items: center; flex-wrap: wrap"> <div class="item" style="width: 23%; display: flex; align-items: flex-start; flex-wrap: wrap">
<div style="width: 25%">审核：</div> <div style="width: 25%">审核：</div>
<div <div
style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
v-if="approveSignList.length > 0" v-if="approveSignList.length > 0"
> >
<div <div
style="width: 80%; margin-left: 20px; height: 40px" style="width: 80%; margin-left: 20px; height: 40px;transform: translateY(-30px)"
v-for="(item, index) in approveSignList" v-for="(item, index) in approveSignList"
:key="index" :key="index"
> >
@ -296,10 +296,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap"> <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
<div style="width: 30%">领料：</div> <div style="width: 30%">领料：</div>
<div <div
style="width: 70%; display: flex; align-items: center; flex-wrap: wrap" style="width: 70%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)"
v-if="outSignList.length > 0" v-if="outSignList.length > 0"
> >
<div <div
@ -316,14 +316,13 @@
</div> </div>
</div> </div>
</div> </div>
<!-- confirmSign --> <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
<div style="width: 30%">材料员：</div> <div style="width: 30%">材料员：</div>
<div <div
style="width: 70%; display: flex; align-items: center; flex-wrap: wrap" style="width: 70%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)"
v-if="confirmSign && confirmSign.confirmSignUrl" v-if="confirmSign && confirmSign.confirmSignUrl"
> >
<div style="width: 80%; margin-left: 20px"> <div style="width: 80%; margin-left: 25px">
<img <img
:src="confirmSign.confirmSignUrl" :src="confirmSign.confirmSignUrl"
style="width: 40px; height: 100px; max-width: 100%" style="width: 40px; height: 100px; max-width: 100%"
@ -333,9 +332,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="item" style="width: 28%; display: flex; align-items: center"> <div class="item" style="width: 28%; display: flex; align-items: flex-start">
<div style="width: 25%">库管：</div> <div style="width: 25%">库管：</div>
<div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" v-if="kgSignList.length > 0"> <div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)" v-if="kgSignList.length > 0">
<div <div
style="width: 80%; margin-left: 20px; height: 40px" style="width: 80%; margin-left: 20px; height: 40px"
v-for="(item, index) in kgSignList" v-for="(item, index) in kgSignList"
@ -350,9 +349,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="item" style="width: 25%; display: flex; align-items: center"> <div class="item" style="width: 25%; display: flex; align-items: flex-start">
<div style="width: 25%">制单：</div> <div style="width: 25%">制单：</div>
<div style="width: 75%" v-if="leaseApplyData.leaseSignUrl"> <div style="width: 75%;margin-left: 20px;transform: translateY(-30px)" v-if="leaseApplyData.leaseSignUrl">
<img <img
:src="leaseApplyData.leaseSignUrl" :src="leaseApplyData.leaseSignUrl"
style="width: 40px; height: 90px; max-width: 100%" style="width: 40px; height: 90px; max-width: 100%"

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

@ -190,7 +190,7 @@
确认 确认
</el-button> </el-button>
<el-button type="" size="mini" @click="openBills(row)">领料单</el-button> <el-button type="" size="mini" @click="openBills(row)">领料单</el-button>
<el-button type="" size="mini" @click="openPass(row)">出门证</el-button> <!-- <el-button type="" size="mini" @click="openPass(row)">出门证</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -275,15 +275,15 @@
</tbody> </tbody>
</table> </table>
<div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between"> <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
<div class="item" style="width: 23%; display: flex; align-items: center; flex-wrap: wrap"> <div class="item" style="width: 23%; display: flex; align-items: flex-start; flex-wrap: wrap">
<div style="width: 25%">审核：</div> <div style="width: 25%">审核：</div>
<div <div
style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
v-if="approveSignList.length > 0" v-if="approveSignList.length > 0"
> >
<div <div
style="width: 80%; margin-left: 20px; height: 40px" style="width: 80%; margin-left: 20px; height: 40px;transform: translateY(-30px)"
v-for="(item, index) in approveSignList" v-for="(item, index) in approveSignList"
:key="index" :key="index"
> >
@ -296,10 +296,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap"> <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
<div style="width: 30%">领料：</div> <div style="width: 30%">领料：</div>
<div <div
style="width: 70%; display: flex; align-items: center; flex-wrap: wrap" style="width: 70%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)"
v-if="outSignList.length > 0" v-if="outSignList.length > 0"
> >
<div <div
@ -316,14 +316,13 @@
</div> </div>
</div> </div>
</div> </div>
<!-- confirmSign --> <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
<div style="width: 30%">材料员：</div> <div style="width: 30%">材料员：</div>
<div <div
style="width: 70%; display: flex; align-items: center; flex-wrap: wrap" style="width: 70%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)"
v-if="confirmSign && confirmSign.confirmSignUrl" v-if="confirmSign && confirmSign.confirmSignUrl"
> >
<div style="width: 80%; margin-left: 20px"> <div style="width: 80%; margin-left: 25px">
<img <img
:src="confirmSign.confirmSignUrl" :src="confirmSign.confirmSignUrl"
style="width: 40px; height: 100px; max-width: 100%" style="width: 40px; height: 100px; max-width: 100%"
@ -333,9 +332,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="item" style="width: 28%; display: flex; align-items: center"> <div class="item" style="width: 28%; display: flex; align-items: flex-start">
<div style="width: 25%">库管：</div> <div style="width: 25%">库管：</div>
<div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" v-if="kgSignList.length > 0"> <div style="width: 75%; display: flex; align-items: center; flex-wrap: wrap;transform: translateY(-30px)" v-if="kgSignList.length > 0">
<div <div
style="width: 80%; margin-left: 20px; height: 40px" style="width: 80%; margin-left: 20px; height: 40px"
v-for="(item, index) in kgSignList" v-for="(item, index) in kgSignList"
@ -343,16 +342,16 @@
> >
<img <img
:src="item.outSignUrl" :src="item.outSignUrl"
style="width: 40px; height: 90px; max-width: 100%" style="width: 40px; height: 90px"
:style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }" :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
alt="" alt=""
/> />
</div> </div>
</div> </div>
</div> </div>
<div class="item" style="width: 25%; display: flex; align-items: center"> <div class="item" style="width: 25%; display: flex; align-items: flex-start">
<div style="width: 25%">制单：</div> <div style="width: 25%">制单：</div>
<div style="width: 75%" v-if="leaseApplyData.leaseSignUrl"> <div style="width: 75%;margin-left: 20px;transform: translateY(-30px)" v-if="leaseApplyData.leaseSignUrl">
<img <img
:src="leaseApplyData.leaseSignUrl" :src="leaseApplyData.leaseSignUrl"
style="width: 40px; height: 90px; max-width: 100%" style="width: 40px; height: 90px; max-width: 100%"

162
src/views/material/lease/outBound/index.vue
View File

@ -72,18 +72,8 @@
width="150px" width="150px"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column label="租赁单位" align="center" prop="leaseUnit" width="180px" />
label="租赁单位" <el-table-column label="租赁工程" align="center" prop="leaseProject" width="180px" />
align="center"
prop="leaseUnit"
width="180px"
/>
<el-table-column
label="租赁工程"
align="center"
prop="leaseProject"
width="180px"
/>
<!-- <el-table-column <!-- <el-table-column
label="领料物资类型" label="领料物资类型"
align="center" align="center"
@ -91,29 +81,10 @@
width="110px" width="110px"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> --> /> -->
<el-table-column <el-table-column label="协议号" align="center" prop="agreementCode" width="140px" />
label="协议号" <el-table-column label="租赁申请单号" align="center" prop="code" width="140px"></el-table-column>
align="center" <el-table-column label="业务联系单号" align="center" prop="businessCode" width="140px"></el-table-column>
prop="agreementCode" <el-table-column label="申请数量" align="center" prop="preCountNum"></el-table-column>
width="140px"
/>
<el-table-column
label="租赁申请单号"
align="center"
prop="code"
width="140px"
></el-table-column>
<el-table-column
label="业务联系单号"
align="center"
prop="businessCode"
width="140px"
></el-table-column>
<el-table-column
label="申请数量"
align="center"
prop="preCountNum"
></el-table-column>
<!-- <el-table-column <!-- <el-table-column
label="已出库数量" label="已出库数量"
@ -506,31 +477,37 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between"> <div class="fillIn" style="margin-top: 50px; display: flex; justify-content: space-between">
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap"> <div class="item" style="width: 23%; display: flex; align-items: flex-start; flex-wrap: wrap">
<div style="width: 25%">审核：</div> <div style="width: 25%">审核：</div>
<div <div
style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" style="width: 75%; display: flex; align-items: center; flex-wrap: wrap"
v-if="approveSignList.length > 0" v-if="approveSignList.length > 0"
> >
<div <div
style="width: 80%; margin-left: 20px; height: 40px" style="width: 80%; margin-left: 20px; height: 40px; transform: translateY(-30px)"
v-for="(item, index) in approveSignList" v-for="(item, index) in approveSignList"
:key="index" :key="index"
> >
<img <img
:src="item.outSignUrl" :src="item.outSignUrl"
:class="{ 'is-rotate': item.outSignType == 0 }" style="width: 40px; height: 90px; max-width: 100%"
style="width: 40px; height: 90px; max-width: 100%" :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
alt="" alt=""
/> />
</div>
</div> </div>
</div> </div>
</div> <div class="item" style="width: 24%; display: flex; align-items: flex-start; flex-wrap: wrap">
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
<div style="width: 30%">领料：</div> <div style="width: 30%">领料：</div>
<div <div
style="width: 70%; display: flex; align-items: center; flex-wrap: wrap" style="
width: 70%;
display: flex;
align-items: center;
flex-wrap: wrap;
transform: translateY(-30px);
"
v-if="outSignList.length > 0" v-if="outSignList.length > 0"
> >
<div <div
@ -541,16 +518,22 @@
<img <img
:src="item.outSignUrl" :src="item.outSignUrl"
style="width: 40px; height: 90px; max-width: 100%" style="width: 40px; height: 90px; max-width: 100%"
:class="{ 'is-rotate': item.outSignType == 0 }" :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
alt="" alt=""
/> />
</div> </div>
</div> </div>
</div> </div>
<div class="item" style="width: 28%; display: flex; align-items: center"> <div class="item" style="width: 28%; display: flex; align-items: flex-start">
<div style="width: 25%">库管：</div> <div style="width: 25%">库管：</div>
<div <div
style="width: 75%; display: flex; align-items: center; flex-wrap: wrap" style="
width: 75%;
display: flex;
align-items: center;
flex-wrap: wrap;
transform: translateY(-30px);
"
v-if="kgSignList.length > 0" v-if="kgSignList.length > 0"
> >
<div <div
@ -560,20 +543,23 @@
> >
<img <img
:src="item.outSignUrl" :src="item.outSignUrl"
:class="{ 'is-rotate': item.outSignType == 0 }" style="width: 40px; height: 90px"
style="width: 40px; height: 90px; max-width: 100%" :style="{ transform: item.outSignType == 0 ? 'rotate(-90deg)' : '' }"
alt="" alt=""
/> />
</div> </div>
</div> </div>
</div> </div>
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap"> <div class="item" style="width: 25%; display: flex; align-items: flex-start">
<div style="width: 25%">制单：</div> <div style="width: 25%">制单：</div>
<div style="width: 75%" v-if="leaseApplyData.leaseSignUrl"> <div
style="width: 75%; margin-left: 20px; transform: translateY(-30px)"
v-if="leaseApplyData.leaseSignUrl"
>
<img <img
:src="leaseApplyData.leaseSignUrl" :src="leaseApplyData.leaseSignUrl"
:class="{ 'is-rotate': leaseApplyData.leaseSignType == 0 }"
style="width: 40px; height: 90px; max-width: 100%" style="width: 40px; height: 90px; max-width: 100%"
:style="{ transform: leaseApplyData.leaseSignType == 0 ? 'rotate(-90deg)' : '' }"
alt="" alt=""
/> />
</div> </div>
@ -786,7 +772,7 @@ export default {
kgSignList: [], kgSignList: [],
outSignList: [], outSignList: [],
approveSignList: [], approveSignList: [],
currentRowData: null, // 当前查看的行数据 currentRowData: null // 当前查看的行数据
} }
}, },
created() { created() {
@ -1221,36 +1207,40 @@ export default {
// 处理驳回操作 // 处理驳回操作
handleReject(row) { handleReject(row) {
console.log(row); console.log(row)
this.$confirm('确定要驳回此条数据吗？', '提示', { this.$confirm('确定要驳回此条数据吗？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => {
// 调用驳回API
const rejectData = {
id: row.id,
parentId: row.parentId,
taskId: this.currentRowData ? this.currentRowData.taskId : row.taskId, // 使用主列表的taskId
typeId: row.typeId,
newTypeId: row.newTypeId,
publishTask: this.publishTask,
outNum: row.outNum, // 待出库数量
remark: '已出库数量为0，执行驳回操作'
}
rejectLeaseOut(rejectData).then(response => {
this.$modal.msgSuccess('驳回成功')
// 刷新查看弹窗的数据
this.getListView()
// 刷新主列表数据
this.getList()
}).catch(error => {
this.$modal.msgError('驳回失败: ' + (error.message || '未知错误'))
})
}).catch(() => {
// 用户取消操作
}) })
.then(() => {
// 调用驳回API
const rejectData = {
id: row.id,
parentId: row.parentId,
taskId: this.currentRowData ? this.currentRowData.taskId : row.taskId, // 使用主列表的taskId
typeId: row.typeId,
newTypeId: row.newTypeId,
publishTask: this.publishTask,
outNum: row.outNum, // 待出库数量
remark: '已出库数量为0，执行驳回操作'
}
rejectLeaseOut(rejectData)
.then(response => {
this.$modal.msgSuccess('驳回成功')
// 刷新查看弹窗的数据
this.getListView()
// 刷新主列表数据
this.getList()
})
.catch(error => {
this.$modal.msgError('驳回失败: ' + (error.message || '未知错误'))
})
})
.catch(() => {
// 用户取消操作
})
}, },
//绘制五角星 //绘制五角星