shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-09-20 15:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

beyond 5.13.3

Browse source
This commit is contained in:
beyond 2020-05-13 17:27:54 +08:00
parent 8ddaa6dab6
commit df53749345
7 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/views/StockInvoice/AddRedStockInvoice.vue
View file

@ -175,7 +175,7 @@
@input="getprice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -183,7 +183,7 @@
@input="getincludeTaxPrice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"

4
src/views/StockInvoice/AddStockInvoice.vue
View file

@ -179,7 +179,7 @@
@input="getprice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -187,7 +187,7 @@
@input="getincludeTaxPrice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"

4
src/views/StockInvoice/components/MyDialog.vue
View file

@ -174,7 +174,7 @@
@input="getprice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
@ -182,7 +182,7 @@
@input="getincludeTaxPrice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="200px">
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="200px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"

2
src/views/StockOrder/AddStockOrder.vue
View file

@ -216,7 +216,7 @@
@input="getincludeTaxPrice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"

2
src/views/StockOrder/components/MyDialog.vue
View file

@ -217,7 +217,7 @@
@input="getincludeTaxPrice(scope.row)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"

4
src/views/StockRetreat/StockRetreatList.vue
View file

@ -30,6 +30,10 @@
<el-option :label="$t('updates.shtg')" value="2"/>
<el-option :label="$t('updates.shptg')" value="3"/>
</el-select>
<el-select v-model="getemplist.sourceType" :value="getemplist.sourceType" :placeholder="$t('StockRetreat.sourceType')" size="mini" clearable style="width: 40%;float: left;margin-left: 20px;margin-top: 20px">
<el-option label="采购到货单" value="1"/>
<el-option label="采购入库单" value="2"/>
</el-select>
<div class="seachbutton" style="width: 100%;float: right;margin-top: 20px">
<el-button v-waves class="filter-item" size="mini" type="primary" style="float: right" round @click="handleFilter">{{ $t('public.search') }}</el-button>
</div>

18
src/views/StockRetreat/components/MyEnter.vue
View file

@ -19,6 +19,10 @@
</el-form-item>
<my-delivery :deliverycontrol.sync="deliverycontrol" @deliveryName="deliveryName"/>
</el-col>
<el-col :span="3" style="margin-left: 20px">
<el-input v-model="supplierId" placeholder="供应商" clearable @focus="handlechoose" @clear="restFilter"/>
<my-supplier :control.sync="empcontrol" @supplierName="supplierName"/>
</el-col>
<!--更多搜索条件-->
<!-- <el-col :span="3" style="margin-left: 30px">-->
<!-- <el-popover-->
@ -147,10 +151,11 @@ import MyEmp from './MyEmp'
import MyDelivery from './MyDelivery'
import MyDetail from './MyDetail'
import DetailList from './DetailList'
var _that
export default {
directives: { waves },
components: { DetailList, Pagination, MyRepository, MySupplier, MyEmp, MyDelivery, MyDetail },
components: { MySupplier, DetailList, Pagination, MyRepository, MyEmp, MyDelivery, MyDetail },
filters: {
judgeStatFilter(status) {
const statusMap = {
@ -235,6 +240,7 @@ export default {
stockPersonId: '',
// 批量操作
moreaction: '',
empcontrol: false,
// 加载操作控制
downloadLoading: false,
// 表格数据
@ -315,6 +321,12 @@ export default {
_that = this
},
methods: {
// 供应商列表返回数据
supplierName(val) {
console.log(val)
this.supplierId = val.supplierName
this.getemplist.supplierId = val.id
},
// 默认选中
memoryChecked() {
console.log('我执行啦')
@ -394,6 +406,10 @@ export default {
}
})
},
// 供应商输入框focus事件触发
handlechoose() {
this.empcontrol = true
},
// 清空搜索条件
restFilter() {
this.enterRepositoryId = ''