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

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

Browse Source
This commit is contained in:
liushuai
2020-03-14 10:49:31 +08:00
parent a53f88aa61 b2940edb34
commit 64703a0c64
7 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/ManufacturingCenter/TraceabilityOfParts.js
View File

@@ -10,8 +10,8 @@ export function SelectPart() {
UserID: state.state.user.id, UserID: state.state.user.id,
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK', name: '车间生产管理工艺_零件追溯_零件查询',
param: '项目流水号_check=' + arguments[0] + '&项目流水号=' + arguments[1] + '&机床流水号_check=' + arguments[2] + '&机床流水号=' + arguments[3] + '&组件流水号_check=' + arguments[4] + '&组件流水号=' + arguments[5] + '&零件图号_check=' + arguments[6] + '&零件图号=' + arguments[7] + '&考核状态_check=' + arguments[8] + '&考核状态=' + arguments[9] + '&单件是否外协_check=' + arguments[10] + '&单件是否外协=' + arguments[11] + '&时间=' + arguments[12] + '&机加工开始时间=' + arguments[13] + '&机加工结束时间=' + arguments[14] + '&零件类型=' + arguments[15] + '&工艺计划流水号=' + arguments[16] param: '零件图号=' + arguments[0]
} }
}) })
} }

16
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -549,16 +549,12 @@ export default {
}) })
}, },
searchTable() { searchTable() {
if (this.Machine === '' || this.Machine === null) { if (this.PartType === '标准件') {
this.$message.warning('请先选择机床组号') this.searchTable0()
} else { } else if (this.PartType === '外购件') {
if (this.PartType === '标准件') { this.searchTable1()
this.searchTable0() } else if (this.PartType === '基本件') {
} else if (this.PartType === '外购件') { this.searchTable2()
this.searchTable1()
} else if (this.PartType === '基本件') {
this.searchTable2()
}
} }
}, },
searchTable0() { // 查询标准件 searchTable0() { // 查询标准件

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

@@ -116,7 +116,7 @@ export default {
param[3] = ['物料规格', this.materialSpec] param[3] = ['物料规格', this.materialSpec]
param[4] = ['物料型号_check', check3] param[4] = ['物料型号_check', check3]
param[5] = ['物料型号', this.materialModel] param[5] = ['物料型号', this.materialModel]
var Data = this.CreateData('00', '报表_采购部仓库_库存_查询', param) var Data = this.CreateData('2001', '报表_采购部仓库_库存_查询', param)
this.exportExcel_NPOI(Data) this.exportExcel_NPOI(Data)
}, },
// 初始化数据 // 初始化数据

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

@@ -251,7 +251,7 @@ export default {
querySearch(queryString, cb) { querySearch(queryString, cb) {
this.restaurantsPick = [] this.restaurantsPick = []
if (this.searchPick !== '' && this.searchPick !== null) { if (this.searchPick !== '' && this.searchPick !== null) {
SelectPart(0, '', 0, '', 0, '', 1, this.searchPick, 0, '', 0, '', 0, '', '', '', '').then(response => { SelectPart(this.searchPick).then(response => {
const res = response.data const res = response.data
res.forEach(item => { res.forEach(item => {
this.restaurantsPick.push({ this.restaurantsPick.push({

12
src/views/PurchasingCenter/FundApproval3/index.vue
View File

@@ -18,7 +18,7 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款金额" align="center" min-width="80" prop="请款金额"> <el-table-column label="请款金额(元)" align="center" min-width="80" prop="请款金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.请款金额 }} {{ scope.row.请款金额 }}
</template> </template>
@@ -51,12 +51,12 @@
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }} {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="120" align="center" label="已付金额" prop="已付金额"> <el-table-column width="120" align="center" label="已付金额(元)" prop="已付金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }} {{ parseFloat(scope.row.已付金额).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="120" align="center" label="请款金额" prop="请款金额"> <el-table-column width="120" align="center" label="请款金额(元)" prop="请款金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(scope.row.请款金额).toFixed(2) }} {{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template> </template>
@@ -85,17 +85,17 @@
{{ scope.row.数量 }} {{ scope.row.数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货数量" align="center" width="70"> <el-table-column label="到货数量" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }} {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合计" align="center" min-width="100" prop="合计"> <el-table-column label="合计(元)" align="center" min-width="100" prop="合计">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }} {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价" align="center" min-width="100" prop="单价"> <el-table-column label="单价(元)" align="center" min-width="100" prop="单价">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseFloat(scope.row.单价||0).toFixed(2) }} {{ parseFloat(scope.row.单价||0).toFixed(2) }}
</template> </template>

2
src/views/WorkshopProcurement/FundApproval3/index.vue
View File

@@ -168,7 +168,7 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额"> <el-table-column label="请款金额(元)" align="center" min-width="100" prop="请款金额">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.请款金额 }} {{ scope.row.请款金额 }}
</template> </template>

69
src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
View File

@@ -10,38 +10,38 @@
<el-card> <el-card>
<h4 style="margin: 5px">到票结算申请单</h4> <h4 style="margin: 5px">到票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2"> <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
<el-table-column label="详情" type="expand"> <!--<el-table-column label="详情" type="expand">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-form label-position="left" inline class="demo-table-expand"> <!--<el-form label-position="left" inline class="demo-table-expand">-->
<el-row> <!--<el-row>-->
<el-col :span="6"> <!--<el-col :span="6">-->
<viewer> <!--<viewer>-->
<img :src="scope.row.scanSrc" alt="发票扫描件" height="120px"> <!--<img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
</viewer> <!--</viewer>-->
</el-col> <!--</el-col>-->
<el-col :span="6"> <!--<el-col :span="6">-->
<el-form-item label="已付款项"> <!--<el-form-item label="已付款项">-->
<span>{{ scope.row.已付款项 }}</span> <!--<span>{{ scope.row.已付款项 }}</span>-->
</el-form-item><br> <!--</el-form-item><br>-->
<el-form-item label="尚欠金额"> <!--<el-form-item label="尚欠金额">-->
<span>{{ scope.row.尚欠金额 }}</span> <!--<span>{{ scope.row.尚欠金额 }}</span>-->
</el-form-item><br> <!--</el-form-item><br>-->
<el-form-item label="备注"> <!--<el-form-item label="备注">-->
<span>{{ scope.row.备注 }}</span> <!--<span>{{ scope.row.备注 }}</span>-->
</el-form-item><br> <!--</el-form-item><br>-->
</el-col> <!--</el-col>-->
<el-col :span="6"> <!--<el-col :span="6">-->
<el-form-item label="是否费用类发票"> <!--<el-form-item label="是否费用类发票">-->
<span>{{ scope.row.是否费用类 }}</span> <!--<span>{{ scope.row.是否费用类 }}</span>-->
</el-form-item><br> <!--</el-form-item><br>-->
<el-form-item label="税额"> <!--<el-form-item label="税额">-->
<span>{{ scope.row.税额 }}</span> <!--<span>{{ scope.row.税额 }}</span>-->
</el-form-item> <!--</el-form-item>-->
</el-col> <!--</el-col>-->
</el-row> <!--</el-row>-->
</el-form> <!--</el-form>-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip> <el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -152,11 +152,6 @@
{{ scope.row.备注 }} {{ scope.row.备注 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="120"> <el-table-column label="合同编号" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 || scope.row.离线合同编号 }} {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}