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

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into yanyan_dev

Browse Source
This commit is contained in:
严妍 2023-04-28 18:08:06 +08:00
commit d3ca8f5584
13 changed files with 89 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地 // 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.221:12350' //金林湾本地
// axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 // 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:8070' //演示平台郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 // 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:11111' //百色线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上

2
src/store/index.js
View File

@ -93,6 +93,8 @@ export default new Vuex.Store({
// FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地 // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
// FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
// UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
// FILEURL: 'http://42.194.144.62:8088/image/',//中建四
ACCOUNTTYPE: [ ACCOUNTTYPE: [
"系统管理员", "系统管理员",

26
src/views/projectAdmin/fourEngin/carbon/index.vue
View File

@ -1,19 +1,13 @@
<template> <template>
<div class="carbon"> <div class="carbon">
<div class="between"> <iframe
<div class="top"><LeftTop /></div> style="margin: -5px -20px;"
<div class="center"><LeftCenter /></div> src="https://cloud.dev.pkpm.cn/fourth/"
<div class="bottom"><RightBottom /></div> frameborder="0"
</div> width="100%"
<div class="center"> height="100%"
<div class="top"><CenterTop /></div> id="iframe"
<div class="bottom"><CenterBottom /></div> ></iframe>
</div>
<div class="between2">
<div class="top"><RightTop /></div>
<div class="center"><RightCenter /></div>
<div class="bottom"><LeftBottom /></div>
</div>
</div> </div>
</template> </template>
@ -33,8 +27,8 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.carbon { .carbon {
width: 100%; width: 101%;
height: 100%; height: 105%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
// background: url(../assets/temp/7.png) no-repeat; // background: url(../assets/temp/7.png) no-repeat;

5
src/views/projectAdmin/fourEngin/quality/centerTop.vue
View File

@ -3,7 +3,9 @@
<div class="list"> <div class="list">
<vue-scroll style="width: 100%; height: 550px"> <vue-scroll style="width: 100%; height: 550px">
<div class="list-item" v-for="(item, index) in showList" :key="index"> <div class="list-item" v-for="(item, index) in showList" :key="index">
<p>{{ item.title }}</p> <p>{{ item.title }}</p>
<img <img
:preview="item.imageUrl[0] ? item.imageUrl[0].url : []" :preview="item.imageUrl[0] ? item.imageUrl[0].url : []"
:src="item.imageUrl[0] ? item.imageUrl[0].url : []" :src="item.imageUrl[0] ? item.imageUrl[0].url : []"
@ -110,11 +112,12 @@ export default {
} }
p { p {
width: 100%; width: 100%;
height: 25px; height: 50px;
line-height: 25px; line-height: 25px;
position: absolute; position: absolute;
background-color: rgba(0, 0, 0, 0.55); background-color: rgba(0, 0, 0, 0.55);
bottom: 0; bottom: 0;
overflow: hidden;
} }
} }
} }

8
src/views/projectAdmin/fourEngin/sourse/rightTop.vue
View File

@ -288,7 +288,9 @@ export default {
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: '#fff' color: '#fff'
} },
// formatter: function(value){ return (value*10)+'%'}
}, },
axisLine: { axisLine: {
show: true, show: true,
@ -370,7 +372,6 @@ export default {
this.isblock = true this.isblock = true
} }
console.log('查询材料类别', res)
} }
) )
}, },
@ -379,7 +380,6 @@ export default {
typeId: this.typeId, typeId: this.typeId,
year: this.checkDate year: this.checkDate
}).then((res) => { }).then((res) => {
console.log('查询g============================== ： ', res)
let passList = [] let passList = []
let consumeList = [] let consumeList = []
@ -392,12 +392,10 @@ export default {
// this.series[0].data = passList //计划用量 pass // this.series[0].data = passList //计划用量 pass
// this.series[1].data = consumeList //实际用量 consume // this.series[1].data = consumeList //实际用量 consume
// this.series[2].data = deviationRatioList //偏差比例 deviationRatio // this.series[2].data = deviationRatioList //偏差比例 deviationRatio
console.log('查询getgetPassConsumeRatioList ： ', this.series)
this.getEcharts(passList, consumeList, deviationRatioList) this.getEcharts(passList, consumeList, deviationRatioList)
}) })
}, },
checkTypes(val) { checkTypes(val) {
console.log('类型或者时间修改事件值 ：', val)
this.getgetPassConsumeRatioList() this.getgetPassConsumeRatioList()
} }
// getTime1(val) { // getTime1(val) {

1
src/views/projectFront/contractManagement/evaluationRecords.vue
View File

@ -145,6 +145,7 @@
v-model="addEditForm.evaluationDate" v-model="addEditForm.evaluationDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

16
src/views/projectFront/equipmentManagement/leasingEquipment.vue
View File

@ -201,6 +201,7 @@
v-model="contractForm.liftFallArresterAppearanceLeftDate" v-model="contractForm.liftFallArresterAppearanceLeftDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -213,6 +214,7 @@
v-model="contractForm.liftInspectionLeftDate" v-model="contractForm.liftInspectionLeftDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -225,6 +227,7 @@
v-model="contractForm.liftFallArresterAppearanceRightDate" v-model="contractForm.liftFallArresterAppearanceRightDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -237,6 +240,7 @@
v-model="contractForm.liftInspectionRightDate" v-model="contractForm.liftInspectionRightDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -278,6 +282,7 @@
v-model="contractForm.entryDate" v-model="contractForm.entryDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -310,6 +315,7 @@
v-model="contractForm.appearanceDate" v-model="contractForm.appearanceDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -446,6 +452,7 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -459,6 +466,7 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -472,6 +480,7 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -485,6 +494,7 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -530,6 +540,7 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -560,6 +571,7 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -811,6 +823,7 @@
v-model="tenderRecordsForm.maintenanceTime" v-model="tenderRecordsForm.maintenanceTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 320px !important" style="width: 320px !important"
> >
</el-date-picker> </el-date-picker>
@ -820,6 +833,7 @@
v-model="tenderRecordsForm.nextMaintenanceTime" v-model="tenderRecordsForm.nextMaintenanceTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 320px !important" style="width: 320px !important"
> >
</el-date-picker> </el-date-picker>
@ -902,6 +916,7 @@
v-model="tenderListForm.inspectionTime" v-model="tenderListForm.inspectionTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 320px !important" style="width: 320px !important"
> >
</el-date-picker> </el-date-picker>
@ -911,6 +926,7 @@
v-model="tenderListForm.nextInspectionTime" v-model="tenderListForm.nextInspectionTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 320px !important" style="width: 320px !important"
> >
</el-date-picker> </el-date-picker>

36
src/views/projectFront/equipmentManagement/ownEquipment.vue
View File

@ -74,11 +74,11 @@
align="center" align="center"
label="额定载重重量" label="额定载重重量"
></el-table-column> ></el-table-column>
<el-table-column <!-- <el-table-column
prop="rentalUnit" prop="rentalUnit"
align="center" align="center"
label="租赁单位" label="租赁单位"
></el-table-column> ></el-table-column> -->
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tableBtns" style="margin-left: 10px !important"> <div class="tableBtns" style="margin-left: 10px !important">
@ -161,12 +161,12 @@
:placeholder="$t('message.companyDiagram.PleaseEnter')" :placeholder="$t('message.companyDiagram.PleaseEnter')"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="租赁单位" prop="remarks" label-width="70px"> <!-- <el-form-item label="租赁单位" prop="remarks" label-width="70px">
<el-input <el-input
v-model="contractForm.rentalUnit" v-model="contractForm.rentalUnit"
:placeholder="$t('message.companyDiagram.PleaseEnter')" :placeholder="$t('message.companyDiagram.PleaseEnter')"
></el-input> ></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="额定载重重量" prop="remarks" label-width="100px"> <el-form-item label="额定载重重量" prop="remarks" label-width="100px">
<el-input <el-input
v-model="contractForm.ratedLoadCapacity" v-model="contractForm.ratedLoadCapacity"
@ -201,6 +201,7 @@
v-model="contractForm.liftFallArresterAppearanceLeftDate" v-model="contractForm.liftFallArresterAppearanceLeftDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -213,6 +214,7 @@
v-model="contractForm.liftInspectionLeftDate" v-model="contractForm.liftInspectionLeftDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -225,6 +227,7 @@
v-model="contractForm.liftFallArresterAppearanceRightDate" v-model="contractForm.liftFallArresterAppearanceRightDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -237,6 +240,7 @@
v-model="contractForm.liftInspectionRightDate" v-model="contractForm.liftInspectionRightDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -278,6 +282,7 @@
v-model="contractForm.entryDate" v-model="contractForm.entryDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -310,6 +315,7 @@
v-model="contractForm.appearanceDate" v-model="contractForm.appearanceDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -401,13 +407,13 @@
:placeholder="$t('message.companyDiagram.PleaseEnter')" :placeholder="$t('message.companyDiagram.PleaseEnter')"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="租赁单位" prop="remarks" label-width="70px"> <!-- <el-form-item label="租赁单位" prop="remarks" label-width="70px">
<el-input <el-input
v-model="detailData.rentalUnit" v-model="detailData.rentalUnit"
disabled disabled
:placeholder="$t('message.companyDiagram.PleaseEnter')" :placeholder="$t('message.companyDiagram.PleaseEnter')"
></el-input> ></el-input>
</el-form-item> </el-form-item> -->
<el-form-item label="额定载重重量" prop="remarks" label-width="100px"> <el-form-item label="额定载重重量" prop="remarks" label-width="100px">
<el-input <el-input
v-model="detailData.ratedLoadCapacity" v-model="detailData.ratedLoadCapacity"
@ -446,6 +452,8 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -459,6 +467,8 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -472,6 +482,8 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -485,6 +497,8 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -530,6 +544,8 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -560,6 +576,8 @@
disabled disabled
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -812,6 +830,8 @@
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
style="width: 320px !important" style="width: 320px !important"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -820,6 +840,7 @@
v-model="tenderRecordsForm.nextMaintenanceTime" v-model="tenderRecordsForm.nextMaintenanceTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 320px !important" style="width: 320px !important"
> >
</el-date-picker> </el-date-picker>
@ -902,6 +923,7 @@
v-model="tenderListForm.inspectionTime" v-model="tenderListForm.inspectionTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 320px !important" style="width: 320px !important"
> >
</el-date-picker> </el-date-picker>
@ -911,6 +933,8 @@
v-model="tenderListForm.nextInspectionTime" v-model="tenderListForm.nextInspectionTime"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 320px !important" style="width: 320px !important"
> >
</el-date-picker> </el-date-picker>

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

@ -98,7 +98,7 @@
<el-table-column <el-table-column
prop="category" prop="category"
align="center" align="center"
label="类别" label="类型"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="department" prop="department"

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

@ -98,7 +98,7 @@
<el-table-column <el-table-column
prop="category" prop="category"
align="center" align="center"
label="类别" label="类型"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="department" prop="department"
@ -173,7 +173,7 @@
:visible.sync="dialogShow" :visible.sync="dialogShow"
width="1167px" width="1167px"
> >
<p>入库单信息</p> <p>出库单信息</p>
<div class="dialog_content"> <div class="dialog_content">
<el-form <el-form
style="margin: 0 28px" style="margin: 0 28px"
@ -740,15 +740,14 @@ export default {
this.materialData.splice(index, 1) this.materialData.splice(index, 1)
}, },
add() { add() {
this.title = '新增入库' this.title = '新增出库'
this.dialogShow = true this.dialogShow = true
this.materialData = [] this.materialData = []
this.addForm = {} this.addForm = {}
}, },
edit(obj) { edit(obj) {
console.log('obj=======', obj); this.title = '编辑出库'
this.title = '编辑入库'
this.dialogShow = true this.dialogShow = true
this.addForm = JSON.parse(JSON.stringify(obj)) this.addForm = JSON.parse(JSON.stringify(obj))
this.gtMaterialInOutWarehouseId = obj.id this.gtMaterialInOutWarehouseId = obj.id
@ -761,15 +760,14 @@ export default {
params.type = 20 params.type = 20
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
if (valid) { if (valid) {
if (this.title == '新增入库') { if (this.title == '新增出库') {
addGtMaterialInOutWarehouseApi(params).then((result) => { addGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) { if (result.success) {
this.$message.success(result.message) this.$message.success(result.message)
this.getList() this.getList()
} }
}) })
} else if (this.title === '编辑入库') { } else if (this.title === '编辑出库') {
console.log('编辑信息', this.addEditForm)
editGtMaterialInOutWarehouseApi(params).then((result) => { editGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) { if (result.success) {
this.$message.success(result.message) this.$message.success(result.message)

6
src/views/projectFront/procurementManagement/materialSupplierManagement.vue
View File

@ -79,11 +79,11 @@
</el-table-column> </el-table-column>
<el-table-column prop="mail" label="邮件" align="center"> <el-table-column prop="mail" label="邮件" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="mail" label="法人代表" align="center"> <el-table-column prop="legalRepresentative" label="法人代表" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="mail" label="开户银行" align="center"> <el-table-column prop="openedBankAccount" label="开户银行" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="mail" label="银行账号" align="center"> <el-table-column prop="bankAccount" label="银行账号" align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">

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

@ -98,7 +98,7 @@
<el-table-column <el-table-column
prop="category" prop="category"
align="center" align="center"
label="类别" label="类型"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="department" prop="department"
@ -173,7 +173,7 @@
:visible.sync="dialogShow" :visible.sync="dialogShow"
width="1167px" width="1167px"
> >
<p>入库单信息</p> <p>进场登记信息</p>
<div class="dialog_content"> <div class="dialog_content">
<el-form <el-form
style="margin: 0 28px" style="margin: 0 28px"
@ -740,15 +740,14 @@ export default {
this.materialData.splice(index, 1) this.materialData.splice(index, 1)
}, },
add() { add() {
this.title = '新增入库' this.title = '新增进场登记'
this.dialogShow = true this.dialogShow = true
this.materialData = [] this.materialData = []
this.addForm = {} this.addForm = {}
}, },
edit(obj) { edit(obj) {
console.log('obj=======', obj); this.title = '编辑进场登记'
this.title = '编辑入库'
this.dialogShow = true this.dialogShow = true
this.addForm = JSON.parse(JSON.stringify(obj)) this.addForm = JSON.parse(JSON.stringify(obj))
this.gtMaterialInOutWarehouseId = obj.id this.gtMaterialInOutWarehouseId = obj.id
@ -761,14 +760,14 @@ export default {
params.type = 30 params.type = 30
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
if (valid) { if (valid) {
if (this.title == '新增入库') { if (this.title == '新增进场登记') {
addGtMaterialInOutWarehouseApi(params).then((result) => { addGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) { if (result.success) {
this.$message.success(result.message) this.$message.success(result.message)
this.getList() this.getList()
} }
}) })
} else if (this.title === '编辑入库') { } else if (this.title === '编辑进场登记') {
console.log('编辑信息', this.addEditForm) console.log('编辑信息', this.addEditForm)
editGtMaterialInOutWarehouseApi(params).then((result) => { editGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) { if (result.success) {

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

@ -98,7 +98,7 @@
<el-table-column <el-table-column
prop="category" prop="category"
align="center" align="center"
label="类别" label="类型"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="department" prop="department"
@ -173,7 +173,7 @@
:visible.sync="dialogShow" :visible.sync="dialogShow"
width="1167px" width="1167px"
> >
<p>入库单信息</p> <p>出场登记信息</p>
<div class="dialog_content"> <div class="dialog_content">
<el-form <el-form
style="margin: 0 28px" style="margin: 0 28px"
@ -740,15 +740,14 @@ export default {
this.materialData.splice(index, 1) this.materialData.splice(index, 1)
}, },
add() { add() {
this.title = '新增入库' this.title = '新增出场登记'
this.dialogShow = true this.dialogShow = true
this.materialData = [] this.materialData = []
this.addForm = {} this.addForm = {}
}, },
edit(obj) { edit(obj) {
console.log('obj=======', obj); this.title = '编辑出场登记'
this.title = '编辑入库'
this.dialogShow = true this.dialogShow = true
this.addForm = JSON.parse(JSON.stringify(obj)) this.addForm = JSON.parse(JSON.stringify(obj))
this.gtMaterialInOutWarehouseId = obj.id this.gtMaterialInOutWarehouseId = obj.id
@ -761,15 +760,14 @@ export default {
params.type = 40 params.type = 40
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
if (valid) { if (valid) {
if (this.title == '新增入库') { if (this.title == '新增出场登记') {
addGtMaterialInOutWarehouseApi(params).then((result) => { addGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) { if (result.success) {
this.$message.success(result.message) this.$message.success(result.message)
this.getList() this.getList()
} }
}) })
} else if (this.title === '编辑入库') { } else if (this.title === '编辑出场登记') {
console.log('编辑信息', this.addEditForm)
editGtMaterialInOutWarehouseApi(params).then((result) => { editGtMaterialInOutWarehouseApi(params).then((result) => {
if (result.success) { if (result.success) {
this.$message.success(result.message) this.$message.success(result.message)