|
@@ -1129,7 +1129,7 @@ import {
|
|
import {listUser, queryUserVal} from "@/api/system/user";
|
|
import {listUser, queryUserVal} from "@/api/system/user";
|
|
import {listGoods} from "@/api/basicdata/goods";
|
|
import {listGoods} from "@/api/basicdata/goods";
|
|
import {listFees} from "@/api/basicdata/fees";
|
|
import {listFees} from "@/api/basicdata/fees";
|
|
-import {listCorps} from "@/api/basicdata/corps";
|
|
|
|
|
|
+import { agreementListCorps, listCorps } from '@/api/basicdata/corps'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
import AddOrUpdate from '@/views/viewApproval'
|
|
import AddOrUpdate from '@/views/viewApproval'
|
|
import ApprovalComments from '@/views/startApproval'
|
|
import ApprovalComments from '@/views/startApproval'
|
|
@@ -1446,7 +1446,7 @@ export default {
|
|
rules: {
|
|
rules: {
|
|
fCorpid: [{required: true, message: " ", trigger: "blur",}],
|
|
fCorpid: [{required: true, message: " ", trigger: "blur",}],
|
|
fBillingDeadline: [{required: true, message: " ", trigger: "blur",}],
|
|
fBillingDeadline: [{required: true, message: " ", trigger: "blur",}],
|
|
- fGoodsid: [{required: true, message: " ", trigger: "blur",}]
|
|
|
|
|
|
+ fGoodsid: [{required: false, message: " ", trigger: "blur",}]
|
|
},
|
|
},
|
|
pickerOptions: {
|
|
pickerOptions: {
|
|
shortcuts: [{
|
|
shortcuts: [{
|
|
@@ -1818,7 +1818,7 @@ export default {
|
|
calculateCost() {
|
|
calculateCost() {
|
|
this.countstate = true
|
|
this.countstate = true
|
|
if (!this.form.fCorpid || !this.form.fBillingDeadline) {
|
|
if (!this.form.fCorpid || !this.form.fBillingDeadline) {
|
|
- this.$message({message: '请维护货权方以及,仓储费计算截止日期', type: 'warning'})
|
|
|
|
|
|
+ this.$message({message: '请维护客户名称以及,仓储费计算截止日期', type: 'warning'})
|
|
this.countstate = false
|
|
this.countstate = false
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
@@ -2282,7 +2282,7 @@ export default {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
let queryParams = {pageNum: 1, pageSize: 10, fName: name};
|
|
let queryParams = {pageNum: 1, pageSize: 10, fName: name};
|
|
- listCorps(queryParams).then((response) => {
|
|
|
|
|
|
+ agreementListCorps(queryParams).then((response) => {
|
|
this.fMblnoOptions = response.rows;
|
|
this.fMblnoOptions = response.rows;
|
|
});
|
|
});
|
|
},
|
|
},
|