|
@@ -20,28 +20,47 @@
|
|
</Column>
|
|
</Column>
|
|
<!-- 合同名 -->
|
|
<!-- 合同名 -->
|
|
<Column :label="$t('lift.contractName')" :searchParams="queryParams" :showSearch="true" prop="contractName" />
|
|
<Column :label="$t('lift.contractName')" :searchParams="queryParams" :showSearch="true" prop="contractName" />
|
|
|
|
+
|
|
|
|
+ <!-- 签单日期1 -->
|
|
|
|
+ <Column :label="$t('contract.signingDate')" :searchParams="queryParams" :showSearch="true" prop="signingDate" search-type="dateRange" width="250"/>
|
|
<!--区域-->
|
|
<!--区域-->
|
|
<Column :label="$t('user.area')" prop="areaId" :showSearch="true" searchType="select" :searchDict="areaList" :searchParams="queryParams" :min-width="200" :selectMore="true"/>
|
|
<Column :label="$t('user.area')" prop="areaId" :showSearch="true" searchType="select" :searchDict="areaList" :searchParams="queryParams" :min-width="200" :selectMore="true"/>
|
|
<!--国家-->
|
|
<!--国家-->
|
|
<Column :label="$t('account.country')" prop="countryId" :showSearch="true" searchType="select" :searchDict="curCountryOps" :searchParams="queryParams" :min-width="200" :selectMore="true"/>
|
|
<Column :label="$t('account.country')" prop="countryId" :showSearch="true" searchType="select" :searchDict="curCountryOps" :searchParams="queryParams" :min-width="200" :selectMore="true"/>
|
|
<!--城市-->
|
|
<!--城市-->
|
|
<Column :label="$t('project.city')" prop="city" show-search :searchParams="queryParams"/>
|
|
<Column :label="$t('project.city')" prop="city" show-search :searchParams="queryParams"/>
|
|
- <!--业务员-->
|
|
|
|
- <Column :label="$t('contract.salesman')" prop="salesman" width="250" show-search :searchParams="queryParams">
|
|
|
|
- <template #default="{ row }">
|
|
|
|
- {{ getNickName(row.salesman) }}
|
|
|
|
- </template>
|
|
|
|
- </Column>
|
|
|
|
<!--代理商-->
|
|
<!--代理商-->
|
|
<Column :label="$t('agent.agent')" prop="agentId" :showSearch="true" searchType="select" :searchDict="curAgentOps" :searchParams="queryParams" :min-width="200" :selectMore="true"/>
|
|
<Column :label="$t('agent.agent')" prop="agentId" :showSearch="true" searchType="select" :searchDict="curAgentOps" :searchParams="queryParams" :min-width="200" :selectMore="true"/>
|
|
- <!--终端客户 v-hasRole="['system_manager', 'sales_director']" -->
|
|
|
|
- <Column :label="$t('contract.endCustomers')" prop="endCustomersName" show-search :searchParams="queryParams"/>
|
|
|
|
<!--贸易条款-->
|
|
<!--贸易条款-->
|
|
<Column :label="$t('contract.tradeTerms')" :searchDict="dict.type.contract_trade_terms" :showSearch="true" prop="tradeTerms" selectProp="origins"
|
|
<Column :label="$t('contract.tradeTerms')" :searchDict="dict.type.contract_trade_terms" :showSearch="true" prop="tradeTerms" selectProp="origins"
|
|
searchType="select" selectMore :searchParams="queryParams"/>
|
|
searchType="select" selectMore :searchParams="queryParams"/>
|
|
|
|
+
|
|
|
|
+ <!--付款方式-->
|
|
|
|
+ <Column :label="$t('contract.paymentMethod')" :searchParams="queryParams" :showSearch="true" prop="paymentMethod" searchType="select" selectMore
|
|
|
|
+ :searchDict="dict.type.contract_payment_method"/>
|
|
|
|
+
|
|
<!--销售模式-->
|
|
<!--销售模式-->
|
|
<Column :label="$t('contract.salesModel')" :searchDict="dict.type.contract_sales_model" :showSearch="true" prop="salesModel" selectProp="origins"
|
|
<Column :label="$t('contract.salesModel')" :searchDict="dict.type.contract_sales_model" :showSearch="true" prop="salesModel" selectProp="origins"
|
|
searchType="select" selectMore :searchParams="queryParams"/>
|
|
searchType="select" selectMore :searchParams="queryParams"/>
|
|
|
|
+ <!--业务员-->
|
|
|
|
+ <Column :label="$t('contract.salesman')" prop="salesman" width="250" show-search :searchParams="queryParams">
|
|
|
|
+ <template #default="{ row }">
|
|
|
|
+ {{ getNickName(row.salesman) }}
|
|
|
|
+ </template>
|
|
|
|
+ </Column>
|
|
|
|
+
|
|
|
|
+ <!--终端客户 v-hasRole="['system_manager', 'sales_director']" -->
|
|
|
|
+ <Column :label="$t('contract.endCustomers')" prop="endCustomersName" show-search :searchParams="queryParams"/>
|
|
|
|
+
|
|
|
|
+ <!--币种10-->
|
|
|
|
+ <Column :label="$t('contract.currencyId')" prop="currencyId" searchType="select" :searchDict="dict.type.currency_type" />
|
|
|
|
+
|
|
|
|
+ <!--金额31-->
|
|
|
|
+ <Column :label="$t('lift.amountOfMoney')" :searchParams="queryParams" prop="amount" align="right" >
|
|
|
|
+ <template #default="{ row }">
|
|
|
|
+ <span>{{ toDecimal2(numFormat(row.amount)) }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </Column>
|
|
<!--地址-->
|
|
<!--地址-->
|
|
<Column :label="$t('contract.address')" prop="address" show-search :searchParams="queryParams"/>
|
|
<Column :label="$t('contract.address')" prop="address" show-search :searchParams="queryParams"/>
|
|
<!--电话-->
|
|
<!--电话-->
|
|
@@ -85,34 +104,6 @@
|
|
</Column>
|
|
</Column>
|
|
</template>
|
|
</template>
|
|
</card-table>
|
|
</card-table>
|
|
-<!-- <DialogPage ref="approveDialog" :title="approveTitle" maxWidth="800px" :disabled="approveDisabled" label-position="top" :header="true">-->
|
|
|
|
-<!-- -->
|
|
|
|
-<!-- </DialogPage>-->
|
|
|
|
- <!--审批dialog-->
|
|
|
|
- <el-dialog :close-on-click-modal="false" :title="approveTitle" :visible.sync="approveOpen" append-to-body
|
|
|
|
- custom-class="edit-dialog" width="24vw" >
|
|
|
|
- <el-form ref="equipmentForm" :model="approveForm" :rules="approveFormRules" label-position="top" label-width="100px">
|
|
|
|
- <el-row :gutter="24">
|
|
|
|
- <el-col :span="24">
|
|
|
|
- <!-- 合同号-->
|
|
|
|
- <Input :label = "$t('contract.contractNo')" prop="contractNo" width="100%" disabled/>
|
|
|
|
- </el-col>
|
|
|
|
- </el-row>
|
|
|
|
- <el-row :gutter="24">
|
|
|
|
- <el-col :span="24">
|
|
|
|
- <!-- 合同号-->
|
|
|
|
- <Input label = "备注" prop="approveRemark" width="100%" type="textarea" style="height: 100px" :rows="5" :maxlength="500"/>
|
|
|
|
- </el-col>
|
|
|
|
- </el-row>
|
|
|
|
- </el-form>
|
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
|
- <!--通过-->
|
|
|
|
- <el-button icon="el-icon-circle-check" type="success" @click="approveYes">{{ $t('contract.approveYes') }}</el-button>
|
|
|
|
- <!--驳回-->
|
|
|
|
- <el-button icon="el-icon-circle-close" type="primary" @click="approveNo">{{ $t('contract.approveNo') }}</el-button>
|
|
|
|
- <el-button icon="el-icon-remove-outline" @click="approveCancel">{{ $t('common.cancel') }}</el-button>
|
|
|
|
- </div>
|
|
|
|
- </el-dialog>
|
|
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -211,7 +202,7 @@ export default {
|
|
name: "Contract",
|
|
name: "Contract",
|
|
inject: ["main"],
|
|
inject: ["main"],
|
|
components: {TextBox, ColorDictTag, CardTable, DialogPage, MoreBtn, Column},
|
|
components: {TextBox, ColorDictTag, CardTable, DialogPage, MoreBtn, Column},
|
|
- dicts: [ 'audit_status','agent_type', 'agent_level', 'contract_approval_status','contract_sales_model','contract_trade_terms'],
|
|
|
|
|
|
+ dicts: [ 'currency_type','contract_payment_method','audit_status','agent_type', 'agent_level', 'contract_approval_status','contract_sales_model','contract_trade_terms'],
|
|
computed: {
|
|
computed: {
|
|
tcAgentHistory() {
|
|
tcAgentHistory() {
|
|
return tcAgentHistory
|
|
return tcAgentHistory
|
|
@@ -250,12 +241,6 @@ export default {
|
|
contractList: [],
|
|
contractList: [],
|
|
// 弹出层标题
|
|
// 弹出层标题
|
|
title: "",
|
|
title: "",
|
|
-
|
|
|
|
- approveTitle:VueI18n.t('contract.approve'),
|
|
|
|
- approveOpen:false,
|
|
|
|
- approveFormRules: {
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
approveForm:[],
|
|
approveForm:[],
|
|
// 是否显示弹出层
|
|
// 是否显示弹出层
|
|
open: false,
|
|
open: false,
|
|
@@ -389,14 +374,9 @@ export default {
|
|
},
|
|
},
|
|
/** 重置按钮操作 todo:待补充*/
|
|
/** 重置按钮操作 todo:待补充*/
|
|
resetQuery() {
|
|
resetQuery() {
|
|
- this.$set(this.queryParams, 'agentLevelName', null)
|
|
|
|
- this.$set(this.queryParams, 'agentTypeName', null)
|
|
|
|
this.$set(this.queryParams, 'contractNo', null)
|
|
this.$set(this.queryParams, 'contractNo', null)
|
|
this.$set(this.queryParams, 'contractName', null)
|
|
this.$set(this.queryParams, 'contractName', null)
|
|
- this.$set(this.queryParams, 'contractCustomer', null)
|
|
|
|
- this.$set(this.queryParams, 'versionNo', null)
|
|
|
|
this.$set(this.queryParams, 'salesman', null)
|
|
this.$set(this.queryParams, 'salesman', null)
|
|
- this.$set(this.queryParams, 'endCustomers', null)
|
|
|
|
this.$set(this.queryParams, 'tradeTerms', null)
|
|
this.$set(this.queryParams, 'tradeTerms', null)
|
|
this.$set(this.queryParams, 'salesModel', null)
|
|
this.$set(this.queryParams, 'salesModel', null)
|
|
this.$set(this.queryParams, 'approveStatus', null)
|
|
this.$set(this.queryParams, 'approveStatus', null)
|
|
@@ -408,7 +388,9 @@ export default {
|
|
this.$set(this.queryParams, 'agentId', null)
|
|
this.$set(this.queryParams, 'agentId', null)
|
|
this.$set(this.queryParams, 'countries', null)
|
|
this.$set(this.queryParams, 'countries', null)
|
|
this.$set(this.queryParams, 'origins', null)
|
|
this.$set(this.queryParams, 'origins', null)
|
|
-
|
|
|
|
|
|
+ this.$set(this.queryParams, 'sign', null)
|
|
|
|
+ this.$set(this.queryParams, 'signingDate', null)
|
|
|
|
+ this.$set(this.queryParams, 'paymentMethod', null)
|
|
this.$set(this.queryParams, 'address', null)
|
|
this.$set(this.queryParams, 'address', null)
|
|
this.$set(this.queryParams, 'telephone', null)
|
|
this.$set(this.queryParams, 'telephone', null)
|
|
this.$set(this.queryParams, 'email', null)
|
|
this.$set(this.queryParams, 'email', null)
|
|
@@ -416,11 +398,7 @@ export default {
|
|
this.$set(this.queryParams, 'shipmentPort', null)
|
|
this.$set(this.queryParams, 'shipmentPort', null)
|
|
this.$set(this.queryParams, 'destinationPort', null)
|
|
this.$set(this.queryParams, 'destinationPort', null)
|
|
this.$set(this.queryParams, 'shipmentDeadline', null)
|
|
this.$set(this.queryParams, 'shipmentDeadline', null)
|
|
-
|
|
|
|
this.$set(this.queryParams, 'flowStatus', null)
|
|
this.$set(this.queryParams, 'flowStatus', null)
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
this.handleQuery();
|
|
this.handleQuery();
|
|
},
|
|
},
|
|
// 多选框选中数据
|
|
// 多选框选中数据
|
|
@@ -527,11 +505,6 @@ export default {
|
|
},
|
|
},
|
|
//打开审批按钮
|
|
//打开审批按钮
|
|
handleApprove(row){
|
|
handleApprove(row){
|
|
- // this.approveForm = []
|
|
|
|
- // getContractById(row.id).then(response => {
|
|
|
|
- // this.approveForm = response.data;
|
|
|
|
- // })
|
|
|
|
- // this.approveOpen = true
|
|
|
|
this.$tab.openPage('合同审批', '/contract-edit/index/' + row.id, {type: 'approve'});
|
|
this.$tab.openPage('合同审批', '/contract-edit/index/' + row.id, {type: 'approve'});
|
|
},
|
|
},
|
|
handleAmendment(row){
|
|
handleAmendment(row){
|
|
@@ -597,71 +570,6 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
},
|
|
},
|
|
- //审核通过
|
|
|
|
- async approveYes(){
|
|
|
|
- this.$set(this.approveForm,"approveStatus","2")
|
|
|
|
- let bargainObj = {
|
|
|
|
- paymentMethod:this.approveForm.paymentMethod,
|
|
|
|
- paymentRatio:this.approveForm.paymentRatio
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- let auditForm = {
|
|
|
|
- // 审批流
|
|
|
|
- auditFlow: this.approveForm.paymentMethod === '1' || this.approveForm.paymentRatio !=='1' ? 3 :4,
|
|
|
|
- // 业务id 报价id
|
|
|
|
- businessId: this.approveForm.id,
|
|
|
|
- // 审批结果
|
|
|
|
- status: 200,
|
|
|
|
- // 备注
|
|
|
|
- remark: this.approveForm.approveRemark,
|
|
|
|
- // 业务参数
|
|
|
|
- businessObj: bargainObj
|
|
|
|
- }
|
|
|
|
- const response = await audit(auditForm)
|
|
|
|
- if(response && response.code == 200){
|
|
|
|
- const res = await editFlow({...this.approveForm})
|
|
|
|
- if(res && res.code == 200){
|
|
|
|
- this.$message.success(this.$t('common.operateSuccess'))
|
|
|
|
- }else{
|
|
|
|
- this.$message.error("操作失败")
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- await this.getList()
|
|
|
|
- this.approveOpen = false
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- //审核驳回
|
|
|
|
- async approveNo(){
|
|
|
|
- this.$set(this.approveForm,"approveStatus","1")
|
|
|
|
- let bargainObj = {}
|
|
|
|
- let auditForm = {
|
|
|
|
- // 审批流
|
|
|
|
- auditFlow:this.approveForm.paymentMethod === '1' || this.approveForm.paymentRatio !=='1' ? 3 :4,
|
|
|
|
- // 业务id 报价id
|
|
|
|
- businessId: this.approveForm.id,
|
|
|
|
- // 审批结果
|
|
|
|
- status: 30,
|
|
|
|
- // 备注
|
|
|
|
- remark: this.approveForm.approveRemark,
|
|
|
|
- // 业务参数
|
|
|
|
- businessObj: bargainObj
|
|
|
|
- }
|
|
|
|
- const response = await audit(auditForm)
|
|
|
|
- if(response && response.code == 200){
|
|
|
|
- const res = await updateContract({...this.approveForm})
|
|
|
|
- if(res && res.code == 200){
|
|
|
|
- this.$message.success(this.$t('common.operateSuccess'))
|
|
|
|
- this.approveOpen = false
|
|
|
|
- }else{
|
|
|
|
- this.$message.error("操作失败")
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- await this.getList()
|
|
|
|
- this.approveOpen = false
|
|
|
|
- },
|
|
|
|
- approveCancel(){
|
|
|
|
- this.approveOpen = false
|
|
|
|
- },
|
|
|
|
hasPermission(row){
|
|
hasPermission(row){
|
|
// let flag = true;
|
|
// let flag = true;
|
|
//销售VP角色,可以任意操作
|
|
//销售VP角色,可以任意操作
|