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

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

This commit is contained in:
zzyuan 2025-01-22 09:59:54 +08:00
parent a962b345fb 1f76e51498
commit 91aeaa0e3b
8 changed files with 332 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/part/partArrived.js
View File

@ -61,4 +61,13 @@ export function getPartTypeFileList(query) {
method: 'get', method: 'get',
params: query params: query
}) })
}
//根据任务id查询入库单
export function getInBoundForm(query) {
return request({
url: '/material/part_arrived/getInBoundForm',
method: 'get',
params: query
})
} }

6
src/views/material/part/partAccept/detail.vue
View File

@ -148,12 +148,12 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <!-- <el-table-column
label="供应商" label="供应商"
align="center" align="center"
prop="supplierName" prop="supplier"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column <el-table-column
label="出厂日期" label="出厂日期"
align="center" align="center"

336
src/views/material/part/partAccept/index.vue
View File

@ -83,10 +83,10 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span> <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货时间" align="center" prop="arrivalTime" width="150" :show-overflow-tooltip="true"/> <el-table-column label="到货时间" align="center" prop="arrivalTime" width="200" :show-overflow-tooltip="true"/>
<el-table-column label="采购单号" align="center" prop="code" width="150" :show-overflow-tooltip="true"/> <el-table-column label="采购单号" align="center" prop="code" width="150" :show-overflow-tooltip="true"/>
<el-table-column label="采购配件" align="center" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/> <el-table-column label="采购配件" align="center" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseMaNumber" :show-overflow-tooltip="true"/> <el-table-column label="采购数量" align="center" prop="purchaseMaNumber" :show-overflow-tooltip="true"/>
<el-table-column label="物资厂家" align="center" prop="supplier" :show-overflow-tooltip="true"/> <el-table-column label="物资厂家" align="center" prop="supplier" :show-overflow-tooltip="true"/>
<el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true"/> <el-table-column label="创建人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="200" :show-overflow-tooltip="true"/> <el-table-column label="创建时间" align="center" prop="createTime" width="200" :show-overflow-tooltip="true"/>
@ -132,170 +132,156 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 验收单弹窗 --> <!-- 入库单弹窗 -->
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="openPrint" :visible.sync="openPrint"
width="1100px" width="1100px"
append-to-body append-to-body
> >
<div style="height: 500px; overflow-y: scroll"> <div style="height: 500px; overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRef" class="print"> <vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div <div
class="title" class="title"
style=" style="text-align: center; font-weight: 600; font-size: 16px"
text-align: center; >
font-weight: 600; 机具配件到货入库单
font-size: 16px; </div>
" <div
> class="info"
机具配件到货验收单 style="margin-top: 10px; display: flex; flex-wrap: wrap"
</div> >
<div <div
class="info" class="item"
style="margin-top: 10px; display: flex; flex-wrap: wrap" style="
> width: 100%;
<div flex-shrink: 0;
class="item" margin-bottom: 5px;
style=" font-size: 14px;
width: 100%; "
flex-shrink: 0; >
margin-bottom: 5px; <span>单据编号：{{printData.code}}</span>
font-size: 14px; </div>
" <div
> class="item"
<span>单据编号：{{printData.code}}</span> style="
</div> width: 50%;
<div flex-shrink: 0;
class="item" margin-bottom: 5px;
style=" font-size: 14px;
width: 50%; "
flex-shrink: 0; >
margin-bottom: 5px; <span>生产厂家（供应商）：{{printData.supplier}}</span>
font-size: 14px;
"
>
<span>生产厂家（供应商）：{{printData.supplierName}}</span>
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>到货日期：{{printData.arrivalDate}}</span>
</div>
</div>
<el-table
:data="printTableData"
class="table"
style="
margin-top: 20px;
width: 1000px;
padding-bottom: 1px;
"
border
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column
label="序号"
align="center"
type="index"
row=2
/>
<el-table-column
label="物资名称"
align="center"
prop="maTypeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeName"
/>
<el-table-column
label="单位"
align="center"
prop="unitName"
/>
<el-table-column label="验收情况" align="center">
<el-table-column
label="采购数量"
align="center"
prop="purchaseNum"
/>
<el-table-column
label="验收结论"
align="center"
prop="checkResult"
/>
</el-table-column>
<el-table-column
label="备注"
align="center"
prop="remark"
/>
<!-- <el-table-column-->
<!-- label="合格证及技术资料"-->
<!-- align="center"-->
<!-- prop=""-->
<!-- />-->
<!-- <el-table-column label="包装" align="center" prop="" />-->
</el-table>
<div
class="fillIn"
style="
margin-top: 20px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 33%">
<div>
<span>供应科：{{printData.supplyDept}}</span>
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>生产技术科：{{printData.productionTechDept}}</span>
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>库管班：{{printData.warehouseTeam}}</span>
</div>
</div>
</div>
</vue-easy-print>
</div> </div>
<div slot="footer" class="dialog-footer" style="text-align: center"> <div
<el-button type="primary" @click="print">打 印</el-button> class="item"
<el-button @click="openPrint = false">关 闭</el-button> style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
<span>到货日期：{{printData.arrivalTime}}</span>
</div> </div>
</el-dialog> </div>
<el-table
:data="printTableData"
class="table"
style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
border
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" row="2" />
<el-table-column
label="配件类型"
align="center"
prop="maName"
/>
<el-table-column
label="配件名称"
align="center"
prop="maTypeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="partName"
/>
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="采购数量" align="center" prop="purchaseNum" />
<!-- <el-table-column label="验收情况" align="center">
<el-table-column
label="到货数量"
align="center"
prop="purchaseNum"
/>
<el-table-column
label="验收结论"
align="center"
prop="purchaseNum"
/>
</el-table-column>
<el-table-column label="备注" align="center" prop="unitName" /> -->
</el-table>
<div
class="fillIn"
style="
margin-top: 20px;
display: flex;
justify-content: space-between;
"
>
<div class="item" style="width: 33%">
<div>
<span>供应科：</span>
</div>
</div>
<!-- <div class="item" style="width: 33%">
<div>
<span>生产技术科：</span>
</div>
</div> -->
<div class="item" style="width: 33%">
<div>
<span>生产技术科：</span>
<!-- <el-select v-model="printData.productionTechDept" placeholder="请选择生产技术科">
<el-option v-for="item in productionTechDeptOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> -->
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>库管班：</span>
</div>
</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="openPrint = false">关 闭</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getPurchaseCheckFormByTaskId } from "@/api/purchase/goodsAccept"; import { getListNewBuy,getInBoundForm } from '@/api/part/partArrived';
import { getListNewBuy } from '@/api/part/partArrived'; import { passAll, rejectAll } from '@/api/part/partAccept';
import { passAll,rejectAll } from '@/api/part/partAccept'; import vueEasyPrint from "vue-easy-print";
import { downloadFile } from '@/utils/download' import { downloadFile } from '@/utils/download'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
export default { export default {
name: "PartAcceptList", name: "PartAcceptList",
dicts: ['part_task_status'], dicts: ['part_task_status'],
components: { vueEasyPrint },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -329,6 +315,11 @@ import { passAll,rejectAll } from '@/api/part/partAccept';
openPrint: false, openPrint: false,
printData: {}, printData: {},
printTableData: [], printTableData: [],
productionTechDeptOptions: [
{ value: '0', label: '张三' },
{ value: '1', label: '李四' },
{ value: '2', label: '王五' },
],
}; };
}, },
created() { created() {
@ -427,27 +418,24 @@ import { passAll,rejectAll } from '@/api/part/partAccept';
this.$modal.msgError('驳回失败') this.$modal.msgError('驳回失败')
}) })
}, },
//查看验收单 //查看入库单
handlePrint(row) { handlePrint(row) {
// this.query.taskId = row.taskId // this.query.taskId = row.taskId
this.getPrintTable(row.taskId) this.openPrint = true;
this.openPrint = true this.title = "机具配件到货入库单";
this.title = '新购工机具验收单' let params = {
id: row.id,
taskId: row.taskId,
};
this.getPrintTable(params)
}, },
//获取验收单数据 //获取入库单数据
getPrintTable(taskId) { getPrintTable(params) {
getPurchaseCheckFormByTaskId(taskId).then((response) => { getInBoundForm({ id: params.id,taskId:params.taskId }).then((response) => {
this.printData = response.data this.printData = response.data.partTypeCheckInfo;
this.printTableData = response.data.materialList this.printTableData = response.data.partTypeCheckDetailsList;
// let supplierList = []
// this.printTableData.forEach((e) => { });
// if (e.supplier) {
// supplierList.push(e.supplier)
// }
// })
// supplierList = [...new Set(supplierList)]
// this.supplierStr = supplierList.join(',')
})
}, },
//打印 //打印
print() { print() {

2
src/views/material/part/partArrived/component/addTools.vue
View File

@ -543,7 +543,7 @@ export default {
obj.purchaseTaxPrice = 0 obj.purchaseTaxPrice = 0
obj.purchaseNum = 1 obj.purchaseNum = 1
obj.status = 0 obj.status = 0
obj.isExitFile = '0', obj.isExitFile = '1',
obj.bmFileInfos=[] obj.bmFileInfos=[]
tempList.push(obj); tempList.push(obj);
break break

111
src/views/material/part/partArrived/component/home.vue
View File

@ -107,7 +107,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="采购物资" label="采购配件"
align="center" align="center"
prop="purchaseMaTypeName" prop="purchaseMaTypeName"
width="140" width="140"
@ -223,7 +223,7 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 验收单弹窗 --> <!-- 入库单弹窗 -->
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="openPrint" :visible.sync="openPrint"
@ -236,7 +236,7 @@
class="title" class="title"
style="text-align: center; font-weight: 600; font-size: 16px" style="text-align: center; font-weight: 600; font-size: 16px"
> >
机具配件到货验收单 机具配件到货入库单
</div> </div>
<div <div
class="info" class="info"
@ -251,7 +251,7 @@
font-size: 14px; font-size: 14px;
" "
> >
<span>单据编号：</span> <span>单据编号：{{printData.code}}</span>
</div> </div>
<div <div
class="item" class="item"
@ -262,7 +262,7 @@
font-size: 14px; font-size: 14px;
" "
> >
<span>生产厂家（供应商）：</span> <span>生产厂家（供应商）：{{printData.supplier}}</span>
</div> </div>
<div <div
@ -274,7 +274,7 @@
font-size: 14px; font-size: 14px;
" "
> >
<span>到货日期：</span> <span>到货日期：{{printData.arrivalTime}}</span>
</div> </div>
</div> </div>
<el-table <el-table
@ -286,17 +286,23 @@
<!-- <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" row="2" /> <el-table-column label="序号" align="center" type="index" row="2" />
<el-table-column <el-table-column
label="物资名称" label="配件类型"
align="center" align="center"
prop="machineTypeName" prop="maName"
/>
<el-table-column
label="配件名称"
align="center"
prop="maTypeName"
/> />
<el-table-column <el-table-column
label="规格型号" label="规格型号"
align="center" align="center"
prop="specificationType" prop="partName"
/> />
<el-table-column label="单位" align="center" prop="unitName" /> <el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="验收情况" align="center"> <el-table-column label="采购数量" align="center" prop="purchaseNum" />
<!-- <el-table-column label="验收情况" align="center">
<el-table-column <el-table-column
label="到货数量" label="到货数量"
align="center" align="center"
@ -308,14 +314,7 @@
prop="purchaseNum" prop="purchaseNum"
/> />
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="unitName" /> <el-table-column label="备注" align="center" prop="unitName" /> -->
<!-- <el-table-column-->
<!-- label="合格证及技术资料"-->
<!-- align="center"-->
<!-- prop=""-->
<!-- />-->
<!-- <el-table-column label="包装" align="center" prop="" />-->
</el-table> </el-table>
<div <div
@ -332,10 +331,18 @@
</div> </div>
</div> </div>
<div class="item" style="width: 33%"> <!-- <div class="item" style="width: 33%">
<div> <div>
<span>生产技术科：</span> <span>生产技术科：</span>
</div> </div>
</div> -->
<div class="item" style="width: 33%">
<div>
<span>生产技术科：</span>
<!-- <el-select v-model="printData.productionTechDept" placeholder="请选择生产技术科">
<el-option v-for="item in productionTechDeptOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> -->
</div>
</div> </div>
<div class="item" style="width: 33%"> <div class="item" style="width: 33%">
@ -357,15 +364,12 @@
</template> </template>
<script> <script>
import { import { getListNewBuy, deletePartInfo, getInBoundForm } from '@/api/part/partArrived';
getAcceptanceForm, import vueEasyPrint from "vue-easy-print";
} from "@/api/purchase/goodsArrived";
import { getListNewBuy,deletePartInfo } from '@/api/part/partArrived';
export default { export default {
name: "Home", name: "Home",
dicts: ["part_task_status"], dicts: ["part_task_status"],
// components: { vueEasyPrint }, components: { vueEasyPrint },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -426,6 +430,12 @@ export default {
printTableData: [], printTableData: [],
// 供应商 // 供应商
supplierStr: "", supplierStr: "",
productionTechDeptOptions: [
{ value: '0', label: '张三' },
{ value: '1', label: '李四' },
{ value: '2', label: '王五' },
],
}; };
}, },
created() { created() {
@ -495,59 +505,36 @@ export default {
}; };
this.resetForm("form"); this.resetForm("form");
}, },
// // 多选框选中数据
// handleSelectionChange(selection) {
// this.ids = selection.map((item) => item.taskId)
// this.single = selection.length != 1
// this.multiple = !selection.length
// },
/** 验收按钮 */ /** 验收按钮 */
handleAccept(row) { handleAccept(row) {
// let query = { taskId: row.taskId }
// this.$tab.closeOpenPage({
// path: '/store/newBuy/newDevicesAccept',
// query,
// })
this.$emit("acceptTools", row.taskId); this.$emit("acceptTools", row.taskId);
}, },
//编码管理 //编码管理
handleCode(row) { handleCode(row) {
// let query = { taskId: row.taskId }
// this.$tab
// .closeOpenPage({
// path: '/store/newBuy/newDevicesCode',
// query,
// })
// .then(() => {
// this.$tab.refreshPage()
// })
this.$emit("codingTools", row.taskId); this.$emit("codingTools", row.taskId);
}, },
//获取验收单数据 //获取入库单数据
getPrintTable(taskId) { getPrintTable(params) {
getAcceptanceForm({ taskId: taskId }).then((response) => { getInBoundForm({ id: params.id,taskId:params.taskId }).then((response) => {
this.printData = response.data; this.printData = response.data.partTypeCheckInfo;
this.printTableData = response.data.checkDetailsList; this.printTableData = response.data.partTypeCheckDetailsList;
let supplierList = [];
this.printTableData.forEach((e) => {
if (e.supplier) {
supplierList.push(e.supplier);
}
});
supplierList = [...new Set(supplierList)];
this.supplierStr = supplierList.join(",");
}); });
}, },
//查看验收单 //查看入库单
handlePrint(row) { handlePrint(row) {
// this.query.taskId = row.taskId // this.query.taskId = row.taskId
// this.getPrintTable(row.taskId)
this.openPrint = true; this.openPrint = true;
this.title = "机具设备到货验收单"; this.title = "机具配件到货入库单";
let params = {
id: row.id,
taskId: row.taskId,
};
this.getPrintTable(params)
}, },
//打印 //打印
print() { print() {

6
src/views/material/purchase/goodsAccept/detail.vue
View File

@ -85,7 +85,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/> <el-table-column label="验收结论" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" width="180" v-if="!isView"> <!-- <el-table-column label="操作" align="center" width="180" v-if="!isView">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status==2||scope.row.status==13||scope.row.status==14"> <el-button size="mini" type="success" @click="pass(scope.row)" v-if="scope.row.status==2||scope.row.status==13||scope.row.status==14">
合格 合格
@ -94,7 +94,7 @@
不合格 不合格
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<!-- <pagination <!-- <pagination
@ -402,7 +402,7 @@ export default {
console.log(param); console.log(param);
acceptInnerVerifyer(param).then((response) => { acceptInnerVerifyer(param).then((response) => {
if (response.code == 200) { if (response.code == 200) {
this.$modal.msgSuccess("操作成功"); this.$modal.msgSuccess(response.msg);
this.confirmShow = false; this.confirmShow = false;
this.getList(); this.getList();
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();

178
src/views/material/purchase/goodsArrived/component/home.vue
View File

@ -133,67 +133,83 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 验收单弹窗 --> <!-- 验收单弹窗 -->
<el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body> <el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body>
<div style="height: 500px; overflow-y: scroll"> <div style="height: 500px; overflow-y: scroll">
<vue-easy-print tableShow ref="remarksPrintRef" class="print"> <vue-easy-print tableShow ref="remarksPrintRef" class="print">
<div class="title" style="text-align: center; font-weight: 600; font-size: 16px"> <div class="title" style="text-align: center;font-weight: 600;font-size: 16px;">
机具设备到货验收单 机具设备到货验收单
</div> </div>
<div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap"> <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
<div class="item" style="width: 100%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div class="item" style="width: 100%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>单据编号：</span> <span>单据编号：{{printData.code}}</span>
</div> </div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <div
<span>生产厂家（供应商）：</span> class="item"
</div> style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> <span>生产厂家（供应商）：{{printData.supplierName}}</span>
<span>到货日期：</span> </div>
</div> <div
</div> class="item"
<el-table :data="printTableData" class="table" style="margin-top: 20px; width: 1000px; padding-bottom: 1px" border> style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<!--<el-table-column type="selection" width="55" align="center" />--> <span>到货日期：{{printData.arrivalDate}}</span>
<el-table-column label="序号" align="center" type="index" row="2" /> </div>
<el-table-column label="物资名称" align="center" prop="machine" /> </div>
<el-table-column label="规格型号" align="center" prop="specifica" /> <el-table :data="printTableData" class="table" style="margin-top: 20px;width: 1000px;padding-bottom: 1px;" border>
<el-table-column label="单位" align="center" prop="unitName" /> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="配送信息" align="center"> <el-table-column label="序号" align="center" type="index" row="2" />
<el-table-column label="到货数量" align="center" prop="purchaseNum"/> <el-table-column label="物资名称" align="center" prop="maTypeName"/>
<el-table-column label="验收结论" align="center" prop="purchaseNum"/> <el-table-column label="规格型号" align="center" prop="typeName"/>
<el-table-column label="质保质量" align="center"> <el-table-column label="单位" align="center" prop="unitName"/>
<el-table-column label="实收份数" align="center" prop="purchaseNum"/> <el-table-column label="配送信息" align="center">
<el-table-column label="符合要求" align="center" prop="purchaseNum"/> <el-table-column label="采购数量" align="center" prop="purchaseNum"/>
</el-table-column> <el-table-column label="验收结论" align="center" prop="checkResult"/>
</el-table-column> <el-table-column label="质保质量" align="center">
<el-table-column label="备注" align="center" prop="unitName"/> <el-table-column label="实收份数" align="center" prop="checkNum"/>
</el-table> <el-table-column label="符合要求" align="center"/>
</el-table-column>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark"/>
</el-table>
<div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;"> <div class="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;" >
<div class="item" style="width: 33%"> <div class="item" style="width: 33%;display: flex;align-items: center;">
<div> <div style="width: 25%;">供应科：</div>
<span>供应科：</span> <div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.gySignUrl">
</div> <div v-for="(sign, index) in printData.gySignUrl" :key="index" style="width: 35%;margin-left: 5px;">
</div> <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
<div class="item" style="width: 33%"> </div>
<div> </div>
<span>生产技术科：</span> </div>
</div>
</div> <div class="item" style="width: 33%;display: flex;align-items: center;">
<div class="item" style="width: 33%"> <div style="width: 30%;">生产技术科：</div>
<div> <div style="width: 70%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.scSignUrl">
<span>库管班：</span> <div v-for="(sign, index) in printData.scSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
</div> <img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
</div>
</div>
</div>
<div class="item" style="width: 33%;display: flex;align-items: center;">
<div style="width: 25%;">库管班：</div>
<div style="width: 75%;display: flex;align-items: center;flex-wrap: wrap;" v-if="printData.kgSignUrl">
<div v-for="(sign, index) in printData.kgSignUrl" :key="index" style="width: 35%;margin-left: 5px;">
<img :src="sign.signUrl" :class="sign.signType=='0' ? 'image-type':'sign-type'" alt="">
</div>
</div>
<!-- <div>
<span>库管班：{{printData.warehouseTeam}}</span>
</div> -->
</div>
</div>
</vue-easy-print>
</div> </div>
</div>
</vue-easy-print> <div slot="footer" class="dialog-footer" style="text-align: center">
</div> <el-button type="primary" @click="print">打 印</el-button>
<el-button @click="openPrint = false">关 闭</el-button>
<div slot="footer" class="dialog-footer" style="text-align: center"> </div>
<el-button type="primary" @click="print">打 印</el-button> </el-dialog>
<el-button @click="openPrint = false">关 闭</el-button>
</div>
</el-dialog>
<!-- 通知弹窗 --> <!-- 通知弹窗 -->
<el-dialog :title="title" :visible.sync="showPeople" width="800px" append-to-body @close="cancel"> <el-dialog :title="title" :visible.sync="showPeople" width="800px" append-to-body @close="cancel">
@ -263,7 +279,7 @@ import {
bmNoticeInfo, bmNoticeInfo,
delPeople, delPeople,
} from "@/api/purchase/goodsArrived"; } from "@/api/purchase/goodsArrived";
import {getPurchaseCheckFormByTaskId } from "@/api/purchase/goodsAccept";
export default { export default {
name: "Home", name: "Home",
dicts: ["purchase_task_status"], dicts: ["purchase_task_status"],
@ -547,25 +563,25 @@ export default {
//获取验收单数据 //获取验收单数据
getPrintTable(taskId) { getPrintTable(taskId) {
getAcceptanceForm({ taskId: taskId }).then((response) => { getPurchaseCheckFormByTaskId(taskId).then((response) => {
this.printData = response.data; this.printData = response.data;
this.printTableData = response.data.checkDetailsList; this.printTableData = response.data.materialList;
let supplierList = []; // let supplierList = [];
this.printTableData.forEach((e) => { // this.printTableData.forEach((e) => {
if (e.supplier) { // if (e.supplier) {
supplierList.push(e.supplier); // supplierList.push(e.supplier);
} // }
}); // });
supplierList = [...new Set(supplierList)]; // supplierList = [...new Set(supplierList)];
this.supplierStr = supplierList.join(","); // this.supplierStr = supplierList.join(",");
}); });
}, },
//查看验收单 //查看验收单
handlePrint(row) { handlePrint(row) {
// this.query.taskId = row.taskId // this.query.taskId = row.taskId
// this.getPrintTable(row.taskId) this.getPrintTable(row.taskId)
this.openPrint = true; this.openPrint = true;
this.title = "机具设备到货验收单"; this.title = "机具设备到货验收单";
}, },
@ -613,8 +629,22 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini { .image-type {
width: 70px !important; /* 旋转图片 */
margin-bottom: 10px; transform: rotate(-90deg);
} /* 确保旋转后的图片不会超出容器 */
max-width: 100%;
/* 保持图片的宽高比 */
width: 40px;
height: 80px;
}
.sign-type{
width: 80px;
height: 40px;
}
::v-deep.el-table .fixed-width .el-button--mini {
width: 70px !important;
margin-bottom: 10px;
}
</style> </style>

2
src/views/system/user/index.vue
View File

@ -84,7 +84,7 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
<el-table-column type="selection" width="50" align="center"/> <el-table-column type="selection" width="50" align="center"/>
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/> <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="false"/>
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />