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

sidebar

Browse Source
This commit is contained in:
Vergil
2020-02-17 10:55:45 +08:00
parent 1895977eb2
commit 14b7f653cb
6 changed files with 786 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/styles/sidebar.scss
View File

@@ -1,6 +1,7 @@
#app { #app {
// 主体区域 // 主体区域
.main-container { .main-container {
min-width: 1380px;
min-height: 100%; min-height: 100%;
transition: margin-left .28s; transition: margin-left .28s;
margin-left: 200px; margin-left: 200px;

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

@@ -1,6 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <div style="width: 100%;overflow:auto">
<div style="white-space: nowrap">
<el-card style="width: 1455px">
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup"> <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
<el-option <el-option
v-for="item in Machines" v-for="item in Machines"
@@ -23,7 +25,7 @@
<el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button> <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
</el-card> </el-card>
<el-row> <el-row>
<el-card style="width: 50%; float: left"> <el-card style="width: 850px; margin-left: 0px;display: inline-block;" >
<el-table <el-table
:data="tableData" :data="tableData"
loading="loading" loading="loading"
@@ -77,7 +79,7 @@
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
</div> </div>
</el-card> </el-card>
<el-card style="width: 34.5%; float: left"> <el-card style="width: 600px; margin-left: 1px;display: inline-block;vertical-align: top;">
<el-table <el-table
:data="tableData1" :data="tableData1"
loading="loading" loading="loading"
@@ -112,6 +114,8 @@
</el-card> </el-card>
</el-row> </el-row>
</div> </div>
</div>
</div>
</template> </template>
<script> <script>

22
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -1,6 +1,8 @@
<template> <template>
<div> <div class="app-container">
<el-card> <div style="width: 100%;overflow:auto">
<div style="white-space: nowrap">
<el-card style="width: 1329px;">
<div> <div>
<span style="margin-left: 10px">供应商:</span> <span style="margin-left: 10px">供应商:</span>
<el-select v-model="supplierNameValue" placeholder="供应商" size="small" style="width: 220px" filterable clearable @change="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()"> <el-select v-model="supplierNameValue" placeholder="供应商" size="small" style="width: 220px" filterable clearable @change="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">
@@ -27,7 +29,7 @@
<el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button> <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
</div> </div>
</el-card> </el-card>
<el-card style="width: 45%;float: left"> <el-card style="width: 660px;margin-left: 0px;display: inline-block">
<span>到货单</span> <span>到货单</span>
<el-table v-loading="" :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 7000px" height="240px" size="mini" highlight-current-row @row-click="searchTable5"> <el-table v-loading="" :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 7000px" height="240px" size="mini" highlight-current-row @row-click="searchTable5">
<el-table-column label="关联情况" align="center" width="80"> <el-table-column label="关联情况" align="center" width="80">
@@ -36,7 +38,7 @@
<span v-else type="primary" size="mini">未结算</span> <span v-else type="primary" size="mini">未结算</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" width="245" show-overflow-tooltip> <el-table-column label="供应商" prop="供应商名称" align="center" width="220" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -83,7 +85,7 @@
@current-change="handleCurrentChange4"/> @current-change="handleCurrentChange4"/>
</div> </div>
</el-card> </el-card>
<el-card style="width: 54%;float: left;margin-left: 10px"> <el-card style="width: 660px;margin-left: 3px;display: inline-block;vertical-align: top">
<span>到货单明细</span> <span>到货单明细</span>
<el-button type="primary" plain size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button> <el-button type="primary" plain size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
<!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>--> <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
@@ -95,7 +97,7 @@
border border
show-summary show-summary
highlight-current-row highlight-current-row
style="margin: 3px 0; width: 900px" style="margin: 3px 0; width: 650px"
height="260px" height="260px"
size="mini" size="mini"
@row-click="searchTable6"> @row-click="searchTable6">
@@ -115,12 +117,12 @@
{{ scope.row.单位 }} {{ scope.row.单位 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价" align="right" width="130"> <el-table-column label="单价" align="right" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.单价.toFixed(2) }} {{ scope.row.单价.toFixed(2) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="金额" align="right" width="130"> <el-table-column label="金额" align="right" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }} {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
</template> </template>
@@ -141,7 +143,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-card style="width: 100%"> <el-card style="width: 1329px">
<span>关联备料材料</span> <span>关联备料材料</span>
<el-table <el-table
v-loading="" v-loading=""
@@ -497,6 +499,8 @@
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</div>
</div>
</template> </template>
<script> <script>
import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5, import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5,

15
src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
View File

@@ -1,19 +1,16 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card style="width: 76%"> <el-card style="width: 100%">
<div style="margin-top: 7px; margin-bottom: 7px"> <div style="margin-top: 7px; margin-bottom: 7px">
<span>供应商</span> <el-select v-model="supplierNameValue" style="width:220px" placeholder="供应商" size="small" filterable clearable>
<el-select v-model="supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable clearable>
<el-option <el-option
v-for="item in supplierNames" v-for="item in supplierNames"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>零件图号</span> <el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 180px" clearable/>
<el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 160px" clearable/> <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 140px" clearable>
<span>备料状态</span>
<el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 100px" clearable>
<el-option <el-option
v-for="item in Materials" v-for="item in Materials"
:key="item.value" :key="item.value"
@@ -27,7 +24,7 @@
size="small" size="small"
type="daterange" type="daterange"
align="center" align="center"
style="width: 300px;margin: 3px 0" style="width: 240px;margin: 3px 0"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
range-separator="～" range-separator="～"
@@ -37,7 +34,7 @@
<el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button> <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
</div> </div>
</el-card> </el-card>
<el-card style="width: 76%"> <el-card style="width: 100%">
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"

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

@@ -1,6 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card style=""> <div style="width: 100%;overflow:auto">
<div style="white-space: nowrap">
<el-card style="width: 1663px">
<el-col> <el-col>
<span>请款时间段:</span> <span>请款时间段:</span>
<el-date-picker <el-date-picker
@@ -34,7 +36,7 @@
</el-tooltip> </el-tooltip>
</el-col> </el-col>
</el-card> </el-card>
<el-card style="margin-left: 0px;width: 67%;float: left" > <el-card style="margin-left: 0px;width: 1135px;margin-left: 0px;display: inline-block" >
<el-table <el-table
v-loading="" v-loading=""
:data="tableData1" :data="tableData1"
@@ -115,7 +117,7 @@
@current-change="handleCurrentChange1"/> @current-change="handleCurrentChange1"/>
</div> </div>
</el-card> </el-card>
<el-card style="margin-left: 0px;width:31%; float: left"> <el-card style="margin-left: 0px;width:524px; margin-left: 1px; display: inline-block;vertical-align: top">
<el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" border class="subTableHeader" size="mini" show-summary style=""> <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" border class="subTableHeader" size="mini" show-summary style="">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="120" align="center" label="发票号"> <el-table-column min-width="120" align="center" label="发票号">
@@ -171,6 +173,8 @@
<el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button> <el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
</el-dialog> </el-dialog>
</div> </div>
</div>
</div>
</template> </template>
<script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials' <script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'

2
src/views/layout/components/AppMain.vue
View File

@@ -24,7 +24,7 @@ export default {
<style scoped> <style scoped>
.app-main { .app-main {
/*50 = navbar */ /*50 = navbar */
/*width: 1200px;*/ width: 1380px;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
/*min-height:calc(100vh - 85px);background: url('../../../../static/bg.jpg') repeat;*/ /*min-height:calc(100vh - 85px);background: url('../../../../static/bg.jpg') repeat;*/