|
|
@@ -57,7 +57,6 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
-
|
|
|
<el-form-item
|
|
|
label="核价单"
|
|
|
prop="sourceName"
|
|
|
@@ -111,7 +110,6 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
|
|
|
-
|
|
|
<el-form-item
|
|
|
label="合同名称"
|
|
|
prop="contractName"
|
|
|
@@ -135,12 +133,9 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="contractFile" label="合同附件">
|
|
|
- <fileUpload
|
|
|
- v-model="form.contractFile"
|
|
|
- module="main"
|
|
|
- :showLib="false"
|
|
|
- :limit="10"
|
|
|
- />
|
|
|
+ <el-badge :value="form.fileId.length" class="item">
|
|
|
+ <el-button type="primary" @click="fileOpen">附件上传</el-button>
|
|
|
+ </el-badge>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
@@ -226,12 +221,15 @@
|
|
|
prop="pricingWay"
|
|
|
style="margin-bottom: 22px"
|
|
|
>
|
|
|
- <el-radio-group v-model="form.pricingWay" @change="changePricingWay">
|
|
|
- <el-radio v-for="item in pricingWayList" :label="item.id">{{ item.name }}</el-radio>
|
|
|
+ <el-radio-group
|
|
|
+ v-model="form.pricingWay"
|
|
|
+ @change="changePricingWay"
|
|
|
+ >
|
|
|
+ <el-radio v-for="item in pricingWayList" :label="item.id">{{
|
|
|
+ item.name
|
|
|
+ }}</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
-
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<headerTitle title="基本信息"></headerTitle>
|
|
|
@@ -333,7 +331,7 @@
|
|
|
prop="partaFax"
|
|
|
style="margin-bottom: 22px"
|
|
|
>
|
|
|
- <el-input clearable v-model="form.partaFax" placeholder="请输入"/>
|
|
|
+ <el-input clearable v-model="form.partaFax" placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label=" 甲方Email"
|
|
|
@@ -447,10 +445,10 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="partbTel" label="乙方联系电话">
|
|
|
- <el-input clearable v-model="form.partbTel" placeholder="请输入"/>
|
|
|
+ <el-input clearable v-model="form.partbTel" placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="partbFax" label="乙方传真">
|
|
|
- <el-input clearable v-model="form.partbFax" placeholder="请输入"/>
|
|
|
+ <el-input clearable v-model="form.partbFax" placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item
|
|
|
@@ -486,13 +484,13 @@
|
|
|
:isCustomerMark="false"
|
|
|
:isDiscountTotalPrice="true"
|
|
|
:contractBookType="form.type"
|
|
|
- :pricingWay='form.pricingWay'
|
|
|
+ :pricingWay="form.pricingWay"
|
|
|
></inventoryTable>
|
|
|
<headerTitle
|
|
|
:title="form.type == '2' ? '付款方式' : '收款方式'"
|
|
|
style="margin-top: 30px"
|
|
|
></headerTitle>
|
|
|
- <paymentList ref="paymentListTable"/>
|
|
|
+ <paymentList ref="paymentListTable" />
|
|
|
</el-form>
|
|
|
|
|
|
<parentList ref="parentRef" @changeParent="changeParent"></parentList>
|
|
|
@@ -515,13 +513,18 @@
|
|
|
></supplierList>
|
|
|
<head-list ref="headRef" @changeParent="changePersonel"></head-list>
|
|
|
<!-- 商机 -->
|
|
|
- <opportunity-dialog :opportunityDialogFlag.sync="opportunityDialogFlag" v-if="opportunityDialogFlag"
|
|
|
- ref="opportunityDialogRef" @changeParent="getOpportunityDetail"></opportunity-dialog>
|
|
|
+ <opportunity-dialog
|
|
|
+ :opportunityDialogFlag.sync="opportunityDialogFlag"
|
|
|
+ v-if="opportunityDialogFlag"
|
|
|
+ ref="opportunityDialogRef"
|
|
|
+ @changeParent="getOpportunityDetail"
|
|
|
+ ></opportunity-dialog>
|
|
|
+ <fileMain ref="fileMainRef" @success="fileSuccess"></fileMain>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {emailReg, numberReg} from 'ele-admin';
|
|
|
+import { emailReg, numberReg } from 'ele-admin';
|
|
|
import inventoryTable from './inventoryTable.vue';
|
|
|
import fileUpload from '@/components/upload/fileUpload';
|
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
|
@@ -533,18 +536,19 @@ import {
|
|
|
getDetail,
|
|
|
enterprisePage
|
|
|
} from '@/api/bpm/components/contractManage/contractBook';
|
|
|
-import {getcontactlink} from '@/api/bpm/components/saleManage/businessOpportunity.js';
|
|
|
-import {getDetail as getOpportunityInfo} from '@/api/bpm/components/saleManage/businessOpportunity';
|
|
|
+import { getcontactlink } from '@/api/bpm/components/saleManage/businessOpportunity.js';
|
|
|
+import { getDetail as getOpportunityInfo } from '@/api/bpm/components/saleManage/businessOpportunity';
|
|
|
import paymentList from './paymentList.vue';
|
|
|
-import {copyObj} from '@/utils/util';
|
|
|
-import {contactTypeTree} from '@/api/bpm/components/saleManage/contact';
|
|
|
-import InquiryManageList from "@/views/bpm/handleTask/components/inquiryManage/inquiryManage-list.vue";
|
|
|
-import InquiryList from "@/views/bpm/handleTask/components/contractBook/inquiryList.vue";
|
|
|
-import QuotationList from "@/views/bpm/handleTask/components/contractBook/quotationList.vue";
|
|
|
-import OpportunityDialog
|
|
|
- from "@/views/bpm/handleTask/components/financialManage/components/opportunityDialog.vue";
|
|
|
-import {getplanDetail} from "@/api/bpm/components/purchasingManage/purchasePlanManage";
|
|
|
-import {contactDetail} from '@/api/bpm/components/saleManage/contact';
|
|
|
+import { copyObj } from '@/utils/util';
|
|
|
+import fileMain from '@/components/addDoc/main';
|
|
|
+
|
|
|
+import { contactTypeTree } from '@/api/bpm/components/saleManage/contact';
|
|
|
+import InquiryManageList from '@/views/bpm/handleTask/components/inquiryManage/inquiryManage-list.vue';
|
|
|
+import InquiryList from '@/views/bpm/handleTask/components/contractBook/inquiryList.vue';
|
|
|
+import QuotationList from '@/views/bpm/handleTask/components/contractBook/quotationList.vue';
|
|
|
+import OpportunityDialog from '@/views/bpm/handleTask/components/financialManage/components/opportunityDialog.vue';
|
|
|
+import { getplanDetail } from '@/api/bpm/components/purchasingManage/purchasePlanManage';
|
|
|
+import { contactDetail } from '@/api/bpm/components/saleManage/contact';
|
|
|
export default {
|
|
|
mixins: [dictMixins],
|
|
|
components: {
|
|
|
@@ -557,7 +561,8 @@ export default {
|
|
|
inventoryTable,
|
|
|
supplierList,
|
|
|
parentList,
|
|
|
- headList
|
|
|
+ headList,
|
|
|
+ fileMain
|
|
|
},
|
|
|
props: {
|
|
|
businessId: {
|
|
|
@@ -601,42 +606,43 @@ export default {
|
|
|
pricingWay: 1,
|
|
|
totalPrice: null,
|
|
|
type: '', //1=销售合同 2=采购合同
|
|
|
- typeName: ''
|
|
|
+ typeName: '',
|
|
|
+ fileId: [] //附件集合
|
|
|
};
|
|
|
|
|
|
return {
|
|
|
payWayOptions: [],
|
|
|
delDetailIds: [],
|
|
|
paymentTypeOptions: [
|
|
|
- {id: 1, name: '固定'},
|
|
|
- {id: 2, name: '分期'}
|
|
|
+ { id: 1, name: '固定' },
|
|
|
+ { id: 2, name: '分期' }
|
|
|
],
|
|
|
pricingWayList: [
|
|
|
- {id: 1, name: '按数量计价'},
|
|
|
- {id: 2, name: '按重量计价'}
|
|
|
+ { id: 1, name: '按数量计价' },
|
|
|
+ { id: 2, name: '按重量计价' }
|
|
|
],
|
|
|
contractBookTypeList: [],
|
|
|
sourceTypeList: [
|
|
|
{
|
|
|
code: 1,
|
|
|
name: '报价单',
|
|
|
- parentId: '1',
|
|
|
+ parentId: '1'
|
|
|
},
|
|
|
{
|
|
|
code: 2,
|
|
|
name: '核价单',
|
|
|
- parentId: '2',
|
|
|
+ parentId: '2'
|
|
|
},
|
|
|
{
|
|
|
code: 3,
|
|
|
name: '采购计划',
|
|
|
- parentId: '2',
|
|
|
+ parentId: '2'
|
|
|
},
|
|
|
{
|
|
|
code: 4,
|
|
|
name: '商机',
|
|
|
- parentId: '1',
|
|
|
- },
|
|
|
+ parentId: '1'
|
|
|
+ }
|
|
|
],
|
|
|
categoryList: [],
|
|
|
linkNameOptions: [],
|
|
|
@@ -654,28 +660,28 @@ export default {
|
|
|
|
|
|
rules: {
|
|
|
type: [
|
|
|
- {required: true, message: '请选择合同类型', trigger: 'change'}
|
|
|
+ { required: true, message: '请选择合同类型', trigger: 'change' }
|
|
|
],
|
|
|
settlementMode: [
|
|
|
- {required: true, message: '请选择结算方式', trigger: 'change'}
|
|
|
+ { required: true, message: '请选择结算方式', trigger: 'change' }
|
|
|
],
|
|
|
categoryId: [
|
|
|
- {required: true, message: '请选择合同分类', trigger: 'change'}
|
|
|
+ { required: true, message: '请选择合同分类', trigger: 'change' }
|
|
|
],
|
|
|
contractNumber: [
|
|
|
- {required: true, message: '请输入自带编号', trigger: 'change'}
|
|
|
+ { required: true, message: '请输入自带编号', trigger: 'change' }
|
|
|
],
|
|
|
contractName: [
|
|
|
- {required: true, message: '请输入合同名称', trigger: 'blur'}
|
|
|
+ { required: true, message: '请输入合同名称', trigger: 'blur' }
|
|
|
],
|
|
|
partaName: [
|
|
|
- {required: true, message: '请选择甲方名称', trigger: 'change'}
|
|
|
+ { required: true, message: '请选择甲方名称', trigger: 'change' }
|
|
|
],
|
|
|
partaLinkName: [
|
|
|
- {required: true, message: '请选择甲方联系人', trigger: 'change'}
|
|
|
+ { required: true, message: '请选择甲方联系人', trigger: 'change' }
|
|
|
],
|
|
|
acceptUnpack: [
|
|
|
- {required: true, message: '请选择是否接受', trigger: 'change'}
|
|
|
+ { required: true, message: '请选择是否接受', trigger: 'change' }
|
|
|
],
|
|
|
partaTel: [
|
|
|
{
|
|
|
@@ -686,14 +692,14 @@ export default {
|
|
|
}
|
|
|
],
|
|
|
deliveryDate: [
|
|
|
- {required: true, message: '请选择交货日期', trigger: 'change'}
|
|
|
+ { required: true, message: '请选择交货日期', trigger: 'change' }
|
|
|
],
|
|
|
|
|
|
partbName: [
|
|
|
- {required: true, message: '请输入乙方名称', trigger: 'change'}
|
|
|
+ { required: true, message: '请输入乙方名称', trigger: 'change' }
|
|
|
],
|
|
|
partbLinkName: [
|
|
|
- {required: true, message: '请输入乙方联系人', trigger: 'change'}
|
|
|
+ { required: true, message: '请输入乙方联系人', trigger: 'change' }
|
|
|
],
|
|
|
partbTel: [
|
|
|
{
|
|
|
@@ -704,14 +710,12 @@ export default {
|
|
|
}
|
|
|
],
|
|
|
partaEmail: [
|
|
|
- {pattern: emailReg, message: '邮箱格式不正确', trigger: 'blur'}
|
|
|
+ { pattern: emailReg, message: '邮箱格式不正确', trigger: 'blur' }
|
|
|
],
|
|
|
contractStartDate: [
|
|
|
- {required: true, message: '请选择签订日期', trigger: 'change'}
|
|
|
+ { required: true, message: '请选择签订日期', trigger: 'change' }
|
|
|
],
|
|
|
- contractEndDate: [
|
|
|
- {validator: this.validateEndDate, trigger: 'blur'}
|
|
|
- ]
|
|
|
+ contractEndDate: [{ validator: this.validateEndDate, trigger: 'blur' }]
|
|
|
},
|
|
|
enterprise: {
|
|
|
address: '',
|
|
|
@@ -730,7 +734,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
async created() {
|
|
|
- await contactTypeTree({type: 20}).then((res) => {
|
|
|
+ await contactTypeTree({ type: 20 }).then((res) => {
|
|
|
this.treeList = res.data;
|
|
|
});
|
|
|
await enterprisePage({
|
|
|
@@ -767,7 +771,14 @@ export default {
|
|
|
callback();
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+ //文件上传
|
|
|
+ fileOpen() {
|
|
|
+ this.$refs.fileMainRef.open(this.form.fileId);
|
|
|
+ },
|
|
|
+ //文件列表回调
|
|
|
+ fileSuccess(list) {
|
|
|
+ this.form.fileId = list;
|
|
|
+ },
|
|
|
//选择供应商
|
|
|
changeSupplier(obj) {
|
|
|
this.form = Object.assign({}, this.form, {
|
|
|
@@ -789,15 +800,16 @@ export default {
|
|
|
this.loading = false;
|
|
|
if (data) {
|
|
|
this.$nextTick(() => {
|
|
|
- let {contractVO} = data;
|
|
|
+ let { contractVO } = data;
|
|
|
this.dictChange(contractVO.type, 'init');
|
|
|
this.form = contractVO;
|
|
|
+ if (this.form.fileId) {
|
|
|
+ this.form.fileId = JSON.parse(this.form.fileId);
|
|
|
+ }
|
|
|
this.$refs.inventoryTable &&
|
|
|
- this.$refs.inventoryTable.putTableValue(data);
|
|
|
+ this.$refs.inventoryTable.putTableValue(data);
|
|
|
this.$refs.paymentListTable &&
|
|
|
- this.$refs.paymentListTable.putTableValue(
|
|
|
- data.receiptPaymentList
|
|
|
- );
|
|
|
+ this.$refs.paymentListTable.putTableValue(data.receiptPaymentList);
|
|
|
this.getLinkInfo(
|
|
|
contractVO.type == '2' ? contractVO.partbId : contractVO.partaId
|
|
|
);
|
|
|
@@ -811,7 +823,7 @@ export default {
|
|
|
|
|
|
//更新联系人数据
|
|
|
async getLinkInfo(contactId) {
|
|
|
- const data = await getcontactlink({contactId});
|
|
|
+ const data = await getcontactlink({ contactId });
|
|
|
if (data && data?.length) {
|
|
|
this.linkNameOptions = data;
|
|
|
}
|
|
|
@@ -882,7 +894,7 @@ export default {
|
|
|
partbName: '',
|
|
|
partbTel: '',
|
|
|
partaUnifiedSocialCreditCode: '',
|
|
|
- partbUnifiedSocialCreditCode: '',
|
|
|
+ partbUnifiedSocialCreditCode: ''
|
|
|
// categoryName: '',
|
|
|
// categoryId: ''
|
|
|
});
|
|
|
@@ -1019,9 +1031,9 @@ export default {
|
|
|
// this.getDetailData(row.id);
|
|
|
// }
|
|
|
// },
|
|
|
-//切换计价方式重新算费用
|
|
|
+ //切换计价方式重新算费用
|
|
|
changePricingWay() {
|
|
|
- this.$refs.inventoryTable.getTotalPrice()
|
|
|
+ this.$refs.inventoryTable.getTotalPrice();
|
|
|
},
|
|
|
salesmanChange(val, info) {
|
|
|
this.otherForm.salesmanName = info.name;
|
|
|
@@ -1036,51 +1048,52 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
handInquiry(e) {
|
|
|
- if (e.target.nodeName == "I") {
|
|
|
+ if (e.target.nodeName == 'I') {
|
|
|
this.$set(this.form, 'sourceName', '');
|
|
|
this.$set(this.form, 'sourceId', '');
|
|
|
- return
|
|
|
+ return;
|
|
|
}
|
|
|
this.$refs.inquiryListRef.open();
|
|
|
},
|
|
|
handQuotation(e) {
|
|
|
- if (e.target.nodeName == "I") {
|
|
|
+ if (e.target.nodeName == 'I') {
|
|
|
this.$set(this.form, 'sourceName', '');
|
|
|
this.$set(this.form, 'sourceId', '');
|
|
|
- return
|
|
|
+ return;
|
|
|
}
|
|
|
this.$refs.quotationListRef.open();
|
|
|
},
|
|
|
|
|
|
- async changeInquiryList({data, sourceCode}) {
|
|
|
+ async changeInquiryList({ data, sourceCode }) {
|
|
|
this.setValue(data);
|
|
|
this.$set(this.form, 'sourceName', sourceCode);
|
|
|
this.$set(this.form, 'sourceId', data.id);
|
|
|
|
|
|
- let contactId = this.form.type == 2 ? data.contractVO.partbId : data.contractVO.partaId
|
|
|
- let {base} = await contactDetail(contactId)
|
|
|
+ let contactId =
|
|
|
+ this.form.type == 2 ? data.contractVO.partbId : data.contractVO.partaId;
|
|
|
+ let { base } = await contactDetail(contactId);
|
|
|
this.$set(this.form, 'contractName', base.simpleName);
|
|
|
},
|
|
|
//选择采购计划
|
|
|
handPlan(e) {
|
|
|
- if (e.target.nodeName == "I") {
|
|
|
+ if (e.target.nodeName == 'I') {
|
|
|
this.$set(this.form, 'sourceName', '');
|
|
|
this.$set(this.form, 'sourceId', '');
|
|
|
- return
|
|
|
+ return;
|
|
|
}
|
|
|
this.$refs.inquiryManageRef.open();
|
|
|
},
|
|
|
//选择采购计划回调
|
|
|
async changeInquiryManageList(data) {
|
|
|
- let info = await this.getPlanInfo(data.id)
|
|
|
- let cusInfo = {}
|
|
|
+ let info = await this.getPlanInfo(data.id);
|
|
|
+ let cusInfo = {};
|
|
|
// if (info.detailList.length) cusInfo = await this.getCusInfo(info.detailList[0]?.supplierId ?? '');
|
|
|
this.$set(this.form, 'sourceName', data.planName);
|
|
|
this.$set(this.form, 'sourceId', data.id);
|
|
|
// this.$set(this.form, 'contractName', cusInfo?.base?.simpleName);
|
|
|
let form = {
|
|
|
contractVO: {
|
|
|
- ...this.form,
|
|
|
+ ...this.form
|
|
|
// partbName: cusInfo.base.name,
|
|
|
// partbId: cusInfo.base.id,
|
|
|
// partbUnifiedSocialCreditCode: cusInfo.base.unifiedSocialCreditCode,
|
|
|
@@ -1090,34 +1103,33 @@ export default {
|
|
|
// partbTel: cusInfo.linkList[0]?.mobilePhone,
|
|
|
},
|
|
|
productList: info.detailList || []
|
|
|
- }
|
|
|
+ };
|
|
|
this.setValue(form);
|
|
|
// await this.getLinkInfo(cusInfo.base.id)
|
|
|
-
|
|
|
},
|
|
|
//获取计划详情
|
|
|
async getPlanInfo(id) {
|
|
|
- return Promise.resolve(await getplanDetail(id))
|
|
|
+ return Promise.resolve(await getplanDetail(id));
|
|
|
},
|
|
|
//获取客户详情
|
|
|
async getCusInfo(id = '') {
|
|
|
- if (!id) return
|
|
|
- return Promise.resolve(await contactDetail(id))
|
|
|
+ if (!id) return;
|
|
|
+ return Promise.resolve(await contactDetail(id));
|
|
|
},
|
|
|
//选择商机
|
|
|
handOpportunity(e) {
|
|
|
- if (e.target.nodeName == "I") {
|
|
|
+ if (e.target.nodeName == 'I') {
|
|
|
this.$set(this.form, 'sourceName', '');
|
|
|
this.$set(this.form, 'sourceId', '');
|
|
|
- return
|
|
|
+ return;
|
|
|
}
|
|
|
- this.opportunityDialogFlag = true
|
|
|
+ this.opportunityDialogFlag = true;
|
|
|
this.$nextTick(() => {
|
|
|
let item = {
|
|
|
id: this.form.sourceId
|
|
|
- }
|
|
|
- this.$refs.opportunityDialogRef.init(item)
|
|
|
- })
|
|
|
+ };
|
|
|
+ this.$refs.opportunityDialogRef.init(item);
|
|
|
+ });
|
|
|
},
|
|
|
//获取商机信息
|
|
|
async getOpportunityDetail(row) {
|
|
|
@@ -1125,17 +1137,17 @@ export default {
|
|
|
this.$set(this.form, 'sourceId', row.id);
|
|
|
let cusInfo = await this.getCusInfo(row?.contactId ?? '');
|
|
|
let info = await this.getOpportunityDetailData(row?.id ?? '');
|
|
|
- await this.getLinkInfo(cusInfo.base.id)
|
|
|
+ await this.getLinkInfo(cusInfo.base.id);
|
|
|
let totalPrice = info.productList.reduce((num, cur) => {
|
|
|
return num + Number(cur.totalPrice);
|
|
|
- }, 0)
|
|
|
+ }, 0);
|
|
|
info.productList.forEach((item) => {
|
|
|
- item.discountSinglePrice = item.discountSinglePrice || item.singlePrice
|
|
|
- item.discountTotalPrice = item.discountTotalPrice || item.totalPrice
|
|
|
- })
|
|
|
+ item.discountSinglePrice = item.discountSinglePrice || item.singlePrice;
|
|
|
+ item.discountTotalPrice = item.discountTotalPrice || item.totalPrice;
|
|
|
+ });
|
|
|
let discountTotalPrice = info.productList.reduce((num, cur) => {
|
|
|
return num + Number(cur.discountTotalPrice);
|
|
|
- }, 0)
|
|
|
+ }, 0);
|
|
|
let form = {
|
|
|
contractVO: {
|
|
|
...this.form,
|
|
|
@@ -1147,34 +1159,33 @@ export default {
|
|
|
partaLinkId: cusInfo.linkList[0]?.id,
|
|
|
partaTel: cusInfo.linkList[0]?.mobilePhone,
|
|
|
totalPrice: totalPrice,
|
|
|
- discountTotalPrice: discountTotalPrice,
|
|
|
+ discountTotalPrice: discountTotalPrice
|
|
|
},
|
|
|
productList: info.productList || []
|
|
|
- }
|
|
|
+ };
|
|
|
this.setValue(form);
|
|
|
-
|
|
|
},
|
|
|
//获取商机详情
|
|
|
async getOpportunityDetailData(id) {
|
|
|
- return Promise.resolve(await getOpportunityInfo(id))
|
|
|
+ return Promise.resolve(await getOpportunityInfo(id));
|
|
|
},
|
|
|
//赋值
|
|
|
setValue(row) {
|
|
|
- let {contractVO} = row;
|
|
|
+ let { contractVO } = row;
|
|
|
contractVO = {
|
|
|
...contractVO,
|
|
|
categoryId: contractVO.categoryId || this.form.categoryId,
|
|
|
categoryName: contractVO.categoryName || this.form.categoryName,
|
|
|
- contractStartDate: contractVO.contractStartDate || this.form.contractStartDate,
|
|
|
- contractEndDate: contractVO.contractEndDate || this.form.contractEndDate,
|
|
|
- pricingWay: 1,
|
|
|
-
|
|
|
- }
|
|
|
+ contractStartDate:
|
|
|
+ contractVO.contractStartDate || this.form.contractStartDate,
|
|
|
+ contractEndDate:
|
|
|
+ contractVO.contractEndDate || this.form.contractEndDate,
|
|
|
+ pricingWay: 1
|
|
|
+ };
|
|
|
this.form = contractVO;
|
|
|
- this.$refs.inventoryTable &&
|
|
|
- this.$refs.inventoryTable.putTableValue(row);
|
|
|
+ this.$refs.inventoryTable && this.$refs.inventoryTable.putTableValue(row);
|
|
|
this.$refs.paymentListTable &&
|
|
|
- this.$refs.paymentListTable.putTableValue(row.receiptPaymentList);
|
|
|
+ this.$refs.paymentListTable.putTableValue(row.receiptPaymentList);
|
|
|
|
|
|
this.getEnterprise();
|
|
|
this.getLinkInfo(
|
|
|
@@ -1217,7 +1228,8 @@ export default {
|
|
|
await this.getValidate();
|
|
|
// 表单验证通过,执行保存操作
|
|
|
this.loading = true;
|
|
|
- let [totalPrice, discountTotalPrice] = this.$refs.inventoryTable.getPrice();
|
|
|
+ let [totalPrice, discountTotalPrice] =
|
|
|
+ this.$refs.inventoryTable.getPrice();
|
|
|
this.form.totalPrice = totalPrice;
|
|
|
this.form.discountTotalPrice = discountTotalPrice;
|
|
|
if (this.form.categoryId) {
|
|
|
@@ -1230,6 +1242,9 @@ export default {
|
|
|
'结算方式',
|
|
|
this.form.settlementMode
|
|
|
);
|
|
|
+ if (this.form.fileId) {
|
|
|
+ this.form.fileId = JSON.stringify(this.form.fileId);
|
|
|
+ }
|
|
|
let commitData = Object.assign(
|
|
|
{},
|
|
|
{
|