meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

Browse Source
This commit is contained in:
caoxinyu
2018-12-17 20:17:04 +08:00
parent 3363e1bbc3 bccc982ab6
commit 99391b695f
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/PurchasingCenter/ProjectTotalSearch.js
View File

@@ -18,7 +18,7 @@ export function searchProjectTotal(num) {
method: 'post',
data: {
type: '1',
name: '采购管理_项目总价_明细_查询数据',
name: '采购管理_项目采购总价_查询数据',
param: `项目流水号=${num}`
}
})

2
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -86,7 +86,7 @@
</el-col>
<el-col :span="1" class="line">～</el-col>
<el-col :span="11">
<el-date-picker :default-time="['12:00:00']" v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
<el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
</el-col>
</el-form-item>
</el-form>

21
src/views/PurchasingCenter/ProjectTotalSearch/index.vue
View File

@@ -25,19 +25,19 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="100">
<el-table-column label="图号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
{{ scope.row.图号 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="100">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="100">
<el-table-column label="规格" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
{{ scope.row.规格 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="100">
@@ -50,9 +50,14 @@
{{ scope.row.单价 }}
</template>
</el-table-column>
<el-table-column label="小计(元)" align="center" min-width="100" prop="金额">
<el-table-column label="优惠后单价" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.金额 }}
{{ scope.row.优惠后单价 }}
</template>
</el-table-column>
<el-table-column label="优惠后小计(元)" align="center" min-width="100" prop="金额">
<template slot-scope="scope">
{{ scope.row.金额 = Number(scope.row.优惠后单价) * Number(scope.row.数量) }}
</template>
</el-table-column>
</el-table>