Commit 152f286d authored by wdy's avatar wdy

库存修正,样品库基本信息

parent 81afd45f
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作日期" prop="createDate" :show-overflow-tooltip="true"> <el-table-column label="操作日期" prop="createDate" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseTime(scope.row.createDate,'{y}-{m}-{d} {h}:{i}') || '-' }} {{ parseTime(scope.row.updateDate,'{y}-{m}-{d} {h}:{i}') || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作">--> <!-- <el-table-column label="操作">-->
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.page" :page.sync="queryParams.page"
:limit.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList" @pagination="getList"
/> />
<!-- 新增修改弹出 --> <!-- 新增修改弹出 -->
...@@ -210,16 +210,14 @@ export default { ...@@ -210,16 +210,14 @@ export default {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
// 校验通过,提交表单或进行其他操作 // 校验通过,提交表单或进行其他操作
console.log('form', this.form)
if (this.form.businessId !== undefined) { if (this.form.businessId !== undefined) {
console.log('更新')
updataInfo(this.form).then(res => { updataInfo(this.form).then(res => {
console.log('res', res)
if (res.code === 200) { if (res.code === 200) {
this.open = false this.open = false
this.$message.success('操作成功') this.$message.success('操作成功')
this.getList() this.getList()
this.reFrom() this.reFrom()
this.queryParams.page = 1
} else if (res.code === null) { } else if (res.code === null) {
this.$message.error(res.message) this.$message.error(res.message)
} }
...@@ -231,6 +229,7 @@ export default { ...@@ -231,6 +229,7 @@ export default {
this.$message.success('操作成功') this.$message.success('操作成功')
this.getList() this.getList()
this.reFrom() this.reFrom()
this.queryParams.page = 1
} else if (res.code === null) { } else if (res.code === null) {
this.$message.error(res.message) this.$message.error(res.message)
} }
...@@ -253,7 +252,6 @@ export default { ...@@ -253,7 +252,6 @@ export default {
type: 'warning' type: 'warning'
}).then(res => { }).then(res => {
deleteLogical(id).then(res => { deleteLogical(id).then(res => {
console.log('res', res)
if (res.code === 200) { if (res.code === 200) {
this.$message.success('操作成功') this.$message.success('操作成功')
this.getList() this.getList()
...@@ -274,8 +272,7 @@ export default { ...@@ -274,8 +272,7 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
queryList(this.queryParams).then(res => { queryList(this.queryParams).then(res => {
console.log('res', res) res.rows.updateDate = parseTime(res.rows.updateDate, '{y}-{m}-{d}')
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.total = res.total this.total = res.total
this.basicinfoMationList = res.rows this.basicinfoMationList = res.rows
this.loading = false this.loading = false
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作时间" prop="create_date" :show-overflow-tooltip="true"> <el-table-column label="操作时间" prop="create_date" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.create_date || '-' }} {{ parseTime(scope.row.updateDate, '{y}-{m}-{d} {h}:{i}') || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.page" :page.sync="queryParams.page"
:limit.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList" @pagination="getList"
/> />
<!-- 新增修改弹出 --> <!-- 新增修改弹出 -->
...@@ -209,16 +209,14 @@ export default { ...@@ -209,16 +209,14 @@ export default {
this.$refs.form.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
// 校验通过,提交表单或进行其他操作 // 校验通过,提交表单或进行其他操作
console.log('form', this.form)
if (this.form.businessId !== undefined) { if (this.form.businessId !== undefined) {
console.log('更新')
updataInfo(this.form).then(res => { updataInfo(this.form).then(res => {
console.log('res', res)
if (res.code === 200) { if (res.code === 200) {
this.open = false this.open = false
this.$message.success('操作成功') this.$message.success('操作成功')
this.getList() this.getList()
this.reFrom() this.reFrom()
this.queryParams.page = 1
} else if (res.code === null) { } else if (res.code === null) {
this.$message.error(res.message) this.$message.error(res.message)
} }
...@@ -230,6 +228,7 @@ export default { ...@@ -230,6 +228,7 @@ export default {
this.$message.success('操作成功') this.$message.success('操作成功')
this.getList() this.getList()
this.reFrom() this.reFrom()
this.queryParams.page = 1
} else if (res.code === null) { } else if (res.code === null) {
this.$message.error(res.message) this.$message.error(res.message)
} }
...@@ -252,7 +251,6 @@ export default { ...@@ -252,7 +251,6 @@ export default {
type: 'warning' type: 'warning'
}).then(res => { }).then(res => {
deleteLogical(id).then(res => { deleteLogical(id).then(res => {
console.log('res', res)
if (res.code === 200) { if (res.code === 200) {
this.$message.success('操作成功') this.$message.success('操作成功')
this.getList() this.getList()
...@@ -272,8 +270,7 @@ export default { ...@@ -272,8 +270,7 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
queryList(this.queryParams).then(res => { queryList(this.queryParams).then(res => {
console.log('res', res) res.rows.updateDate = parseTime(res.rows.updateDate, '{y}-{m}-{d}')
res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
this.total = res.total this.total = res.total
this.basicinfoMationList = res.rows this.basicinfoMationList = res.rows
this.loading = false this.loading = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment