|
@@ -269,6 +269,13 @@ export default {
|
|
|
width: 100,
|
|
|
onabort: ''
|
|
|
},{
|
|
|
+ surface: '10',
|
|
|
+ label: 'fBillstatusName',
|
|
|
+ name: '状态',
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ onabort: ''
|
|
|
+ },{
|
|
|
surface: '11',
|
|
|
label: 'operation',
|
|
|
name: '操作',
|
|
@@ -746,7 +753,7 @@ export default {
|
|
|
let date = this.$route.query
|
|
|
console.log(date)
|
|
|
if (this.$route.query.list){
|
|
|
- console.log(this.contentButton)
|
|
|
+ this.contentButton = this.$options.data().contentButton
|
|
|
this.contentButton.push(JSON.parse(this.$route.query.list))
|
|
|
console.log(this.contentButton)
|
|
|
let scope = {
|
|
@@ -982,6 +989,13 @@ export default {
|
|
|
console.log(this.dataList, this.contentList)
|
|
|
if (item == 1){
|
|
|
this.dialogVisible = true
|
|
|
+ }else if (item === 2){
|
|
|
+ let data = {
|
|
|
+ tableName: this.queryList.tableName,
|
|
|
+ userId: Cookies.get('userName')
|
|
|
+ }
|
|
|
+ this.getRow(data)
|
|
|
+ this.query(this.formDataList)
|
|
|
}
|
|
|
}
|
|
|
})
|
|
@@ -1090,7 +1104,7 @@ export default {
|
|
|
this.getRow(data)
|
|
|
this.query(this.formDataList)
|
|
|
} else if(this.$route.query.data){
|
|
|
-
|
|
|
+ this.cancelTwo();
|
|
|
this.$router.push({path:'/index'})
|
|
|
}else {
|
|
|
this.$confirm('当前数据未保存是否保存?', '提示', {
|
|
@@ -1098,7 +1112,7 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- this.submitAndSave()
|
|
|
+ this.submitAndSave(2)
|
|
|
}).catch(() => {
|
|
|
data = {
|
|
|
tableName: this.queryList.tableName,
|