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.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-09-22 11:34:37 +08:00
parent 0bc8dd33a1 d165cd9fd2
commit a6bc192744
10 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/styles/index.scss
View File

@@ -218,6 +218,18 @@ el-card{
//card白条宽度
padding: 5px 5px;
}
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
h3 {
height: 10px !important;

18
src/views/Assembly/QualityBasicData/index.vue
View File

@@ -11,7 +11,7 @@
:data="tableData"
border
style="width: 100%;max-height: 450px;margin-top: 10px"
height="450px"
height="350px"
size="mini"
stripe
highlight-current-row>
@@ -75,7 +75,7 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检尺寸</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
<el-table
:data="tableData2"
border
@@ -88,13 +88,13 @@
type="index"
label="序号"
align="center"
width="50"/>
min-width="50"/>
<el-table-column label="质检尺寸" align="center">
<template slot-scope="scope">
{{ scope.row.质检尺寸 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200px">
<el-table-column label="操作" align="center" fixed="right" width="150px">
<template slot-scope="scope">
<el-button
size="mini"
@@ -112,7 +112,7 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检外观</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
<el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
<el-table-column
type="index"
@@ -124,7 +124,7 @@
{{ scope.row.质检外观 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200px">
<el-table-column label="操作" align="center" fixed="right" width="150px">
<template slot-scope="scope">
<el-button
size="mini"
@@ -142,7 +142,7 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检形位</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
<el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
<el-table-column
type="index"
@@ -154,7 +154,7 @@
{{ scope.row.质检形位 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200px">
<el-table-column label="操作" align="center" fixed="right" width="150px">
<template slot-scope="scope">
<el-button
size="mini"
@@ -174,7 +174,7 @@
<el-row>
<div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项</div>
</el-row>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
<el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
<el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" highlight-current-row stripe size="mini" @row-click="searchTesting">
<el-table-column
type="index"

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

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<el-col :span="12">
<el-col style="width: 530px">
<el-form label-width="270px" label-position="right" class="Time">
<el-form-item v-show="false">
<el-radio-group v-model="radio" size="small">

6
src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
View File

@@ -66,13 +66,13 @@
<el-table-column
type="selection"
align="center"
width="35"/>
<el-table-column label="零件图号" align="center" width="300">
width="50"/>
<el-table-column label="零件图号" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="200">
<el-table-column label="零件名称" align="center" width="300">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

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

@@ -2,23 +2,23 @@
<div class="app-container">
<el-card>
<h3 style="margin-top: 0">采购合同</h3>
<el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="350">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="请款时间" align="center" min-width="150">
<el-table-column label="请款时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="100">
<el-table-column label="请款人" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
<el-table-column label="请款金额" align="center" min-width="80" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
@@ -26,7 +26,7 @@
<el-table-column label="审核" align="center" width="320">
<template slot-scope="scope">
<el-popover placement="right" width="400" trigger="click">
<el-table :data="gridData1" stripe size="mini" show-summary highlight-current-row @row-click="searchContactDetail">
<el-table :data="gridData1" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchContactDetail">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="采购合同编号">
<template slot-scope="scope">
@@ -39,10 +39,10 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" plain style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
</el-popover>
<el-button type="primary" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>
@@ -58,26 +58,25 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card>
<h3 style="margin-top: 0">离线合同</h3>
<el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<el-table v-loading="" :data="tableData2" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="320">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="请款时间" align="center" min-width="150">
<el-table-column label="请款时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.请款时间 }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="100">
<el-table-column label="请款人" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
<el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
@@ -85,23 +84,23 @@
<el-table-column label="付款" align="center" width="320">
<template slot-scope="scope">
<el-popover placement="right" width="400" trigger="click">
<el-table :data="gridData2" stripe size="mini" show-summary highlight-current-row @row-click="searchOfflineContactDetail">
<el-table :data="gridData2" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchOfflineContactDetail">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="离线合同编号">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
<el-table-column min-width="80" align="center" label="合同总额" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" plain style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
</el-popover>
<el-button type="primary" size="mini" icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" @click="noApprovalOffline(scope.row)">不通过</el-button>
<el-button type="primary" size="mini" plain icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApprovalOffline(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>
@@ -120,23 +119,23 @@
<h3 style="margin-top: 0">采购合同</h3>
<div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/>
<h3 style="">离线合同</h3>
<el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
<el-table-column label="离线合同编号" align="center" min-width="150">
<el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border stripe style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
<el-table-column label="离线合同编号" align="center" min-width="130">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="150">
<el-table-column label="物料名称" align="center" min-width="100 ">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="100">
<el-table-column label="物料规格" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="200">
<el-table-column label="物料型号" align="center" min-width="120">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>

20
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -51,7 +51,7 @@
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column label="发票金额" align="center" min-width="70">
<el-table-column label="发票金额" align="center" min-width="85">
<template slot-scope="scope">
{{ scope.row.发票金额 }}
</template>
@@ -61,7 +61,7 @@
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template>
</el-table-column>
<el-table-column label="申请时间" align="center" min-width="115">
<el-table-column label="申请时间" align="center" min-width="126">
<template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
</template>
@@ -71,7 +71,7 @@
{{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="115">
<el-table-column label="审批时间" align="center" min-width="136">
<template slot-scope="scope">
{{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
</template>
@@ -81,7 +81,7 @@
{{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="115">
<el-table-column label="审批时间" align="center" min-width="136">
<template slot-scope="scope">
{{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
</template>
@@ -91,14 +91,14 @@
{{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="115">
<el-table-column label="审批时间" align="center" min-width="136">
<template slot-scope="scope">
{{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<el-table-column label="操作" align="center" width="100" fixed="right">
<template slot-scope="scope">
<el-button :disabled="false" type="primary" size="mini" @click="excuteApprove(scope.row)">审批</el-button>
<el-button :disabled="false" type="primary" plain size="mini" @click="excuteApprove(scope.row)">审批</el-button>
</template>
</el-table-column>
</el-table>
@@ -114,12 +114,11 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card>
<h4 style="margin-top: 5px;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 stripe highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
@@ -277,4 +276,7 @@ export default {
#expandTable .el-form-item{
margin: 0;
}
.el-card{
margin: 0px;
}
</style>

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

@@ -95,7 +95,7 @@
{{ scope.row.采购单名称 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="250">
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>

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

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<el-table v-loading="" :data="tableData" border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table v-loading="" :data="tableData" border stripe style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -59,7 +59,7 @@
</div>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table v-loading="" :data="tableData2" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -116,7 +116,7 @@
</div>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table v-loading="" :data="tableData3" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}

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

@@ -6,11 +6,10 @@
<el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-card>
<el-card>
<h4 style="margin-top: 5px">发票结算申请单</h4>
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
<el-table-column type="expand">
<el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="330" size="mini" @row-click="searchTable2">
<el-table-column label="展开" align="center" type="expand" >
<template slot-scope="scope">
<el-form label-position="left" inline class="demo-table-expand">
<el-row>
@@ -47,7 +46,7 @@
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="发票号" align="center" min-width="90">
<el-table-column label="发票号" align="center" min-width="118">
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
@@ -57,12 +56,12 @@
{{ scope.row.发票金额 }}
</template>
</el-table-column>
<el-table-column label="申请人" align="center" min-width="60">
<el-table-column label="申请人" align="center" min-width="85">
<template slot-scope="scope">
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template>
</el-table-column>
<el-table-column label="申请时间" align="center" min-width="110">
<el-table-column label="申请时间" align="center" min-width="140">
<template slot-scope="scope">
{{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
</template>
@@ -97,9 +96,9 @@
{{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<el-table-column label="操作" align="center" width="100" fixed="right">
<template slot-scope="scope">
<el-button :disabled="false" type="primary" size="mini" @click="excuteApprove(scope.row)">审批</el-button>
<el-button :disabled="false" type="primary" size="mini" plain @click="excuteApprove(scope.row)">审批</el-button>
</template>
</el-table-column>
</el-table>
@@ -126,12 +125,12 @@
{{ scope.row.采购物料名称 || 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="180">
<template slot-scope="scope">
{{ scope.row.采购物料型号 || scope.row.离线物料型号 || scope.row.采购零件图号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" min-width="150">
<el-table-column label="规格" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
</template>

4
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -49,7 +49,7 @@
</el-table>
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="250">
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
@@ -95,7 +95,7 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" align="center" width="250">
<el-table-column label="操作" align="center" width="150">
<template slot-scope="scope">
<el-tooltip effect="dark" content="取消请款" placement="top">
<div style="display: inline-block">