yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 1 year ago
parent
1558bec75e 66e14bedd8
commit
d744d4d511
3 changed files with 272 additions and 485 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 440
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
  2. 316
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
  3. 1
      yxt-as/src/main/resources/application-test.yml

440
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
View File

@ -11,87 +11,63 @@
</div> </div>
<div class="listconadd"> <div class="listconadd">
<div class="titwu">外采申请表</div> <div class="titwu">外采申请表</div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div> <div style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
<el-row class="first_row"> <el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>分公司</span> <div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item>{{ formobj.useOrgName }}</el-form-item> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-col :span="3" class="tleftb"> <div class="span-sty">申请日期</div>
<span>申请人</span> <el-form-item><span class="addinputInfo">{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>{{ formobj.createByName }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>申请日期</span>
</el-col>
<el-col :span="5">
<el-form-item>{{ formobj.applicationDate }}</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span><span class="icon">*</span>采购系统</span> <div class="span-sty"><span class="icon">*</span>采购系统</div>
</el-col>
<el-col :span="5">
<el-form-item prop="purchaseSystemName"> <el-form-item prop="purchaseSystemName">
<el-select v-model="formobj.purchaseSystemName" :disabled="formobj.saleOrderSid !== ''" placeholder="请选择" @change="changeOrgDept" clearable> <el-select class="addinputInfo" v-model="formobj.purchaseSystemName" :disabled="formobj.saleOrderSid !== ''" placeholder="请选择" @change="changeOrgDept" clearable>
<el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option> <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span><span class="icon">*</span>是否销售部审批</span> <div class="span-sty"><span class="icon">*</span>是否销售部审批</div>
</el-col>
<el-col :span="5">
<el-form-item prop="isSaleOrgApproval"> <el-form-item prop="isSaleOrgApproval">
<el-radio-group v-model="formobj.isSaleOrgApproval"> <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.isSaleOrgApproval">
<el-radio label="1">是</el-radio> <el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio> <el-radio label="0">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span v-show="formobj.isSaleOrgApproval === '1'">销售经理</span> <div v-show="formobj.isSaleOrgApproval == '1'">
</el-col> <div class="span-sty">销售经理</div>
<el-col :span="5"> <el-form-item>
<el-form-item v-show="formobj.isSaleOrgApproval === '1'"> <el-select v-model="formobj.approvalName" placeholder="请选择" @change="changeUser" class="addinputInfo">
<el-select v-model="formobj.approvalName" placeholder="请选择" @change="changeUser" class="addinputw"> <el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
<el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.name"></el-option> </el-select>
</el-select> </el-form-item>
</el-form-item> </div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>外采类型</span>
</el-col>
<el-col :span="21" >
<el-radio v-model="formobj.externalMiningTypeKey" label="1">直接外采</el-radio>
<el-radio v-model="formobj.externalMiningTypeKey" label="2">政策外采</el-radio>
</el-col>
</el-row>-->
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span><span class="icon">*</span>品牌</span> <div class="span-sty"><span class="icon">*</span>品牌</div>
</el-col>
<el-col :span="5">
<el-form-item prop="carBrandName"> <el-form-item prop="carBrandName">
<el-select v-model="formobj.carBrandName" :disabled="formobj.saleOrderSid !== ''" filterable placeholder="请选择" @change="carBrandChange"> <el-select class="addinputInfo" v-model="formobj.carBrandName" :disabled="formobj.saleOrderSid !== ''" filterable placeholder="请选择" @change="carBrandChange">
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"></el-option> <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="14" class="tlineheightb">
<span><span class="icon">*</span>车型</span> <div class="span-sty">车型</div>
</el-col> <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
<el-col :span="11">
<el-form-item>{{ formobj.modelName }}</el-form-item>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<el-form-item> <el-form-item>
@ -100,224 +76,146 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"> <el-col :span="16" class="tlineheightb">
<span>常用配置</span> <div class="span-sty">常用配置</div>
</el-col> <el-form-item><span class="addinputInfo">{{ formobj.configName }}</span></el-form-item>
<el-col :span="13" class="trightb tlineheightb">
<el-form-item>{{ formobj.configName }}</el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"> <el-col :span="8">
<span>内部编码</span> <div class="span-sty">内部编码</div>
</el-col> <el-form-item><span class="addinputInfo">{{ formobj.insideCode }}</span></el-form-item>
<el-col :span="5" class="trightb tlineheightb">
<el-form-item>
{{ formobj.insideCode }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span><span class="icon">*</span>车辆型号</span> <div class="span-sty"><span class="icon">*</span>车辆型号</div>
</el-col> <el-form-item prop="vehMark"><el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputInfo addinputw"/></el-form-item>
<el-col :span="5">
<el-form-item prop="vehMark">
<el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>销售指导价</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item>{{ formobj.guidedPrice }}</el-form-item> <div class="span-sty">销售指导价</div>
<el-form-item><span class="addinputInfo">{{ formobj.guidedPrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>厂家合同价</span> <div class="span-sty">厂家合同价</div>
</el-col> <el-form-item><el-input v-model="formobj.manufactorSettlementPrice" clearable placeholder="" class="addinputInfo addinputw"/></el-form-item>
<el-col :span="5">
<el-form-item>
<el-input v-model="formobj.manufactorSettlementPrice" class="addinputw" clearable></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span><span class="icon">*</span>采购供应商</span> <div class="span-sty"><span class="icon">*</span>采购供应商</div>
</el-col>
<el-col :span="5">
<el-form-item prop="purchasingUnitName"> <el-form-item prop="purchasingUnitName">
<el-select v-model="formobj.purchasingUnitName" filterable placeholder="请选择" @change="changeWcgys"> <el-select class="addinputInfo" v-model="formobj.purchasingUnitName" filterable placeholder="请选择" @change="changeWcgys">
<el-option v-for="item in wcgys_list" :key="item.sid" :label="item.manufacturerName" :value="item.manufacturerName"></el-option> <el-option v-for="item in wcgys_list" :key="item.sid" :label="item.manufacturerName" :value="item.manufacturerName"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span><span class="icon">*</span>是否先付车款</span> <div class="span-sty"><span class="icon">*</span>是否先付车款</div>
</el-col>
<el-col :span="5">
<el-form-item prop="isBeforePayment"> <el-form-item prop="isBeforePayment">
<el-radio v-model="formobj.isBeforePayment" @change="changeRadio" label="1">是</el-radio> <el-radio-group class="addinputInfo" style="font-size: 1px" @change="changeRadio" v-model="formobj.isBeforePayment">
<el-radio v-model="formobj.isBeforePayment" label="0">否</el-radio> <el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span v-show="formobj.isBeforePayment == '0'"><span class="icon">*</span>订金使用规则</span> <div v-show="formobj.isBeforePayment == '0'">
</el-col> <div class="span-sty">订金使用规则</div>
<el-col :span="5"> <el-form-item>
<el-form-item> <el-select class="addinputInfo" v-model="formobj.depositUseRuleValue" filterable placeholder="请选择" @change="depositUseRuleChange">
<el-select v-show="formobj.isBeforePayment == '0'" v-model="formobj.depositUseRuleValue" filterable placeholder="请选择" @change="depositUseRuleChange"> <el-option v-for="item in depositUseRule_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
<el-option v-for="item in depositUseRule_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option> </el-select>
</el-select> </el-form-item>
</el-form-item> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span><span class="icon">*</span>采购单价</span> <div class="span-sty"><span class="icon">*</span>采购单价</div>
<el-form-item prop="purchasePrice"><el-input v-model="formobj.purchasePrice" placeholder="" class="addinputInfo addinputw" clearable/></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item prop="purchasePrice"> <div class="span-sty"><span class="icon">*</span>台数</div>
<el-input v-model="formobj.purchasePrice" placeholder="" class="addinputw" clearable/> <el-form-item prop="num"><el-input v-model="formobj.num" :disabled="formobj.saleOrderSid !== ''" placeholder="" class="addinputw" clearable/></el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="5">
<el-form-item prop="num">
<el-input v-model="formobj.num" :disabled="formobj.saleOrderSid !== ''" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>采购总价</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item> <div class="span-sty">采购总价</div>
<span>{{ ZongDeposit() }}</span> <el-form-item prop="num"><span class="addinputInfo">{{ ZongDeposit }}</span></el-form-item>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title" style="color: red;">外采订金及车款付款申请</div>
<el-row> <el-row>
<el-col :span="24" class="headline"> <el-col :span="8">
<el-form-item> <div class="span-sty"><span class="icon">*</span>审批通过后付订金</div>
<span>外采订金及车款付款申请</span> <el-form-item prop="deposit"><el-input :disabled="formobj.isBeforePayment === '1'" v-model="formobj.deposit" placeholder="" class="addinputInfo addinputw" clearable/></el-form-item>
</el-form-item> </el-col>
<el-col :span="8">
<div v-show="formobj.isBeforePayment == '0'">
<div class="span-sty" style="color: red">验车无问题后付车款</div>
<el-form-item><span class="addinputInfo">{{ ShengYuMoney }}</span></el-form-item>
</div>
</el-col>
<el-col :span="8">
<div v-show="formobj.isBeforePayment == '1'">
<div class="span-sty" style="color: red">审批通过后付车款</div>
<el-form-item><span class="addinputInfo">{{ ShengYuMoney }}</span></el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span style="color: red"><span class="icon">*</span>审批通过后付订金</span> <div class="span-sty"><span class="icon">*</span>车款账户名称</div>
</el-col>
<el-col :span="5">
<el-form-item prop="deposit">
<el-input style="height:10px;" :disabled="formobj.isBeforePayment === '1'" v-model="formobj.deposit" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span style="color: red;" v-show="formobj.isBeforePayment == '0'">验车无问题后付车款</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span v-show="formobj.isBeforePayment == '0'">{{ ShengYuMoney() }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span style="color: red;" v-show="formobj.isBeforePayment == '1'">审批通过后付车款</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span v-show="formobj.isBeforePayment == '1'">{{ ShengYuMoney() }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>车款账户名称</span>
</el-col>
<el-col :span="5">
<el-form-item prop="accountName"> <el-form-item prop="accountName">
<el-select v-model="formobj.accountName" filterable placeholder="请选择" @change="changeAccountName"> <el-select class="addinputInfo" v-model="formobj.accountName" filterable placeholder="请选择" @change="changeAccountName">
<el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option> <el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>开户行</span> <div class="span-sty">开户行</div>
</el-col> <el-form-item><span class="addinputInfo">{{ formobj.depositBankName }}</span></el-form-item>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.depositBankName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>银行账号</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item> <div class="span-sty">银行账号</div>
<span>{{ formobj.bankAccount }}</span> <el-form-item><span class="addinputInfo">{{ formobj.bankAccount }}</span></el-form-item>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="formobj.isBeforePayment === '0'"> <el-row v-if="formobj.isBeforePayment == '0'">
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>订金账户名称</span> <div class="span-sty">订金账户名称</div>
</el-col>
<el-col :span="5">
<el-form-item> <el-form-item>
<el-select v-model="formobj.modelAccountName" filterable placeholder="请选择" @change="changeModelAccountName"> <el-select class="addinputInfo" v-model="formobj.modelAccountName" filterable placeholder="请选择" @change="changeModelAccountName">
<el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option> <el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>开户行</span> <div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.modelBankName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item> <div class="span-sty">银行账号</div>
<span>{{ formobj.modelBankName }}</span> <el-form-item><span class="addinputInfo">{{ formobj.modelBankAccount }}</span></el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>银行账号</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.modelBankAccount }}</span>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="16">
<span>其他费用名称</span> <div class="span-sty">其他费用名称</div>
<el-form-item><el-input v-model="formobj.expenseName" placeholder="" class="addinputInfo addinputw" clearable/></el-form-item>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="8">
<el-form-item> <div class="span-sty">其他费用合计</div>
<el-input v-model="formobj.expenseName" placeholder="" class="addinputw" clearable/> <el-form-item><el-input v-model="formobj.totalExpenseAmount" placeholder="" class="addinputInfo addinputw" clearable/></el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>其他费用合计</span>
</el-col>
<el-col :span="5">
<el-form-item>
<el-input v-model="formobj.totalExpenseAmount" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="24">
<span>备注</span> <div class="span-sty">备注</div>
</el-col> <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputInfo addinputw" clearable/></el-form-item>
<el-col :span="21">
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="24">
<span>合同附件</span> <div class="span-sty">合同附件</div>
</el-col>
<el-col :span="21">
<el-form-item> <el-form-item>
<el-upload :action="uploadAction" :data="requestData" :headers="accessToken" :accept="filType" :multiple="false" :on-success="uploadSuccessHetong" :limit="1" :file-list="fileList" :on-preview='handleDown' class="upload-demo"> <el-upload :action="uploadAction" :data="requestData" :headers="accessToken" :accept="filType" :multiple="false" :on-success="uploadSuccessHetong" :limit="1" :file-list="fileList" :on-preview='handleDown' class="upload-demo">
<el-button size="small" type="primary">合同上传</el-button> <el-button size="small" type="primary">合同上传</el-button>
@ -325,33 +223,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="listcon" v-show="formobj.externalMiningTypeKey==2">
<div style="border:1px solid #c0c0c0;padding:5px 5px 5px 5px;">
车辆列表
<el-button type="primary" size="small" @click="selectVehicleDialog">选择车辆</el-button>
</div>
<el-table :data="formobj.baseOutsourcingApplicationVehicleDtos" border style="width: 100%">‘
<el-table-column width="60px" label="序号" type="index" align="center"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="deleteVehicle(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="vinNo" label="车架号" align="center"/>
</el-table>
</div>
</el-form> </el-form>
</div> </div>
</div> </div>
<!-- End 添加修改部分 --> <!-- End 添加修改部分 -->
<!-- <modellibrary @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>-->
<!--选择车型和常用配置--> <!--选择车型和常用配置-->
<configuration v-show="viewState == 2" ref="divconfiguration" @backData="selectChexing" @doback="closePage"/> <configuration v-show="viewState == 2" ref="divconfiguration" @backData="selectChexing" @doback="closePage"/>
</div> </div>
</template> </template>
<script> <script>
import modellibrary from '@/views/baseoutsourcingapplication/relation/modellibrary'
import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication' import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
import configuration from './chexingbyconfiguration' import configuration from './chexingbyconfiguration'
import { getStorage } from '@/utils/auth' import { getStorage } from '@/utils/auth'
@ -360,7 +240,6 @@ import { getOrgSidByPath, brandDown, fetchDetailsByUseOrgSid, typeValues, select
export default { export default {
name: 'BaseOutsourcingApplicationAdd', name: 'BaseOutsourcingApplicationAdd',
components: { components: {
modellibrary,
configuration configuration
}, },
data() { data() {
@ -369,9 +248,6 @@ export default {
token: getStorage() token: getStorage()
}, },
// 点击提交按钮显示弹框 // 点击提交按钮显示弹框
selectedSids: '',
vehicleDialogVisible: false,
dialogVisible: false,
viewState: '1', viewState: '1',
submitdisabled: false, submitdisabled: false,
viewTitle: '', viewTitle: '',
@ -424,7 +300,7 @@ export default {
deposit: '', // 订金 deposit: '', // 订金
expenseName: '', // 费用名称 expenseName: '', // 费用名称
totalExpenseAmount: '', // 费用金额合计 totalExpenseAmount: '', // 费用金额合计
orgSid: window.sessionStorage.getItem('orgSid'), // 部门sid orgSid: '', // 部门sid
baseOutsourcingApplicationVehicleDtos: [], baseOutsourcingApplicationVehicleDtos: [],
businessSid: '', businessSid: '',
taskId: '', taskId: '',
@ -457,17 +333,19 @@ export default {
} }
} }
}, },
methods: { computed: {
ZongDeposit() { ZongDeposit() {
if (this.formobj.purchasePrice !== '' && this.formobj.purchasePrice !== 0 && this.formobj.num !== '' && this.formobj.num !== 0) { let zdt = '0'
return parseInt(this.formobj.purchasePrice) * parseInt(this.formobj.num) zdt = Math.round((parseFloat(zdt) + parseFloat(this.formobj.purchasePrice == '' ? '0' : this.formobj.purchasePrice) * parseFloat(this.formobj.num == '' ? '0' : this.formobj.num)) * 100) / 100
} return zdt
}, },
ShengYuMoney() { ShengYuMoney() {
if (this.formobj.purchasePrice !== '' && this.formobj.purchasePrice !== 0 && this.formobj.num !== '' && this.formobj.num !== 0 && this.formobj.deposit !== '') { let money = '0'
return parseInt(this.formobj.purchasePrice) * parseInt(this.formobj.num) - parseInt(this.formobj.deposit) money = Math.round((parseFloat(money) + parseFloat(this.formobj.purchasePrice == '' ? '0' : this.formobj.purchasePrice) * parseFloat(this.formobj.num == '' ? '0' : this.formobj.num) - parseFloat(this.formobj.deposit == '' ? '0' : this.formobj.deposit)) * 100) / 100
} return money
}, }
},
methods: {
// 下载附件 // 下载附件
handleDown(row) { handleDown(row) {
console.log(row) console.log(row)
@ -506,6 +384,7 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) { if (res.success) {
this.formobj.useOrgSid = res.data this.formobj.useOrgSid = res.data
this.formobj.orgSid = res.data
req.fetchOrgBySid(res.data).then((resp) => { req.fetchOrgBySid(res.data).then((resp) => {
if (resp.success) { if (resp.success) {
this.formobj.useOrgName = resp.data.name this.formobj.useOrgName = resp.data.name
@ -557,20 +436,6 @@ export default {
this.formobj.insideCode = info[0].insideCode // 内部编码 this.formobj.insideCode = info[0].insideCode // 内部编码
this.formobj.vehicleTypeKey = info[0].vehicleTypeKey // 车辆类型Key this.formobj.vehicleTypeKey = info[0].vehicleTypeKey // 车辆类型Key
}, },
selectVehicleDialog() {
var objs = this.formobj.baseOutsourcingApplicationVehicleDtos
var s = ''
for (var i = 0; i < objs.length; i++) {
if (i == objs.length - 1) {
s = s + objs[i].sid
} else {
s = s + objs[i].sid + ','
}
}
this.selectedSids = s
this.vehicleDialogVisible = true
this.$refs.cheliang.dosearch()
},
showAdd() { showAdd() {
this.init() this.init()
var nowDate = new Date() var nowDate = new Date()
@ -738,7 +603,6 @@ export default {
}, },
saveOrUpdate() { saveOrUpdate() {
this.formobj.userSid = window.sessionStorage.getItem('userSid') this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.formobj.orgSid = this.$store.getters.orgSid
if (this.formobj.externalMiningTypeKey === '1') { if (this.formobj.externalMiningTypeKey === '1') {
this.formobj.externalMiningTypeValue = '直接外采' this.formobj.externalMiningTypeValue = '直接外采'
} else if (this.formobj.externalMiningTypeKey === '2') { } else if (this.formobj.externalMiningTypeKey === '2') {
@ -802,7 +666,6 @@ export default {
} }
// 提交的代码 // 提交的代码
this.formobj.userSid = window.sessionStorage.getItem('userSid') this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.formobj.orgSid = this.$store.getters.orgSid
// 查验下一环节要用到，流程定义的id // 查验下一环节要用到，流程定义的id
this.$refs['form_obj'].validate(valid => { this.$refs['form_obj'].validate(valid => {
if (valid) { if (valid) {
@ -822,23 +685,6 @@ export default {
closePage() { closePage() {
this.viewState = 1 this.viewState = 1
}, },
deleteVehicle(row) {
var arr = this.formobj.baseOutsourcingApplicationVehicleDtos
const tip = '请确认是否删除车架号为' + row.vinNo + '记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
for (var i = 0; i < arr.length; i++) {
if (row.vinNo == arr[i].vinNo) {
arr.splice(i, 1)
}
}
this.formobj.num = this.formobj.num - 1
}).catch(() => {
})
},
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
this.formobj.id = '' this.formobj.id = ''
@ -896,12 +742,18 @@ export default {
</script> </script>
<style scoped> <style scoped>
.headline { .span-sty {
background-color: #edf1f7; width: 180px !important;
text-align: left; }
font-size: 14px; .addinputInfo {
color: red; margin-left: 170px !important;
line-height: 40px !important; }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 170px !important;
width: calc(100% - 165px);
}
/deep/ .el-form-item__error {
margin-left: 170px !important;
} }
.tlineheightb { .tlineheightb {
display: flex; display: flex;
@ -909,7 +761,7 @@ export default {
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
/deep/ .tlineheightb .el-form-item .el-form-item__content { /deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo{
line-height: 15px !important; line-height: 15px !important;
display: flex; display: flex;
flex-direction: row; flex-direction: row;

316
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
View File

@ -13,238 +13,171 @@
<!-- 标题按钮部分结束 --> <!-- 标题按钮部分结束 -->
<div class="listconadd"> <div class="listconadd">
<div class="titwu">外采申请表</div> <div class="titwu">外采申请表</div>
<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="wlInfo" style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div> <div style="text-align: right;"><span style="font-size:14px;">金额单位：元</span></div>
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="3" class="tleftb">分公司</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">分公司</div>
<el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
<span>{{ formobj.useOrgName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">申请人</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">申请人</div>
<el-form-item><span>{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">申请日期</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">申请日期</div>
<el-form-item><span>{{ formobj.applicationDate }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.applicationDate }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb">采购系统</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">采购系统</div>
<el-form-item><span>{{ formobj.purchaseSystemName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">是否销售部审批</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">是否销售部审批</div>
<el-form-item><span>{{ formobj.isSaleOrgApproval == '1' ? '是' : '否' }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.isSaleOrgApproval == '1' ? '是' : '否' }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span v-show="formobj.isSaleOrgApproval === '1'">销售经理</span> <div v-show="formobj.isSaleOrgApproval == '1'">
</el-col> <div class="span-sty">销售经理</div>
<el-col :span="5"> <el-form-item><span class="addinputInfo">{{ formobj.approvalName }}</span></el-form-item>
<el-form-item><span v-show="formobj.isSaleOrgApproval === '1'">{{ formobj.approvalName }}</span></el-form-item> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb">品牌</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">品牌</div>
<el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.carBrandName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">车型</el-col> <el-col :span="16">
<el-col :span="13"> <div class="span-sty">车型</div>
<el-form-item><span>{{ formobj.modelName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb">常用配置</el-col> <el-col :span="16" class="tlineheightb">
<el-col :span="13" class="tlineheightb"> <div class="span-sty">常用配置</div>
<el-form-item><span>{{ formobj.configName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.configName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>内部编码</span>
</el-col> </el-col>
<el-col :span="5" class="tlineheightb"> <el-col :span="8" class="tlineheightb">
<el-form-item> <div class="span-sty">内部编码</div>
<span>{{ formobj.insideCode }}</span> <el-form-item><span class="addinputInfo">{{ formobj.insideCode }}</span></el-form-item>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>车辆型号</span> <div class="span-sty">车辆型号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item> <div class="span-sty">销售指导价</div>
<span>{{ formobj.vehMark }}</span> <el-form-item><span class="addinputInfo">{{ formobj.guidedPrice }}</span></el-form-item>
</el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">销售指导价</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">厂家合同价</div>
<el-form-item><span>{{ formobj.guidedPrice }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">厂家合同价</el-col>
<el-col :span="5">
<el-form-item><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb">采购供应商</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">采购供应商</div>
<el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.purchasingUnitName }}</span></el-form-item>
<span>{{ formobj.purchasingUnitName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">是否先付车款</el-col>
<el-col :span="5">
<el-form-item><span>{{ formobj.isBeforePayment === '1' ? '是' : '否' }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span v-show="formobj.isBeforePayment == '0'">订金使用规则</span> <div class="span-sty">是否先付车款</div>
<el-form-item><span class="addinputInfo">{{ formobj.isBeforePayment === '1' ? '是' : '否' }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item><span v-show="formobj.isBeforePayment == '0'">{{ formobj.depositUseRuleValue }}</span></el-form-item> <div v-show="formobj.isBeforePayment == '0'">
<div class="span-sty">订金使用规则</div>
<el-form-item><span class="addinputInfo">{{ formobj.depositUseRuleValue }}</span></el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>采购单价</span> <div class="span-sty">采购单价</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePrice }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item> <div class="span-sty">台数</div>
<span>{{ formobj.purchasePrice }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.num }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>台数</span> <div class="span-sty">采购总价</div>
</el-col> <el-form-item><span class="addinputInfo">{{ ZongDeposit }}</span></el-form-item>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.num }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>采购总价</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ ZongDeposit() }}</span>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title" style="color: red">外采订金及车款付款申请</div>
<el-row> <el-row>
<el-col :span="24" class="headline"> <el-col :span="8">
<el-form-item> <div class="span-sty">审批通过后付订金</div>
<span>外采订金及车款付款申请</span> <el-form-item><span class="addinputInfo">{{ formobj.deposit }}</span></el-form-item>
</el-form-item> </el-col>
<el-col :span="8">
<div v-show="formobj.isBeforePayment == '0'">
<div class="span-sty" style="color: red">验车无问题后付车款</div>
<el-form-item><span class="addinputInfo">{{ ShengYuMoney }}</span></el-form-item>
</div>
</el-col>
<el-col :span="8">
<div v-show="formobj.isBeforePayment == '1'">
<div class="span-sty" style="color: red">审批通过后付车款</div>
<el-form-item><span class="addinputInfo">{{ ShengYuMoney }}</span></el-form-item>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span style="color: red"><span class="icon">*</span>审批通过后付订金</span> <div class="span-sty">车款账户名称</div>
</el-col> <el-form-item><span class="addinputInfo">{{ formobj.accountName }}</span></el-form-item>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.deposit }}</span>
</el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span style="color: red;" v-show="formobj.isBeforePayment == '0'">验车无问题后付车款</span> <div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.depositBankName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item> <div class="span-sty">银行账号</div>
<span v-show="formobj.isBeforePayment == '0'">{{ ShengYuMoney() }}</span> <el-form-item><span class="addinputInfo">{{ formobj.bankAccount }}</span></el-form-item>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span style="color: red;" v-show="formobj.isBeforePayment == '1'">审批通过后付车款</span>
</el-col>
<el-col :span="5">
<span v-show="formobj.isBeforePayment == '1'">{{ ShengYuMoney() }}</span>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">车款账户名称</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.accountName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>开户行</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.depositBankName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>银行账号</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.bankAccount }}</span>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="formobj.isBeforePayment === '0'"> <el-row v-if="formobj.isBeforePayment === '0'">
<el-col :span="3" class="tleftb">订金账户名称</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">订金账户名称</div>
<el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.modelAccountName }}</span></el-form-item>
<span>{{ formobj.modelAccountName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>开户行</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.modelBankName }}</span>
</el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="8">
<span>银行账号</span> <div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.modelBankName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="8">
<el-form-item> <div class="span-sty">银行账号</div>
<span>{{ formobj.modelBankAccount }}</span> <el-form-item><span class="addinputInfo">{{ formobj.modelBankAccount }}</span></el-form-item>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb">其他费用名称</el-col> <el-col :span="16">
<el-col :span="13"> <div class="span-sty">其他费用名称</div>
<el-form-item><span>{{ formobj.expenseName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.expenseName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">其他费用合计</el-col> <el-col :span="8">
<el-col :span="5"> <div class="span-sty">其他费用合计</div>
<el-form-item><span>{{ formobj.totalExpenseAmount }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.totalExpenseAmount }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="24" class="tlineheightb">
<span>备注</span> <div class="span-sty">备注</div>
</el-col> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
<el-col :span="21">
<el-form-item>
<span>{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="24" class="tlineheightb">
<span>合同附件</span> <div class="span-sty">合同附件</div>
</el-col> <el-form-item><span v-if="formobj.contract != null" class="addinputInfo bluezi" @click="handleDown(formobj.contract)">{{ formobj.contract.fileName }}</span></el-form-item>
<el-col :span="21">
<el-form-item>
<span v-if="formobj.contract != null" class="bluezi" @click="handleDown(formobj.contract)">{{ formobj.contract.fileName }}</span>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="listcon" v-show="formobj.externalMiningTypeKey==2">
<div style="border:1px solid #c0c0c0;padding:5px 5px 5px 5px;">
车辆列表
</div>
<el-table :data="formobj.baseOutsourcingApplicationVehicleDtos" border style="width: 100%">‘
<el-table-column width="60px" label="序号" type="index" align="center"/>
<el-table-column prop="vinNo" label="车架号" align="center"/>
</el-table>
</div>
</el-form> </el-form>
</div> </div>
</div> </div>
@ -261,17 +194,19 @@ export default {
formobj: {} formobj: {}
} }
}, },
methods: { computed: {
ZongDeposit() { ZongDeposit() {
if (this.formobj.purchasePrice !== '' && this.formobj.purchasePrice !== 0 && this.formobj.num !== '' && this.formobj.num !== 0) { let zdt = '0'
return parseInt(this.formobj.purchasePrice) * parseInt(this.formobj.num) zdt = Math.round((parseFloat(zdt) + parseFloat(this.formobj.purchasePrice == '' ? '0' : this.formobj.purchasePrice) * parseFloat(this.formobj.num == '' ? '0' : this.formobj.num)) * 100) / 100
} return zdt
}, },
ShengYuMoney() { ShengYuMoney() {
if (this.formobj.purchasePrice !== '' && this.formobj.purchasePrice !== 0 && this.formobj.num !== '' && this.formobj.num !== 0 && this.formobj.deposit !== '') { let money = '0'
return parseInt(this.formobj.purchasePrice) * parseInt(this.formobj.num) - parseInt(this.formobj.deposit) money = Math.round((parseFloat(money) + parseFloat(this.formobj.purchasePrice == '' ? '0' : this.formobj.purchasePrice) * parseFloat(this.formobj.num == '' ? '0' : this.formobj.num) - parseFloat(this.formobj.deposit == '' ? '0' : this.formobj.deposit)) * 100) / 100
} return money
}, }
},
methods: {
// 下载附件 // 下载附件
handleDown(row) { handleDown(row) {
console.log(row) console.log(row)
@ -316,12 +251,11 @@ export default {
</script> </script>
<style scoped> <style scoped>
.headline { .span-sty {
background-color: #edf1f7; width: 180px !important;
text-align: left; }
font-size: 14px; .addinputInfo {
color: red; margin-left: 170px !important;
line-height: 40px !important;
} }
.tlineheightb { .tlineheightb {
display: flex; display: flex;
@ -329,7 +263,7 @@ export default {
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
/deep/ .tlineheightb .el-form-item .el-form-item__content { /deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo{
line-height: 15px !important; line-height: 15px !important;
display: flex; display: flex;
flex-direction: row; flex-direction: row;

1
yxt-as/src/main/resources/application-test.yml
View File

@ -8,6 +8,7 @@ spring:
nacos: nacos:
discovery: discovery:
server-addr: 172.18.0.5:8848 server-addr: 172.18.0.5:8848
namespace: as
redis: redis:
database: 3 # Redis数据库索引（默认为0） database: 3 # Redis数据库索引（默认为0）
host: 172.18.0.7 host: 172.18.0.7

Write Preview
Loading…
Cancel
Save