|
@@ -969,7 +969,7 @@ export default {
|
|
this.cancelButton = false
|
|
this.cancelButton = false
|
|
this.reset()
|
|
this.reset()
|
|
getAgreement(this.approval.billId).then(response => {
|
|
getAgreement(this.approval.billId).then(response => {
|
|
- this.deptName = response.data.dept.deptName
|
|
|
|
|
|
+ this.deptName = response.data.dept?response.data.dept.deptName: ''
|
|
this.form = response.data.tWarehouseAgreement
|
|
this.form = response.data.tWarehouseAgreement
|
|
//--
|
|
//--
|
|
// this.fMblnoOptions = response.data.corps
|
|
// this.fMblnoOptions = response.data.corps
|
|
@@ -1060,7 +1060,8 @@ export default {
|
|
this.register()
|
|
this.register()
|
|
getAgreement(row.fId).then(response => {
|
|
getAgreement(row.fId).then(response => {
|
|
// this.fMblnoOptions = response.data.corps
|
|
// this.fMblnoOptions = response.data.corps
|
|
- this.deptName = response.data.dept.deptName
|
|
|
|
|
|
+ // this.deptName = response.data.dept.deptName
|
|
|
|
+ this.deptName = response.data.dept?response.data.dept.deptName: ''
|
|
this.form = response.data.tWarehouseAgreement
|
|
this.form = response.data.tWarehouseAgreement
|
|
this.operator = this.form.createBy
|
|
this.operator = this.form.createBy
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
@@ -1207,8 +1208,8 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
// this.$set("deptName", response.dept.deptName);
|
|
// this.$set("deptName", response.dept.deptName);
|
|
- this.deptName = response.dept.deptName
|
|
|
|
- this.form.fDeptid = response.dept.deptId
|
|
|
|
|
|
+ this.deptName = response.dept?response.dept.deptName: ''
|
|
|
|
+ this.form.fDeptid = response.dept? response.dept.deptId: ''
|
|
this.agreementitemsList.createBy = response.user.userName
|
|
this.agreementitemsList.createBy = response.user.userName
|
|
|
|
|
|
// this.$set(this.agreementitemsList, "createBy", response.user.userName);
|
|
// this.$set(this.agreementitemsList, "createBy", response.user.userName);
|
|
@@ -1358,8 +1359,8 @@ export default {
|
|
this.title = '添加仓储费'
|
|
this.title = '添加仓储费'
|
|
queryUserVal().then((response) => {
|
|
queryUserVal().then((response) => {
|
|
// this.$set("deptName", response.dept.deptName);
|
|
// this.$set("deptName", response.dept.deptName);
|
|
- this.deptName = response.dept.deptName
|
|
|
|
- this.form.fDeptid = response.dept.deptId
|
|
|
|
|
|
+ this.deptName = response.dept?response.dept.deptName: ''
|
|
|
|
+ this.form.fDeptid = response.dept? response.dept.deptId: ''
|
|
// this.agreementitemsList.createBy = response.user.userName
|
|
// this.agreementitemsList.createBy = response.user.userName
|
|
|
|
|
|
// this.$set(this.agreementitemsList, "createBy", response.user.userName);
|
|
// this.$set(this.agreementitemsList, "createBy", response.user.userName);
|
|
@@ -1373,7 +1374,8 @@ export default {
|
|
if (num === 2){
|
|
if (num === 2){
|
|
this.notChange = false
|
|
this.notChange = false
|
|
getAgreement(this.idCopy).then(response => {
|
|
getAgreement(this.idCopy).then(response => {
|
|
- this.deptName = response.data.dept.deptName
|
|
|
|
|
|
+ // this.deptName = response.data.dept.deptName
|
|
|
|
+ this.deptName = response.data.dept?response.data.dept.deptName: ''
|
|
this.form = response.data.tWarehouseAgreement
|
|
this.form = response.data.tWarehouseAgreement
|
|
this.form.fId = null
|
|
this.form.fId = null
|
|
this.form.fBillstatus = ''
|
|
this.form.fBillstatus = ''
|
|
@@ -1402,7 +1404,8 @@ export default {
|
|
this.browseStatus = false
|
|
this.browseStatus = false
|
|
const fId = row.fId || this.ids
|
|
const fId = row.fId || this.ids
|
|
getAgreement(fId).then(response => {
|
|
getAgreement(fId).then(response => {
|
|
- this.deptName = response.data.dept.deptName
|
|
|
|
|
|
+ // this.deptName = response.data.dept.deptName
|
|
|
|
+ this.deptName = response.data.dept?response.data.dept.deptName: ''
|
|
this.form = response.data.tWarehouseAgreement
|
|
this.form = response.data.tWarehouseAgreement
|
|
if (response.data.tWarehouseAgreement.tPackages) {
|
|
if (response.data.tWarehouseAgreement.tPackages) {
|
|
this.form.tPackages = this.form.tPackages
|
|
this.form.tPackages = this.form.tPackages
|