admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

材料管理页面/中建五局页面调整

Browse Source
This commit is contained in:
jxj_yjl 2023-04-27 15:22:14 +08:00
parent 93da7c4040
commit cdec2aba21
17 changed files with 1575 additions and 967 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -1,4 +1,4 @@
// var COMPANY = ''; //通用
var COMPANY = ''; //通用
// var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
// var COMPANY='hezhan'; //合展-宿迁
// var COMPANY='nanchang'; //南昌地铁、衢州
@ -11,7 +11,7 @@
// COMPANY = 'yunlian'//云联万物
// COMPANY = 'neimenggu'//内蒙古项目
// COMPANY = 'zjsj'//中建四局
COMPANY = 'zjwj'//中建五局
// COMPANY = 'zjwj'//中建五局

BIN
src/assets/images/menu/xmgk_cggl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
src/assets/images/menu/xmgk_htgl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/assets/images/menu/xmgk_sbgl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
src/assets/images/menu/xmgk_zcgl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
src/assets/images/menu/xmgk_zclgl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

2
src/assets/js/api/materialManagement.js
View File

@ -68,7 +68,7 @@ export const gettGMaterialSupplierEvaluationRecordPageApi = data => get('/xmgl/g
//出入库管理
export const addGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/addWithMaterial', data);
export const deletGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/delete', data);
export const editGtMaterialInOutWarehouseApi = data => post('/xmgl/gt/gtMaterialInOutWarehouse/edit', data);
export const editGtMaterialInOutWarehouseApi = data => post('xmgl/gt/gtMaterialInOutWarehouse/editWithMaterial', data);
export const gettGMaterialInOutWarehousePageApi = data => get('/xmgl/gt/gtMaterialInOutWarehouse/page', data);//查询表单数据
export const gettGMaterialInOutWarehouseListApi = data => get('/xmgl/gt/gtMaterialPointCheckIntoWarehouseDetail/list', data);//根据id查物料

5
src/assets/js/http.js
View File

@ -80,12 +80,13 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
// axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
// axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
// axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
// axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
// axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
} else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com'

60
src/views/companyAdmin/basicSetup/checkItem.vue
View File

@ -55,7 +55,7 @@
@mouseleave="name.visible = false"
>{{
name.dangerName.length > 9
? name.dangerName.substring(0, 8) + "..."
? name.dangerName.substring(0, 8) + '...'
: name.dangerName
}}</span
>
@ -93,7 +93,7 @@
<el-button
type="text"
size="medium"
style="color: red;font-size: 14px;"
style="color: red; font-size: 14px"
icon="el-icon-delete"
@click="del1(name.id, 1)"
></el-button>
@ -132,7 +132,7 @@
>
{{
item.dangerName.length > 10
? item.dangerName.substring(0, 9) + "..."
? item.dangerName.substring(0, 9) + '...'
: item.dangerName
}}
</div>
@ -166,7 +166,7 @@
<el-button
type="text"
size="medium"
style="color: red;font-size: 14px;"
style="color: red; font-size: 14px"
icon="el-icon-delete"
@click="del1(item.id, 2)"
></el-button>
@ -187,10 +187,7 @@
</ul>
<li
class="title"
style="
text-align: center;
line-height: 140px;
"
style="text-align: center; line-height: 140px"
v-show="dataList.length == 0"
>
暂无数据
@ -262,7 +259,7 @@
@click="del1(scope.row.id, 3)"
type="text"
size="small"
style="color: red;"
style="color: red"
icon="el-icon-delete"
>
<span style="font-size: 14px">删除</span>
@ -281,9 +278,13 @@
width="30%"
>
<p>你确定要删除该项吗</p>
<div slot="footer" style="margin-top:0px;" class="dialog-footer">
<el-button size="medium" @click="dialogVisible1 = false">取 消</el-button>
<el-button size="medium" type="primary" @click="delSave1">确 定</el-button>
<div slot="footer" style="margin-top: 0px" class="dialog-footer">
<el-button size="medium" @click="dialogVisible1 = false"
>取 消</el-button
>
<el-button size="medium" type="primary" @click="delSave1"
>确 定</el-button
>
</div>
</el-dialog>
<el-dialog
@ -302,10 +303,16 @@
size="medium"
>
<el-form-item label="检查库名称" prop="dangerName">
<el-input v-model="dialogdata.dangerName"></el-input>
<el-input
placeholder="请输入检查库名称"
v-model="dialogdata.dangerName"
></el-input>
</el-form-item>
<el-form-item label="描述">
<el-input v-model="dialogdata.remark"></el-input>
<el-input
placeholder="请输入"
v-model="dialogdata.remark"
></el-input>
</el-form-item>
<div class="dialog-footer">
<el-button
@ -342,10 +349,16 @@
size="medium"
>
<el-form-item label="大项名称" prop="dangerName">
<el-input v-model="dialogdata.dangerName"></el-input>
<el-input
placeholder="请输入大项"
v-model="dialogdata.dangerName"
></el-input>
</el-form-item>
<el-form-item label="描述">
<el-input v-model="dialogdata.remark"></el-input>
<el-input
placeholder="请输入"
v-model="dialogdata.remark"
></el-input>
</el-form-item>
</el-form>
<div class="dialog-footer">
@ -395,14 +408,23 @@
</el-select>
</el-form-item>
<el-form-item label="问题描述" prop="content">
<el-input v-model="dialogdata.content"></el-input>
<el-input
placeholder="请输入"
v-model="dialogdata.content"
></el-input>
</el-form-item>
<el-form-item label="整改要求">
<el-input v-model="dialogdata.remark"></el-input>
<el-input
placeholder="请输入"
v-model="dialogdata.remark"
></el-input>
</el-form-item>
<el-form-item label="整改时限(天)" prop="changeLimit">
<el-input v-model="dialogdata.changeLimit"></el-input>
<el-input
placeholder="请输入"
v-model="dialogdata.changeLimit"
></el-input>
</el-form-item>
</el-form>
<div class="dialog-footer">

8
src/views/projectFront/configManage/roleManage.vue
View File

@ -39,18 +39,18 @@
<vue-scroll style="height: 70%">
<el-table class="tables" :data="List">
<!--align="center"-->
<el-table-column prop="roleName" :label="$t('message.roleManage.juese')"></el-table-column>
<el-table-column prop="roleName" :label="$t('message.roleManage.juese')" align="center"></el-table-column>
<!-- 是否能进入设备中台 -->
<el-table-column prop="roleName" :label="$t('message.projectInfo.isJoinDev')">
<el-table-column prop="roleName" :label="$t('message.projectInfo.isJoinDev')" align="center">
<template slot-scope="scope">
<!-- '是':'否' -->
{{scope.row.seeEquipment==0?$t('message.projectInfo.is'):$t('message.projectInfo.isNot')}}
</template>
</el-table-column>
<el-table-column prop="roleDesc" :label="$t('message.roleManage.miaoshu')"></el-table-column>
<el-table-column prop="roleDesc" :label="$t('message.roleManage.miaoshu')" align="center"></el-table-column >
<el-table-column :label="$t('message.alarmValueSet.operation')" align="center">
<template slot-scope="scope">
<div class="tableBtns">
<div class="tableBtns" style="margin-left: 120px !important">
<div @click="edit(scope.row)" class="operationText">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>{{ $t("message.alarmValueSet.edit") }}</span>

232
src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
View File

@ -11,9 +11,9 @@
<el-form-item label="单号">
<el-input v-model="searchForm.number" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="货号">
<!-- <el-form-item label="货号">
<el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label="仓库">
<el-input
v-model="searchForm.warehouse"
@ -38,18 +38,19 @@
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="助查码">
<!-- <el-form-item label="助查码">
<el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label="日期">
<el-date-picker
v-model="searchForm.warehouseName"
v-model="timeValue"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
@change="getTime"
>
</el-date-picker>
</el-form-item>
@ -125,6 +126,7 @@
label="制单人"
></el-table-column>
<el-table-column
width="110"
prop="createTime"
align="center"
label="制单时间"
@ -132,7 +134,7 @@
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns" style="margin-left: -14px !important">
<div @click="edit(scope.row)" class="operationText">
<div @click.stop="edit(scope.row)" class="operationText" style="margin-right: 10px !important;margin-left: 20px !important;">
<img
src="@/assets/images/icon-edit.png"
width="15px"
@ -140,7 +142,7 @@
/>
<span>编辑</span>
</div>
<div @click="deleteDev(scope.row)" class="operationText">
<div @click.stop="deleteDev(scope.row)" class="operationText">
<img
src="@/assets/images/icon-delete.png"
width="15px"
@ -183,7 +185,7 @@
>
<el-form-item label="日期" prop="createTime">
<el-date-picker
v-model="addForm.createTime"
v-model="addForm.date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
@ -271,7 +273,7 @@
</el-button>
<el-table
class="tables"
:data="orderMaterialList"
:data="materialData"
height="360"
style="min-height: auto"
>
@ -369,7 +371,7 @@
<el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(2)"
@click="saveContractInfoFn"
size="medium"
>
保存
@ -377,11 +379,11 @@
</div>
</div>
</el-dialog>
<!--详情信息弹框-->
<!--详情弹框-->
<el-dialog
:modal-append-to-body="false"
title="详情"
:visible.sync="deliteShow"
:visible.sync="isShow"
width="1167px"
>
<div class="dialog_content">
@ -395,7 +397,8 @@
>
<el-form-item label="日期" prop="createTime">
<el-date-picker
v-model="detailData.createTime"
v-model="detailData.date"
disabled
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
@ -404,12 +407,14 @@
</el-form-item>
<el-form-item label="仓库" prop="warehouse">
<el-input
disabled
v-model="detailData.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型" prop="category">
<el-input
disabled
v-model="detailData.category"
placeholder="请输入"
></el-input>
@ -417,6 +422,7 @@
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
<el-input
disabled
v-model="detailData.direction"
placeholder="请输入"
></el-input>
@ -427,17 +433,23 @@
style="margin-left: 10px"
>
<el-input
disabled
v-model="detailData.serialNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="单号" prop="number">
<el-input v-model="detailData.number" placeholder="请输入"></el-input>
<el-input
disabled
v-model="detailData.number"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="批号" prop="lotNumber">
<el-input
disabled
v-model="detailData.lotNumber"
placeholder="请输入"
></el-input>
@ -445,25 +457,36 @@
<el-form-item label="部门" prop="department">
<el-input
disabled
v-model="detailData.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人" prop="handler">
<el-input v-model="detailData.handler" placeholder="请输入"></el-input>
<el-input
disabled
v-model="detailData.handler"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="制单人" prop="singleHanded">
<el-input
disabled
v-model="detailData.singleHanded"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="供货单位" prop="vendor">
<el-input v-model="detailData.vendor" placeholder="请输入"></el-input>
<el-input
disabled
v-model="detailData.vendor"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
disabled
style="width: 790px"
type="textarea"
:rows="1"
@ -475,13 +498,14 @@
<div class="importMaterialBox">
<el-table
class="tables"
:data="deliteMaterialList"
:data="materialData"
height="360"
style="min-height: auto"
>
<el-table-column prop="name" label="品名" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.name"
@ -491,6 +515,7 @@
<el-table-column prop="specification" label="规格" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.specification"
@ -500,6 +525,7 @@
<el-table-column prop="unit" label="单位" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.unit"
@ -509,6 +535,7 @@
<el-table-column prop="quantity" label="数量" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.quantity"
@ -518,6 +545,7 @@
<el-table-column prop="unitPrice" label="单价" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.unitPrice"
@ -527,6 +555,7 @@
<el-table-column prop="amount" label="金额" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.amount"
@ -536,58 +565,28 @@
<el-table-column prop="remark" label="备注" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.remark"
></el-input>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns" style="margin-left: 35px !important">
<div
@click="deleteTable(scope.row, scope.index)"
class="operationText"
>
<img
src="@/assets/images/icon-delete.png"
width="15px"
height="15px"
/>
<span>删除</span>
</div>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="dialog-footer" style="text-align: center">
<el-button
class="cancleBtn"
@click="dialogShow = false"
icon="el-icon-circle-close"
size="medium"
>取消
</el-button>
<!-- <el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(1)"
size="medium"
@click="isShow = false"
>
暂存
</el-button> -->
<el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(2)"
size="medium"
>
保存
确认
</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
@ -604,22 +603,24 @@ export default {
},
data() {
return {
timeValue: '',
isShow: false,
deliteShow: false,
detailData: {},
searchForm: {
number: "",
stuffNumber:"",//货号
// stuffNumber:"",//货号
warehouse: "",
department: "",
category: "",
handler: "",
lookupCode: "",//助查码
// lookupCode: "",//助查码
vendor: "",
startTime: '',//开始时间
endTime: '',//结束时间
},//查询
addForm: {
createTime: "",
date: "",
warehouse: "",
category: "",
direction: "",
@ -631,8 +632,11 @@ export default {
singleHanded: "",
vendor: "",
remark: "",
materialList: [],
gtMaterialInOutWarehouseId: '',
type: "",
},//表单
orderMaterialList: [
materialData: [
{
name: "",
specification: "",
@ -653,48 +657,20 @@ export default {
total: 0 //总条数
},
List: [],
gtMaterialInOutWarehouseId: '',//编辑查询
}
},
methods: {
//显示检查详细弹框
showDetailFn(row) {
this.detailData = row
this.deliteShow = true
// this.gtMaterialContractId = this.detailData.id
},
//表格动态添加
importMaterial() {
let statusType = true;
this.orderMaterialList.forEach((item) => {
if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "" || item.unitPrice == "" || item.amount == "" || item.remark == "") {
this.$message({
message: "请完善信息后在添加",
type: "warning",
});
statusType = false;
//选择时间时
getTime(val) {
if (val) {
this.searchForm.startTime = val[0]
this.searchForm.endTime = val[1]
} else {
this.searchForm.startTime = ''
this.searchForm.endTime = ''
}
})
if (statusType) {
this.orderMaterialList.push({
name: "",
specification: "",
unit: "",
quantity: "",
unitPrice: "",
amount: "",
remark: "",
});
}
},
//删除表格动态操作
deleteTable(item, index) {
this.orderMaterialList.splice(index, 1)
this.$message({
message: "删除成功",
type: "success",
});
},
//查询仓库数据
getList() {
@ -703,13 +679,14 @@ export default {
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
number: this.searchForm.number,
stuffNumber: this.searchForm.stuffNumber,
warehouse: this.searchForm.warehouse,
department: this.searchForm.department,
category: this.searchForm.category,
handler: this.searchForm.handler,
lookupCode: this.searchForm.lookupCode,
vendor: this.searchForm.vendor,
endTime:this.searchForm.endTime,
startTime:this.searchForm.startTime,
type: 10,
}).then((result) => {
if (result.success) {
this.List = result.result.records
@ -717,23 +694,72 @@ export default {
}
})
},
//查询物料信息
getMaterialData() {
gettGMaterialInOutWarehouseListApi({
projectSn: this.$store.state.projectSn,
gtMaterialInOutWarehouseId: this.gtMaterialInOutWarehouseId
}).then((result) => {
this.materialData = result.result
})
},
//显示检查详细弹框
showDetailFn(row) {
this.detailData = row
this.isShow = true
this.gtMaterialInOutWarehouseId = this.detailData.id
this.getMaterialData()
},
//表格动态添加
importMaterial() {
// let statusType = true;
// this.materialList.forEach((item) => {
// if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "") {
// this.$message({
// message: "请完善信息后在添加",
// type: "warning",
// });
// statusType = false;
// }
// })
// if (statusType) {
this.materialData.push({
name: "",
specification: "",
unit: "",
quantity: "",
unitPrice: "",
amount: "",
remark: "",
});
// }
},
//删除表格动态操作
deleteTable(index) {
this.materialData.splice(index, 1)
},
add() {
this.title = '新增入库'
this.dialogShow = true
this.orderMaterialList = []
this.close()
this.materialData = []
this.addForm = {}
},
edit(obj) {
console.log('obj=======', obj);
this.title = '编辑入库'
this.dialogShow = true
this.addEditForm = JSON.parse(JSON.stringify(obj))
this.addForm = JSON.parse(JSON.stringify(obj))
this.gtMaterialInOutWarehouseId = obj.id
this.getMaterialData()
},
submit() {
let params = JSON.parse(JSON.stringify(this.addEditForm))
saveContractInfoFn() {
let params = JSON.parse(JSON.stringify(this.addForm))
params.materialList = this.materialData
params.projectSn = this.$store.state.projectSn
this.$refs.addEditForm.validate((valid) => {
params.type = 10
this.$refs.addForm.validate((valid) => {
if (valid) {
if (this.title == '新增入库') {
addGtMaterialInOutWarehouseApi(params).then((result) => {
@ -787,12 +813,6 @@ export default {
});
},
close() {
this.addEditForm = {}
this.$nextTick(() => {
this.$refs.addEditForm.clearValidate()
})
},
SizeChange(val) {
this.pagInfo.pageSize = val
this.getList()

683
src/views/projectFront/inOutboundManagement/materialOutbound.vue
View File

@ -9,88 +9,53 @@
size="medium"
>
<el-form-item label="单号">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-input v-model="searchForm.number" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="客户">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<!-- <el-form-item label="货号">
<el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
</el-form-item> -->
<el-form-item label="仓库">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型">
<el-input
v-model="searchForm.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.handler"
placeholder="请输入"
></el-input>
</el-form-item>
<!-- <el-form-item label="助查码">
<el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
</el-form-item> -->
<el-form-item label="日期">
<el-date-picker
v-model="searchForm.warehouseName"
v-model="timeValue"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
@change="getTime"
>
</el-date-picker>
</el-form-item>
<el-form-item label="批号">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型">
<el-select v-model="searchForm.warehouseName" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="货号">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="品名">
<el-select v-model="searchForm.warehouseName" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="助查码">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-form-item label="客户">
<el-input v-model="searchForm.customer" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="getList">{{
@ -104,71 +69,72 @@
</el-form>
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" :data="List">
<el-table class="tables" :data="List" @row-click="showDetailFn">
<el-table-column
prop="warehouseName"
prop="serialNumber"
label="编号"
align="center"
></el-table-column>
<el-table-column
prop="warehousePos"
prop="number"
align="center"
label="单号"
></el-table-column>
<el-table-column
prop="header"
prop="date"
align="center"
label="日期"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="warehouse"
align="center"
label="仓库"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="direction"
align="center"
label="方向"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="category"
align="center"
label="类别"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="department"
align="center"
label="部门"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="customer"
align="center"
label="供应商"
label="客户"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="handler"
align="center"
label="经手人"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="lotNumber"
align="center"
label="批号"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="singleHanded"
align="center"
label="制单人"
></el-table-column>
<el-table-column
prop="headerPhone"
width="110"
prop="createTime"
align="center"
label="制单时间"
></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns" style="margin-left: -14px !important">
<div @click="edit(scope.row)" class="operationText">
<div @click.stop="edit(scope.row)" class="operationText" style="margin-right: 10px !important;margin-left: 20px !important;">
<img
src="@/assets/images/icon-edit.png"
width="15px"
@ -176,7 +142,7 @@
/>
<span>编辑</span>
</div>
<div @click="deleteDev(scope.row)" class="operationText">
<div @click.stop="deleteDev(scope.row)" class="operationText">
<img
src="@/assets/images/icon-delete.png"
width="15px"
@ -207,107 +173,98 @@
:visible.sync="dialogShow"
width="1167px"
>
<p>出库单信息</p>
<p>入库单信息</p>
<div class="dialog_content">
<el-form
style="margin: 0 28px"
size="medium"
:model="contractForm"
ref="contractForm"
:rules="contractFormRules"
:model="addForm"
ref="addForm"
:rules="addFormules"
:inline="true"
>
<el-form-item label="日期" prop="arrivalTime">
<el-form-item label="日期" prop="createTime">
<el-date-picker
v-model="value1"
v-model="addForm.date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="仓库" prop="enterpriseId">
<el-form-item label="仓库" prop="warehouse">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型" prop="enterpriseId">
<el-form-item label="类型" prop="category">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="客户" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
<el-input
v-model="addForm.direction"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item
label="方向"
prop="enterpriseId"
style="margin-left: 15px"
label="编号"
prop="serialNumber"
style="margin-left: 10px"
>
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="编号" prop="orderNumber">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.serialNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="单号" prop="orderNumber">
<el-form-item label="单号" prop="number">
<el-input v-model="addForm.number" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="批号" prop="lotNumber">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.lotNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="批号" prop="orderNumber">
<el-form-item label="部门" prop="department">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门" prop="enterpriseId">
<el-form-item label="经手人" prop="handler">
<el-input v-model="addForm.handler" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="制单人" prop="singleHanded">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.singleHanded"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="制单人" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-form-item label="客户" prop="customer">
<el-input v-model="addForm.customer" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
style="width: 790px"
style="width: 820px"
type="textarea"
:rows="1"
v-model="contractForm.remarks"
v-model="addForm.remark"
placeholder="请输入"
></el-input>
</el-form-item>
</el-form>
<div class="importMaterialBox">
<el-button
style="margin-bottom: 15px; margin-left: 990px"
style="margin-bottom: 15px; margin-left: 1005px"
type="primary"
size="medium"
@click="importMaterial"
@ -316,7 +273,7 @@
</el-button>
<el-table
class="tables"
:data="orderMaterialList"
:data="materialData"
height="360"
style="min-height: auto"
>
@ -329,12 +286,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="specifications" label="规格" align="center">
<el-table-column prop="specification" label="规格" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.specifications"
v-model="scope.row.specification"
></el-input>
</template>
</el-table-column>
@ -347,12 +304,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="materialNum" label="数量" align="center">
<el-table-column prop="quantity" label="数量" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.materialNum"
v-model="scope.row.quantity"
></el-input>
</template>
</el-table-column>
@ -365,12 +322,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="computeUnit" label="金额" align="center">
<el-table-column prop="amount" label="金额" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.computeUnit"
v-model="scope.row.amount"
></el-input>
</template>
</el-table-column>
@ -410,18 +367,11 @@
size="medium"
>取消
</el-button>
<!-- <el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(1)"
size="medium"
>
暂存
</el-button> -->
<el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(2)"
@click="saveContractInfoFn"
size="medium"
>
保存
@ -429,33 +379,276 @@
</div>
</div>
</el-dialog>
<!--详情弹框-->
<el-dialog
:modal-append-to-body="false"
title="详情"
:visible.sync="isShow"
width="1167px"
>
<div class="dialog_content">
<el-form
style="margin: 0 28px"
size="medium"
:model="addForm"
ref="addForm"
:rules="addFormules"
:inline="true"
>
<el-form-item label="日期" prop="createTime">
<el-date-picker
v-model="detailData.date"
disabled
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="仓库" prop="warehouse">
<el-input
disabled
v-model="detailData.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型" prop="category">
<el-input
disabled
v-model="detailData.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
<el-input
disabled
v-model="detailData.direction"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item
label="编号"
prop="serialNumber"
style="margin-left: 10px"
>
<el-input
disabled
v-model="detailData.serialNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="单号" prop="number">
<el-input
disabled
v-model="detailData.number"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="批号" prop="lotNumber">
<el-input
disabled
v-model="detailData.lotNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门" prop="department">
<el-input
disabled
v-model="detailData.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人" prop="handler">
<el-input
disabled
v-model="detailData.handler"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="制单人" prop="singleHanded">
<el-input
disabled
v-model="detailData.singleHanded"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="客户" prop="customer">
<el-input
disabled
v-model="detailData.customer"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
disabled
style="width: 790px"
type="textarea"
:rows="1"
v-model="detailData.remark"
placeholder="请输入"
></el-input>
</el-form-item>
</el-form>
<div class="importMaterialBox">
<el-table
class="tables"
:data="materialData"
height="360"
style="min-height: auto"
>
<el-table-column prop="name" label="品名" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.name"
></el-input>
</template>
</el-table-column>
<el-table-column prop="specification" label="规格" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.specification"
></el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="单位" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.unit"
></el-input>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.quantity"
></el-input>
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="单价" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.unitPrice"
></el-input>
</template>
</el-table-column>
<el-table-column prop="amount" label="金额" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.amount"
></el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.remark"
></el-input>
</template>
</el-table-column>
</el-table>
</div>
<div class="dialog-footer" style="text-align: center">
<el-button
type="primary"
icon="el-icon-circle-check"
size="medium"
@click="isShow = false"
>
确认
</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import {
addStuffWarehouseApi,
deleteStuffWarehouseApi,
editStuffWarehouseApi,
getStuffWarehousePageApi
} from '@/assets/js/api/warehouseManagement.js'
addGtMaterialInOutWarehouseApi,
deletGtMaterialInOutWarehouseApi,
editGtMaterialInOutWarehouseApi,
gettGMaterialInOutWarehousePageApi,//查询表单数据
gettGMaterialInOutWarehouseListApi,//根据id查询物料
} from '@/assets/js/api/materialManagement.js'
export default {
mounted() {
this.getList()
},
data() {
return {
orderMaterialList: [
timeValue: '',
isShow: false,
deliteShow: false,
detailData: {},
searchForm: {
number: "",
// stuffNumber:"",//货号
warehouse: "",
department: "",
category: "",
handler: "",
// lookupCode: "",//助查码
customer: "",
startTime: '',//开始时间
endTime: '',//结束时间
},//查询
addForm: {
date: "",
warehouse: "",
category: "",
direction: "",
serialNumber: "",
number: "",
lotNumber: "",
department: "",
handler: "",
singleHanded: "",
customer: "",
remark: "",
materialList: [],
gtMaterialInOutWarehouseId: '',
type: "",
},//表单
materialData: [
{
name: "",
specifications: "",
specification: "",
unit: "",
materialNum: "",
quantity: "",
unitPrice: "",
computeUnit: "",
amount: "",
remark: "",
}
],
contractForm: {},
deliteMaterialList: [],//详情
addFormules: {},
title: "",
dialogShow: false,
pagInfo: {
@ -464,113 +657,36 @@ export default {
total: 0 //总条数
},
List: [],
addEditForm: {
warehouseName: '',//仓库名称
warehousePos: '',//warehousePos
header: '',//负责人
headerPhone: '',//负责人电话
remark: '',//备注
},
addEditRules: {
warehouseName: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
warehousePos: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
header: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
headerPhone: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
gtMaterialInOutWarehouseId: '',//编辑查询
},
searchForm: {
warehouseName: '',
warehouseNumber: '',
warehousePos: '',
},
}
},
methods: {
//表格动态添加
importMaterial() {
let statusType = true;
this.orderMaterialList.forEach((item) => {
if (item.name == "" || item.specifications == "" || item.unit == "" || item.materialNum == "" || item.unitPrice == "" || item.computeUnit == "" || item.remark == "") {
this.$message({
message: "请完善信息后在添加",
type: "warning",
});
statusType = false;
//选择时间时
getTime(val) {
if (val) {
this.searchForm.startTime = val[0]
this.searchForm.endTime = val[1]
} else {
this.searchForm.startTime = ''
this.searchForm.endTime = ''
}
})
if (statusType) {
this.orderMaterialList.push({
name: "",
specifications: "",
unit: "",
materialNum: "",
unitPrice: "",
computeUnit: "",
remark: "",
});
}
},
//删除表格动态操作
deleteTable(item, index) {
this.orderMaterialList.splice(index, 1)
this.$message({
message: "删除成功",
type: "success",
});
},
//查询仓库数据
getList() {
getStuffWarehousePageApi({
gettGMaterialInOutWarehousePageApi({
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
warehouseName: this.searchForm.warehouseName,
warehousePos: this.searchForm.warehousePos,
number: this.searchForm.number,
warehouse: this.searchForm.warehouse,
department: this.searchForm.department,
category: this.searchForm.category,
handler: this.searchForm.handler,
customer: this.searchForm.customer,
endTime:this.searchForm.endTime,
startTime:this.searchForm.startTime,
type: 20,
}).then((result) => {
if (result.success) {
this.List = result.result.records
@ -578,34 +694,83 @@ export default {
}
})
},
//查询物料信息
getMaterialData() {
gettGMaterialInOutWarehouseListApi({
projectSn: this.$store.state.projectSn,
gtMaterialInOutWarehouseId: this.gtMaterialInOutWarehouseId
}).then((result) => {
this.materialData = result.result
})
},
//显示检查详细弹框
showDetailFn(row) {
this.detailData = row
this.isShow = true
this.gtMaterialInOutWarehouseId = this.detailData.id
this.getMaterialData()
},
//表格动态添加
importMaterial() {
// let statusType = true;
// this.materialList.forEach((item) => {
// if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "") {
// this.$message({
// message: "请完善信息后在添加",
// type: "warning",
// });
// statusType = false;
// }
// })
// if (statusType) {
this.materialData.push({
name: "",
specification: "",
unit: "",
quantity: "",
unitPrice: "",
amount: "",
remark: "",
});
// }
},
//删除表格动态操作
deleteTable(index) {
this.materialData.splice(index, 1)
},
add() {
this.title = '新增'
this.title = '新增入库'
this.dialogShow = true
this.orderMaterialList = []
this.close()
this.materialData = []
this.addForm = {}
},
edit(obj) {
this.title = '编辑'
console.log('obj=======', obj);
this.title = '编辑入库'
this.dialogShow = true
this.addEditForm = JSON.parse(JSON.stringify(obj))
this.addForm = JSON.parse(JSON.stringify(obj))
this.gtMaterialInOutWarehouseId = obj.id
this.getMaterialData()
},
submit() {
let params = JSON.parse(JSON.stringify(this.addEditForm))
saveContractInfoFn() {
let params = JSON.parse(JSON.stringify(this.addForm))
params.materialList = this.materialData
params.projectSn = this.$store.state.projectSn
this.$refs.addEditForm.validate((valid) => {
params.type = 20
this.$refs.addForm.validate((valid) => {
if (valid) {
if (this.title == '新增仓库') {
addStuffWarehouseApi(params).then((result) => {
if (this.title == '新增入库') {
addGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message)
this.getList()
}
})
} else if (this.title === '编辑仓库') {
} else if (this.title === '编辑入库') {
console.log('编辑信息', this.addEditForm)
editStuffWarehouseApi(params).then((result) => {
editGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message)
this.getList()
@ -625,7 +790,7 @@ export default {
type: "warning",
})
.then(() => {
deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
deletGtMaterialInOutWarehouseApi({ id: obj.id }).then((res) => {
if (res.success) {
this.getList()
this.$message({
@ -648,12 +813,6 @@ export default {
});
},
close() {
this.addEditForm = {}
this.$nextTick(() => {
this.$refs.addEditForm.clearValidate()
})
},
SizeChange(val) {
this.pagInfo.pageSize = val
this.getList()

19
src/views/projectFront/quality/businessModule/checkPoint.vue
View File

@ -2,9 +2,7 @@
<!-- 检查部位 -->
<vue-scroll style="height: 100%">
<div class="checkPoint">
<el-button type="primary" size="medium" @click="newRootNode">{{
$t('message.quality.NewRootNode')
}}</el-button>
<el-button type="primary" size="medium" @click="newRootNode">新增区域</el-button>
<el-table
:data="tableData"
style="width: 100%; margin: 20px 0"
@ -16,24 +14,32 @@
<el-table-column
prop="regionName"
:label="$t('message.quality.regionName')"
>
</el-table-column>
<el-table-column
align="center"
prop="regionCode"
:label="$t('message.quality.coding')"
>
</el-table-column>
<el-table-column
align="center"
prop="dutyName"
:label="$t('message.quality.rectificationPeople')"
>
</el-table-column>
<el-table-column
align="center"
prop="intendanceNames"
:label="$t('message.quality.notifier')"
>
</el-table-column>
<el-table-column prop="remark" :label="$t('message.quality.explain')">
<el-table-column prop="remark" :label="$t('message.quality.explain')" align="center"
>
</el-table-column>
<el-table-column
prop="remark"
@ -81,6 +87,7 @@
]"
>
<el-input
placeholder="请输入区域名称"
v-model="form.regionName"
:disabled="dialogType == 2"
></el-input>
@ -236,7 +243,7 @@ export default {
remark: ''
}
this.editDialog = true
this.title = this.$t('message.quality.NewRootNode')
this.title ='新增区域'
this.dialogType = 1
this.getNotifierOrPeopleList()
},
@ -270,7 +277,7 @@ export default {
this.form.intendanceIds = value.intendanceIds.split(',')
this.form.remark = value.remark
this.form.id = value.id
this.title = this.$t('message.quality.EditorialResponsibilityArea')
this.title = '编辑区域'
this.dialogType = 2
this.getNotifierOrPeopleList()
this.editDialog = true

68
src/views/projectFront/quality/qualitypersonnel.vue
View File

@ -77,6 +77,7 @@
label="手机号"
align="center"
></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button
@ -121,7 +122,11 @@
size="medium"
>
<el-form-item label="部门名称" prop="departmentName">
<el-input style="width: 350px" v-model="dialogdata.departmentName"></el-input>
<el-input
placeholder="请输入部门"
style="width: 350px"
v-model="dialogdata.departmentName"
></el-input>
</el-form-item>
<div class="dialog-footer">
<el-button
@ -159,14 +164,38 @@
>
<el-form-item label="账号" prop="account">
<el-input
placeholder="请输入账号"
v-model="dialogTable.account"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item label="密码" prop="password">
<el-form-item
:label="$t('message.personnelAccess.LabPwd')"
prop="password"
v-if="!dialogTable.showPassword && dialogTable.showPassword != ''"
>
<el-input
v-model="dialogTable.password"
style="width: 350px"
type="password"
show-password
v-model="dialogTable.password"
:placeholder="$t('message.personnelAccess.pwd')"
></el-input>
</el-form-item>
<el-form-item label="密码" prop="password" v-else>
<el-input
type="password"
show-password
v-model="dialogTable.showPassword"
style="width: 350px"
></el-input>
</el-form-item>
<el-form-item label="姓名" prop="realName">
<el-input
placeholder="请输入姓名"
style="width: 350px"
v-model="dialogTable.realName"
></el-input>
</el-form-item>
<el-form-item label="角色" prop="roleId">
@ -185,14 +214,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名" prop="realName">
<el-input
style="width: 350px"
v-model="dialogTable.realName"
></el-input>
</el-form-item>
<el-form-item label="手机号" prop="userTel">
<el-input
placeholder="请输入手机号"
style="width: 350px"
v-model="dialogTable.userTel"
></el-input>
@ -239,7 +263,15 @@ export default {
dialogdata: {
departmentName: "",//部门名称
},
rules: {},
rules: {
departmentName:[
{
required: true,
message: '请输入部门',
trigger: "blur"
}
]
},
threeData: [],
dialogVisible: false,
depart: [],
@ -252,13 +284,16 @@ export default {
realName: '',
userTel: '',
departmentId: '',
showPassword: '',
},
rules2: {
account: [{
account: [
{
required: true,
message: '请输入账号',
trigger: "blur"
}],
}
],
password: [{
required: true,
message: '请输入密码',
@ -280,10 +315,13 @@ export default {
currentTwo: -1,
current: 0,
checkedId: 1,
showPassword: '',
};
},
mounted() {
this.getList()
this.getRoleList()
},
methods: {
@ -324,6 +362,9 @@ export default {
}).then((res) => {
console.log('res===', res);
this.threeData = res.result
this.threeData.forEach(item => {
this.showPassword = item.showPassword
})
})
},
@ -337,7 +378,6 @@ export default {
if (type == 2) {
this.dialogVisible3 = true
this.title = '新增人员'
this.getRoleList()
this.dialogTable = {}
}
@ -347,12 +387,14 @@ export default {
this.dialogVisible = true
this.title = '编辑部门'
this.dialogdata = JSON.parse(JSON.stringify(val))
},
//编辑
edit2(val) {
this.dialogVisible3 = true
this.title = '编辑人员'
this.dialogTable = JSON.parse(JSON.stringify(val))
},
//部门保存/编辑
addSave() {

41
src/views/projectFront/quality/recordsModule/inspectionRecord.vue
View File

@ -221,6 +221,8 @@
</el-table-column>
<!-- 检查结果-->
<el-table-column
align="center"
prop="changeLimitTime"
:label="
$t('message.quality.inspectionResult') +
@ -253,6 +255,8 @@
</template>
</el-table-column>
<el-table-column
align="center"
prop="inspectManName"
:label="
$t('message.quality.rummager') +
@ -268,26 +272,35 @@
</template>
</el-table-column>
<el-table-column
align="center"
prop="dangerItemContent"
:label="$t('message.quality.problemInformation')"
>
</el-table-column>
<el-table-column
align="center"
prop="changeName"
:label="$t('message.quality.rectificationPeople')"
>
</el-table-column>
<el-table-column
align="center"
prop="reviewName"
:label="$t('message.quality.reviewOfThePeople')"
>
</el-table-column>
<el-table-column
align="center"
prop="verifyManName"
:label="$t('message.quality.checkOne')"
>
</el-table-column>
<el-table-column
align="center"
prop="notifyPersonName"
:label="$t('message.quality.notifier')"
>
@ -298,7 +311,8 @@
:label="$t('message.quality.routineCheck')"
>
</el-table-column> -->
<el-table-column prop="remark" :label="$t('message.quality.explain')">
<el-table-column align="center"
prop="remark" :label="$t('message.quality.explain')">
</el-table-column>
</el-table>
<el-pagination
@ -655,9 +669,9 @@
>
<el-option
v-for="item in crewList"
:key="item.userId"
:key="item.userId+''"
:label="item.workerName"
:value="item.userId"
:value="item.userId+''"
>
<!-- <span style="float: left">{{ item.workerName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px"
@ -1579,7 +1593,6 @@ export default {
}
getSubdivisionProjectApi(data).then((res) => {
if (res.code == 200) {
console.log('获取到的列表- 以父子节点形式呈现', res)
this.listData = res.result
if (this.listData.length >= 1) {
this.addForm1.subsectionId = this.listData[0].id
@ -1596,7 +1609,7 @@ export default {
if (this.COMPANY == 'zjwj') {
window.location.href =
this.$http.defaults.baseURL +
'/xmgl/qualityRectifyRecord/recordRectify/excel/export?projectSn=' +
'xmgl/qualityRectifyRecord/recordRectify/excel/export?projectSn=' +
this.$store.state.projectSn +
'&recordStatus=' +
this.formInline.recordStatus +
@ -1704,9 +1717,10 @@ export default {
text = pathLabels[i]
}
}
// if (data.dutyId) {
// this.addForm1.changeId = Number(data.dutyId)
// }
if (data.dutyId) {
this.addForm1.changeId = data.dutyId
console.log(' this.addForm1.changeId================', this.addForm1.changeId);
}
this.addForm1.regionName = text
// console.log(data.intendanceIds.split(','))
// console.log(text)
@ -1715,13 +1729,14 @@ export default {
if (this.addForm1.notifyPerson > 0) {
this.addForm1.notifyPerson = []
}
// this.addForm1.notifyPerson.push(
// Number(data.intendanceIds.split(',')[j])
// )
this.addForm1.notifyPerson.push(
Number(data.intendanceIds.split(',')[j])
)
}
}
console.log(data.intendanceIds)
// this.addForm1.notifyPerson = data.intendanceIds.split(',')
this.addForm1.notifyPerson = data.intendanceIds.split(',')
console.log(' this.addForm1.notifyPerson================', this.addForm1.notifyPerson);
} else if (this.recordType == 2) {
let pathLabels =
this.$refs['addFormRegion2'].getCheckedNodes()[0].pathLabels

639
src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
View File

@ -9,63 +9,53 @@
size="medium"
>
<el-form-item label="单号">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="货号">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-input v-model="searchForm.number" placeholder="请输入"></el-input>
</el-form-item>
<!-- <el-form-item label="货号">
<el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
</el-form-item> -->
<el-form-item label="仓库">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="助查码">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.handler"
placeholder="请输入"
></el-input>
</el-form-item>
<!-- <el-form-item label="助查码">
<el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
</el-form-item> -->
<el-form-item label="日期">
<el-date-picker
v-model="searchForm.warehouseName"
v-model="timeValue"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
@change="getTime"
>
</el-date-picker>
</el-form-item>
<el-form-item label="供货单位">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-input v-model="searchForm.vendor" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="getList">{{
@ -79,71 +69,72 @@
</el-form>
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" :data="List">
<el-table class="tables" :data="List" @row-click="showDetailFn">
<el-table-column
prop="warehouseName"
prop="serialNumber"
label="编号"
align="center"
></el-table-column>
<el-table-column
prop="warehousePos"
prop="number"
align="center"
label="单号"
></el-table-column>
<el-table-column
prop="header"
prop="date"
align="center"
label="日期"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="warehouse"
align="center"
label="仓库"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="direction"
align="center"
label="方向"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="category"
align="center"
label="类别"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="department"
align="center"
label="部门"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="vendor"
align="center"
label="供应商"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="handler"
align="center"
label="经手人"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="lotNumber"
align="center"
label="批号"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="singleHanded"
align="center"
label="制单人"
></el-table-column>
<el-table-column
prop="headerPhone"
width="110"
prop="createTime"
align="center"
label="制单时间"
></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns" style="margin-left: -14px !important">
<div @click="edit(scope.row)" class="operationText">
<div @click.stop="edit(scope.row)" class="operationText" style="margin-right: 10px !important;margin-left: 20px !important;">
<img
src="@/assets/images/icon-edit.png"
width="15px"
@ -151,7 +142,7 @@
/>
<span>编辑</span>
</div>
<div @click="deleteDev(scope.row)" class="operationText">
<div @click.stop="deleteDev(scope.row)" class="operationText">
<img
src="@/assets/images/icon-delete.png"
width="15px"
@ -187,88 +178,78 @@
<el-form
style="margin: 0 28px"
size="medium"
:model="contractForm"
ref="contractForm"
:rules="contractFormRules"
:model="addForm"
ref="addForm"
:rules="addFormules"
:inline="true"
>
<el-form-item label="日期" prop="arrivalTime">
<el-form-item label="日期" prop="createTime">
<el-date-picker
v-model="value1"
v-model="addForm.date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="仓库" prop="enterpriseId">
<el-form-item label="仓库" prop="warehouse">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型" prop="enterpriseId">
<el-form-item label="类型" prop="category">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
<el-input
v-model="addForm.direction"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item
label="方向"
prop="enterpriseId"
style="margin-left: 15px"
label="编号"
prop="serialNumber"
style="margin-left: 10px"
>
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="编号" prop="orderNumber" style="margin-left: 10px">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.serialNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="单号" prop="orderNumber">
<el-form-item label="单号" prop="number">
<el-input v-model="addForm.number" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="批号" prop="lotNumber">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.lotNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="批号" prop="orderNumber">
<el-form-item label="部门" prop="department">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门" prop="enterpriseId">
<el-form-item label="经手人" prop="handler">
<el-input v-model="addForm.handler" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="制单人" prop="singleHanded">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.singleHanded"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="制单人" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="供货单位" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-form-item label="供货单位" prop="vendor">
<el-input v-model="addForm.vendor" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
@ -276,7 +257,7 @@
style="width: 790px"
type="textarea"
:rows="1"
v-model="contractForm.remarks"
v-model="addForm.remark"
placeholder="请输入"
></el-input>
</el-form-item>
@ -292,7 +273,7 @@
</el-button>
<el-table
class="tables"
:data="orderMaterialList"
:data="materialData"
height="360"
style="min-height: auto"
>
@ -305,12 +286,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="specifications" label="规格" align="center">
<el-table-column prop="specification" label="规格" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.specifications"
v-model="scope.row.specification"
></el-input>
</template>
</el-table-column>
@ -323,12 +304,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="materialNum" label="数量" align="center">
<el-table-column prop="quantity" label="数量" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.materialNum"
v-model="scope.row.quantity"
></el-input>
</template>
</el-table-column>
@ -341,12 +322,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="computeUnit" label="金额" align="center">
<el-table-column prop="amount" label="金额" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.computeUnit"
v-model="scope.row.amount"
></el-input>
</template>
</el-table-column>
@ -378,7 +359,7 @@
</el-table-column>
</el-table>
</div>
<div class="dialog-footer" style="text-align: center;">
<div class="dialog-footer" style="text-align: center">
<el-button
class="cancleBtn"
@click="dialogShow = false"
@ -386,18 +367,11 @@
size="medium"
>取消
</el-button>
<!-- <el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(1)"
size="medium"
>
暂存
</el-button> -->
<el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(2)"
@click="saveContractInfoFn"
size="medium"
>
保存
@ -405,33 +379,276 @@
</div>
</div>
</el-dialog>
<!--详情弹框-->
<el-dialog
:modal-append-to-body="false"
title="详情"
:visible.sync="isShow"
width="1167px"
>
<div class="dialog_content">
<el-form
style="margin: 0 28px"
size="medium"
:model="addForm"
ref="addForm"
:rules="addFormules"
:inline="true"
>
<el-form-item label="日期" prop="createTime">
<el-date-picker
v-model="detailData.date"
disabled
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="仓库" prop="warehouse">
<el-input
disabled
v-model="detailData.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型" prop="category">
<el-input
disabled
v-model="detailData.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
<el-input
disabled
v-model="detailData.direction"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item
label="编号"
prop="serialNumber"
style="margin-left: 10px"
>
<el-input
disabled
v-model="detailData.serialNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="单号" prop="number">
<el-input
disabled
v-model="detailData.number"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="批号" prop="lotNumber">
<el-input
disabled
v-model="detailData.lotNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门" prop="department">
<el-input
disabled
v-model="detailData.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人" prop="handler">
<el-input
disabled
v-model="detailData.handler"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="制单人" prop="singleHanded">
<el-input
disabled
v-model="detailData.singleHanded"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="供货单位" prop="vendor">
<el-input
disabled
v-model="detailData.vendor"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
disabled
style="width: 790px"
type="textarea"
:rows="1"
v-model="detailData.remark"
placeholder="请输入"
></el-input>
</el-form-item>
</el-form>
<div class="importMaterialBox">
<el-table
class="tables"
:data="materialData"
height="360"
style="min-height: auto"
>
<el-table-column prop="name" label="品名" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.name"
></el-input>
</template>
</el-table-column>
<el-table-column prop="specification" label="规格" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.specification"
></el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="单位" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.unit"
></el-input>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.quantity"
></el-input>
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="单价" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.unitPrice"
></el-input>
</template>
</el-table-column>
<el-table-column prop="amount" label="金额" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.amount"
></el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.remark"
></el-input>
</template>
</el-table-column>
</el-table>
</div>
<div class="dialog-footer" style="text-align: center">
<el-button
type="primary"
icon="el-icon-circle-check"
size="medium"
@click="isShow = false"
>
确认
</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import {
addStuffWarehouseApi,
deleteStuffWarehouseApi,
editStuffWarehouseApi,
getStuffWarehousePageApi
} from '@/assets/js/api/warehouseManagement.js'
addGtMaterialInOutWarehouseApi,
deletGtMaterialInOutWarehouseApi,
editGtMaterialInOutWarehouseApi,
gettGMaterialInOutWarehousePageApi,//查询表单数据
gettGMaterialInOutWarehouseListApi,//根据id查询物料
} from '@/assets/js/api/materialManagement.js'
export default {
mounted() {
this.getList()
},
data() {
return {
orderMaterialList: [
timeValue: '',
isShow: false,
deliteShow: false,
detailData: {},
searchForm: {
number: "",
// stuffNumber:"",//货号
warehouse: "",
department: "",
category: "",
handler: "",
// lookupCode: "",//助查码
vendor: "",
startTime: '',//开始时间
endTime: '',//结束时间
},//查询
addForm: {
date: "",
warehouse: "",
category: "",
direction: "",
serialNumber: "",
number: "",
lotNumber: "",
department: "",
handler: "",
singleHanded: "",
vendor: "",
remark: "",
materialList: [],
gtMaterialInOutWarehouseId: '',
type: "",
},//表单
materialData: [
{
name: "",
specifications: "",
specification: "",
unit: "",
materialNum: "",
quantity: "",
unitPrice: "",
computeUnit: "",
amount: "",
remark: "",
}
],
contractForm: {},
deliteMaterialList: [],//详情
addFormules: {},
title: "",
dialogShow: false,
pagInfo: {
@ -440,113 +657,36 @@ export default {
total: 0 //总条数
},
List: [],
addEditForm: {
warehouseName: '',//仓库名称
warehousePos: '',//warehousePos
header: '',//负责人
headerPhone: '',//负责人电话
remark: '',//备注
},
addEditRules: {
warehouseName: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
warehousePos: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
header: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
headerPhone: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
gtMaterialInOutWarehouseId: '',//编辑查询
},
searchForm: {
warehouseName: '',
warehouseNumber: '',
warehousePos: '',
},
}
},
methods: {
//表格动态添加
importMaterial() {
let statusType = true;
this.orderMaterialList.forEach((item) => {
if (item.name == "" || item.specifications == "" || item.unit == "" || item.materialNum == "" || item.unitPrice == "" || item.computeUnit == "" || item.remark == "") {
this.$message({
message: "请完善信息后在添加",
type: "warning",
});
statusType = false;
//选择时间时
getTime(val) {
if (val) {
this.searchForm.startTime = val[0]
this.searchForm.endTime = val[1]
} else {
this.searchForm.startTime = ''
this.searchForm.endTime = ''
}
})
if (statusType) {
this.orderMaterialList.push({
name: "",
specifications: "",
unit: "",
materialNum: "",
unitPrice: "",
computeUnit: "",
remark: "",
});
}
},
//删除表格动态操作
deleteTable(item, index) {
this.orderMaterialList.splice(index, 1)
this.$message({
message: "删除成功",
type: "success",
});
},
//查询仓库数据
getList() {
getStuffWarehousePageApi({
gettGMaterialInOutWarehousePageApi({
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
warehouseName: this.searchForm.warehouseName,
warehousePos: this.searchForm.warehousePos,
number: this.searchForm.number,
warehouse: this.searchForm.warehouse,
department: this.searchForm.department,
category: this.searchForm.category,
handler: this.searchForm.handler,
vendor: this.searchForm.vendor,
endTime:this.searchForm.endTime,
startTime:this.searchForm.startTime,
type: 30,
}).then((result) => {
if (result.success) {
this.List = result.result.records
@ -554,34 +694,83 @@ export default {
}
})
},
//查询物料信息
getMaterialData() {
gettGMaterialInOutWarehouseListApi({
projectSn: this.$store.state.projectSn,
gtMaterialInOutWarehouseId: this.gtMaterialInOutWarehouseId
}).then((result) => {
this.materialData = result.result
})
},
//显示检查详细弹框
showDetailFn(row) {
this.detailData = row
this.isShow = true
this.gtMaterialInOutWarehouseId = this.detailData.id
this.getMaterialData()
},
//表格动态添加
importMaterial() {
// let statusType = true;
// this.materialList.forEach((item) => {
// if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "") {
// this.$message({
// message: "请完善信息后在添加",
// type: "warning",
// });
// statusType = false;
// }
// })
// if (statusType) {
this.materialData.push({
name: "",
specification: "",
unit: "",
quantity: "",
unitPrice: "",
amount: "",
remark: "",
});
// }
},
//删除表格动态操作
deleteTable(index) {
this.materialData.splice(index, 1)
},
add() {
this.title = '新增'
this.title = '新增入库'
this.dialogShow = true
this.orderMaterialList=[]
this.close()
this.materialData = []
this.addForm = {}
},
edit(obj) {
this.title = '编辑'
console.log('obj=======', obj);
this.title = '编辑入库'
this.dialogShow = true
this.addEditForm = JSON.parse(JSON.stringify(obj))
this.addForm = JSON.parse(JSON.stringify(obj))
this.gtMaterialInOutWarehouseId = obj.id
this.getMaterialData()
},
submit() {
let params = JSON.parse(JSON.stringify(this.addEditForm))
saveContractInfoFn() {
let params = JSON.parse(JSON.stringify(this.addForm))
params.materialList = this.materialData
params.projectSn = this.$store.state.projectSn
this.$refs.addEditForm.validate((valid) => {
params.type = 30
this.$refs.addForm.validate((valid) => {
if (valid) {
if (this.title == '新增仓库') {
addStuffWarehouseApi(params).then((result) => {
if (this.title == '新增入库') {
addGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message)
this.getList()
}
})
} else if (this.title === '编辑仓库') {
} else if (this.title === '编辑入库') {
console.log('编辑信息', this.addEditForm)
editStuffWarehouseApi(params).then((result) => {
editGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message)
this.getList()
@ -601,7 +790,7 @@ export default {
type: "warning",
})
.then(() => {
deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
deletGtMaterialInOutWarehouseApi({ id: obj.id }).then((res) => {
if (res.success) {
this.getList()
this.$message({
@ -624,12 +813,6 @@ export default {
});
},
close() {
this.addEditForm = {}
this.$nextTick(() => {
this.$refs.addEditForm.clearValidate()
})
},
SizeChange(val) {
this.pagInfo.pageSize = val
this.getList()

683
src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue
View File

@ -9,88 +9,53 @@
size="medium"
>
<el-form-item label="单号">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-input v-model="searchForm.number" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="客户">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<!-- <el-form-item label="货号">
<el-input v-model="searchForm.stuffNumber" placeholder="请输入"></el-input>
</el-form-item> -->
<el-form-item label="仓库">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型">
<el-input
v-model="searchForm.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人">
<el-input
v-model="searchForm.warehouseName"
v-model="searchForm.handler"
placeholder="请输入"
></el-input>
</el-form-item>
<!-- <el-form-item label="助查码">
<el-input v-model="searchForm.lookupCode" placeholder="请输入"></el-input>
</el-form-item> -->
<el-form-item label="日期">
<el-date-picker
v-model="searchForm.warehouseName"
v-model="timeValue"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
@change="getTime"
>
</el-date-picker>
</el-form-item>
<el-form-item label="批号">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型">
<el-select v-model="searchForm.warehouseName" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="货号">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="品名">
<el-select v-model="searchForm.warehouseName" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="助查码">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-form-item label="客户">
<el-input v-model="searchForm.customer" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" plain @click="getList">{{
@ -104,71 +69,72 @@
</el-form>
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" :data="List">
<el-table class="tables" :data="List" @row-click="showDetailFn">
<el-table-column
prop="warehouseName"
prop="serialNumber"
label="编号"
align="center"
></el-table-column>
<el-table-column
prop="warehousePos"
prop="number"
align="center"
label="单号"
></el-table-column>
<el-table-column
prop="header"
prop="date"
align="center"
label="日期"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="warehouse"
align="center"
label="仓库"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="direction"
align="center"
label="方向"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="category"
align="center"
label="类别"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="department"
align="center"
label="部门"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="customer"
align="center"
label="供应商"
label="客户"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="handler"
align="center"
label="经手人"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="lotNumber"
align="center"
label="批号"
></el-table-column>
<el-table-column
prop="headerPhone"
prop="singleHanded"
align="center"
label="制单人"
></el-table-column>
<el-table-column
prop="headerPhone"
width="110"
prop="createTime"
align="center"
label="制单时间"
></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns" style="margin-left: -14px !important">
<div @click="edit(scope.row)" class="operationText">
<div @click.stop="edit(scope.row)" class="operationText" style="margin-right: 10px !important;margin-left: 20px !important;">
<img
src="@/assets/images/icon-edit.png"
width="15px"
@ -176,7 +142,7 @@
/>
<span>编辑</span>
</div>
<div @click="deleteDev(scope.row)" class="operationText">
<div @click.stop="deleteDev(scope.row)" class="operationText">
<img
src="@/assets/images/icon-delete.png"
width="15px"
@ -207,107 +173,98 @@
:visible.sync="dialogShow"
width="1167px"
>
<p>出库单信息</p>
<p>入库单信息</p>
<div class="dialog_content">
<el-form
style="margin: 0 28px"
size="medium"
:model="contractForm"
ref="contractForm"
:rules="contractFormRules"
:model="addForm"
ref="addForm"
:rules="addFormules"
:inline="true"
>
<el-form-item label="日期" prop="arrivalTime">
<el-form-item label="日期" prop="createTime">
<el-date-picker
v-model="value1"
v-model="addForm.date"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="仓库" prop="enterpriseId">
<el-form-item label="仓库" prop="warehouse">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型" prop="enterpriseId">
<el-form-item label="类型" prop="category">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="客户" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
<el-input
v-model="addForm.direction"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item
label="方向"
prop="enterpriseId"
style="margin-left: 15px"
label="编号"
prop="serialNumber"
style="margin-left: 10px"
>
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="编号" prop="orderNumber">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.serialNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="单号" prop="orderNumber">
<el-form-item label="单号" prop="number">
<el-input v-model="addForm.number" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="批号" prop="lotNumber">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.lotNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="批号" prop="orderNumber">
<el-form-item label="部门" prop="department">
<el-input
v-model="contractForm.orderNumber"
v-model="addForm.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门" prop="enterpriseId">
<el-form-item label="经手人" prop="handler">
<el-input v-model="addForm.handler" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="制单人" prop="singleHanded">
<el-input
v-model="searchForm.warehouseName"
v-model="addForm.singleHanded"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="制单人" prop="enterpriseId">
<el-input
v-model="searchForm.warehouseName"
placeholder="请输入"
></el-input>
<el-form-item label="客户" prop="customer">
<el-input v-model="addForm.customer" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
style="width: 790px"
style="width: 820px"
type="textarea"
:rows="1"
v-model="contractForm.remarks"
v-model="addForm.remark"
placeholder="请输入"
></el-input>
</el-form-item>
</el-form>
<div class="importMaterialBox">
<el-button
style="margin-bottom: 15px; margin-left: 990px"
style="margin-bottom: 15px; margin-left: 1005px"
type="primary"
size="medium"
@click="importMaterial"
@ -316,7 +273,7 @@
</el-button>
<el-table
class="tables"
:data="orderMaterialList"
:data="materialData"
height="360"
style="min-height: auto"
>
@ -329,12 +286,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="specifications" label="规格" align="center">
<el-table-column prop="specification" label="规格" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.specifications"
v-model="scope.row.specification"
></el-input>
</template>
</el-table-column>
@ -347,12 +304,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="materialNum" label="数量" align="center">
<el-table-column prop="quantity" label="数量" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.materialNum"
v-model="scope.row.quantity"
></el-input>
</template>
</el-table-column>
@ -365,12 +322,12 @@
></el-input>
</template>
</el-table-column>
<el-table-column prop="computeUnit" label="金额" align="center">
<el-table-column prop="amount" label="金额" align="center">
<template slot-scope="scope">
<el-input
style="width: 122px"
size="mini"
v-model="scope.row.computeUnit"
v-model="scope.row.amount"
></el-input>
</template>
</el-table-column>
@ -410,18 +367,11 @@
size="medium"
>取消
</el-button>
<!-- <el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(1)"
size="medium"
>
暂存
</el-button> -->
<el-button
type="primary"
icon="el-icon-circle-check"
@click="saveContractInfoFn(2)"
@click="saveContractInfoFn"
size="medium"
>
保存
@ -429,33 +379,276 @@
</div>
</div>
</el-dialog>
<!--详情弹框-->
<el-dialog
:modal-append-to-body="false"
title="详情"
:visible.sync="isShow"
width="1167px"
>
<div class="dialog_content">
<el-form
style="margin: 0 28px"
size="medium"
:model="addForm"
ref="addForm"
:rules="addFormules"
:inline="true"
>
<el-form-item label="日期" prop="createTime">
<el-date-picker
v-model="detailData.date"
disabled
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="仓库" prop="warehouse">
<el-input
disabled
v-model="detailData.warehouse"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="类型" prop="category">
<el-input
disabled
v-model="detailData.category"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="方向" prop="direction" style="margin-left: 15px">
<el-input
disabled
v-model="detailData.direction"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item
label="编号"
prop="serialNumber"
style="margin-left: 10px"
>
<el-input
disabled
v-model="detailData.serialNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="单号" prop="number">
<el-input
disabled
v-model="detailData.number"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="批号" prop="lotNumber">
<el-input
disabled
v-model="detailData.lotNumber"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="部门" prop="department">
<el-input
disabled
v-model="detailData.department"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="经手人" prop="handler">
<el-input
disabled
v-model="detailData.handler"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="制单人" prop="singleHanded">
<el-input
disabled
v-model="detailData.singleHanded"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="客户" prop="customer">
<el-input
disabled
v-model="detailData.customer"
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input
disabled
style="width: 790px"
type="textarea"
:rows="1"
v-model="detailData.remark"
placeholder="请输入"
></el-input>
</el-form-item>
</el-form>
<div class="importMaterialBox">
<el-table
class="tables"
:data="materialData"
height="360"
style="min-height: auto"
>
<el-table-column prop="name" label="品名" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.name"
></el-input>
</template>
</el-table-column>
<el-table-column prop="specification" label="规格" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.specification"
></el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="单位" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.unit"
></el-input>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.quantity"
></el-input>
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="单价" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.unitPrice"
></el-input>
</template>
</el-table-column>
<el-table-column prop="amount" label="金额" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.amount"
></el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
<template slot-scope="scope">
<el-input
disabled
style="width: 122px"
size="mini"
v-model="scope.row.remark"
></el-input>
</template>
</el-table-column>
</el-table>
</div>
<div class="dialog-footer" style="text-align: center">
<el-button
type="primary"
icon="el-icon-circle-check"
size="medium"
@click="isShow = false"
>
确认
</el-button>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import {
addStuffWarehouseApi,
deleteStuffWarehouseApi,
editStuffWarehouseApi,
getStuffWarehousePageApi
} from '@/assets/js/api/warehouseManagement.js'
addGtMaterialInOutWarehouseApi,
deletGtMaterialInOutWarehouseApi,
editGtMaterialInOutWarehouseApi,
gettGMaterialInOutWarehousePageApi,//查询表单数据
gettGMaterialInOutWarehouseListApi,//根据id查询物料
} from '@/assets/js/api/materialManagement.js'
export default {
mounted() {
this.getList()
},
data() {
return {
orderMaterialList: [
timeValue: '',
isShow: false,
deliteShow: false,
detailData: {},
searchForm: {
number: "",
// stuffNumber:"",//货号
warehouse: "",
department: "",
category: "",
handler: "",
// lookupCode: "",//助查码
customer: "",
startTime: '',//开始时间
endTime: '',//结束时间
},//查询
addForm: {
date: "",
warehouse: "",
category: "",
direction: "",
serialNumber: "",
number: "",
lotNumber: "",
department: "",
handler: "",
singleHanded: "",
customer: "",
remark: "",
materialList: [],
gtMaterialInOutWarehouseId: '',
type: "",
},//表单
materialData: [
{
name: "",
specifications: "",
specification: "",
unit: "",
materialNum: "",
quantity: "",
unitPrice: "",
computeUnit: "",
amount: "",
remark: "",
}
],
contractForm: {},
deliteMaterialList: [],//详情
addFormules: {},
title: "",
dialogShow: false,
pagInfo: {
@ -464,113 +657,36 @@ export default {
total: 0 //总条数
},
List: [],
addEditForm: {
warehouseName: '',//仓库名称
warehousePos: '',//warehousePos
header: '',//负责人
headerPhone: '',//负责人电话
remark: '',//备注
},
addEditRules: {
warehouseName: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
warehousePos: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
header: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
headerPhone: [
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'blur'
},
{
required: true,
message: this.$t('message.carManage.required'),
trigger: 'change'
}
],
gtMaterialInOutWarehouseId: '',//编辑查询
},
searchForm: {
warehouseName: '',
warehouseNumber: '',
warehousePos: '',
},
}
},
methods: {
//表格动态添加
importMaterial() {
let statusType = true;
this.orderMaterialList.forEach((item) => {
if (item.name == "" || item.specifications == "" || item.unit == "" || item.materialNum == "" || item.unitPrice == "" || item.computeUnit == "" || item.remark == "") {
this.$message({
message: "请完善信息后在添加",
type: "warning",
});
statusType = false;
//选择时间时
getTime(val) {
if (val) {
this.searchForm.startTime = val[0]
this.searchForm.endTime = val[1]
} else {
this.searchForm.startTime = ''
this.searchForm.endTime = ''
}
})
if (statusType) {
this.orderMaterialList.push({
name: "",
specifications: "",
unit: "",
materialNum: "",
unitPrice: "",
computeUnit: "",
remark: "",
});
}
},
//删除表格动态操作
deleteTable(item, index) {
this.orderMaterialList.splice(index, 1)
this.$message({
message: "删除成功",
type: "success",
});
},
//查询仓库数据
getList() {
getStuffWarehousePageApi({
gettGMaterialInOutWarehousePageApi({
pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize,
projectSn: this.$store.state.projectSn,
warehouseName: this.searchForm.warehouseName,
warehousePos: this.searchForm.warehousePos,
number: this.searchForm.number,
warehouse: this.searchForm.warehouse,
department: this.searchForm.department,
category: this.searchForm.category,
handler: this.searchForm.handler,
customer: this.searchForm.customer,
endTime:this.searchForm.endTime,
startTime:this.searchForm.startTime,
type: 40,
}).then((result) => {
if (result.success) {
this.List = result.result.records
@ -578,34 +694,83 @@ export default {
}
})
},
//查询物料信息
getMaterialData() {
gettGMaterialInOutWarehouseListApi({
projectSn: this.$store.state.projectSn,
gtMaterialInOutWarehouseId: this.gtMaterialInOutWarehouseId
}).then((result) => {
this.materialData = result.result
})
},
//显示检查详细弹框
showDetailFn(row) {
this.detailData = row
this.isShow = true
this.gtMaterialInOutWarehouseId = this.detailData.id
this.getMaterialData()
},
//表格动态添加
importMaterial() {
// let statusType = true;
// this.materialList.forEach((item) => {
// if (item.name == "" || item.specifications == "" || item.unit == "" || item.quantity == "") {
// this.$message({
// message: "请完善信息后在添加",
// type: "warning",
// });
// statusType = false;
// }
// })
// if (statusType) {
this.materialData.push({
name: "",
specification: "",
unit: "",
quantity: "",
unitPrice: "",
amount: "",
remark: "",
});
// }
},
//删除表格动态操作
deleteTable(index) {
this.materialData.splice(index, 1)
},
add() {
this.title = '新增'
this.title = '新增入库'
this.dialogShow = true
this.orderMaterialList = []
this.close()
this.materialData = []
this.addForm = {}
},
edit(obj) {
this.title = '编辑'
console.log('obj=======', obj);
this.title = '编辑入库'
this.dialogShow = true
this.addEditForm = JSON.parse(JSON.stringify(obj))
this.addForm = JSON.parse(JSON.stringify(obj))
this.gtMaterialInOutWarehouseId = obj.id
this.getMaterialData()
},
submit() {
let params = JSON.parse(JSON.stringify(this.addEditForm))
saveContractInfoFn() {
let params = JSON.parse(JSON.stringify(this.addForm))
params.materialList = this.materialData
params.projectSn = this.$store.state.projectSn
this.$refs.addEditForm.validate((valid) => {
params.type = 40
this.$refs.addForm.validate((valid) => {
if (valid) {
if (this.title == '新增仓库') {
addStuffWarehouseApi(params).then((result) => {
if (this.title == '新增入库') {
addGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message)
this.getList()
}
})
} else if (this.title === '编辑仓库') {
} else if (this.title === '编辑入库') {
console.log('编辑信息', this.addEditForm)
editStuffWarehouseApi(params).then((result) => {
editGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message)
this.getList()
@ -625,7 +790,7 @@ export default {
type: "warning",
})
.then(() => {
deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
deletGtMaterialInOutWarehouseApi({ id: obj.id }).then((res) => {
if (res.success) {
this.getList()
this.$message({
@ -648,12 +813,6 @@ export default {
});
},
close() {
this.addEditForm = {}
this.$nextTick(() => {
this.$refs.addEditForm.clearValidate()
})
},
SizeChange(val) {
this.pagInfo.pageSize = val
this.getList()