shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2025-01-01 04:51:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/shawncai/ERP

Browse source
This commit is contained in:
beyond 2020-02-07 09:21:23 +08:00
commit 187a4cfdc5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/views/Repository/RepCategory.vue
View file

@ -27,7 +27,7 @@
<!-- 打印操作 -->
<el-button v-permission="['1-9-13-7']" v-waves class="filter-item" icon="el-icon-printer" style="width: 86px" @click="handlePrint">{{ $t('public.print') }}</el-button>
<!-- 新建操作 -->
<el-button v-permission="['1-9-13-1']" v-waves class="filter-item" icon="el-icon-plus" type="success" style="width: 86px;float: right" @click="handleAdd2">{{ $t('updates.lx') }}</el-button>
<el-button v-permission="['1-9-13-1']" v-waves class="filter-item" icon="el-icon-plus" type="success" style="width: 86px;float: right" @click="handleAdd2">{{ $t('public.add') }}</el-button>
<el-dialog :visible.sync="categoryVisible2" :title="$t('updates.xjflsx')" append-to-body width="600px" class="normal" center>
<el-form ref="addCategoryForm2" :rules="addCategoryFormRules2" :model="addCategoryForm2" class="demo-ruleForm" style="margin: 0 auto; width: 400px">
<el-form-item :label="$t('NewEmployeeInformation.type')" label-width="100px" prop="type">

2
src/views/SaleContract/AddSaleContract.vue
View file

@ -466,7 +466,7 @@ export default {
components: { MyAgent, MyPackage, MyCustomer, MyInstallmentapply, MyOpportunity, MyDelivery, MyPlan, MyApply, MySupplier, MyDetail, MyEmp },
data() {
const validatePass4 = (rule, value, callback) => {
if (this.customerId === undefined || this.customerId === null || this.customerId === '') {
if (this.personalForm.customerId === undefined || this.personalForm.customerId === null || this.personalForm.customerId === '') {
callback(new Error('请选择客户'))
} else {
callback()