|
|
@@ -1248,6 +1248,7 @@ export default {
|
|
|
this.$refs.avatar.form = res.data.warehouseBills
|
|
|
}
|
|
|
this.contentList = res.data.tWarehousebillsCntrs
|
|
|
+ this.$message.success('保存成功')
|
|
|
selectMessage(this.$refs.avatar.form.fId).then(res1 => {
|
|
|
this.contentList = res1.data.tWarehousebillsfees
|
|
|
this.$refs.avatar.form = res1.data.warehouseBills
|
|
|
@@ -1256,32 +1257,6 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
- // this.formList = Object.assign({}, this.$refs.avatar.form, this.formIn, this.formOut)
|
|
|
-
|
|
|
- // console.log(this.listData.fFeeid,this.contentList)
|
|
|
- // for (let item in this.contentList){
|
|
|
- // for (let li in this.listData.fFeeid){
|
|
|
- // if (this.contentList[item].fFeeid == this.listData.fFeeid[li].value){
|
|
|
- // this.contentList[item].feeName = this.listData.fFeeid[li].label
|
|
|
- // }
|
|
|
- // }
|
|
|
- // for(let i in this.listData.fFeeunitid){
|
|
|
- // if (this.contentList[item].fFeeunitid == this.listData.fFeeunitid[i].value){
|
|
|
- // this.contentList[item].fFeeunitName = this.listData.fFeeunitid[i].label
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
- // if (!this.$refs.avatar.form.fId){
|
|
|
- // this.$message.error('未保存，不允许打印');
|
|
|
- // }else if (this.$refs.avatar.form.fBillstatus >= 4){
|
|
|
- // this.formList = this.$refs.avatar.form
|
|
|
- // this.dialogVisible = true
|
|
|
- // }else {
|
|
|
- // this.formList = this.$refs.avatar.form
|
|
|
- // console.log(this.$refs.avatar.form.fBillstatus)
|
|
|
- // this.submitAndSave(1)
|
|
|
- // }
|
|
|
break
|
|
|
case '修改':
|
|
|
// this.purchaseList.columnList.forEach(item => item.disabled = false)
|
|
|
@@ -1405,6 +1380,15 @@ export default {
|
|
|
selectMessage(this.$refs.avatar.form.fId).then(res => {
|
|
|
this.contentList = res.data.tWarehousebillsfees
|
|
|
this.$refs.avatar.form = res.data.warehouseBills
|
|
|
+ let data = {
|
|
|
+ tableName: this.purchaseList.tableName,
|
|
|
+ userId: Cookies.get('userName')
|
|
|
+ }
|
|
|
+ let list = {
|
|
|
+ warehouseBills:res.data.warehouseBills,
|
|
|
+ tWarehousebillsfees:res.data.tWarehousebillsfees
|
|
|
+ }
|
|
|
+ this.getRow(data, list)
|
|
|
})
|
|
|
this.$message({
|
|
|
message: '调拨成功',
|
|
|
@@ -1461,6 +1445,19 @@ export default {
|
|
|
selectMessage(this.$refs.avatar.form.fId).then(res => {
|
|
|
this.contentList = res.data.tWarehousebillsfees
|
|
|
this.$refs.avatar.form = res.data.warehouseBills
|
|
|
+ let data = {
|
|
|
+ tableName: this.purchaseList.tableName,
|
|
|
+ userId: Cookies.get('userName')
|
|
|
+ }
|
|
|
+ let list = {
|
|
|
+ warehouseBills:res.data.warehouseBills,
|
|
|
+ tWarehousebillsfees:res.data.tWarehousebillsfees
|
|
|
+ }
|
|
|
+ this.contentOption.forEach(item => {
|
|
|
+ item.disabled = true
|
|
|
+ })
|
|
|
+ this.formDisabled = true
|
|
|
+ this.getRow(data, list)
|
|
|
})
|
|
|
this.$message({
|
|
|
message: '调拨成功',
|
|
|
@@ -1505,28 +1502,37 @@ export default {
|
|
|
}
|
|
|
break
|
|
|
case '刷新':
|
|
|
- let formData1 = new window.FormData()
|
|
|
- formData1.append('tWarehousebills', JSON.stringify(Object.assign({},this.$refs.avatar.form, this.formOut, this.formIn)))
|
|
|
- formData1.append('tWarehousebillsfees', JSON.stringify(this.contentList))
|
|
|
- formData1.append('fBilltype', 'DB')
|
|
|
- submit(formData1).then(res => {
|
|
|
- if (res.code == 200) {
|
|
|
- console.log(res)
|
|
|
- if(res){
|
|
|
- this.$refs.avatar.form = res.data.warehouseBills
|
|
|
- }
|
|
|
- this.contentList = res.data.tWarehousebillsCntrs
|
|
|
- selectMessage(this.$refs.avatar.form.fId).then(res => {
|
|
|
- this.contentList = res.data.tWarehousebillsfees
|
|
|
- this.$refs.avatar.form = res.data.warehouseBills
|
|
|
- this.$message({
|
|
|
- message: '刷新成功',
|
|
|
- type: 'success',
|
|
|
- showClose:true
|
|
|
- });
|
|
|
- })
|
|
|
- }
|
|
|
+ selectMessage(this.$refs.avatar.form.fId).then(res => {
|
|
|
+ this.contentList = res.data.tWarehousebillsfees
|
|
|
+ this.$refs.avatar.form = res.data.warehouseBills
|
|
|
+ this.$message({
|
|
|
+ message: '刷新成功',
|
|
|
+ type: 'success',
|
|
|
+ showClose:true
|
|
|
+ });
|
|
|
})
|
|
|
+ // let formData1 = new window.FormData()
|
|
|
+ // formData1.append('tWarehousebills', JSON.stringify(Object.assign({},this.$refs.avatar.form, this.formOut, this.formIn)))
|
|
|
+ // formData1.append('tWarehousebillsfees', JSON.stringify(this.contentList))
|
|
|
+ // formData1.append('fBilltype', 'DB')
|
|
|
+ // submit(formData1).then(res => {
|
|
|
+ // if (res.code == 200) {
|
|
|
+ // console.log(res)
|
|
|
+ // if(res){
|
|
|
+ // this.$refs.avatar.form = res.data.warehouseBills
|
|
|
+ // }
|
|
|
+ // this.contentList = res.data.tWarehousebillsCntrs
|
|
|
+ // selectMessage(this.$refs.avatar.form.fId).then(res => {
|
|
|
+ // this.contentList = res.data.tWarehousebillsfees
|
|
|
+ // this.$refs.avatar.form = res.data.warehouseBills
|
|
|
+ // this.$message({
|
|
|
+ // message: '刷新成功',
|
|
|
+ // type: 'success',
|
|
|
+ // showClose:true
|
|
|
+ // });
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
break
|
|
|
default:
|
|
|
this.$message.error('该按钮暂无功能')
|
|
|
@@ -1618,7 +1624,6 @@ export default {
|
|
|
backToList(){
|
|
|
let data
|
|
|
if (!this.$refs.avatar.form.fId && this.contentList !== 0 || this.$refs.avatar.form.fBillstatus > 3 && !this.$route.query.data) {
|
|
|
- console.log(888)
|
|
|
data = {
|
|
|
tableName: this.queryList.tableName,
|
|
|
userId: Cookies.get('userName')
|
|
|
@@ -1627,11 +1632,9 @@ export default {
|
|
|
// this.pageDisplay = true
|
|
|
this.query(this.formDataList)
|
|
|
} else if(this.$route.query.data){
|
|
|
- console.log(777)
|
|
|
this.cancelTwo();
|
|
|
// this.$router.push({path:'/index'})
|
|
|
}else {
|
|
|
- console.log(666)
|
|
|
this.$confirm('当前数据是否保存?', '提示', {
|
|
|
confirmButtonText: '保存',
|
|
|
cancelButtonText: '取消',
|
|
|
@@ -1650,13 +1653,10 @@ export default {
|
|
|
},
|
|
|
//查询列数据
|
|
|
getRow(data,list,add,i) {
|
|
|
- console.log('????')
|
|
|
+ console.log(list)
|
|
|
// console.log(data,list,add)
|
|
|
select(data).then((res) => {
|
|
|
- console.log(123)
|
|
|
this.$refs.avatar.form = {}
|
|
|
- console.log(data.tableName)
|
|
|
- console.log(res)
|
|
|
if (data.tableName === '仓库调拨详情') {
|
|
|
if (res.data.length != 0) {
|
|
|
this.purchaseList.columnList = res.data.filter((e) => e.checked == 0)
|
|
|
@@ -1670,7 +1670,6 @@ export default {
|
|
|
this.setRowList = this.$options.data().contentStyle
|
|
|
}
|
|
|
if(add){
|
|
|
- console.log(321)
|
|
|
this.listData.fWarehouseid = []
|
|
|
this.listData.fAllotWarehouseid = []
|
|
|
this.formIn = {
|
|
|
@@ -1689,7 +1688,6 @@ export default {
|
|
|
this.isItHidden = false
|
|
|
this.inDex = this.contentOption.length
|
|
|
} else {
|
|
|
- console.log(98787)
|
|
|
if (res.data.length != 0) {
|
|
|
this.queryList.columnList = res.data.filter((e) => e.checked == 0)
|
|
|
this.queryList.columnList = res.data
|
|
|
@@ -1719,7 +1717,6 @@ export default {
|
|
|
this.formOut.fAllotWarehouseid = list.warehouseBills.fAllotWarehouseid
|
|
|
this.contentList = list.tWarehousebillsfees
|
|
|
this.contentButton = this.$options.data().contentButton
|
|
|
- console.log(this.$route.query.list)
|
|
|
getArea(this.formOut.fAllotWarehouseid).then(res => {
|
|
|
this.listData.fAllotWarehouseid = []
|
|
|
for (let item in res.data) {
|
|
|
@@ -1748,7 +1745,6 @@ export default {
|
|
|
}
|
|
|
getName(data).then(response => {
|
|
|
this.getStockNumPrice();
|
|
|
- console.log(response)
|
|
|
if (response.data.length != 0) {
|
|
|
this.before = response.data[0].userName
|
|
|
if (this.$refs.avatar.form.fBillstatus === 6 && this.before == this.lander) {
|
|
|
@@ -1757,13 +1753,6 @@ export default {
|
|
|
//
|
|
|
// }
|
|
|
// })
|
|
|
- this.contentButton.push({
|
|
|
- type: 'danger',
|
|
|
- size: 'mini',
|
|
|
- icon: 'el-icon-edit-outline',
|
|
|
- name: '撤销采购',
|
|
|
- disabled: false
|
|
|
- })
|
|
|
}
|
|
|
}
|
|
|
})
|
lichao