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-05-14 18:17:09 +08:00
parent 990052a70e f0e3cbe42f
commit 2503108a9b
8 changed files with 67 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/Inventory/MaterialReturn/index.vue
View File

@@ -112,19 +112,19 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="补投" center width="300px">
<el-dialog :visible.sync="dialogFormVisible" title="退料" center width="300px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="80px" class="demo-ruleForm">
<div>
<ei-row>
<el-row style="padding: 10px 0">
<span>{{ nameOrNumber }}</span>
</ei-row>
<el-row>
</el-row>
<el-row style="padding: 10px 0">
<span>出库数量:{{ outNumber }}</span>
</el-row>
<el-row>
<el-row style="padding: 10px 0">
<span>领料人:{{ people }}</span>
</el-row>
<el-row>
<el-row style="padding: 10px 0">
<span>出库时间:{{ time }}</span>
</el-row>
</div>

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

@@ -23,22 +23,32 @@
<el-col :span="8">
<el-card>
<el-table :data="tableData1" :row-class-name="tableRowClassName" empty-text=" " style="height: 670px" highlight-current-row border>
<el-table-column align="center" label="工序名" width="110">
<el-table-column align="center" label="工序名" width="80">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作者" width="100">
<el-table-column align="center" label="操作者" width="70" show-overflow-tooltip="">
<template slot-scope="scope">
<!--{{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}-->
{{ scope.row.工序间是否外协 === 2 ? '外协' : (scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名) }}
</template>
</el-table-column>
<el-table-column align="center" label="数量" show-overflow-tooltip min-width="90">
<el-table-column align="center" label="数量" show-overflow-tooltip min-width="50">
<template slot-scope="scope">
{{ scope.row.投产数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检数" show-overflow-tooltip min-width="65">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不良数" show-overflow-tooltip min-width="65">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="完成日期" show-overflow-tooltip min-width="90">
<template slot-scope="scope">
{{ scope.row.完成日期 ? scope.row.完成日期.split(' ')[0] : '' }}

27
src/views/ManufacturingCenter/MachiningParts/index.vue
View File

@@ -131,14 +131,14 @@
</el-col>
</el-row>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工序完成情况" center width="650px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工序完成情况" center width="700px">
<el-row>
<span>零件图号:</span>
<el-input v-model="SparePartsNumber" style="width: 150px" size="small"/>
<span>零件名称:</span>
<el-input v-model="SparePartsName" style="width: 150px" size="small"/>
</el-row>
<el-table :data="tableData2" style="width: 615px;margin-top: 20px" size="mini" height="320" stripe highlight-current-row border>
<el-table :data="tableData2" style="width: 665px;margin-top: 20px" size="mini" height="320" stripe highlight-current-row border>
<el-table-column align="center" label="工序" width="70">
<template slot-scope="scope">
{{ scope.row.工序顺序 }}
@@ -149,17 +149,17 @@
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="工艺要求" width="205">
<el-table-column align="center" label="工艺要求" width="205" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作工" width="70">
<el-table-column align="center" label="操作工" width="70" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.工序间是否外协 === 2 ? '外协' : scope.row.操作员 }}
</template>
</el-table-column>
<el-table-column align="center" label="工序完成" width="80">
<el-table-column align="center" label="状态" width="80">
<template slot-scope="scope">
<span v-if="parseInt(scope.row.工序状态)===4" style="color: #67C23A">已完</span>
<span v-if="parseInt(scope.row.工序状态)===5" style="color: #E6A23C">报废</span>
@@ -169,16 +169,23 @@
<!--<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完</el-tag>-->
</template>
</el-table-column>
<el-table-column align="center" label="工序质检" width="80">
<el-table-column align="center" label="质检数" width="65">
<template slot-scope="scope">
{{ scope.row.数量 === null ? 0 : scope.row.数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不良数" width="65">
<template slot-scope="scope">
{{ scope.row.不合格数量 === null ? 0 : scope.row.不合格数量 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="工序质检" width="80">
<template slot-scope="scope">
<span v-if="parseInt(scope.row.是否质检)===1" style="color: #67C23A">合格</span>
<span v-if="parseInt(scope.row.是否质检)===2" style="color: #E6A23C">不合格</span>
<span v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" style="color: #409EFF">未检</span>
<!--<el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>-->
<!--<el-tag v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" type="primary" size="small">未检</el-tag>-->
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</el-dialog>
</div>

18
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -49,14 +49,14 @@
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="检验数" width="80">
<el-table-column align="center" label="质检数" width="80">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数" width="80">
<el-table-column align="center" label="不良数" width="80">
<template slot-scope="scope">
{{ scope.row不合格数量 }}
{{ scope.row.不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作者" show-overflow-tooltip width="70">
@@ -105,12 +105,12 @@
{{ scope.row.报废数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="检验数" width="70">
<el-table-column align="center" label="质检数" width="70">
<template slot-scope="scope">
{{ scope.row.检验数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不合格数" width="80">
<el-table-column align="center" label="不良数" width="80">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template>
@@ -418,7 +418,9 @@ export default {
工序流水号: response.data[i].工序流水号,
完成过程流水号: response.data[i].完成过程流水号,
工序状态: response.data[i].工序状态,
完成数量: response.data[i].完成数量
完成数量: response.data[i].完成数量,
检验数量: response.data[i].检验数量,
不合格数量: response.data[i].不合格数量
})
}
}
@@ -590,7 +592,9 @@ export default {
完成过程流水号: response.data[i].完成过程流水号,
工序状态: response.data[i].工序状态,
完成数量: response.data[i].完成数量,
工序间是否外协: response.data[i].工序间是否外协
工序间是否外协: response.data[i].工序间是否外协,
检验数量: response.data[i].检验数量,
不合格数量: response.data[i].不合格数量
})
}
this.loading2 = false

10
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -55,6 +55,16 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="质检数" width="65px">
<template slot-scope="scope">
{{ scope.row.质检数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="不良数" width="65px">
<template slot-scope="scope">
{{ scope.row.质检不合格数量 }}
</template>
</el-table-column>
<el-table-column align="center" label="投产时间" width="100px">
<template slot-scope="scope">
{{ scope.row.传递时间 }}

2
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -157,7 +157,7 @@
<!-- <h4 style="margin-top: 5px;margin-bottom: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>-->
<!-- <span>发票号：</span>-->
<!-- <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>-->
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 450px;" height="450px" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}

6
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -46,17 +46,17 @@
@selection-change="handleSelectionChange1"
@select="handleSelection">
<el-table-column :selectable="selectable" align="center" width="43" type="selection"/>
<el-table-column label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip>
<el-table-column fixed label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" width="120" show-overflow-tooltip>
<el-table-column fixed label="规格" align="center" prop="物料规格" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="型号" prop="物料型号" align="center" width="100" show-overflow-tooltip>
<el-table-column fixed label="型号" prop="物料型号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>

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

@@ -110,28 +110,28 @@
<el-col :span="10">
<el-card>
<el-table :data="gridData" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContract">
<el-table-column width="100" align="center" label="合同编号">
<el-table-column min-width="110" align="center" label="合同编号" show-overflow-tooltip="">
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="合同总额(元)" prop="合同总额">
<el-table-column width="105" align="center" label="合同总额(元)" prop="合同总额">
<template slot-scope="scope">
<span v-if="scope.row.合同总额">{{ scope.row.合同总额 ? parseFloat(scope.row.合同总额).toFixed(2) : 0 }}</span>
<span v-if="scope.row.离线合同总额">{{ scope.row.离线合同总额 ? parseFloat(scope.row.离线合同总额).toFixed(2) : 0 }}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="到货金额(元)" prop="到货金额">
<el-table-column width="105" align="center" label="到货金额(元)" prop="到货金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.到货金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="已付金额(元)" prop="已付金额">
<el-table-column width="105" align="center" label="已付金额(元)" prop="已付金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="请款金额(元)" prop="请款金额">
<el-table-column width="105" align="center" label="请款金额(元)" prop="请款金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
@@ -142,7 +142,7 @@
<el-col :span="14">
<el-card>
<el-table :data="tableData2" :summary-method="getSummaries" border height="450px" size="mini" stripe show-summary>
<el-table-column label="物料名称" align="center" min-width="120">
<el-table-column label="物料名称" align="center" min-width="110">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>