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

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

Browse source
This commit is contained in:
beyond 2020-05-12 20:16:38 +08:00
parent 5158030273 262dabd7f8
commit 7213f2ea08
65 changed files with 1491 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/api/StockArrival.js
View file

@ -75,6 +75,61 @@ export function searchstockArrival(query) {
})
}
export function searchstockArrival2(query) {
var params = new URLSearchParams()
if (query.number !== '' && query.number !== null && query.number !== undefined) {
params.append('number', query.number) // 你要传给后台的参数值 key/value
}
if (query.title !== '' && query.title !== null && query.title !== undefined) {
params.append('title', query.title) // 你要传给后台的参数值 key/value
}
if (query.supplierId !== '' && query.supplierId !== null && query.supplierId !== undefined) {
params.append('supplierId', query.supplierId) // 你要传给后台的参数值 key/value
}
if (query.deptId !== '' && query.deptId !== null && query.deptId !== undefined) {
params.append('deptId', query.deptId) // 你要传给后台的参数值 key/value
}
if (query.stockPersonId !== '' && query.stockPersonId !== null && query.stockPersonId !== undefined) {
params.append('stockPersonId', query.stockPersonId) // 你要传给后台的参数值 key/value
}
if (query.sourceType !== '' && query.sourceType !== null && query.sourceType !== undefined) {
params.append('sourceType', query.sourceType) // 你要传给后台的参数值 key/value
}
if (query.sourceNumber !== '' && query.sourceNumber !== null && query.sourceNumber !== undefined) {
params.append('sourceNumber', query.sourceNumber) // 你要传给后台的参数值 key/value
}
if (query.judgeStat !== '' && query.judgeStat !== null && query.judgeStat !== undefined) {
params.append('judgeStat', query.judgeStat) // 你要传给后台的参数值 key/value
}
if (query.receiptStat !== '' && query.receiptStat !== null && query.receiptStat !== undefined) {
params.append('receiptStat', query.receiptStat) // 你要传给后台的参数值 key/value
}
if (query.beginTime !== '' && query.beginTime !== null && query.beginTime !== undefined) {
params.append('beginTime', query.beginTime) // 你要传给后台的参数值 key/value
}
if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
}
if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
}
if (query.createPersonId !== '' && query.createPersonId !== null && query.createPersonId !== undefined) {
params.append('createPersonId', query.createPersonId) // 你要传给后台的参数值 key/value
}
// if (query.regionIds !== '' && query.regionIds !== null && query.regionIds !== undefined) {
// params.append('regionIds', query.regionIds) // 你要传给后台的参数值 key/value
// }
if (query.isActive !== '' && query.isActive !== null && query.isActive !== undefined) {
params.append('isActive', query.isActive) // 你要传给后台的参数值 key/value
}
params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
return request({
url: '/stockArrival/search',
method: 'post',
data: params
})
}
// 修改采购到货
export function updatestockArrival(query, query2) {
var params = new URLSearchParams()

24
src/api/count.js
View file

@ -183,6 +183,9 @@ export function purchaseCount(query) {
if (query.endTime !== '' && query.endTime !== null && query.endTime !== undefined) {
params.append('endTime', query.endTime) // 你要传给后台的参数值 key/value
}
if (query.type !== '' && query.type !== null && query.type !== undefined) {
params.append('type', query.type) // 你要传给后台的参数值 key/value
}
if (query.pageNum !== '' && query.pageNum !== null && query.pageNum !== undefined) {
params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
}
@ -1438,3 +1441,24 @@ export function installmentAnalyze(query) {
data: params
})
}
// 库存呆滞分析表
export function SluggishAnalysisTable(query) {
var params = new URLSearchParams()
if (query.type !== '' && query.type !== null && query.type !== undefined) {
params.append('type', query.type) // 你要传给后台的参数值 key/value
}
if (query.time !== '' && query.time !== null && query.time !== undefined) {
params.append('time', query.time) // 你要传给后台的参数值 key/value
}
if (query.pageNum !== '' && query.pageNum !== null && query.pageNum !== undefined) {
params.append('pageNum', query.pageNum) // 你要传给后台的参数值 key/value
}
if (query.pageSize !== '' && query.pageSize !== null && query.pageSize !== undefined) {
params.append('pageSize', query.pageSize) // 你要传给后台的参数值 key/value
}
return request({
url: '/installmentCount/installmentComplete',
method: 'post',
data: params
})
}

3
src/lang/en.js
View file

@ -128,6 +128,8 @@ export default {
AddLocationAdjust: 'new form',
LocationAdjustList: 'adjustment list',
Inventorydetaillist: 'stocks detail list',
InventorySluggishAnalysisTable: 'InventorySluggishAnalysisTable',
InventoryMatchingAnalysisTable: 'InventoryMatchingAnalysisTable',
ProduceRequire: 'production requirement',
MaterialsList: 'material list',
AddMaterialsList: 'new material list',
@ -3353,6 +3355,7 @@ export default {
cwxx: 'finance info.',
fzxx: 'other info.',
gyskh: 'supplier evaluation',
gyscf: 'supplier punish',
sctjd: 'generate price adjustment form',
tzdmx: 'adjustment form detail',
cgdyj: 'purchase order original price',

3
src/lang/zh.js
View file

@ -146,6 +146,8 @@ export default {
AddLocationAdjust: '新建货位调整单',
LocationAdjustList: '货位调整单列表',
Inventorydetaillist: '库存明细统计表',
InventorySluggishAnalysisTable: '库存呆滞料分析表',
InventoryMatchingAnalysisTable: '库存配套分析表',
ProduceRequire: '生产需求',
MaterialsList: '物料清单',
AddMaterialsList: '新建物料清单',
@ -3378,6 +3380,7 @@ export default {
cwxx: '财务信息',
fzxx: '辅助信息',
gyskh: '供应商考核',
gyscf: '供应商惩罚',
sctjd: '生成调价单',
tzdmx: '调整单明细',
cgdyj: '采购单原价',

12
src/router/index.js
View file

@ -3124,6 +3124,18 @@ export const asyncRouterMap = [
component: () => import('@/views/inventorycount2/Inventorydetaillist'),
name: 'Inventorydetaillist',
meta: { title: 'Inventorydetaillist', noCache: false, roles: ['311-312-323-4'] }
},
{
path: 'InventorySluggishAnalysisTable',
component: () => import('@/views/inventorycount2/InventorySluggishAnalysisTable'),
name: 'InventorySluggishAnalysisTable',
meta: { title: 'InventorySluggishAnalysisTable', noCache: false, roles: ['311-312-397-4'] }
},
{
path: 'InventoryMatchingAnalysisTable',
component: () => import('@/views/inventorycount2/InventorySluggishAnalysisTable'),
name: 'InventoryMatchingAnalysisTable',
meta: { title: 'InventoryMatchingAnalysisTable', noCache: false, roles: ['311-312-398-4'] }
}
]
},

4
src/views/AccessComponent/AccessComponentList.vue
View file

@ -97,10 +97,10 @@
<!-- </el-table-column>-->
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['54-67-363-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-67-363-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="scope.row.confirmPersonId === null && scope.row.judgeStat === 2" title="确认" type="warning" size="mini" icon="el-icon-check" circle @click="handleReview9(scope.row)"/>
<el-button v-permission="['54-67-363-36']" v-show="scope.row.confirmPersonId !== null && scope.row.judgeStat === 2 && scope.row.returnStat === 0" title="归还" type="primary" size="mini" icon="el-icon-back" circle @click="handleEdit3(scope.row)"/>
<el-button v-permission2="['54-67-363-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['54-67-363-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['54-67-363-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['54-67-363-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>

4
src/views/AccessMaterials/RetreatMaterialsList.vue
View file

@ -145,12 +145,12 @@
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-show="scope.row.judgeStat === 2&&scope.row.receivePersonId === null" size="mini" type="success" @click="handleDispatch(scope.row)">收料</el-button>
<el-button v-permission2="['171-185-188-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['171-185-188-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['171-185-188-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['171-185-188-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['171-185-188-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['171-185-188-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['171-185-188-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

4
src/views/Advancemanage/AdvanceOrderList.vue
View file

@ -134,12 +134,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="320">
<template slot-scope="scope">
<el-button v-permission2="['54-84-86-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-84-86-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['54-84-86-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['54-84-86-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['54-84-86-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['54-84-86-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['54-84-86-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['54-84-86-22']" v-show="scope.row.judgeStat === 2" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成销售出库单</span></el-button>
<el-button v-permission="['54-84-86-37']" v-show="scope.row.judgeStat === 2" type="primary" style="width: 107px" @click="handleMyReceipt2(scope.row)"><span style="margin-left: -15px;">生成预售退款单</span></el-button>
</template>

4
src/views/Advancemanage/PrepReturnList.vue
View file

@ -143,12 +143,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['54-84-89-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-84-89-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['54-84-89-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['54-84-89-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['54-84-89-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['54-84-89-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['54-84-89-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

4
src/views/ChangeCount/ChangeCountList.vue
View file

@ -149,9 +149,9 @@
</el-table-column> -->
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['200-204-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['200-204-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['200-204-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['200-204-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

2
src/views/CheckReport/CheckReportList.vue
View file

@ -171,7 +171,7 @@
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['227-231-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['227-231-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['227-231-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['227-231-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['227-231-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>

4
src/views/Collection/CollectionList.vue
View file

@ -130,9 +130,9 @@
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button size="mini" type="success" @click="handleDispatch(scope.row)">重分派</el-button>
<el-button v-permission2="['200-208-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['200-208-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['200-208-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['200-208-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['200-208-75']" type="primary" style="width: 84px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成收车单</span></el-button>
</template>
</el-table-column>

4
src/views/Collection/RecoverVehicleList.vue
View file

@ -139,9 +139,9 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['200-209-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['200-209-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['200-209-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['200-209-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['200-209-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['200-209-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['200-209-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>

24
src/views/CostInvoice/AddCostInvoice.vue
View file

@ -151,7 +151,14 @@
<p>{{ getTaxMoney(scope.row) }}</p>
</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 :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px">
<template slot="edit" slot-scope="scope">
<el-input-number
:precision="6"
v-model="scope.row.taxRate"
@input="gettaxRate(scope.row, scope)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0, precision: 6}, type: 'visible'}" :label="$t('updates.kdyse')" prop="deduTaxMoney" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.bhsje')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
@ -402,6 +409,21 @@ export default {
_that = this
},
methods: {
gettaxRate(row, scope) {
if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
if (row.taxRate !== '' && row.taxRate !== null && row.taxRate !== undefined) {
for (let i = 0; i < this.list2.length; i++) {
this.list2[i].temp = i
}
for (let i = row.temp; i < this.list2.length; i++) {
console.log('需求值=========', this.list2[i].taxRate)
console.log(222)
this.list2[i].taxRate = row.taxRate
}
console.log(row)
}
}
},
getcurrency() {
const mycountry = this.$store.getters.countryId
if (mycountry === 1) {

4
src/views/CostInvoice/CostInvoiceList.vue
View file

@ -115,12 +115,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['266-259-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['266-259-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<!-- <el-button v-permission="['266-259-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>-->
<!-- <el-button v-permission="['266-259-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>-->
<!-- <el-button v-permission="['266-259-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>-->
<el-button v-permission2="['266-259-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['266-259-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

4
src/views/DeliverGoods/DeliverGoodsList.vue
View file

@ -136,9 +136,9 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['235-237-3']" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['235-237-3']" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['235-237-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['235-237-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['235-237-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 2" title="确认送货单" size="mini" type="success" icon="el-icon-circle-check" circle @click="handleconfirm(scope.row)"/>
</template>
<my-confirm :detailcontrol.sync="detailvisible2" :detaildata.sync="personalForm"/>

4
src/views/Expenses/ExpensesList.vue
View file

@ -178,12 +178,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['266-92-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['266-92-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['266-92-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['266-92-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['266-92-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['266-92-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['266-92-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button title="查看附件" type="primary" size="mini" icon="el-icon-document" circle @click="check(scope.row)"/>
<!-- <el-button v-show="isReview5(scope.row)" :title="$t('updates.scpz')" type="warning" size="mini" icon="el-icon-news" circle @click="creatvoucher(scope.row)"/> -->
</template>

4
src/views/InstallmentList/index.vue
View file

@ -216,9 +216,9 @@
</el-table-column> -->
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['200-203-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['200-203-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['200-203-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['200-203-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['200-203-59']" v-show="scope.row.stat !== 2&&scope.row.stat !== 3&&scope.row.stat !== 6" type="primary" @click="handleMyReceipt1(scope.row)"><span>改期</span></el-button>
<el-button v-show="scope.row.stat !== 2&&scope.row.stat !== 6" type="primary" style="width: 84px" @click="handleMyReceipt2(scope.row)"><span style="margin-left: -15px;">{{ $t('newupd.oijn') }}</span></el-button>
</template>

4
src/views/Invoice/InvoiceList.vue
View file

@ -126,9 +126,9 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['104-129-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-129-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['104-129-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-129-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

62
src/views/OutSourceEnter/AddOutSourceEnter.vue
View file

@ -66,6 +66,16 @@
</el-form-item>
<my-repository :repositorycontrol.sync="repositorycontrol" @repositoryname="repositoryname"/>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('Stockenter.enterDate')" prop="enterDate" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-date-picker
v-model="personalForm.enterDate"
:picker-options="pickerOptions2"
type="date"
value-format="yyyy-MM-dd"
style="width: 200px"/>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item :label="$t('Stockenter.enterReason')" prop="summary" style="margin-left: 18px;width: 100%;margin-bottom: 0">-->
<!-- <el-input v-model="personalForm.enterReason" placeholder="请输入原因" style="width: 200px" clearable/>-->
@ -233,6 +243,20 @@ export default {
// }
}
return {
pickerOptions2: {
disabledDate: (time) => {
// 只能选择当月
var date = new Date()
const startd = date.setDate(1)
var currentMonth = date.getMonth()
var nextMonth = ++currentMonth
var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)
var oneDay = 1000 * 60 * 60 * 24
var lastTime = new Date(nextMonthFirstDay).getTime()
console.log(startd, lastTime)
return time.getTime() < startd - 8.64e7 || time.getTime() > lastTime - 8.64e7
}
},
issure: false,
IsNumber: true,
outsourcecontrol: false,
@ -258,6 +282,7 @@ export default {
control: false,
// 入库信息数据
personalForm: {
enterDate: null,
createPersonId: this.$store.getters.userId,
countryId: this.$store.getters.countryId,
repositoryId: this.$store.getters.repositoryId,
@ -290,6 +315,9 @@ export default {
],
enterRepositoryId: [
{ required: true, validator: validatePass2, trigger: 'change' }
],
enterDate: [
{ required: true, message: '请选择入库日期', trigger: 'change' }
]
},
// 入库单明细数据
@ -310,12 +338,45 @@ export default {
},
mounted() {
this.getdatatime()
this.getlist()
},
beforeCreate() {
_that = this
},
methods: {
getCurrentMonthLast() {
var date = new Date()
var currentMonth = date.getMonth()
var nextMonth = ++currentMonth
var nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)
var oneDay = 1000 * 60 * 60 * 24
var lastTime = new Date(nextMonthFirstDay - oneDay)
var month = parseInt(lastTime.getMonth() + 1)
var day = lastTime.getDate()
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
return date.getFullYear() + '-' + month + '-' + day
},
getdatatime() { // 默认显示今天
var date = new Date()
var seperator1 = '-'
var year = date.getFullYear()
var month = date.getMonth() + 1
var strDate = date.getDate()
if (month >= 1 && month <= 9) {
month = '0' + month
}
if (strDate >= 0 && strDate <= 9) {
strDate = '0' + strDate
}
var currentdate = year + seperator1 + month + seperator1 + strDate
this.personalForm.enterDate = currentdate
},
getmylocation(scope) {
if (scope.row.flag === undefined) {
scope.row.flag = true
@ -542,6 +603,7 @@ export default {
this.enterPersonId = this.$store.getters.name
this.acceptPersonId = null
this.deliveryPersonId = null
this.getdatatime()
},
// 保存操作
handlesave() {

9
src/views/OutSourceEnter/components/MyOther.vue
View file

@ -70,6 +70,15 @@
<el-input v-model="personalForm.enterReason" placeholder="请输入原因" style="margin-left: 18px;width: 150px" clearable/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('Stockenter.enterDate')" prop="enterDate" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-date-picker
v-model="personalForm.enterDate"
type="date"
value-format="yyyy-MM-dd"
style="width: 200px"/>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item :label="$t('Stockenter.newOrOld')" style="width: 100%;">-->
<!-- <el-radio-group v-model="personalForm.newOrOld" style="width: 200px;margin-left: 19px">-->

4
src/views/OutSourcing/OutSourcingList.vue
View file

@ -136,10 +136,10 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['171-190-199-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['171-190-199-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['171-190-199-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission2="['171-190-199-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['171-190-199-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

4
src/views/OverdueList/index.vue
View file

@ -161,9 +161,9 @@
<template slot-scope="scope">
<el-button v-permission="['200-206-60']" type="primary" style="width: 84px" @click="handleEdit2(scope.row)"><span style="margin-left: -15px;">{{ $t('newupd.pkj') }}</span></el-button>
<!-- <el-button v-permission="['200-206-60']" title="转催收" type="primary" size="mini" icon="el-icon-d-arrow-right" circle @click="handleEdit2(scope.row)"/>-->
<el-button v-permission2="['200-206-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['200-206-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['200-206-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['200-206-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['200-206-74']" type="primary" style="width: 84px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">{{ $t('newupd.oijn') }}</span></el-button>
</template>
</el-table-column>

4
src/views/PrepReceipt/PrepReceiptList.vue
View file

@ -122,12 +122,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['266-98-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['266-98-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['266-98-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['266-98-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['266-98-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['266-98-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['266-98-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<!-- <el-button v-permission="['266-98-38']" v-show="scope.row.judgeStat === 2" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成预收退款单</span></el-button> -->
<el-button title="查看附件" type="primary" size="mini" icon="el-icon-document" circle @click="check(scope.row)"/>
</template>

4
src/views/ProduceTask/ProduceReportList.vue
View file

@ -103,12 +103,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['171-180-183-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['171-180-183-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['171-180-183-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['171-180-183-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['171-180-183-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['171-180-183-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['171-180-183-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

4
src/views/ProduceTask/ProduceTaskList.vue
View file

@ -135,12 +135,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['171-180-181-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['171-180-181-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['171-180-181-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['171-180-181-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['171-180-181-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['171-180-181-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['171-180-181-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['171-180-181-54']" v-show="scope.row.judgeStat === 2" type="primary" style="width: 135px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成生产任务汇报单</span></el-button>
</template>
</el-table-column>

2
src/views/Receipt/ReceiptList.vue
View file

@ -182,7 +182,7 @@
<template slot-scope="scope">
<el-button v-show="scope.row.judgeStat === 0" type="primary" size="mini" @click="handleEdit(scope.row)">{{ $t('public.edit') }}</el-button>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['200-213-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['200-213-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<!-- <el-button title="查看附件" type="primary" size="mini" icon="el-icon-document" circle @click="check(scope.row)"/>-->
</template>
</el-table-column>

4
src/views/Recycling/RecyclingList.vue
View file

@ -125,12 +125,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['54-96-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-96-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['54-96-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['54-96-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['54-96-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['54-96-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['54-96-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<!-- <el-button title="查看附件" type="primary" size="mini" icon="el-icon-document" circle @click="check(scope.row)"/> -->
</template>
</el-table-column>

4
src/views/RequirePlan/RequirePlanList.vue
View file

@ -128,12 +128,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['171-178-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['171-178-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['171-178-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['171-178-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['171-178-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['171-178-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['171-178-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

4
src/views/ReturnExchange/ReturnExchangeList.vue
View file

@ -133,8 +133,8 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['54-224-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-224-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['54-224-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-224-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['54-224-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['54-224-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>

4
src/views/SaleContract/SaleContractList.vue
View file

@ -140,9 +140,9 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['54-65-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-65-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['54-65-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['54-65-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

8
src/views/SaleOrder/SaleOrderList.vue
View file

@ -138,9 +138,9 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="540">
<template slot-scope="scope">
<el-button v-permission2="['54-57-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-57-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['54-57-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['54-57-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button :title="$t('updates.jc')" size="mini" type="primary" icon="el-icon-sort" circle @click="handleReceipt(scope.row)"/>
<el-button v-permission="['54-57-22']" v-show="scope.row.judgeStat === 2&&scope.row.flag===1" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">{{ $t('newupd.qqq') }}</span></el-button>
<el-button v-permission="['54-57-23']" v-show="scope.row.judgeStat === 2&&scope.row.flag!==3" type="primary" style="width: 107px" @click="handleMyReceipt2(scope.row)"><span style="margin-left: -15px;">{{ $t('newupd.www') }}</span></el-button>
@ -435,6 +435,10 @@ export default {
getlist() {
// 物料需求计划列表数据
this.listLoading = true
if (this.countquery) {
console.log('this.countquery====', this.countquery)
this.getemplist.supplierId = this.countquery
}
searchsaleOrder(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list

5
src/views/SaleOut/NewAccessoriesOut.vue
View file

@ -7,6 +7,11 @@
<div class="container" style="margin-top: 25px">
<el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" size="mini" status-icon class="demo-ruleForm" label-position="left" label-width="130px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('SaleOut.title')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.title" style="width: 200px" clearable/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('SaleOut.invoiceNumber')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.invoiceNumber" style="width: 200px" clearable/>

4
src/views/SaleReturn/SaleReturnList.vue
View file

@ -155,12 +155,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['54-59-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['54-59-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['54-59-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['54-59-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['54-59-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['54-59-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['54-59-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

5
src/views/StockApply/AddStockApply.vue
View file

@ -14,7 +14,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('StockApply.title')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-form-item :label="$t('StockApply.title')" prop="title" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="personalForm.title" size="mini" style="margin-left: 18px;width:200px" clearable/>
</el-form-item>
</el-col>
@ -303,6 +303,9 @@ export default {
},
// 采购申请单规则数据
personalrules: {
title: [
{ required: true, message: '请填写采购主题', trigger: 'change' }
],
applyRepositoryId: [
{ required: true, validator: validatePass6, trigger: 'change' }
],

4
src/views/StockApply/StockApplyList.vue
View file

@ -142,12 +142,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['104-105-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-105-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['104-105-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['104-105-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['104-105-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['104-105-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-105-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button :title="$t('updates.jc')" size="mini" type="primary" icon="el-icon-sort" circle @click="handleReceipt(scope.row)"/>
</template>
</el-table-column>

5
src/views/StockApply/components/MyDialog.vue
View file

@ -7,7 +7,7 @@
<el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
<el-row>
<el-col :span="12">
<el-form-item :label="$t('StockApply.title')" style="width: 100%;">
<el-form-item :label="$t('StockApply.title')" prop="title" style="width: 100%;">
<el-input v-model="personalForm.title" style="margin-left: 18px;width:200px" clearable/>
</el-form-item>
</el-col>
@ -222,6 +222,9 @@ export default {
control: false,
// 采购申请单规则数据
personalrules: {
title: [
{ required: true, message: '请填写采购主题', trigger: 'change' }
],
applyPersonId: [
{ required: true, validator: validatePass, trigger: 'change' }
],

2
src/views/StockArrival/AddStockArrival.vue
View file

@ -155,7 +155,7 @@
</el-form>
</div>
</el-card>
<!--子件信息-->
<!--子件信息12-->
<el-card :body-style="{ padding: '5px' }" class="box-card" style="margin-top: 15px" shadow="never">
<div ref="fuzhu" class="form-name" >{{ $t('updates.cgdhdmx') }}</div>
<div class="buttons" style="margin-top: 35px;margin-bottom: 10px;">

4
src/views/StockArrival/StockArrivalList.vue
View file

@ -172,12 +172,12 @@
</el-table-column> -->
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="600">
<template slot-scope="scope">
<el-button v-permission2="['104-116-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-116-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['104-116-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['104-116-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['104-116-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['104-116-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-116-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['104-116-45']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成采购入库单</span></el-button>
<el-button v-permission="['104-116-46']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt2(scope.row)"><span style="margin-left: -15px;">生成质检报告单</span></el-button>
<el-button v-permission="['104-116-47']" v-show="scope.row.judgeStat === 2" size="mini" type="primary" style="width: 107px" @click="handleMyReceipt3(scope.row)"><span style="margin-left: -15px;">生成采购退货单</span></el-button>

4
src/views/StockContract/StockContractList.vue
View file

@ -141,12 +141,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['104-112-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-112-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['104-112-3-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['104-112-3-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['104-112-3-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['104-112-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-112-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

174
src/views/StockCount/orderImplDetail.vue
View file

@ -26,33 +26,47 @@
ref="table"
:height="tableHeight"
:data="list"
:span-method="arraySpanMethod"
size="small"
border
style="width: 100%"
@row-click="clickRow">
<el-table-column
:label="$t('report.supplierName')"
fixed="left"
prop="supplierName"
width="200"
align="center"/>
<el-table-column
:label="$t('report.orderQuantity')"
prop="orderQuantity"
:label="$t('public.id')"
fixed="left"
prop="orderNumber"
width="200"
align="center"/>
<el-table-column
:label="$t('report.invoiceQuantity')"
prop="invoiceQuantity"
:label="$t('StockArrival.presentdata')"
fixed="left"
prop="productName"
width="200"
align="center"/>
<el-table-column
:label="$t('report.invoiceMoney')"
prop="invoiceMoney"
:label="$t('updates.ys')"
prop="color"
width="200"
align="center"/>
<el-table-column
:label="$t('report.invoiceTaxMoney')"
prop="invoiceTaxMoney"
:label="$t('Hmodule.dw')"
prop="unit"
width="200"
align="center"/>
<el-table-column
:label="$t('updates.cgsl')"
prop="stockQuantity"
width="200"
align="center"/>
<el-table-column
:label="$t('updates.dhsl')"
prop="actualArrivalQuantity"
width="200"
align="center"/>
<el-table-column
@ -61,18 +75,8 @@
width="200"
align="center"/>
<el-table-column
:label="$t('report.enterMoney')"
prop="enterMoney"
width="200"
align="center"/>
<el-table-column
:label="$t('report.diffQuantity')"
prop="diffQuantity"
width="200"
align="center"/>
<el-table-column
:label="$t('report.diffMoney')"
prop="diffMoney"
:label="$t('stockTrackList.deliveryDate')"
prop="deliveryDate"
width="200"
align="center"/>
</el-table>
@ -90,7 +94,7 @@ import waves from '@/directive/waves' // Waves directive
import Pagination from '@/components/Pagination'
import permission from '@/directive/permission/index.js' // 权限判断指令
import permission2 from '@/directive/permission2/index.js' // 权限判断指令
import checkPermission from '@/utils/permission' // 权限判断函数
import checkPermission from '@/utils/permission' // 权限判断函数11
import MyEmp from './components/MyEmp'
import DetailList from './components/DetailList'
import MyDialog from './components/MyDialog'
@ -139,7 +143,6 @@ export default {
data() {
return {
tableHeight: 200,
first: '',
step1: '',
step2: '',
@ -286,16 +289,110 @@ export default {
updatecountry() {
this.getlist()
},
getSpanArr(data) {
this.spanArr = []
for (var i = 0; i < data.length; i++) {
if (i === 0) {
this.spanArr.push(1)
this.pos = 0
} else {
// 判断当前元素与上一个元素是否相同
if (data[i].orderId === data[i - 1].orderId) {
this.spanArr[this.pos] += 1
this.spanArr.push(0)
} else {
this.spanArr.push(1)
this.pos = i
}
}
}
console.log('this.spanArr=================', this.spanArr)
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
const _row = this.spanArr[rowIndex]
const _col = _row > 0 ? 1 : 0
if (columnIndex !== 2 && columnIndex !== 3 && columnIndex !== 4 && columnIndex !== 5 && columnIndex !== 6 && columnIndex !== 7 && columnIndex !== 8) {
return {
rowspan: _row,
colspan: _col
}
}
},
getlist() {
// 物料需求计划列表数据
this.listLoading = true
orderImplDetail(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
for (let i = 0; i < this.list.length; i++) {
this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
const list = res.data.data.content.list
for (let i = 0; i < list.length; i++) {
list[i].heji = list[i].totalMoney + list[i].taxMoney
}
// this.total = res.data.data.content.totalCount
const needlist = list
const newarr = list.map(item => {
return item.stockOrderDetailVos
})
const newarr2 = [].concat.apply([], newarr)
const processarr = this._.cloneDeep(newarr2)
for (const i in needlist) {
for (const j in processarr) {
if (needlist[i].id === processarr[j].orderId) {
processarr[j].id = needlist[i].id
processarr[j].allDiscountMoney = needlist[i].allDiscountMoney
processarr[j].allIncludeTaxDiscountMoney = needlist[i].allIncludeTaxDiscountMoney
processarr[j].allIncludeTaxMoney = needlist[i].allIncludeTaxMoney
processarr[j].allMoney = needlist[i].allMoney
processarr[j].allQuantity = needlist[i].allQuantity
processarr[j].allTaxMoney = needlist[i].allTaxMoney
processarr[j].approvalUseVos = needlist[i].approvalUseVos
processarr[j].arrivalDate = needlist[i].arrivalDate
processarr[j].countryId = needlist[i].countryId
processarr[j].countryName = needlist[i].countryName
processarr[j].createDate = needlist[i].createDate
processarr[j].createPersonId = needlist[i].createPersonId
processarr[j].createPersonName = needlist[i].createPersonName
processarr[j].currency = needlist[i].currency
processarr[j].deliveryMode = needlist[i].deliveryMode
processarr[j].deliveryModeName = needlist[i].deliveryModeName
processarr[j].deptId = needlist[i].deptId
processarr[j].deptName = needlist[i].deptName
processarr[j].endDate = needlist[i].endDate
processarr[j].endPersonId = needlist[i].endPersonId
processarr[j].endPersonName = needlist[i].endPersonName
processarr[j].isVat = needlist[i].isVat
processarr[j].judgeDate = needlist[i].judgeDate
processarr[j].judgePersonId = needlist[i].judgePersonId
processarr[j].judgePersonName = needlist[i].judgePersonName
processarr[j].judgeStat = needlist[i].judgeStat
processarr[j].modifyDate = needlist[i].modifyDate
processarr[j].modifyPersonId = needlist[i].modifyPersonId
processarr[j].modifyPersonName = needlist[i].modifyPersonName
processarr[j].orderDate = needlist[i].orderDate
processarr[j].orderNumber = needlist[i].orderNumber
processarr[j].otherMoney = needlist[i].otherMoney
processarr[j].payMode = needlist[i].payMode
processarr[j].payModeName = needlist[i].payModeName
processarr[j].receiptStat = needlist[i].receiptStat
processarr[j].settleMode = needlist[i].settleMode
processarr[j].settleModeName = needlist[i].settleModeName
processarr[j].signPersonId = needlist[i].signPersonId
processarr[j].signPersonName = needlist[i].signPersonName
processarr[j].sourceType = needlist[i].sourceType
processarr[j].stockPersonId = needlist[i].stockPersonId
processarr[j].stockPersonName = needlist[i].stockPersonName
processarr[j].stockRepositoryId = needlist[i].stockRepositoryId
processarr[j].stockRepositoryName = needlist[i].stockRepositoryName
processarr[j].stockType = needlist[i].stockType
processarr[j].stockTypeId = needlist[i].stockTypeId
processarr[j].supplierId = needlist[i].supplierId
processarr[j].supplierName = needlist[i].supplierName
processarr[j].supplierNumber = needlist[i].supplierNumber
processarr[j].title = needlist[i].title
// processarr[j].stockOrderDetailVos = needlist[i].stockOrderDetailVos
}
}
}
this.list = processarr
this.getSpanArr(processarr)
}
setTimeout(() => {
this.listLoading = false
@ -327,18 +424,19 @@ export default {
this.getemplist.beginTime = this.date[0]
this.getemplist.endTime = this.date[1]
}
orderImplDetail(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
for (let i = 0; i < this.list.length; i++) {
this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
}
// this.total = res.data.data.content.totalCount
// this.restFilter()
} else {
// this.restFilter()
}
})
this.getlist()
// orderImplDetail(this.getemplist).then(res => {
// if (res.data.ret === 200) {
// this.list = res.data.data.content.list
// for (let i = 0; i < this.list.length; i++) {
// this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
// }
// // this.total = res.data.data.content.totalCount
// // this.restFilter()
// } else {
// // this.restFilter()
// }
// })
},
// 采购人focus事件
handlechooseStock() {

2
src/views/StockCount/orderReport.vue
View file

@ -385,7 +385,7 @@ export default {
this.getlist()
}
},
// 详情操作
// 详情操作111
handleDetail(row) {
console.log('row', row)
const param = {}

44
src/views/StockCount/purchaseCount.vue
View file

@ -6,7 +6,10 @@
<el-input v-model="supplierId" :placeholder="$t('StockContract.supplierId')" size="small" class="filter-item" @focus="handlechoose" @clear="restFilter"/>
<my-supplier :control.sync="empcontrol" @supplierName="supplierName"/>
<el-select v-model="getemplist.type" :value="getemplist.type" :placeholder="$t('stockOrderCount.type')" size="small" class="filter-item" @keyup.enter.native="handleFilter" @change="changeName">
<el-option value="1" label="供应商类别分组"/>
<el-option value="2" label="供应商+物品名称分组"/>
</el-select>
<el-date-picker
v-model="date"
type="daterange"
@ -21,7 +24,7 @@
</el-card>
<el-card :body-style=" { padding: '10px' }" class="box-card" shadow="never">
<!-- 列表开始 -->
<!-- 列表开始1 -->
<el-table
ref="table"
:height="tableHeight"
@ -30,10 +33,27 @@
border
style="width: 100%"
@row-click="clickRow">
<el-table-column
<!-- <el-table-column
:label="$t('report.supplierName')"
prop="supplierName"
width="200"
align="center"/> -->
<el-table-column :label="$t('report.supplierName')" :resizable="false" align="center" min-width="200">
<template slot-scope="scope">
<span class="link-type" @click="handleDetail(scope.row)">{{ scope.row.supplierName }}</span>
</template>
</el-table-column>
<el-table-column
v-if="second"
label="物品名称"
prop="productName"
width="300"
align="center"/>
<el-table-column
v-if="second"
label="物品编码"
prop="productCode"
width="300"
align="center"/>
<el-table-column
:label="$t('report.orderQuantity')"
@ -139,7 +159,7 @@ export default {
data() {
return {
tableHeight: 200,
second: false,
first: '',
step1: '',
step2: '',
@ -243,12 +263,7 @@ export default {
}
if (this.getemplist.type === '2') {
this.first = '经办人名称'
}
if (this.getemplist.type === '3') {
this.first = '品牌名称'
}
if (this.getemplist.type === '4') {
this.first = '种类名称'
this.second = true
}
this.getlist()
},
@ -381,8 +396,13 @@ export default {
// 详情操作
handleDetail(row) {
console.log(row)
this.detailvisible = true
this.personalForm = Object.assign({}, row)
const query_params = {
id: row.supplierId,
name: row.supplierName,
beginTime: this.date[0] || '',
endTime: this.date[1] || ''
}
this.$router.push({ path: '/StockOrder/StockOrderList', query: { arry: query_params }})
},
// 判断审核按钮
isReview(row) {

16
src/views/StockCount/stockOrderCount.vue
View file

@ -35,11 +35,16 @@
prop="id"
width="200"
align="center"/>
<el-table-column
<!-- <el-table-column
:label="first"
prop="name"
width="300"
align="center"/>
align="center"/> -->
<el-table-column :label="first" :resizable="false" align="center" min-width="300">
<template slot-scope="scope">
<span class="link-type" @click="handleDetail(scope.row)">{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('stockOrderCount.order')" align="center">
<el-table-column
:label="$t('stockOrderCount.orderQuantity')"
@ -377,8 +382,11 @@ export default {
// 详情操作
handleDetail(row) {
console.log(row)
this.detailvisible = true
this.personalForm = Object.assign({}, row)
const query_params = {
id: row.id,
name: row.name
}
this.$router.push({ path: '/StockOrder/StockOrderList', query: { arry: query_params }})
},
// 判断审核按钮
isReview(row) {

18
src/views/StockCount/stockOrderExecute.vue
View file

@ -49,12 +49,17 @@
prop="name"
width="300"
align="center"/>
<el-table-column
<!-- <el-table-column
v-if="second"
label="物品名称"
prop="productName"
width="300"
align="center"/>
align="center"/> -->
<el-table-column v-if="second" :resizable="false" label="物品名称" align="center" min-width="300">
<template slot-scope="scope">
<span class="link-type" @click="handleDetail(scope.row)">{{ scope.row.productName }}</span>
</template>
</el-table-column>
<el-table-column
v-if="second"
label="物品编码"
@ -477,8 +482,13 @@ export default {
// 详情操作
handleDetail(row) {
console.log(row)
this.detailvisible = true
this.personalForm = Object.assign({}, row)
const query_params = {
id: row.supplierId,
name: row.name,
beginTime: this.date[0] || '',
endTime: this.date[1] || ''
}
this.$router.push({ path: '/StockOrder/StockOrderList', query: { arry: query_params }})
},
// 判断审核按钮
isReview(row) {

222
src/views/StockCount/stockOrderlist.vue
View file

@ -26,6 +26,7 @@
ref="table"
:height="tableHeight"
:data="list"
:span-method="arraySpanMethod"
size="small"
border
style="width: 100%"
@ -33,54 +34,71 @@
<el-table-column
:label="$t('report.supplierName')"
prop="supplierName"
fixed="left"
width="200"
align="center"/>
<el-table-column
:label="$t('report.productName')"
:label="$t('public.id')"
prop="orderNumber"
fixed="left"
width="200"
align="center"/>
<el-table-column
:label="$t('report2.productCode')"
fixed="left"
prop="productCode"
width="200"
align="center"/>
<el-table-column
:label="$t('StockArrival.presentdata')"
fixed="left"
prop="productName"
width="200"
min-width="200"
align="center"/>
<el-table-column
:label="$t('report.productType')"
prop="productType"
width="200"
:label="$t('updates.ys')"
prop="color"
width="75"
align="center"/>
<el-table-column
:label="$t('report.unit')"
:label="$t('Hmodule.dw')"
prop="unit"
width="200"
align="center"/>
<el-table-column :label="$t('stockOrderCount.order')" align="center">
<el-table-column
:label="$t('stockOrderCount.orderQuantity')"
prop="orderQuantity"
width="200"
align="center"/>
<el-table-column
:label="$t('stockOrderCount.totalMoney')"
prop="totalMoney"
width="200"
align="center"/>
<el-table-column
:label="$t('stockOrderCount.taxMoney')"
prop="taxMoney"
width="200"
align="center"/>
<el-table-column
:label="$t('stockOrderCount.heji')"
prop="heji"
width="200"
align="center"/>
</el-table-column>
<el-table-column
:label="$t('stockOrderCount.arrivedQuantity')"
prop="arrivedQuantity"
width="200"
width="75"
align="center"/>
<el-table-column
:label="$t('stockOrderCount.notArrivedQuantity')"
prop="notArrivedQuantity"
width="200"
:label="$t('stockOrderCount.orderQuantity')"
prop="stockQuantity"
width="75"
align="center"/>
<el-table-column
:label="$t('发票数量')"
prop="invoiceQuantity"
width="75"
align="center"/>
<el-table-column
:label="$t('发票单位')"
prop="invoiceUnit"
width="75"
align="center"/>
<el-table-column
:label="$t('发票不含税单价')"
prop="invoicePrice"
width="75"
align="center"/>
<el-table-column
:label="$t('发票不含税金额')"
prop="invoiceMoney"
width="75"
align="center"/>
<el-table-column
:label="$t('发票含税单价')"
prop="invoiceIncludeTaxPrice"
width="75"
align="center"/>
<el-table-column
:label="$t('发票含税金额')"
prop="invoiceIncludeTaxMoney"
width="75"
align="center"/>
</el-table>
<!-- 列表结束 -->
@ -90,7 +108,7 @@
</template>
<script>
import { stockDetailCount } from '@/api/count'
import { stockOrderlist } from '@/api/count'
import { searchStockCategory } from '@/api/StockCategory'
import MyRepository from './components/MyRepository'
import waves from '@/directive/waves' // Waves directive
@ -293,16 +311,110 @@ export default {
updatecountry() {
this.getlist()
},
getSpanArr(data) {
this.spanArr = []
for (var i = 0; i < data.length; i++) {
if (i === 0) {
this.spanArr.push(1)
this.pos = 0
} else {
// 判断当前元素与上一个元素是否相同
if (data[i].orderId === data[i - 1].orderId) {
this.spanArr[this.pos] += 1
this.spanArr.push(0)
} else {
this.spanArr.push(1)
this.pos = i
}
}
}
console.log('this.spanArr=================', this.spanArr)
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
const _row = this.spanArr[rowIndex]
const _col = _row > 0 ? 1 : 0
if (columnIndex !== 2 && columnIndex !== 3 && columnIndex !== 4 && columnIndex !== 5 && columnIndex !== 6 && columnIndex !== 7 && columnIndex !== 8 && columnIndex !== 9 && columnIndex !== 10 && columnIndex !== 11 && columnIndex !== 12) {
return {
rowspan: _row,
colspan: _col
}
}
},
getlist() {
// 物料需求计划列表数据
this.listLoading = true
stockDetailCount(this.getemplist).then(res => {
stockOrderlist(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
for (let i = 0; i < this.list.length; i++) {
this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
const list = res.data.data.content.list
for (let i = 0; i < list.length; i++) {
list[i].heji = list[i].totalMoney + list[i].taxMoney
}
this.total = res.data.data.content.totalCount
const needlist = list
const newarr = list.map(item => {
return item.stockOrderDetailVos
})
const newarr2 = [].concat.apply([], newarr)
const processarr = this._.cloneDeep(newarr2)
for (const i in needlist) {
for (const j in processarr) {
if (needlist[i].id === processarr[j].orderId) {
processarr[j].id = needlist[i].id
processarr[j].allDiscountMoney = needlist[i].allDiscountMoney
processarr[j].allIncludeTaxDiscountMoney = needlist[i].allIncludeTaxDiscountMoney
processarr[j].allIncludeTaxMoney = needlist[i].allIncludeTaxMoney
processarr[j].allMoney = needlist[i].allMoney
processarr[j].allQuantity = needlist[i].allQuantity
processarr[j].allTaxMoney = needlist[i].allTaxMoney
processarr[j].approvalUseVos = needlist[i].approvalUseVos
processarr[j].arrivalDate = needlist[i].arrivalDate
processarr[j].countryId = needlist[i].countryId
processarr[j].countryName = needlist[i].countryName
processarr[j].createDate = needlist[i].createDate
processarr[j].createPersonId = needlist[i].createPersonId
processarr[j].createPersonName = needlist[i].createPersonName
processarr[j].currency = needlist[i].currency
processarr[j].deliveryMode = needlist[i].deliveryMode
processarr[j].deliveryModeName = needlist[i].deliveryModeName
processarr[j].deptId = needlist[i].deptId
processarr[j].deptName = needlist[i].deptName
processarr[j].endDate = needlist[i].endDate
processarr[j].endPersonId = needlist[i].endPersonId
processarr[j].endPersonName = needlist[i].endPersonName
processarr[j].isVat = needlist[i].isVat
processarr[j].judgeDate = needlist[i].judgeDate
processarr[j].judgePersonId = needlist[i].judgePersonId
processarr[j].judgePersonName = needlist[i].judgePersonName
processarr[j].judgeStat = needlist[i].judgeStat
processarr[j].modifyDate = needlist[i].modifyDate
processarr[j].modifyPersonId = needlist[i].modifyPersonId
processarr[j].modifyPersonName = needlist[i].modifyPersonName
processarr[j].orderDate = needlist[i].orderDate
processarr[j].orderNumber = needlist[i].orderNumber
processarr[j].otherMoney = needlist[i].otherMoney
processarr[j].payMode = needlist[i].payMode
processarr[j].payModeName = needlist[i].payModeName
processarr[j].receiptStat = needlist[i].receiptStat
processarr[j].settleMode = needlist[i].settleMode
processarr[j].settleModeName = needlist[i].settleModeName
processarr[j].signPersonId = needlist[i].signPersonId
processarr[j].signPersonName = needlist[i].signPersonName
processarr[j].sourceType = needlist[i].sourceType
processarr[j].stockPersonId = needlist[i].stockPersonId
processarr[j].stockPersonName = needlist[i].stockPersonName
processarr[j].stockRepositoryId = needlist[i].stockRepositoryId
processarr[j].stockRepositoryName = needlist[i].stockRepositoryName
processarr[j].stockType = needlist[i].stockType
processarr[j].stockTypeId = needlist[i].stockTypeId
processarr[j].supplierId = needlist[i].supplierId
processarr[j].supplierName = needlist[i].supplierName
processarr[j].supplierNumber = needlist[i].supplierNumber
processarr[j].title = needlist[i].title
// processarr[j].stockOrderDetailVos = needlist[i].stockOrderDetailVos
}
}
}
this.list = processarr
this.getSpanArr(processarr)
}
setTimeout(() => {
this.listLoading = false
@ -334,18 +446,18 @@ export default {
this.getemplist.beginTime = this.date[0]
this.getemplist.endTime = this.date[1]
}
stockDetailCount(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
for (let i = 0; i < this.list.length; i++) {
this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
}
this.total = res.data.data.content.totalCount
// this.restFilter()
} else {
// this.restFilter()
}
})
// stockOrderlist(this.getemplist).then(res => {
// if (res.data.ret === 200) {
// this.list = res.data.data.content.list
// for (let i = 0; i < this.list.length; i++) {
// this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
// }
// this.total = res.data.data.content.totalCount
// // this.restFilter()
// } else {
// // this.restFilter()
// }
// })
},
// 采购人focus事件
handlechooseStock() {

4
src/views/StockInquiry/StockInquiryList.vue
View file

@ -156,12 +156,12 @@
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission="['104-110-42']" v-show="scope.row.judgeStat === 0" title="再次询价" type="primary" size="mini" icon="el-icon-d-arrow-right" circle @click="handleEdit2(scope.row)"/>
<el-button v-permission2="['104-110-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-110-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['104-110-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['104-110-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['104-110-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['104-110-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-110-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

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

@ -131,7 +131,7 @@
</el-form>
</div>
</el-card>
<!--子件信息123-->
<!--子件信息1234-->
<el-card :body-style=" { padding: '5px' }" class="box-card" shadow="never" style="margin-top: 5px">
<div ref="fuzhu" class="form-name" >{{ $t('updates.cgfpmx') }}</div>
<div class="buttons" style="margin-top: 35px;margin-bottom: 10px;">
@ -192,7 +192,7 @@
<el-input-number
:precision="6"
v-model="scope.row.taxRate"
@input="gettaxRate(scope.row)"/>
@input="gettaxRate(scope.row, scope)"/>
</template>
</el-editable-column>
<el-editable-column :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
@ -645,6 +645,19 @@ export default {
},
// 通过折扣计算折扣额
getdiscountRate(row, scope) {
if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
if (row.discountRate !== '' && row.discountRate !== null && row.discountRate !== undefined) {
for (let i = 0; i < this.list2.length; i++) {
this.list2[i].temp = i
}
for (let i = row.temp; i < this.list2.length; i++) {
console.log('需求值=========', this.list2[i].discountRate)
console.log(222)
this.list2[i].discountRate = row.discountRate
}
console.log(row)
}
}
console.log('执行了')
if (row.discountRate === 0) {
row.discountMoney = 0
@ -672,7 +685,20 @@ export default {
}
},
// 通过税率计算含税价
gettaxRate(row) {
gettaxRate(row, scope) {
if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
if (row.taxRate !== '' && row.taxRate !== null && row.taxRate !== undefined) {
for (let i = 0; i < this.list2.length; i++) {
this.list2[i].temp = i
}
for (let i = row.temp; i < this.list2.length; i++) {
console.log('需求值=========', this.list2[i].taxRate)
console.log(222)
this.list2[i].taxRate = row.taxRate
}
console.log(row)
}
}
if (row.includeTaxPrice !== 0) {
row.includeTaxPrice = (row.price * (1 + row.taxRate / 100)).toFixed(6)
}

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

@ -108,12 +108,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="300px">
<template slot-scope="scope">
<el-button v-permission2="['266-257-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['266-257-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['266-257-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<!-- <el-button v-permission="['266-257-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>-->
<!-- <el-button v-permission="['266-257-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>-->
<el-button v-permission2="['266-257-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['266-257-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-show="scope.row.judgeStat === 2 && scope.row.isRed === 1" type="primary" style="width: 125px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成红字采购发票</span></el-button>
<el-button v-show="scope.row.judgeStat === 2" type="primary" style="width: 90px" @click="handleMyReceipt2(scope.row)"><span style="margin-left: -15px;">生成付款单</span></el-button>
</template>

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

@ -187,7 +187,7 @@
<el-input-number
:precision="6"
v-model="scope.row.taxRate"
@input="gettaxRate(scope.row)"/>
@input="gettaxRate(scope.row, scope)"/>
</template>
</el-editable-column>
<el-editable-column :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
@ -210,7 +210,7 @@
<el-input-number
:precision="6"
v-model="scope.row.discountRate"
@change="getdiscountRate(scope.row)"/>
@change="getdiscountRate(scope.row, scope)"/>
</template>
</el-editable-column>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
@ -627,7 +627,20 @@ export default {
}
},
// 通过折扣计算折扣额
getdiscountRate(row) {
getdiscountRate(row, scope) {
if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
if (row.discountRate !== '' && row.discountRate !== null && row.discountRate !== undefined) {
for (let i = 0; i < this.list2.length; i++) {
this.list2[i].temp = i
}
for (let i = row.temp; i < this.list2.length; i++) {
console.log('需求值=========', this.list2[i].discountRate)
console.log(222)
this.list2[i].discountRate = row.discountRate
}
console.log(row)
}
}
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
@ -635,7 +648,20 @@ export default {
}
},
// 通过税率计算含税价
gettaxRate(row) {
gettaxRate(row, scope) {
if (row !== '' && row !== null && row !== undefined && scope.$index === 0) {
if (row.taxRate !== '' && row.taxRate !== null && row.taxRate !== undefined) {
for (let i = 0; i < this.list2.length; i++) {
this.list2[i].temp = i
}
for (let i = row.temp; i < this.list2.length; i++) {
console.log('需求值=========', this.list2[i].taxRate)
console.log(222)
this.list2[i].taxRate = row.taxRate
}
console.log(row)
}
}
if (row.includeTaxPrice !== 0) {
row.includeTaxPrice = (row.price * (1 + row.taxRate / 100)).toFixed(6)
}

36
src/views/StockOrder/StockOrderList.vue
View file

@ -141,12 +141,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="270">
<template slot-scope="scope">
<el-button v-permission2="['104-114-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-114-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['104-114-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['104-114-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['104-114-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['104-114-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-114-2', scope.row.createPersonId]" scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button :title="$t('updates.jc')" size="mini" type="primary" icon="el-icon-sort" circle @click="handleReceipt(scope.row)"/>
<el-button v-permission="['104-114-44']" v-show="scope.row.judgeStat === 2" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成预付款单</span></el-button>
</template>
@ -259,12 +259,12 @@
</el-table-column> -->
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="270">
<template slot-scope="scope">
<el-button v-permission2="['104-114-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-114-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['104-114-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['104-114-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['104-114-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['104-114-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-114-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button :title="$t('updates.jc')" size="mini" type="primary" icon="el-icon-sort" circle @click="handleReceipt(scope.row)"/>
<el-button v-permission="['104-114-44']" v-show="scope.row.judgeStat === 2" type="primary" style="width: 107px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -15px;">生成预付款单</span></el-button>
</template>
@ -410,10 +410,24 @@ export default {
// 修改控制组件数据
editVisible: false,
// 开始时间到结束时间
date: []
date: [],
// 查询参数
countquery: ''
}
},
activated() {
this.countquery = this.$route.query.arry
if (this.countquery) {
console.log('this.countquery====', this.countquery)
this.getemplist.supplierId = this.countquery.id
this.supplierId = this.countquery.name
if (this.countquery.beginTime !== '') {
this.getemplist.beginTime = this.countquery.beginTime
}
if (this.countquery.beginTime !== '') {
this.getemplist.endTime = this.countquery.endTime
}
}
this.getlist()
setTimeout(() => {
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
@ -421,6 +435,18 @@ export default {
},
mounted() {
this.getinformation()
this.countquery = this.$route.query.arry
if (this.countquery) {
console.log('this.countquery====', this.countquery)
this.getemplist.supplierId = this.countquery.id
this.supplierId = this.countquery.name
if (this.countquery.beginTime !== '') {
this.getemplist.beginTime = this.countquery.beginTime
}
if (this.countquery.beginTime !== '') {
this.getemplist.endTime = this.countquery.endTime
}
}
this.getlist()
setTimeout(() => {
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140

4
src/views/StockPlan/StockPlanList.vue
View file

@ -157,12 +157,12 @@
</el-table-column> -->
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['104-108-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-108-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['104-108-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['104-108-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['104-108-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['104-108-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-108-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button :title="$t('updates.jc')" size="mini" type="primary" icon="el-icon-sort" circle @click="handleReceipt(scope.row)"/>
</template>
</el-table-column>

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

@ -125,12 +125,12 @@
</el-table-column> -->
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['104-118-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['104-118-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['104-118-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['104-118-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['104-118-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['104-118-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['104-118-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

145
src/views/Stockenter/addstockenter.vue
View file

@ -31,7 +31,7 @@
<el-form-item label="源单编号" prop="sourceNumber" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="personalForm.sourceNumber" style="width: 200px" @focus="handleAddSouce"/>
</el-form-item>
<my-arrival :arrivalcontrol.sync="arrivalcontrol" @arrival="arrival" @allarrivalinfo="allarrivalinfo"/>
<my-arrival :arrivalcontrol.sync="arrivalcontrol" :repositoryid="personalForm" @arrival="arrival" @allarrivalinfo="allarrivalinfo"/>
<my-order :ordercontrol.sync="ordercontrol" :supp.sync="supp" @order="order" @allOrderinfo="allOrderinfo"/>
</el-col>
<el-col :span="6">
@ -114,6 +114,8 @@
:data.sync="list2"
:edit-config="{ showIcon: true, showStatus: true}"
:edit-rules="validRules"
:summary-method="getSummaries"
show-summary
class="click-table1"
stripe
border
@ -152,12 +154,36 @@
<el-editable-column :edit-render="{name: 'ElInputNumber', type: 'visible', attrs: {min: 0.00, precision: 6, controls:false}}" :label="$t('updates.rksl')" prop="actualEnterQuantity" align="center" width="150px"/>
<el-editable-column :label="$t('updates.rkdj')" prop="enterPrice" align="center" width="150px"/>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" width="150px"/>
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ getdiscountMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.rkje')" prop="enterMoney" align="center" width="150px">
<template slot-scope="scope">
<p>{{ getSize(scope, scope.row.actualEnterQuantity, scope.row.enterPrice) }}</p>
</template>
</el-editable-column>
<el-editable-column v-show="false" :label="$t('updates.rkje')" prop="id" align="center" width="150px">
<el-editable-column v-show="false" label="123" prop="id" align="center" width="150px">
<template slot-scope="scope">
<p>{{ getmylocation(scope) }}</p>
</template>
@ -182,12 +208,32 @@
<el-row>
<el-col :span="6">
<el-form-item :label="$t('Stockenter.heji')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="heji1" style="width: 200px" disabled/>
<el-input v-model="heji1" size="mini" style="width: 200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('Stockenter.heji2')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="heji2" style="width: 200px" disabled/>
<el-input v-model="heji2" size="mini" style="width: 200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('updates.sehj')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="allTaxMoney" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('updates.hsjehj')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="allIncludeTaxMoney" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('updates.zdzkjehj')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="allDiscountMoney" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('updates.zhhsjehj')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="allMoneyMoveDiscount" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
</el-row>
@ -196,7 +242,6 @@
</el-card>
<!--操作-->
<div class="buttons" style="position:fixed;bottom: 0;width: 100%;height: 40px; background: #fff;z-index: 99">
<el-button v-no-more-click type="primary" @click="handlesave()">{{ $t('Hmodule.baoc') }}</el-button>
<el-button type="danger" @click="handlecancel()">{{ $t('Hmodule.cancel') }}</el-button>
</div>
@ -393,7 +438,11 @@ export default {
receiptVisible2: false,
list111: [],
// 批量操作
moreaction: []
moreaction: [],
allTaxMoney: '',
allIncludeTaxMoney: '',
allDiscountMoney: '',
allMoneyMoveDiscount: ''
}
},
watch: {
@ -403,8 +452,8 @@ export default {
let num2 = 0
for (const i in this.list2) {
console.log(this.list2[i].actualEnterQuantity)
num += this.list2[i].actualEnterQuantity
num2 += this.list2[i].enterMoney
num += Number(this.list2[i].actualEnterQuantity)
num2 += Number(this.list2[i].enterMoney)
}
this.heji1 = num
this.heji2 = num2
@ -430,6 +479,72 @@ export default {
_that = this
},
methods: {
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '总计'
return
}
const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return (Number(prev) + Number(curr)).toFixed(6)
} else {
return (Number(prev)).toFixed(6)
}
}, 0)
sums[index] += ''
} else {
sums[index] = ''
}
})
sums[2] = ''
sums[3] = ''
sums[4] = ''
sums[5] = ''
sums[6] = ''
sums[7] = ''
sums[8] = ''
sums[11] = ''
sums[13] = ''
sums[17] = ''
sums[21] = ''
sums[22] = ''
sums[23] = ''
this.allTaxMoney = sums[16]
this.allIncludeTaxMoney = sums[15]
this.allDiscountMoney = sums[18]
this.allMoneyMoveDiscount = sums[15] - sums[18]
return sums
},
// 计算金额
getMoney(row) {
console.log(row.actualEnterQuantity, row.price)
row.money = (Number(row.actualEnterQuantity) * Number(row.price)).toFixed(6)
return row.money
},
// 计算含税金额
getTaxMoney(row) {
row.includeTaxMoney = (Number(row.actualEnterQuantity) * Number(row.includeTaxPrice)).toFixed(6)
return row.includeTaxMoney
},
getdiscountMoney(row) {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (Number(row.includeTaxPrice) * Number(row.actualEnterQuantity) * (Number(row.discountRate) / 100)).toFixed(6)
}
return row.discountMoney
},
// 计算税额
getTaxMoney2(row) {
row.taxMoney = (Number(row.price) * Number(row.taxRate) / 100 * Number(row.actualEnterQuantity)).toFixed(6)
return row.taxMoney
},
order(val) {
console.log('ssssss', val)
for (let i = 0; i < val.length; i++) {
@ -522,6 +637,15 @@ export default {
},
// 从源单中添加商品
handleAddSouce() {
console.log(this.enterRepositoryId)
if (this.enterRepositoryId === '' || this.enterRepositoryId === null || this.enterRepositoryId === undefined) {
this.$notify.error({
title: 'wrong',
message: '请选择入库仓库',
offset: 100
})
return false
}
if (this.personalForm.sourceType === '1') {
this.arrivalcontrol = true
} else {
@ -529,15 +653,13 @@ export default {
}
},
arrival(val) {
console.log('初始值==================', val)
this.$refs.editable.clear()
let qq = 1
for (let i = 0; i < val.length; i++) {
console.log(val[i].passQuantity)
if (val[i].actualEnterQuantity > 0) {
val[i].actualEnterQuantity = (val[i].arrivalQuantity - val[i].hadStorageQuantity).toFixed(6)
// val[i].actualEnterQuantity = (val[i].arrivalQuantity - val[i].hadStorageQuantity).toFixed(6)
// this.$refs.editable.insert(val[i])
console.log('val[i]==========', val[i])
delete val[i].stockArrivalDetailVos
this.list2.push(val[i])
this.$refs.editable.insert(val[i])
@ -864,6 +986,7 @@ export default {
return (quan * pric).toFixed(6)
},
getmylocation(scope) {
console.log(1231231231231)
if (scope.row.flag === undefined) {
scope.row.flag = true
} else {

66
src/views/Stockenter/components/DetailList.vue
View file

@ -122,6 +122,34 @@
</el-editable-column>
<el-editable-column :label="$t('updates.rkdj')" prop="enterPrice" align="center" />
<el-editable-column :label="$t('updates.slv')" prop="taxRate" align="center" />
<el-editable-column :label="$t('updates.hsj')" prop="includeTaxPrice" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<!-- <p>{{ getMoney(scope.row) }}</p> -->
<p>{{ scope.row.money }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ scope.row.includeTaxMoney }}</p>
<!-- <p>{{ getTaxMoney(scope.row) }}</p> -->
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ scope.row.taxMoney }}</p>
<!-- <p>{{ getTaxMoney2(scope.row) }}</p> -->
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ scope.row.discountMoney }}</p>
<!-- <p>{{ getdiscountMoney(scope.row) }}</p> -->
</template>
</el-editable-column>
<el-editable-column :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.rkje')" prop="enterMoney" align="center" >
<template slot-scope="scope">
<p>{{ getSize(scope.row.actualEnterQuantity, scope.row.enterPrice) }}</p>
@ -142,12 +170,32 @@
<el-row>
<el-col :span="6">
<el-form-item :label="$t('Stockenter.heji')" style="width: 100%;">
<el-input v-model="heji1" style="margin-left: 18px;width: 200px" disabled/>
<el-input v-model="heji1" size="mini" style="margin-left: 18px;width: 200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('Stockenter.heji2')" style="margin-left: 18px;width: 100%;margin-bottom: 0">
<el-input v-model="heji2" style="width: 200px" disabled/>
<el-input v-model="heji2" size="mini" style="width: 200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('updates.sehj')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="allTaxMoney" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('updates.hsjehj')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="allIncludeTaxMoney" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('updates.zdzkjehj')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="allDiscountMoney" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('updates.zhhsjehj')" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
<el-input v-model="allMoneyMoveDiscount" size="mini" style="margin-left: 18px;width:200px" disabled/>
</el-form-item>
</el-col>
</el-row>
@ -283,6 +331,10 @@ export default {
// 合计信息
heji1: '',
heji2: '',
allTaxMoney: '',
allIncludeTaxMoney: '',
allDiscountMoney: '',
allMoneyMoveDiscount: '',
// 审核步骤数据
reviewList: [],
// 弹窗组件的控制
@ -378,13 +430,23 @@ export default {
console.log('list2', this.list2)
let num = 0
let num2 = 0
let num3 = 0
let num4 = 0
let num5 = 0
for (const i in this.list2) {
console.log(this.list2[i].basicQuantity)
num += this.list2[i].basicQuantity
num2 += this.list2[i].enterMoney
num3 += this.list2[i].includeTaxMoney
num4 += this.list2[i].taxMoney
num5 += this.list2[i].discountMoney
}
this.heji1 = num
this.heji2 = num2
this.allTaxMoney = num3
this.allIncludeTaxMoney = num4
this.allDiscountMoney = num5
this.allMoneyMoveDiscount = num4 - num5
this.reviewList = []
const review = this.personalForm.approvalUseVos
for (const i in review) {

29
src/views/Stockenter/components/MyArrival.vue
View file

@ -168,7 +168,7 @@
</template>
<script>
import { searchstockArrival } from '@/api/StockArrival'
import { searchstockArrival2 } from '@/api/StockArrival'
import { getdeptlist } from '@/api/BasicSettings'
import { searchStockCategory } from '@/api/StockCategory'
import waves from '@/directive/waves' // Waves directive
@ -215,6 +215,10 @@ export default {
arrivalcontrol: {
type: Boolean,
default: false
},
repositoryid: {
type: Object,
default: () => {}
}
},
data() {
@ -282,8 +286,9 @@ export default {
watch: {
arrivalcontrol() {
this.employeeVisible = this.arrivalcontrol
this.getlist()
if (this.arrivalcontrol) {
this.getlist()
}
setTimeout(() => {
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 180
}, 100)
@ -300,7 +305,11 @@ export default {
getlist() {
// 物料需求计划列表数据
this.listLoading = true
searchstockArrival(this.getemplist).then(res => {
if (this.repositoryid) {
console.log('repositoryid', this.repositoryid)
this.getemplist.repositoryId = this.repositoryid.enterRepositoryId
}
searchstockArrival2(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
// 判断数组中产品过检数量 - 已入库数量是否小于0
@ -397,7 +406,7 @@ export default {
unit: item.unit,
color: item.color,
basicQuantity: (Number(item.arrivalQuantity) - Number(item.hadStorageQuantity)).toFixed(6),
actualEnterQuantity: (Number(item.arrivalQuantity) - Number(item.hadStorageQuantity)).toFixed(6),
actualEnterQuantity: (item.arrivalQuantity - item.hadStorageQuantity).toFixed(6),
enterPrice: item.includeTaxPrice,
taxRate: (item.taxRate).toFixed(6),
enterMoney: '0.00',
@ -406,8 +415,14 @@ export default {
passQuantity: item.qualifyQuantity,
orderNumber: item.sourceNumber,
sourceNumber: number,
arrivalQuantity: item.arrivalQuantity,
hadStorageQuantity: item.hadStorageQuantity
// arrivalQuantity: item.arrivalQuantity,
discountMoney: item.discountMoney,
discountRate: item.discountRate,
includeTaxMoney: item.includeTaxMoney,
includeTaxPrice: item.includeTaxPrice,
money: item.money,
price: item.price,
taxMoney: item.taxMoney
}
})
console.log('arrivalDetail', arrivalDetail)

48
src/views/Stockenter/components/MyDialog.vue
View file

@ -136,7 +136,29 @@
<el-editable-column :label="$t('updates.jbel')" prop="basicQuantity" align="center" width="150px"/>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 1}, type: 'visible'}" prop="actualEnterQuantity" align="center" label="实收数量" width="150px"/>
<el-editable-column :label="$t('updates.rkdj')" prop="enterPrice" align="center" width="150px"/>
<el-editable-column :edit-render="{name: 'ElInputNumber', attrs: {min: 0}, type: 'visible'}" :label="$t('updates.slv')" prop="taxRate" align="center" width="150px"/>
<el-editable-column :label="$t('updates.slv')" prop="taxRate" align="center" width="150px"/>
<el-editable-column :label="$t('Hmodule.je')" prop="money" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.hsje')" prop="includeTaxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.se')" prop="taxMoney" align="center" min-width="150px">
<template slot-scope="scope">
<p>{{ getTaxMoney2(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('updates.ckl')" prop="discountRate" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.cke')" prop="discountMoney" align="center" min-width="170px">
<template slot-scope="scope">
<p>{{ getdiscountMoney(scope.row) }}</p>
</template>
</el-editable-column>
<el-editable-column :label="$t('Hmodule.dj')" prop="price" align="center" min-width="170px"/>
<el-editable-column :label="$t('updates.rkje')" prop="enterMoney" align="center" width="150px">
<template slot-scope="scope">
<p>{{ getSize(scope.row.actualEnterQuantity, scope.row.enterPrice) }}</p>
@ -302,6 +324,30 @@ export default {
_that = this
},
methods: {
// 计算金额
getMoney(row) {
console.log(row.actualEnterQuantity, row.price)
row.money = (Number(row.actualEnterQuantity) * Number(row.price)).toFixed(6)
return row.money
},
// 计算含税金额
getTaxMoney(row) {
row.includeTaxMoney = (Number(row.actualEnterQuantity) * Number(row.includeTaxPrice)).toFixed(6)
return row.includeTaxMoney
},
getdiscountMoney(row) {
if (row.discountRate === 0) {
row.discountMoney = 0
} else {
row.discountMoney = (Number(row.includeTaxPrice) * Number(row.actualEnterQuantity) * (Number(row.discountRate) / 100)).toFixed(6)
}
return row.discountMoney
},
// 计算税额
getTaxMoney2(row) {
row.taxMoney = (Number(row.price) * Number(row.taxRate) / 100 * Number(row.actualEnterQuantity)).toFixed(6)
return row.taxMoney
},
order(val) {
console.log('ssssss', val)
for (let i = 0; i < val.length; i++) {

2
src/views/Supplier/SupplierList.vue
View file

@ -67,7 +67,7 @@
</el-dropdown>
<!-- 新建分组 -->
<el-button v-permission="['1-22-24-64']" v-waves size="small" class="filter-item2" type="primary" style="width: 100px" @click="handleGroup">{{ $t('Supplier.supplierGroup') }}</el-button>
<el-button v-waves size="small" class="filter-item2" type="primary" style="width: 100px" @click="handlePunish">{{ $t('updates.gyskh') }}</el-button>
<el-button v-waves size="small" class="filter-item2" type="primary" style="width: 100px" @click="handlePunish">{{ $t('updates.gyscf') }}</el-button>
<el-button v-waves size="small" class="filter-item2" type="primary" style="width: 100px" @click="handleModify">{{ $t('updates.sctjd') }}</el-button>
<my-punishment :punishcontrol.sync="punishcontrol" :punishdata="punishdata" @rest="refreshlist"/>
<el-dialog :visible.sync="GroupVisible" title="新建分组" class="normal" width="600px" center>

4
src/views/SupplierAdjust/SupplierAdjustList.vue
View file

@ -79,9 +79,9 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="270">
<template slot-scope="scope">
<el-button v-permission="['1-22-255-3']" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission="['1-22-255-3']" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['1-22-255-2']" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['1-22-255-2']" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

4
src/views/Transfer/TransferList.vue
View file

@ -142,9 +142,9 @@
<template slot-scope="scope">
<el-button v-show="scope.row.stat === 1 && isReview(scope.row)" title="确认" type="primary" size="mini" icon="el-icon-check" circle @click="handleReview1(scope.row)"/>
<el-button v-show="scope.row.stat === 2 && isReview(scope.row)" title="反确认" type="primary" size="mini" icon="el-icon-back" circle @click="handleReview2(scope.row)"/>
<el-button v-permission2="['266-94-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['266-94-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['266-94-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['266-94-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission="['266-94-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['266-373-1']" v-show="scope.row.judgeStat === 2&&scope.row.stat === 2" type="primary" style="width: 80px" @click="handleMyReceipt1(scope.row)"><span style="margin-left: -5px;">生成凭证</span></el-button>

4
src/views/Verification/VerificationList.vue
View file

@ -155,12 +155,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['200-365-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['200-365-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['200-365-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['200-365-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['200-365-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['200-365-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['200-365-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
</template>
</el-table-column>
</el-table>

4
src/views/income/IncomeList.vue
View file

@ -170,12 +170,12 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['266-90-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['266-90-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission="['266-90-76']" v-show="isReview4(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fsp')" type="warning" size="mini" circle @click="handleReview4(scope.row)"><svg-icon icon-class="fanhui"/></el-button>
<el-button v-permission="['266-90-16']" v-show="isReview2(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.jd')" type="success" size="mini" icon="el-icon-check" circle @click="handleReview2(scope.row)"/>
<el-button v-permission="['266-90-17']" v-show="isReview3(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.fjd')" type="success" size="mini" icon="el-icon-back" circle @click="handleReview3(scope.row)"/>
<el-button v-permission2="['266-90-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['266-90-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button title="查看附件" type="primary" size="mini" icon="el-icon-document" circle @click="check(scope.row)"/>
</template>
</el-table-column>

490
src/views/inventorycount2/InventorySluggishAnalysisTable.vue Normal file
View file

@ -0,0 +1,490 @@
<template>
<div class="ERP-container">
<el-card :body-style=" { padding: '5px' }" class="box-card" style="margin-top: 5px" shadow="never">
<el-input v-model="getemplist.productName" :placeholder="$t('Hmodule.wpmc')" size="small" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="supplierId" :placeholder="$t('StockContract.supplierId')" size="small" class="filter-item" @focus="handlechoose" @clear="restFilter"/>
<my-supplier :control.sync="empcontrol" @supplierName="supplierName"/>
<el-date-picker
v-model="date"
type="daterange"
range-separator="-"
unlink-panels
size="small"
value-format="yyyy-MM-dd"
style="width: 250px"/>
<el-button v-waves size="small" class="filter-item" type="primary" icon="el-icon-search" style="width: 86px;margin-top: 10px" round @click="handleFilter">{{ $t('public.search') }}</el-button>
</el-card>
<el-card :body-style=" { padding: '10px' }" class="box-card" shadow="never">
<!-- 列表开始 -->
<el-table
ref="table"
:height="tableHeight"
:data="list"
size="small"
border
style="width: 100%"
@row-click="clickRow">
<el-table-column
:label="$t('stockDetailCount.productCode')"
prop="productCode"
width="200"
align="center"/>
<el-table-column
:label="$t('stockDetailCount.productName')"
prop="productName"
width="200"
align="center"/>
<el-table-column
:label="$t('stockDetailCount.productType')"
prop="productType"
width="200"
align="center"/>
<el-table-column
:label="$t('stockDetailCount.unit')"
prop="unit"
width="200"
align="center"/>
<el-table-column :label="$t('stockOrderCount.order')" align="center">
<el-table-column
:label="$t('stockOrderCount.orderQuantity')"
prop="orderQuantity"
width="200"
align="center"/>
<el-table-column
:label="$t('stockOrderCount.totalMoney')"
prop="totalMoney"
width="200"
align="center"/>
<el-table-column
:label="$t('stockOrderCount.taxMoney')"
prop="taxMoney"
width="200"
align="center"/>
<el-table-column
:label="$t('stockOrderCount.heji')"
prop="heji"
width="200"
align="center"/>
</el-table-column>
<el-table-column
:label="$t('stockOrderCount.arrivedQuantity')"
prop="arrivedQuantity"
width="200"
align="center"/>
<el-table-column
:label="$t('stockOrderCount.notArrivedQuantity')"
prop="notArrivedQuantity"
width="200"
align="center"/>
</el-table>
<!-- 列表结束 -->
<pagination v-show="total>0" :total="total" :page.sync="getemplist.pageNum" :limit.sync="getemplist.pageSize" @pagination="getlist" />
</el-card>
</div>
</template>
<script>
import { stockDetailCount } from '@/api/count'
import { searchStockCategory } from '@/api/StockCategory'
import MyRepository from './components/MyRepository'
import waves from '@/directive/waves' // Waves directive
import Pagination from '@/components/Pagination'
import permission from '@/directive/permission/index.js' // 权限判断指令
import permission2 from '@/directive/permission2/index.js' // 权限判断指令
import checkPermission from '@/utils/permission' // 权限判断函数
import MyEmp from './components/MyEmp'
import DetailList from './components/DetailList'
import MyDialog from './components/MyDialog'
import MyCustomer from './components/MyCustomer'
import MyAgent from './components/MyAgent'
import MySupplier from './components/MySupplier'
var _that
export default {
name: 'InventorySluggishAnalysisTable',
directives: { waves, permission, permission2 },
components: { MyDialog, DetailList, MyEmp, MyCustomer, MySupplier, MyAgent, MyRepository, Pagination },
filters: {
judgeStatFilter(status) {
const statusMap = {
0: _that.$t('updates.wsh'),
1: _that.$t('updates.shz'),
2: _that.$t('Hmodule.shtg'),
3: _that.$t('Hmodule.shbtg')
}
return statusMap[status]
},
receiptStatFilter(status) {
const statusMap = {
1: _that.$t('updates.zd'),
2: _that.$t('updates.zx'),
3: _that.$t('updates.jd')
}
return statusMap[status]
},
stockTypeFilter(status) {
const statusMap = {
1: '采购1'
}
return statusMap[status]
},
sendTypeFilter(status) {
const statusMap = {
1: '未发货',
2: '发货中',
3: '已发货'
}
return statusMap[status]
}
},
data() {
return {
tableHeight: 200,
first: '',
step1: '',
step2: '',
step3: '',
step4: '',
step5: '',
step6: '',
step7: '',
step8: '',
receiptVisible: false,
// 回显客户
customerName: '',
// 控制客户
customercontrol: false,
agentcontrol: false,
// 类别获取参数
typeparms: {
pagenum: 1,
pagesize: 99999
},
// 采购类别数据
types: [],
// 申请部门数据
depts: [],
// 审核传参
reviewParms: {
id: '',
judgePersonId: '',
judgeStat: ''
},
// 详情组件数据
detailvisible: false,
// 更多搜索条件问题
visible2: false,
// 供应商回显
supplierId: '',
// 供应商控制框
empcontrol: false,
// 采购人回显
stockPersonId: '',
// 采购人控制框
stockControl: false,
// 批量操作
moreaction: '',
// 加载操作控制
downloadLoading: false,
// 表格数据
list: [],
// 表格数据条数
total: 0,
// 表格识别
tableKey: 0,
// 加载表格
listLoading: true,
// 采购申请查询加展示参数
getemplist: {
pageNum: 1,
pageSize: 10,
repositoryId: this.$store.getters.repositoryId,
regionIds: this.$store.getters.regionIds,
type: '1'
},
// 传给组件的数据
personalForm: {},
// 修改控制组件数据
editVisible: false,
// 开始时间到结束时间
date: []
}
},
activated() {
this.getlist()
setTimeout(() => {
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
}, 100)
},
mounted() {
this.getlist()
this.changeName()
setTimeout(() => {
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
}, 100)
},
beforeCreate() {
_that = this
},
methods: {
clickRow(val) {
if (val.judgeStat === 0) {
this.$refs.table.toggleRowSelection(val)
}
},
supplierName(val) {
console.log(val)
this.supplierId = val.supplierName
this.getemplist.supplierId = val.id
},
changeName() {
if (this.getemplist.type === '1') {
this.first = '供应商名称'
}
if (this.getemplist.type === '2') {
this.first = '经办人名称'
}
if (this.getemplist.type === '3') {
this.first = '品牌名称'
}
if (this.getemplist.type === '4') {
this.first = '种类名称'
}
this.getlist()
},
checkPermission,
// 不让勾选
selectInit(row, index) {
if (row.judgeStat !== 0) {
return false
} else {
return true
}
},
// 选择客户类型时清理客户名称
clearCustomer() {
this.getemplist.customerId = ''
this.customerName = ''
},
// 选择客户focus
chooseCustomer() {
if (this.getemplist.customerType === '1') {
this.agentcontrol = true
} else if (this.getemplist.customerType === '2') {
this.customercontrol = true
}
},
customerdata(val) {
this.getemplist.customerId = val.id
this.customerName = val.customerName
},
agentdata(val) {
this.getemplist.customerId = val.id
this.customerName = val.agentName
},
// 更新采购类型
updatecountry() {
this.getlist()
},
getlist() {
// 物料需求计划列表数据
this.listLoading = true
stockDetailCount(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
for (let i = 0; i < this.list.length; i++) {
this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
}
this.total = res.data.data.content.totalCount
}
setTimeout(() => {
this.listLoading = false
}, 0.5 * 100)
})
// 采购类别数据
searchStockCategory(this.typeparms).then(res => {
if (res.data.ret === 200) {
this.types = res.data.data.content.list
}
})
},
// 清空搜索条件
restFilter() {
this.supplierId = ''
this.getemplist.supplierId = ''
},
restFilter2() {
this.stockPersonId = ''
this.getemplist.stockPersonId = ''
},
// 搜索
handleFilter() {
this.getemplist.pageNum = 1
if (this.date === null || this.date === undefined || this.date === '') {
this.getemplist.beginTime = ''
this.getemplist.endTime = ''
} else {
this.getemplist.beginTime = this.date[0]
this.getemplist.endTime = this.date[1]
}
stockDetailCount(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
for (let i = 0; i < this.list.length; i++) {
this.list[i].heji = this.list[i].totalMoney + this.list[i].taxMoney
}
this.total = res.data.data.content.totalCount
// this.restFilter()
} else {
// this.restFilter()
}
})
},
// 采购人focus事件
handlechooseStock() {
this.stockControl = true
},
// 采购人回显
stockName(val) {
this.stockPersonId = val.personName
this.getemplist.stockPersonId = val.id
},
// 供应商输入框focus事件触发
handlechoose() {
this.empcontrol = true
},
// 修改操作
handleEdit(row) {
console.log(row)
this.editVisible = true
this.personalForm = Object.assign({}, row)
this.personalForm.sourceType = String(row.sourceType)
if (row.currency !== null) {
this.personalForm.currency = String(row.currency)
}
if (row.customerType !== null) {
this.personalForm.customerType = String(row.customerType)
}
if (row.saleType !== null) {
this.personalForm.saleType = String(row.saleType)
}
if (row.payType !== null) {
this.personalForm.payType = String(row.payType)
}
},
// 修改组件修改成功后返回
refreshlist(val) {
if (val === true) {
this.getlist()
}
},
// 详情操作
handleDetail(row) {
console.log(row)
this.detailvisible = true
this.personalForm = Object.assign({}, row)
},
// 判断审核按钮
isReview(row) {
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}
},
// 仓库列表focus事件触发
handlechooseRep() {
this.repositorycontrol = true
},
repositoryname(val) {
console.log(val)
this.enterRepositoryId = val.repositoryName
this.getemplist.enterRepositoryId = val.id
},
// 部门列表focus刷新
updatedept() {
this.getlist()
},
// 交货人foucs事件触发
handlechooseDelivery() {
this.deliverycontrol = true
},
deliveryName(val) {
this.deliveryPersonId = val.personName
this.getemplist.deliveryPersonId = val.id
},
// 验收人focus事件触发
handlechooseAccept() {
this.accetpcontrol = true
},
acceptName(val) {
this.acceptPersonId = val.personName
this.getemplist.acceptPersonId = val.id
}
}
}
</script>
<style rel="stylesheet/css" scoped>
.ERP-container >>> .el-form-item__label{
color: #909399;
text-align: left;
}
.app-container >>> .el-table .cell {
-webkit-box-sizing: border-box;
box-sizing: border-box;
line-height: 24px;
word-break: keep-all;
word-wrap: break-word;
white-space: pre-wrap;
}
.ERP-container {
margin-left:10px;
}
.filter-container{
padding: 20px;
padding-left: 0px;
}
.filter-item{
width: 180px;
margin-left: 10px;
padding: 10px 0;
}
.filter-item2{
width: 180px;
margin-left: 5px;
padding: 10px 0;
}
.box-card {
/* border : 1px solid #f1f1ff !important; */
border-bottom : 1px solid #f1f1ff00 !important
}
.normal >>> .el-dialog__header {
padding: 20px 20px 10px;
background: #fff;
position: static;
top: auto;
z-index: auto;
width: auto;
border-bottom: none;
}
.normal >>> .el-dialog {
-webkit-transform: none;
transform: none;
left: 0;
position: relative;
margin: 0 auto;
height: auto;
}
</style>

4
src/views/payment/paymentList.vue
View file

@ -136,9 +136,9 @@
</el-table-column>
<el-table-column :label="$t('public.actions')" :resizable="false" align="center" min-width="230">
<template slot-scope="scope">
<el-button v-permission2="['266-126-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-permission2="['266-126-3', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&scope.row.receiptStat === 1" :key="scope.row.id + Math.random()" :title="$t('updates.xg')" type="primary" size="mini" icon="el-icon-edit" circle @click="handleEdit(scope.row)"/>
<el-button v-show="isReview(scope.row)&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.spi')" type="warning" size="mini" icon="el-icon-view" circle @click="handleReview(scope.row)"/>
<el-button v-permission2="['266-126-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :title="$t('updates.sc')" size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button v-permission2="['266-126-2', scope.row.createPersonId]" v-show="scope.row.judgeStat === 0&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" :key="scope.row.id + Math.random()" :title="$t('updates.sc')" scope-row-create-person-id- size="mini" type="danger" icon="el-icon-delete" circle @click="handleDelete(scope.row)"/>
<el-button title="查看附件" type="primary" size="mini" icon="el-icon-document" circle @click="check(scope.row)"/>
<el-button v-permission="['266-126-98']" v-show="scope.row.judgeStat === 2&&scope.row.confirmPersonId === null&&(scope.row.receiptStat === 1||scope.row.receiptStat === 2||scope.row.receiptStat === 3)" title="确认" type="primary" size="mini" icon="el-icon-check" circle @click="handleEdit2(scope.row)"/>
</template>

BIN
test.zip Normal file
View file

Binary file not shown.