修改样式

This commit is contained in:
shawnzhang 2020-04-01 11:23:19 +08:00
parent 8acc117c75
commit 6f7a24d260
8 changed files with 659 additions and 15 deletions

View file

@ -20,4 +20,39 @@ export default{
.el-table--small td, .el-table--small th {
padding: 1px 0 !important;
}
.el-table {
color: #303133;
}
.el-table tbody tr:hover>td {
background-color:#d7ebff!important
}
.el-table--striped .el-table__body tr.el-table__row--striped.current-row td, .el-table__body tr.current-row>td, .el-table__body tr.hover-row.current-row>td, .el-table__body tr.hover-row.el-table__row--striped.current-row>td, .el-table__body tr.hover-row.el-table__row--striped>td, .el-table__body tr.hover-row>td {
background-color: #d7ebff!important;
}
/*
高宽分别对应横竖滚动条的尺寸*/
::-webkit-scrollbar
{
width:10px;
height:10px;
background-color:#F5F5F5;
}
/*
内阴影+圆角*/
::-webkit-scrollbar-track
{
-webkit-box-shadow:inset 0 0 6px rgba(209, 209, 209, 0.3);
border-radius:10px;
background-color:#F5F5F5;
}
/*
内阴影+圆角*/
::-webkit-scrollbar-thumb
{
border-radius:10px;
-webkit-box-shadow:inset 0 0 6px rgba(209, 209, 209, 0.3);
background-color:rgb(151, 151, 151);
}
</style>

View file

@ -129,6 +129,7 @@ code {
//main-container全局样式
.app-container {
padding: 20px;
padding-top: 5px;
}
.components-container {

View file

@ -231,7 +231,7 @@ export default {
}
}
return {
tableHeight: 50,
tableHeight: 200,
//
selected: true,
// id
@ -408,6 +408,14 @@ export default {
mounted() {
this.getlist()
this.handlechange4()
setTimeout(() => {
this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
}, 100)
},
created() {
// setTimeout(() => {
// this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 140
// }, 100)
},
beforeCreate() {
_that = this

View file

@ -774,10 +774,9 @@ export default {
font-size: 18px;
color: #373e4f;
margin-bottom: -20px;
margin-top: 30px;
}
.container{
margin-top: 2%;
margin-top: 5px;
border: 1px solid #eceff6;
}
</style>

View file

@ -2,10 +2,10 @@
<div class="ERP-container">
<div class="app-container" style="padding-right: 0">
<!--个人信息-->
<el-card class="box-card" shadow="never">
<h2 ref="geren" class="form-name">{{ $t('updates.grxx') }}</h2>
<div class="container" style="margin-top: 37px">
<el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
<el-card :body-style=" { padding: '5px' }" class="box-card" shadow="never">
<div ref="geren" class="form-name">{{ $t('updates.grxx') }}</div>
<div class="container" style="margin-top: 30px">
<el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" size="mini" status-icon class="demo-ruleForm" label-width="130px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('NewEmployeeInformation.account')" prop="account" style="width: 100%;">
@ -48,7 +48,7 @@
<el-input v-model="personalForm.email" clearable style="margin-left: 18px;width: 200px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="height: 75px">
<el-form-item :label="$t('NewEmployeeInformation.gender')" prop="gender" style="width: 100%;">
<el-radio-group v-model="personalForm.gender" style="margin-left: 18px;width: 200px">
<el-radio :label="1" style="width: 100px">{{ $t('NewEmployeeInformation.male') }}</el-radio>
@ -85,10 +85,10 @@
</div>
</el-card>
<!--联系信息111-->
<el-card class="box-card" shadow="never" style="margin-top: 15px">
<el-card class="box-card" shadow="never" style="margin-top: 5px">
<h2 ref="lianxi" class="form-name">{{ $t('updates.lxxx') }}</h2>
<div class="container" style="margin-top: 37px">
<el-form ref="connectForm" :model="connectForm" :rules="connectrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
<el-form ref="connectForm" :model="connectForm" :rules="connectrules" :inline="true" size="mini" status-icon class="demo-ruleForm" label-width="130px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('NewEmployeeInformation.phone')" prop="phone" style="width: 100%;">
@ -127,10 +127,10 @@
</div>
</el-card>
<!--公司信息-->
<el-card class="box-card" shadow="never" style="margin-top: 15px">
<el-card class="box-card" shadow="never" style="margin-top: 5px">
<h2 class="form-name">{{ $t('updates.gsxx') }}</h2>
<div class="container" style="margin-top: 37px">
<el-form ref="companyForm" :model="companyForm" :rules="companyrules" :inline="true" status-icon class="demo-ruleForm" label-width="130px">
<el-form ref="companyForm" :model="companyForm" :rules="companyrules" :inline="true" size="mini" status-icon class="demo-ruleForm" label-width="130px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('NewEmployeeInformation.jobnumber')" style="width: 100%;">
@ -200,7 +200,7 @@
</el-form>
</div>
</el-card>
<el-card class="box-card" shadow="never" style="margin-top: 15px">
<el-card class="box-card" shadow="never" style="margin-top: 5px">
<h2 class="form-name">{{ $t('updates.jsxx') }}</h2>
<div class="container" style="margin-top: 37px">
<el-row>
@ -783,13 +783,14 @@ export default {
.ERP-container{
margin-right: 0;
.form-name{
font-weight: bold;
font-size: 18px;
color: #373e4f;
padding: 5px;
margin-bottom: -20px;
margin-top: 20px;
}
.container{
margin-top: 40px;
margin-top: 5px;
}
.el-button+.el-button{
width: 98px;

View file

@ -18,6 +18,7 @@
<el-option value="1" label="工艺BOM"/>
<el-option value="2" label="设计BOM"/>
<el-option value="3" label="制造BOM"/>
<el-option value="4" label="采购BOM"/>
</el-select>
</el-form-item>
</el-col>

View file

@ -0,0 +1,226 @@
<template>
<el-dialog :visible.sync="employeeVisible" :factorycontrol="factorycontrol" :close-on-press-escape="false" top="10px" title="选择外包工厂" append-to-body @close="$emit('update:factorycontrol', false)">
<el-card class="box-card" style="margin-top: 10px;height: 60px" shadow="never">
<el-row>
<el-form ref="getemplist" :model="getemplist" label-width="100px" style="margin-top: -9px">
<el-col :span="5">
<el-form-item :label="$t('updates.gcbh')" label-width="100px">
<el-input v-model="getemplist.code" clearable @keyup.enter.native="handleFilter"/>
</el-form-item>
</el-col>
<el-col :span="5" style="margin-left: 10px">
<el-form-item :label="$t('updates.gcmc')">
<el-input v-model="getemplist.factoryName" clearable @keyup.enter.native="handleFilter"/>
</el-form-item>
</el-col>
<el-col :span="5" style="margin-left: 10px">
<el-form-item :label="$t('updates.gclxr')">
<el-input v-model="getemplist.factoryContactName" clearable @keyup.enter.native="handleFilter"/>
</el-form-item>
</el-col>
<el-col :span="3" style="margin-left: 20px">
<!-- 搜索按钮 -->
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" style="width: 86px" round @click="handleFilter">{{ $t('public.search') }}</el-button>
</el-col>
<el-col :span="3" style="margin-left: 20px">
<!-- 新建 -->
<el-button v-waves class="filter-item" icon="el-icon-plus" type="success" style="width: 86px" @click="handleAdd">{{ $t('public.add') }}</el-button>
</el-col>
</el-form>
</el-row>
</el-card>
<el-card class="box-card" style="margin-top: 10px" shadow="never">
<!-- 列表开始 -->
<el-table
v-loading="listLoading"
:key="tableKey"
:data="list"
border
fit
highlight-current-row
style="width: 100%;"
@current-change="handleCurrentChange">
<el-table-column :label="$t('OutFactory.factoryNumber')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.factoryNumber }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutFactory.factoryName')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.factoryName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutFactory.factoryContactPhone')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.factoryContactPhone }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutFactory.factoryFax')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.factoryFax }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutFactory.factoryContactName')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.factoryContactName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutFactory.factoryContactPhone')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.factoryContactPhone }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutFactory.unitAddress')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.unitAddress }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('public.createDate')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('public.createPersonName')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.createName }}</span>
</template>
</el-table-column>
</el-table>
<!-- 列表结束 -->
<pagination v-show="total>0" :total="total" :page.sync="getemplist.pagenum" :limit.sync="getemplist.pagesize" @pagination="getlist" />
<!--修改开始=================================================-->
<el-button v-waves class="filter-item" type="success" style="width: 100px;float: left;margin-top: 10px" @click="handleConfirm">{{ $t('Hmodule.sure') }}</el-button>
<!--修改结束=================================================-->
</el-card>
</el-dialog>
</template>
<script>
import { searchoutFactory } from '@/api/OutFactory'
import waves from '@/directive/waves' // Waves directive
import Pagination from '@/components/Pagination'
var _that
export default {
directives: { waves },
components: { Pagination },
props: {
factorycontrol: {
type: Boolean,
default: false
}
},
data() {
return {
//
employeeVisible: this.factorycontrol,
//
choosedata: '',
//
downloadLoading: false,
//
list: [],
//
total: 0,
//
tableKey: 0,
//
listLoading: true,
//
getemplist: {
pageNum: 1,
pageSize: 10
},
//
personalForm: {},
//
editVisible: false,
//
date: []
}
},
watch: {
factorycontrol() {
this.employeeVisible = this.factorycontrol
this.getlist()
}
},
created() {
this.getlist()
},
beforeCreate() {
_that = this
},
methods: {
getlist() {
//
this.listLoading = true
searchoutFactory(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
this.total = res.data.data.content.totalCount
}
setTimeout(() => {
this.listLoading = false
}, 0.5 * 100)
})
},
//
restFilter() {
},
//
handleFilter() {
this.getemplist.pageNum = 1
searchoutFactory(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
this.total = res.data.data.content.totalCount
// this.restFilter()
} else {
// this.restFilter()
}
})
},
//
handleAdd() {
this.employeeVisible = false
this.$router.push('/OutFactory/AddOutFactory')
},
//
restemplist() {
this.getemplist = {
pageNum: 1,
pageSize: 10
}
},
//
handleCurrentChange(val) {
this.choosedata = val
},
//
handleConfirm() {
this.employeeVisible = false
this.$emit('factoryName', this.choosedata)
}
}
}
</script>
<style scoped>
.ERP-container {
margin: 50px 30px;
}
.filter-item{
width: 140px;
margin-left: 20px;
}
.form-name{
font-size: 18px;
color: #373e4f;
margin-bottom: -20px;
margin-top: 30px;
}
.container{
margin-top: 2%;
border: 1px solid #eceff6;
}
</style>

View file

@ -0,0 +1,373 @@
<template>
<el-dialog :visible.sync="employeeVisible" :outsourcecontrol="outsourcecontrol" :close-on-press-escape="false" top="10px" title="选择销售订单" append-to-body width="1100px" @close="$emit('update:ordercontrol', false)">
<el-card class="box-card" style="margin-top: 15px;height: 60px;padding-left:0 " shadow="never">
<el-input v-model="getemplist.title" :placeholder="$t('updates.wbdzt')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.number" :placeholder="$t('updates.wbddh')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="outFactoryId" :placeholder="$t('updates.wbgc')" class="filter-item" clearable @keyup.enter.native="handleFilter" @clear="restFilter" @focus="chooseFactory"/>
<my-factory :factorycontrol.sync="factorycontrol" @factoryName="factoryName"/>
<el-popover
v-model="visible2"
placement="bottom"
width="500"
trigger="click">
<el-select v-model="getemplist.paymentAgreementId" :value="getemplist.paymentAgreementId" placeholder="付款约定" clearable style="width: 40%;float: left;margin-left: 20px">
<el-option value="1" label="付款1"/>
<el-option value="2" label="付款2"/>
</el-select>
<el-select v-model="getemplist.billingTypeId" :value="getemplist.billingTypeId" placeholder="开票类型" clearable style="width: 40%;float: right;margin-right: 20px">
<el-option value="1" label="普通发票"/>
<el-option value="2" label="付款2"/>
</el-select>
<el-select v-model="getemplist.receiptStat" :value="getemplist.receiptStat" :placeholder="$t('updates.djzt')" clearable style="width: 40%;float: left;margin-left: 20px;margin-top: 20px">
<el-option :label="$t('updates.zd')" value="1"/>
<el-option :label="$t('updates.zx')" value="2"/>
<el-option :label="$t('updates.jd')" value="3"/>
</el-select>
<el-select v-model="getemplist.judgeStat" :value="getemplist.judgeStat" :placeholder="$t('updates.spzt')" clearable style="width: 40%;float: right;margin-right: 20px;margin-top: 20px">
<el-option :label="$t('updates.wsh')" value="0"/>
<el-option :label="$t('updates.shz')" value="1"/>
<el-option :label="$t('updates.shtg')" value="2"/>
<el-option :label="$t('updates.shptg')" value="3"/>
</el-select>
<el-date-picker
v-model="date"
type="daterange"
range-separator="-"
unlink-panels
start-placeholder="Start"
end-placeholder="End"
value-format="yyyy-MM-dd"
style="margin-top: 20px;margin-left: 20px"/>
<div class="seachbutton" style="width: 100%;float: right;margin-top: 20px">
<el-button v-waves class="filter-item" type="primary" style="float: right" round @click="handleFilter">{{ $t('public.search') }}</el-button>
</div>
<el-button v-waves slot="reference" type="primary" class="filter-item" style="width: 130px" @click="visible2 = !visible2">{{ $t('public.filter') }}<svg-icon icon-class="shaixuan" style="margin-left: 4px"/></el-button>
</el-popover>
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" style="width: 86px;margin-top:10px" round @click="handleFilter">{{ $t('public.search') }}</el-button>
</el-card>
<el-card class="box-card" style="margin-top: 15px" shadow="never">
<!-- 列表开始 -->
<el-table
v-loading="listLoading"
:key="tableKey"
:data="list"
border
fit
highlight-current-row
style="width: 100%;"
@current-change="handleCurrentChange">
<el-table-column :label="$t('public.id')" :resizable="false" fixed="left" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.number }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutSourcing.title')" :resizable="false" fixed="left" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.title }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutSourcing.personId')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.personName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutSourcing.outFactoryId')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.outFactoryName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutSourcing.paiedMoney')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.paiedMoney }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('OutSourcing.notPayMoney')" :resizable="false" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.notPayMoney }}</span>
</template>
</el-table-column>
</el-table>
<!-- 列表结束 -->
<pagination v-show="total>0" :total="total" :page.sync="getemplist.pagenum" :limit.sync="getemplist.pagesize" @pagination="getlist" />
<!--修改开始=================================================-->
<el-button v-waves class="filter-item" type="success" style="width: 100px;float: left;margin-bottom: 10px" @click="handleConfirm">{{ $t('Hmodule.sure') }}</el-button>
</el-card>
</el-dialog>
</template>
<script>
import { searchoutsourcing, deleteoutsourcing, updateoutsourcing2 } from '@/api/OutSourcing'
import waves from '@/directive/waves' // Waves directive
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import permission from '@/directive/permission/index.js' //
import permission2 from '@/directive/permission2/index.js' //
import checkPermission from '@/utils/permission' //
import MyDialog from './components/MyDialog'
import DetailList from './components/DetailList'
import MyFactory from './components/MyFactory'
var _that
export default {
directives: { waves },
components: { MyFactory, Pagination, MyDialog, DetailList },
filters: {
judgeStatFilter(status) {
const statusMap = {
0: _that.$t('updates.wsh'),
1: _that.$t('updates.shz'),
2: _that.$t('Hmodule.shtg'),
3: _that.$t('Hmodule.shbtg')
}
return statusMap[status]
},
receiptStatFilter(status) {
const statusMap = {
1: _that.$t('updates.zd'),
2: _that.$t('updates.zx'),
3: _that.$t('updates.jd')
}
return statusMap[status]
},
stockTypeFilter(status) {
const statusMap = {
1: '采购1'
}
return statusMap[status]
},
sendTypeFilter(status) {
const statusMap = {
1: '已发货',
2: '未发货'
}
return statusMap[status]
}
},
props: {
outsourcecontrol: {
type: Boolean,
default: false
}
},
data() {
return {
//
outFactoryId: '',
//
factorycontrol: false,
//
employeeVisible: this.outsourcecontrol,
//
customerName: '',
//
customercontrol: false,
agentcontrol: false,
//
typeparms: {
pagenum: 1,
pagesize: 99999
},
//
types: [],
//
depts: [],
//
reviewParms: {
id: '',
judgePersonId: '',
judgeStat: ''
},
//
detailvisible: false,
//
visible2: false,
//
supplierId: '',
//
empcontrol: false,
//
stockPersonId: '',
//
stockControl: false,
//
moreaction: '',
//
downloadLoading: false,
//
list: [],
//
total: 0,
//
tableKey: 0,
//
listLoading: true,
//
getemplist: {
pageNum: 1,
pageSize: 10,
repositoryId: this.$store.getters.repositoryId,
regionIds: this.$store.getters.regionIds
},
//
personalForm: {},
//
editVisible: false,
//
date: []
}
},
watch: {
outsourcecontrol() {
this.employeeVisible = this.outsourcecontrol
this.getlist()
}
},
beforeCreate() {
_that = this
},
methods: {
//
clearCustomer() {
this.getemplist.customerId = ''
this.customerName = ''
},
// focus
chooseCustomer() {
if (this.getemplist.customerType === '1') {
this.agentcontrol = true
} else if (this.getemplist.customerType === '2') {
this.customercontrol = true
}
},
customerdata(val) {
this.getemplist.customerId = val.id
this.customerName = val.customerName
},
agentdata(val) {
this.getemplist.customerId = val.id
this.customerName = val.agentName
},
//
updatecountry() {
this.getlist()
},
getlist() {
//
this.listLoading = true
searchoutsourcing(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
this.total = res.data.data.content.totalCount
}
setTimeout(() => {
this.listLoading = false
}, 0.5 * 100)
})
},
//
restFilter() {
this.outFactoryId = ''
this.getemplist.outFactoryId = ''
},
//
handleFilter() {
this.getemplist.pageNum = 1
searchoutsourcing(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
this.total = res.data.data.content.totalCount
// this.restFilter()
} else {
// this.restFilter()
}
})
},
// focus
chooseFactory() {
this.factorycontrol = true
},
//
factoryName(val) {
this.outFactoryId = val.factoryName
this.getemplist.outFactoryId = val.id
},
//
handleAdd() {
this.$router.push('/SaleOrder/AddSaleOrder')
},
//
handleCurrentChange(val) {
this.choosedata = val
console.log('tczjx', val)
},
//
handleConfirm() {
this.employeeVisible = false
console.log(this.choosedata)
const saleOrderdata = this.choosedata.saleOrderDetailVos
const OrderNumber = this.choosedata.number
const saleOrderDetail = saleOrderdata.map(function(item) {
return {
productCode: item.productCode,
productName: item.productName,
categoryName: item.productCategoryName,
category: item.productCategory,
unit: item.unit,
typeName: item.productTypeName,
type: item.productType,
color: item.color,
kpiGrade: '0.00',
point: '0.00',
allQuantity: item.quantity,
salePrice: (item.salePrice).toFixed(2),
costPrice: (item.costPrice).toFixed(2),
taxprice: (item.salePrice).toFixed(2),
costMoney: (item.costMoney).toFixed(2),
includeTaxMoney: (item.includeTaxMoney).toFixed(2),
taxRate: item.taxRate,
taxMoney: item.taxMoney,
money: (item.money).toFixed(2),
includeTaxCostMoney: (item.includeTaxCostMoney).toFixed(2),
discountRate: item.discountRate,
discountMoney: item.discountMoney,
carCode: 0,
motorCode: 0,
batteryCode: 0,
sourceNumber: OrderNumber,
sourceSerialNumber: item.id,
quantity: item.quantity,
alreadyOutQuantity: item.alreadyOutQuantity
}
})
console.log(58520, saleOrderDetail)
this.$emit('saleOrderDetail', saleOrderDetail)
this.$emit('saleOrder', this.choosedata)
}
//
}
}
</script>
<style scoped>
.ERP-container {
margin: 50px 30px;
}
.filter-item{
width: 140px;
}
.form-name{
font-size: 18px;
color: #373e4f;
margin-bottom: -20px;
margin-top: 30px;
}
.container{
margin-top: 2%;
border: 1px solid #eceff6;
}
</style>