|
@@ -856,7 +856,6 @@ export default {
|
|
icon:'el-icon-edit',
|
|
icon:'el-icon-edit',
|
|
name:'打印',
|
|
name:'打印',
|
|
disabled:false,
|
|
disabled:false,
|
|
- res:1
|
|
|
|
},{
|
|
},{
|
|
type:'info',
|
|
type:'info',
|
|
size:'mini',
|
|
size:'mini',
|
|
@@ -871,7 +870,7 @@ export default {
|
|
icon:'el-icon-refresh',
|
|
icon:'el-icon-refresh',
|
|
name:'刷新',
|
|
name:'刷新',
|
|
disabled:false,
|
|
disabled:false,
|
|
- res:1
|
|
|
|
|
|
+ // res:1
|
|
}
|
|
}
|
|
],
|
|
],
|
|
confirmButton:[
|
|
confirmButton:[
|
|
@@ -1363,6 +1362,7 @@ export default {
|
|
this.detailList.columnList.forEach(item => item.fId='')
|
|
this.detailList.columnList.forEach(item => item.fId='')
|
|
this.detailButton = this.$options.data().detailButton
|
|
this.detailButton = this.$options.data().detailButton
|
|
}else if(iem == 1){
|
|
}else if(iem == 1){
|
|
|
|
+ console.log(this.detailForm.fBillstatus)
|
|
if(this.detailForm.fBillstatus >= '4') {
|
|
if(this.detailForm.fBillstatus >= '4') {
|
|
for(let li in this.detailButton ){
|
|
for(let li in this.detailButton ){
|
|
if(this.detailButton[li].name == '录入明细' || this.detailButton[li].name == '保存' ||
|
|
if(this.detailButton[li].name == '录入明细' || this.detailButton[li].name == '保存' ||
|
|
@@ -1374,7 +1374,7 @@ export default {
|
|
}else{
|
|
}else{
|
|
for(let li in this.detailButton ){
|
|
for(let li in this.detailButton ){
|
|
if(this.detailButton[li].name == '录入明细' || this.detailButton[li].name == '保存' ||
|
|
if(this.detailButton[li].name == '录入明细' || this.detailButton[li].name == '保存' ||
|
|
- this.detailButton[li].name == '出库确认' || this.detailButton[li].name == '刷新'){
|
|
|
|
|
|
+ this.detailButton[li].name == '出库确认'){
|
|
this.detailButton[li].disabled = true
|
|
this.detailButton[li].disabled = true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1930,7 +1930,7 @@ export default {
|
|
disabled: false
|
|
disabled: false
|
|
})
|
|
})
|
|
this.detailButton.forEach(item => {
|
|
this.detailButton.forEach(item => {
|
|
- if (item.name === '录入明细' || item.name === '保存' || item.name === '修改' || item.name === '出库确认') {
|
|
|
|
|
|
+ if (item.name === '录入明细' || item.name === '保存' || item.name === '修改' || item.name === '刷新' || item.name === '出库确认') {
|
|
item.disabled = true
|
|
item.disabled = true
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1943,25 +1943,22 @@ export default {
|
|
case '刷新':
|
|
case '刷新':
|
|
if(this.detailForm.fId){
|
|
if(this.detailForm.fId){
|
|
getSave(this.detailForm.fId).then(res=>{
|
|
getSave(this.detailForm.fId).then(res=>{
|
|
- // let data = {
|
|
|
|
- // tableName: this.detailList.tableName,
|
|
|
|
- // userId: Cookies.get('userName')
|
|
|
|
- // }
|
|
|
|
- // let list ={
|
|
|
|
- // warehouseBills:res.data.warehouseBills,
|
|
|
|
- // tWarehousebillsfees:res.data.tWarehousebillsfees
|
|
|
|
- // }
|
|
|
|
- // this.getRow(data,list,1)
|
|
|
|
- if(res.data.warehouseBills){
|
|
|
|
- this.detailForm = res.data.warehouseBills
|
|
|
|
|
|
+ if(res.code == 200){
|
|
|
|
+ let list ={
|
|
|
|
+ warehouseBills:res.data.warehouseBills,
|
|
|
|
+ tWarehousebillsfees:res.data.tWarehousebillsfees
|
|
|
|
+ }
|
|
|
|
+ this.detailForm = list.warehouseBills
|
|
|
|
+ this.detailData = list.tWarehousebillsfees
|
|
this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
- }
|
|
|
|
- if(res.data.tWarehousebillsfees){
|
|
|
|
- this.detailData = res.data.tWarehousebillsfees
|
|
|
|
- for(let li in this.detailData){
|
|
|
|
- this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
|
- this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
|
|
|
+ if(res.data.tWarehousebillsfees){
|
|
|
|
+ this.detailData = res.data.tWarehousebillsfees
|
|
|
|
+ for(let li in this.detailData){
|
|
|
|
+ this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
|
+ this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+ this.$message.success('刷新成功')
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -2019,8 +2016,44 @@ export default {
|
|
}
|
|
}
|
|
break
|
|
break
|
|
case '打印':
|
|
case '打印':
|
|
- this.formList = this.detailForm
|
|
|
|
|
|
+ let formData = new window.FormData();
|
|
|
|
+ formData.append('tWarehousebills', JSON.stringify(this.detailForm))
|
|
|
|
+ formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
|
|
|
|
+ formData.append('fBilltype', 'CK')
|
|
|
|
+ addSave(formData).then(res=> {
|
|
|
|
+ if (res.code == 200) {
|
|
|
|
+ this.detailForm = res.data.warehouseBills
|
|
|
|
+ this.$set(this.detailForm, 'fStorekeeper', JSON.parse(this.detailForm.fStorekeeper))
|
|
|
|
+ this.detailData = res.data.tWarehousebillsCntrs
|
|
|
|
+ for (let li in this.detailData) {
|
|
|
|
+ this.$set(this.detailData[li], 'fFeeunitid', JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
|
+ this.$set(this.detailData[li], 'fStltypeid', JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
|
+ }
|
|
|
|
+ // this.getList();
|
|
|
|
+ this.$message.success("保存成功")
|
|
|
|
+ getSave(this.detailForm.fId).then(res=> {
|
|
|
|
+ if(res.code == 200){
|
|
|
|
+ let list ={
|
|
|
|
+ warehouseBills:res.data.warehouseBills,
|
|
|
|
+ tWarehousebillsfees:res.data.tWarehousebillsfees
|
|
|
|
+ }
|
|
|
|
+ this.detailForm = list.warehouseBills
|
|
|
|
+ this.detailData = list.tWarehousebillsfees
|
|
|
|
+ this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
|
|
|
|
+ if(res.data.tWarehousebillsfees){
|
|
|
|
+ this.detailData = res.data.tWarehousebillsfees
|
|
|
|
+ for(let li in this.detailData){
|
|
|
|
+ this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
|
|
|
|
+ this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ })
|
|
this.dialogVisible = true
|
|
this.dialogVisible = true
|
|
|
|
+ console.log(row.name)
|
|
break
|
|
break
|
|
}
|
|
}
|
|
if(row.name == '修改' && row.res == '0'){
|
|
if(row.name == '修改' && row.res == '0'){
|