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

4.22 修改质检 采购计划样式 采购需求

Browse source
This commit is contained in:
tczjx58520 2020-04-22 10:37:00 +08:00
parent 4659077e46
commit 5d3c3010f8
3 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/views/CheckReport/AddCheckReport.vue
View file

@ -534,7 +534,6 @@ export default {
} else {
this.personalForm.sampleQuantity = 5
}
this.personalForm.sampleQuantity = 5
}
if (Number(this.personalForm.checkQuantity) >= 101) {
this.personalForm.sampleQuantity = Math.round(Number(this.personalForm.checkQuantity) * 0.05)
@ -732,7 +731,6 @@ export default {
} else {
this.personalForm.sampleQuantity = 5
}
this.personalForm.sampleQuantity = 5
}
if (Number(this.personalForm.checkQuantity) >= 101) {
this.personalForm.sampleQuantity = Math.round(Number(this.personalForm.checkQuantity) * 0.05)
@ -784,7 +782,6 @@ export default {
} else {
this.personalForm.sampleQuantity = 5
}
this.personalForm.sampleQuantity = 5
}
if (Number(this.personalForm.checkQuantity) >= 101) {
this.personalForm.sampleQuantity = Math.round(Number(this.personalForm.checkQuantity) * 0.05)
@ -890,8 +887,9 @@ export default {
if (Number(this.personalForm.checkQuantity) <= 100) {
if (Number(this.personalForm.checkQuantity) <= 5) {
this.personalForm.sampleQuantity = this.personalForm.checkQuantity
} else {
this.personalForm.sampleQuantity = 5
}
this.personalForm.sampleQuantity = 5
}
if (Number(this.personalForm.checkQuantity) >= 101) {
this.personalForm.sampleQuantity = Math.round(Number(this.personalForm.checkQuantity) * 0.05)

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

@ -85,7 +85,7 @@
<el-table-column
:selectable="selectInit"
type="selection"
width="55"
width="40"
fixed="left"
align="center"/>
<el-table-column :label="$t('public.id')" :resizable="false" fixed="left" align="center" min-width="150">
@ -104,47 +104,57 @@
<span>{{ scope.row.productName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('updates.ys')" :resizable="false" fixed="left" align="center" min-width="200">
<template slot-scope="scope">
<span>{{ scope.row.color }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('updates.jhsl')" :resizable="false" fixed="left" align="center" min-width="200">
<template slot-scope="scope">
<span>{{ scope.row.planQuantity }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockPlan.planPersonId')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.planPersonName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockPlan.allMoney')" :resizable="false" align="center" min-width="150">
<!-- <el-table-column :label="$t('StockPlan.allMoney')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.allMoney }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column :label="$t('StockPlan.planDate')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.planDate }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockApply.stockType')" :resizable="false" align="center" min-width="150">
<!-- <el-table-column :label="$t('StockApply.stockType')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.stockTypeName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockPlan.sourceType')" :resizable="false" align="center" min-width="150">
</el-table-column> -->
<!-- <el-table-column :label="$t('StockPlan.sourceType')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.sourceType | sourceTypeFilter }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockPlan.isused')" :resizable="false" align="center" min-width="150">
</el-table-column> -->
<!-- <el-table-column :label="$t('StockPlan.isused')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span v-if="scope.row.isused">已调用</span>
<span v-else>未调用</span>
</template>
</el-table-column>
<el-table-column :label="$t('public.judgeStat')" :resizable="false" prop="judgeStat" align="center" min-width="150">
</el-table-column> -->
<!-- <el-table-column :label="$t('public.judgeStat')" :resizable="false" prop="judgeStat" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.judgeStat | judgeStatFilter }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('public.receiptStat')" :resizable="false" align="center" min-width="150">
</el-table-column> -->
<!-- <el-table-column :label="$t('public.receiptStat')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.receiptStat | receiptStatFilter }}</span>
</template>
</el-table-column>
</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)"/>
@ -338,7 +348,7 @@ export default {
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
const _row = this.spanArr[rowIndex]
const _col = _row > 0 ? 1 : 0
if (columnIndex !== 3) {
if (columnIndex !== 3 && columnIndex !== 4 && columnIndex !== 5) {
return {
rowspan: _row,
colspan: _col

21
src/views/StockRequire/index.vue
View file

@ -67,24 +67,25 @@
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55"/>
<el-table-column :label="$t('public.id')" :resizable="false" align="center" min-width="150">
width="55"
fixed="left"/>
<el-table-column :label="$t('public.id')" :resizable="false" fixed="left" align="center" min-width="150">
<template slot-scope="scope">
<span class="link-type" @click="handleDetail(scope.row)">{{ scope.row.materialsRequireNumber }}</span>
</template>
<detail-list :detailcontrol.sync="detailvisible" :detaildata.sync="personalForm"/>
</el-table-column>
<el-table-column :label="$t('inventorydetaillist.repositoryName')" :resizable="false" align="center" min-width="150">
<el-table-column :label="$t('inventorydetaillist.repositoryName')" :resizable="false" fixed="left" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.repositoryName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockRequire.productName')" :resizable="false" align="center" min-width="150">
<el-table-column :label="$t('StockRequire.productName')" :resizable="false" align="center" fixed="left" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.productName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockRequire.productCode')" :resizable="false" align="center" min-width="150">
<el-table-column :label="$t('StockRequire.productCode')" :resizable="false" align="center" fixed="left" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.productCode }}</span>
</template>
@ -129,6 +130,16 @@
<span>{{ scope.row.planedQuantity }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('stockTrackList.enterQuantity')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.alreadyEnterQuantity }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('countlist.onStock')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.planedQuantity - scope.row.alreadyEnterQuantity }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('StockRequire.stockAdvanceday')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.stockAdvanceday }}</span>