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:
hongchao 2025-01-17 18:00:21 +08:00
parent 48b4754fb4 48b9317066
commit 764ccfb256
9 changed files with 155 additions and 617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/material/archives/index.vue
View File

@ -644,14 +644,15 @@ export default {
this.single = selection.length != 1;
this.multiple = !selection.length;
},
//查看
//******查看************
handleView(row) {
console.log(row)
},
//顶部重命名按钮
handleReName(){
this.handleUpdate(this.ids[0])
},
/** 重命名按钮操作 */
/** （表格）重命名按钮操作 */
handleUpdate(row) {
console.log(row)
this.rowData=row
@ -718,29 +719,33 @@ export default {
this.fileList=[]
this.upload.open=true;
},
//文件上传-成功
handleSuccess(response, file, fileList) {
console.log('File uploaded successfully:', response);
console.log('File uploaded successfully:', file);
if(response.code==200){
if(response.code==200){
let param = {
docName:response.data.name,
docUrl:response.data.url,
docType:response.data.name.split(".")[1],
docType:response.data.name.split(".").pop(),
docSize:(file.size / 1024 / 1024).toFixed(2),
detailsId:this.queryParams.detailsId,
infoId:this.queryParams.infoId
infoId:this.queryParams.infoId,
level:this.queryParams.level
}
this.uploadList.push(param)
}
// let size = (file.size / 1024 / 1024).toFixed(2)
// console.log(size)
},
//文件上传删除
handleFileRemove(file, fileList){
console.log(file)
console.log(fileList)
let index = this.uploadList.findIndex(item=>item.docName==file.name)
this.uploadList.splice(index,1)
},
//文件上传失败
handleError(err, file, fileList) {
console.error('Error while uploading file:', err);
},
@ -767,6 +772,7 @@ export default {
// this.$refs.upload.submit()
},
//取消
cancelUpload() {
this.getList()
this.upload.open=false
@ -794,13 +800,10 @@ export default {
},
//切换展示模式
changeShowType(val){
this.showType=val;
this.showType=val;
}
},
};
</script>

4
src/views/material/ma/typeConfigKeeper/index.vue
View File

@ -120,7 +120,7 @@
>解绑</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -129,7 +129,7 @@
@click="handleExport"
>导出
</el-button>
</el-col>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"

4
src/views/material/ma/typeConfigRepair/index.vue
View File

@ -120,7 +120,7 @@
>解绑</el-button
>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -129,7 +129,7 @@
@click="handleExport"
>导出
</el-button>
</el-col>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"

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

@ -1,19 +1,8 @@
<template>
<div class="app-container" id="acceptDetail">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="类型规格：" prop="typeId">
<el-select
v-model="queryParams.typeId"
placeholder="请选择类型规格"
clearable
>
<el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable>
<el-option
v-for="dict in materialModelList"
:key="dict.value"
@ -40,169 +29,62 @@
type="datetime"
>
</el-date-picker>
</el-form-item>
</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"
size="mini"
icon="el-icon-back"
@click="jumpList"
>新购到货验收</el-button
>
<el-button type="primary" size="mini" icon="el-icon-back"
@click="jumpList">新购到货验收</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
<el-button type="warning" plain icon="el-icon-download" size="mini"
@click="handleExport">导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
@click="batchPass"
icon="el-icon-check"
v-show="!isView"
size="mini"
:disabled="multiple"
>合格</el-button
>
<el-button type="success" icon="el-icon-check" size="mini"
@click="batchPass" v-show="!isView" :disabled="multiple">合格</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
@click="batchReject"
icon="el-icon-close"
v-show="!isView"
size="mini"
:disabled="multiple"
>不合格</el-button
>
<el-button type="danger" icon="el-icon-close" size="mini"
@click="batchReject" v-show="!isView" :disabled="multiple">不合格</el-button>
</el-col>
</el-row>
<el-table
v-loading="loading"
:data="tableList"
ref="multipleTable"
row-key="typeId"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center" :selectable="selectable"
:reserve-selection="true"
v-if="!isView"
/>
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="typeId" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :selectable="selectable" :reserve-selection="true" v-if="!isView"/>
<el-table-column label="序号" align="center" width="80" type="index">
</el-table-column>
<el-table-column
label="物资名称"
align="center"
prop="maTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="规格型号"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="单位"
align="center"
prop="unitName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购数量"
align="center"
prop="purchaseNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="验收数量"
align="center"
prop="checkNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="购置单价(元含税)"
align="center"
prop="purchaseTaxPrice"
:show-overflow-tooltip="true"
/>
<el-table-column
label="购置单价（元不含税）"
align="center"
prop="purchasePrice"
:show-overflow-tooltip="true"
/>
<el-table-column label="物资名称" align="center" prop="maTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true"/>
<el-table-column label="验收数量" align="center" prop="checkNum" :show-overflow-tooltip="true"/>
<el-table-column label="购置单价(元含税)" align="center" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
<el-table-column label="购置单价（元不含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="供应商" align="center" prop="supplierName" /> -->
<el-table-column
label="是否未固定资产"
align="center"
prop="fixCodeStr"
:show-overflow-tooltip="true"
/>
<el-table-column
label="出厂日期"
align="center"
prop="productionTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="相关配套资料"
align="center"
prop=""
:show-overflow-tooltip="true"
>
<el-table-column label="是否未固定资产" align="center" prop="fixCodeStr" :show-overflow-tooltip="true"/>
<el-table-column label="出厂日期" align="center" prop="productionTime" :show-overflow-tooltip="true"/>
<el-table-column label="相关配套资料" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div style="color: #02A7F0;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==0">报告管理</div>
<div style="color: red;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==1">报告管理</div>
</template>
</el-table-column>
<el-table-column
label="状态"
align="center"
prop="status"
:show-overflow-tooltip="true"
>
<el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag
:options="dict.type.purchase_task_status"
:value="scope.row.status"
/>
<dict-tag :options="dict.type.purchase_task_status" :value="scope.row.status"/>
</template>
</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">
<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">
@ -223,45 +105,17 @@
@pagination="getList"
/> -->
<el-dialog
title="报告管理"
:visible.sync="open"
width="900px"
append-to-body
>
<el-table
v-loading="dialogLoading"
:data="fileDataList"
width="100%"
height="350px"
>
<el-dialog title="报告管理" :visible.sync="open" width="900px" append-to-body>
<el-table v-loading="dialogLoading" :data="fileDataList" width="100%" height="350px">
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column
label="报告类型"
align="center"
prop="dictLabel"
:show-overflow-tooltip="true"
/>
<el-table-column
label="文件名称"
align="center"
prop="name"
:show-overflow-tooltip="true"
/>
<el-table-column
label="类型名称"
align="center"
:show-overflow-tooltip="true"
>
<el-table-column label="报告类型" align="center" prop="dictLabel" :show-overflow-tooltip="true"/>
<el-table-column label="文件名称" align="center" prop="name" :show-overflow-tooltip="true"/>
<el-table-column label="类型名称" align="center" :show-overflow-tooltip="true">
<template>
<div>{{ this.rowData.maTypeName }}</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>
<div>{{ this.rowData.typeName }}</div>
</template>
@ -298,13 +152,7 @@
<el-dialog title="验收" :visible.sync="confirmShow" width="600px" height="300px">
<div style="width: 100%; height: 80%; display: flex;margin-bottom: 10px;">
<div style="width:15%;">验收结论：</div>
<el-input
type="textarea"
:rows="3" style="width:80%;"
placeholder="请输入结论"
v-model="checkResult"
maxlength="100">
</el-input>
<el-input type="textarea" :rows="3" style="width:80%;" placeholder="请输入结论" v-model="checkResult" maxlength="100"></el-input>
</div>
<div style="width: 100%;height: 20%;display: flex;justify-content: flex-end;align-items: center;">
<el-button type="primary" @click="confirmCheck">确认</el-button>

12
src/views/material/purchase/goodsAccept/index.vue
View File

@ -74,13 +74,17 @@
</el-table-column>
<el-table-column label="到货时间" align="center" prop="arrivalTime" width="180" :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" width="150" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseMaNumber" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格（元不含税）" align="center" prop="purchasePrice" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="税率" align="center" prop="taxRate" :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="taxRate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taxRate }}%</span>
</template>
</el-table-column>
<el-table-column label="物资厂家" align="center" prop="supplier" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="操作人" align="center" prop="createBy" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="操作时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true" width="100">
<!-- <template slot-scope="scope">-->

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

@ -1,13 +1,6 @@
<template>
<div>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item>
<el-date-picker
v-model="queryParams.time"
@ -19,8 +12,7 @@
style="width: 240px"
>
</el-date-picker>
</el-form-item>
</el-form-item>
<!-- <el-form-item label="设备状态" prop="status">
<el-select
clearable
@ -36,8 +28,7 @@
v-for="dict in dict.type.purchase_task_status"
/>
</el-select>
</el-form-item> -->
</el-form-item> -->
<el-form-item prop="keyWord">
<el-input
v-model="queryParams.keyWord"
@ -63,8 +54,7 @@
v-for="dict in taskStatusList"
/>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@ -81,174 +71,56 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['purchase:info:add']"
>设备到货新增</el-button
>
<el-button type="primary" plain icon="el-icon-plus" size="mini"
@click="handleAdd" v-hasPermi="['purchase:info:add']"
>设备到货新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
<el-button type="warning" plain icon="el-icon-download" size="mini"
@click="handleExport"
>导出</el-button
>
>导出</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" row-key="id" border>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column width="60" align="center" label="序号" type="index" />
<el-table-column
align="center"
width="160"
label="到货时间"
prop="arrivalTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购单号"
width="150"
align="center"
prop="code"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购物资"
align="center" width="180"
prop="purchaseMaTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购数量"
align="center" width="100"
prop="purchaseMaNumber"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购价格(元含税)"
align="center" width="100"
prop="purchaseTaxPrice"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购价格(元不含税)"
align="center" width="100"
prop="purchasePrice"
:show-overflow-tooltip="true"
/>
<el-table-column
label="税率"
align="center"
prop="taxRate"
:show-overflow-tooltip="true"
>
<el-table-column align="center" width="160" label="到货时间" prop="arrivalTime" :show-overflow-tooltip="true"/>
<el-table-column label="采购单号" width="150" align="center" prop="code" :show-overflow-tooltip="true"/>
<el-table-column label="采购物资" align="center" width="180" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" width="100" prop="purchaseMaNumber" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(元含税)" align="center" width="100" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(元不含税)" align="center" width="100" prop="purchasePrice" :show-overflow-tooltip="true"/>
<el-table-column label="税率" align="center" prop="taxRate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taxRate }}%</span>
</template>
</el-table-column>
<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"
width="160"
prop="createTime"
:show-overflow-tooltip="true"
/>
<el-table-column
label="状态"
align="center"
prop="taskStatusName"
:show-overflow-tooltip="true"
>
<!-- <template slot-scope="scope">-->
<!-- <dict-tag-->
<!-- :options="dict.type.purchase_task_status"-->
<!-- :value="scope.row.taskStatus"-->
<!-- />-->
<!-- </template>-->
<!-- <template slot-scope="scope">
<span v-if="scope.row.taskStatus==0">待提交</span>
<span v-if="scope.row.taskStatus==1">待通知</span>
<span v-if="scope.row.taskStatus==2">待验收</span>
<span v-if="scope.row.taskStatus==3">待绑定</span>
<span v-if="scope.row.taskStatus==4">待入库</span>
<span v-if="scope.row.taskStatus==5">已完成</span>
<span v-if="scope.row.taskStatus==6">驳回待验收</span>
<span v-if="scope.row.taskStatus==7">驳回待绑定</span>
<span v-if="scope.row.taskStatus==8">驳回待入库</span>
<span v-if="scope.row.taskStatus==9">入库进行中</span>
<span v-if="scope.row.taskStatus==10">未完成</span>
</template> -->
</el-table-column>
<el-table-column
label="备注"
align="center"
prop="remark"
show-overflow-tooltip
/>
<el-table-column label="物资厂家" align="center" prop="supplier" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
<el-table-column label="操作时间" align="center" width="160" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
<el-table-column label="操作" align="center" width="250" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
style="margin-bottom: 10px"
type="normal"
<el-button size="mini" style="margin-bottom: 10px" type="normal"
@click="handleView(scope.row)"
>查看</el-button
>
<el-button
size="mini"
style="margin-bottom: 10px"
type="primary"
>查看</el-button>
<el-button size="mini" style="margin-bottom: 10px" type="primary"
v-if="scope.row.taskStatusName == '未完成'" v-hasPermi="['purchase:info:edit']"
@click="handleUpdate(scope.row)"
>编辑</el-button>
<el-button size="mini" style="margin-bottom: 10px" type="success"
v-if="scope.row.taskStatusName == '未完成'"
@click="handleUpdate(scope.row)"
v-hasPermi="['purchase:info:edit']"
>编辑</el-button
>
<el-button
size="mini"
style="margin-bottom: 10px"
type="success"
v-if="scope.row.taskStatusName == '未完成'"
@click="handleNotice(scope.row)"
v-hasPermi="['purchase:person:notice']"
>通知</el-button
>
<el-button size="mini" type="warning" @click="handlePrint(scope.row)"
>验收单</el-button
>
<el-button
size="mini"
type="danger"
@click="handleNotice(scope.row)" v-hasPermi="['purchase:person:notice']"
>通知</el-button>
<el-button size="mini" type="warning"
@click="handlePrint(scope.row)"
>验收单</el-button>
<el-button size="mini" type="danger" v-hasPermi="['purchase:info:remove']"
@click="handleDeletePurchase(scope.row)"
v-hasPermi="['purchase:info:remove']"
>删除</el-button
>
>删除</el-button>
</template>
</el-table-column>
</el-table>
@ -262,138 +134,58 @@
/>
<!-- 验收单弹窗 -->
<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">
<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
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="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;">
<span>单据编号：</span>
</div>
<div
class="item"
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>生产厂家（供应商）：</span>
</div>
<div
class="item"
style="
width: 50%;
flex-shrink: 0;
margin-bottom: 5px;
font-size: 14px;
"
>
</div>
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
<span>到货日期：</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 :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="machineTypeName"
/>
<el-table-column
label="规格型号"
align="center"
prop="specificationType"
/>
<el-table-column label="物资名称" align="center" prop="machine" />
<el-table-column label="规格型号" align="center" prop="specifica" />
<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="purchaseNum"
/>
<el-table-column label="到货数量" align="center" prop="purchaseNum"/>
<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 label="实收份数" align="center" prop="purchaseNum"/>
<el-table-column label="符合要求" align="center" prop="purchaseNum"/>
</el-table-column>
</el-table-column>
<el-table-column label="备注" align="center" prop="unitName" />
<!-- <el-table-column-->
<!-- label="合格证及技术资料"-->
<!-- align="center"-->
<!-- prop=""-->
<!-- />-->
<!-- <el-table-column label="包装" align="center" prop="" />-->
<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="fillIn" style="margin-top: 20px;display: flex;justify-content: space-between;">
<div class="item" style="width: 33%">
<div>
<span>供应科：</span>
</div>
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>生产技术科：</span>
</div>
</div>
</div>
<div class="item" style="width: 33%">
<div>
<span>库管班：</span>
</div>
</div>
</div>
</vue-easy-print>
</div>
@ -404,87 +196,31 @@
</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">
<el-row :gutter="24">
<el-col :span="20">
<el-form
:model="form"
ref="form"
size="small"
:inline="true"
:rules="rules"
>
<el-form :model="form" ref="form" size="small" :inline="true" :rules="rules">
<el-form-item label="通知内容:" prop="remark" label-width="100px">
<el-input
v-model="form.remark"
type="textarea"
maxlength="100"
:autosize="{ minRows: 3, maxRows: 6 }"
placeholder="请输入通知内容"
style="width: 450px"
/>
<el-input v-model="form.remark" type="textarea" maxlength="100" :autosize="{ minRows: 3, maxRows: 6 }" placeholder="请输入通知内容" style="width: 450px"/>
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-table
:data="getListPeople"
width="600px"
height="450"
@selection-change="handleSelectionUser"
>
<el-table-column
type="selection"
width="55"
align="center"
:reserve-selection="true"
/>
<el-table-column
label="人员名称"
align="center"
prop="userName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="所属机构"
align="center"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="角色"
align="center"
prop="roleName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="联系电话"
align="center"
prop="telphone"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<el-table :data="getListPeople" width="600px" height="450" @selection-change="handleSelectionUser">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table-column label="人员名称" align="center" prop="userName" :show-overflow-tooltip="true"/>
<el-table-column label="所属机构" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<el-table-column label="角色" align="center" prop="roleName" :show-overflow-tooltip="true"/>
<el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="handleDeletePeople(scope.row)"
>删除</el-button
>
<el-button size="mini" type="danger"
@click="handleDeletePeople(scope.row)" >删除</el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="addUserOpen">人员添加</el-button>
<el-button type="primary" @click="configNotice">发起验收</el-button>
@ -492,75 +228,22 @@
</el-dialog>
<!-- 人员添加 -->
<el-dialog
title="人员添加"
:visible.sync="peopleOpen"
v-if="peopleOpen"
width="1000px"
append-to-body
>
<el-table
v-loading="loading"
:data="userList"
@selection-change="handleSelectionAddUser"
height="450"
>
<el-dialog title="人员添加" :visible.sync="peopleOpen" v-if="peopleOpen" width="1000px" append-to-body>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionAddUser" height="450">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column
label="人员账号"
align="center"
key="userName"
prop="userName"
width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
label="人员名称"
align="center"
key="nickName"
prop="nickName"
width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
label="所属机构"
align="center"
key="deptName"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="角色"
align="center"
key="roleName"
prop="roleName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="联系电话"
align="center"
key="telphone"
prop="telphone"
/>
<!-- <el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<el-table-column label="人员账号" align="center" key="userName" prop="userName" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="人员名称" align="center" key="nickName" prop="nickName" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="所属机构" align="center" key="deptName" prop="deptName" :show-overflow-tooltip="true"/>
<el-table-column label="角色" align="center" key="roleName" prop="roleName" :show-overflow-tooltip="true"/>
<el-table-column label="联系电话" align="center" key="telphone" prop="telphone"/>
<!-- <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="addUser(scope.row)"
>添加</el-button>
<el-button size="mini" type="text" icon="el-icon-plus" @click="addUser(scope.row)"
>添加</el-button>
</template>
</el-table-column>-->
</el-table>
</el-table>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="addUser">添加</el-button>
</div>

4
src/views/material/purchase/goodsBind/component/home.vue
View File

@ -111,7 +111,7 @@
<el-table-column
align="center"
label="到货时间"
prop="arrivalTime" width="200"
prop="arrivalTime" width="180"
show-overflow-tooltip
/>
<el-table-column
@ -141,7 +141,7 @@
<el-table-column
label="创建时间"
align="center"
prop="createTime" width="150"
prop="createTime" width="180"
show-overflow-tooltip
/>
<el-table-column label="状态" align="center" prop="taskStatusName" show-overflow-tooltip>

11
src/views/material/purchase/goodsEntry/index.vue
View File

@ -152,12 +152,11 @@
width="100"
:show-overflow-tooltip="true"
/>
<el-table-column
label="税率"
align="center"
prop="taxRate"
:show-overflow-tooltip="true"
/>
<el-table-column label="税率" align="center" prop="taxRate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taxRate }}%</span>
</template>
</el-table-column>
<el-table-column
label="物资厂家"
align="center"

5
src/views/material/repair/testedInBound/component/editApply.vue
View File

@ -87,7 +87,7 @@
<el-dialog title="数量入库" :visible.sync="numOpen" width="600px" append-to-body>
<div style="width: 100%;height: 100%;display: flex;align-items: center;">
<span style="width: 100px;">入库数量：</span>
<el-input v-model="numInput" type="number" min="0" @input="(v)=>(rowData.unitValue==1?numInput=Number(v.replace(/[^\d.]/g,'')) : numInput=Number(v.replace(/[^\d]/g,'')))"
<el-input v-model="numInput" disabled type="number" min="0" @input="(v)=>(rowData.unitValue==1?numInput=Number(v.replace(/[^\d.]/g,'')) : numInput=Number(v.replace(/[^\d]/g,'')))"
placeholder="请输入入库数量" clearable maxlength="50" style="width: 400px"/>
</div>
<div style="width: 100%;height: 50px;display: flex;justify-content: flex-end;align-items: center;">
@ -299,7 +299,8 @@ export default {
console.log(row)
console.log(row.manageType)
if(row.manageType==1){//数量管理
this.numInput=0;
// this.numInput=0;
this.$set(this,"numInput",row.pendingInputNum)
this.numOpen=true;
this.rowData=row;
}else{//编码-打开