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-12-04 17:21:05 +08:00
parent d3bd8686e3 1c1a42b231
commit 755feb2f83
4 changed files with 122 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,9 +20,9 @@
</el-select> </el-select>
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 450px"> <el-col :span="8">
<el-card> <el-card>
<el-table :data="tableData1" style="height: 670px" highlight-current-row border> <el-table :data="tableData1" :row-class-name="tableRowClassName" style="height: 670px" highlight-current-row border>
<el-table-column align="center" label="工序名" width="110"> <el-table-column align="center" label="工序名" width="110">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
@@ -46,9 +46,9 @@
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col style="width:1000px"> <el-col :span="16">
<el-card> <el-card>
<span>机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}</span> <span style="background-color: rgb(126,172,237);font-size: 20px">{{ 机床图号 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ 机床名称 }}</span>
<div style="margin: 10px 0 0 20px;height: 650px;overflow: auto"> <div style="margin: 10px 0 0 20px;height: 650px;overflow: auto">
<el-tree <el-tree
:data="departmentData" :data="departmentData"
@@ -221,11 +221,21 @@ export default {
selectProcedure(row.工艺计划流水号).then(response => { selectProcedure(row.工艺计划流水号).then(response => {
this.tableData1 = response.data this.tableData1 = response.data
}) })
},
tableRowClassName({ row, rowIndex }) {
if (row.工序状态 === 4) {
return 'cjzuwcqk_complet'
}
} }
} }
} }
</script> </script>
<style>
.el-table .cjzuwcqk_complet {
background: #67C23A;
}
</style>
<style lang="scss"> <style lang="scss">
.selectTree{ .selectTree{
.el-tree-node__content>.el-tree-node__expand-icon{ .el-tree-node__content>.el-tree-node__expand-icon{

4
src/views/MarketingCenter/CRM/index.vue
View File

@@ -24,8 +24,8 @@
<el-button type="success" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" @click="selectCustomerOfName">查询</el-button> <el-button type="success" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" @click="selectCustomerOfName">查询</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;background-color: orange" @click="addMarketingManager();flag = 1" >添加营销经理</el-button> <el-button icon="el-icon-circle-plus-outline" type="primary" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;background-color: #f2dede" @click = "addCustomer();flag1 = 1">新增客户</el-button> <el-button icon="el-icon-circle-plus-outline" type="primary" plain size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border> <el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
<!--<el-table-column label="责权省份" align="center" min-width="80">--> <!--<el-table-column label="责权省份" align="center" min-width="80">-->
<!--<template slot-scope="scope">--> <!--<template slot-scope="scope">-->

175
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -15,97 +15,91 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-col :span="15">
v-loading="listLoading" <el-table v-loading="listLoading" :data="tableData1" highlight-current-row style="margin-top: 3px" height="580" border size="mini" @row-click="selectMachine">
:data="tableData1" <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
:row-key="getRowKeys" <template slot-scope="scope">
:expand-row-keys="expands" {{ scope.row.项目名称 }}
highlight-current-row
style="width: 1280px; margin-top: 3px"
height="700"
border
size="mini"
@row-click="fetchTableData"
@expand-change="selectMachine">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 400px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="设备名称" align="center">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column align="center" label="合同编号" prop="合同编号" width="130">
<template slot-scope="scope">
<template>
<el-tag slot="reference" type="mini">{{ scope.row.合同编号 }}</el-tag>
</template> </template>
</template> </el-table-column>
</el-table-column> <el-table-column align="center" label="客户名称" prop="客户名称" width="230" show-overflow-tooltip>
<el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.客户名称 }}
{{ scope.row.项目名称 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column align="center" label="付款方式" width="80">
<el-table-column align="center" label="客户名称" prop="客户名称" width="230" show-overflow-tooltip> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.付款方式 }}
{{ scope.row.客户名称 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column align="center" label="合同总额(万元)" width="110">
<el-table-column align="center" label="合同总额" width="110"> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.合同总金额 }}
{{ scope.row.合同总金额 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column align="center" label="已付金额" width="80">
<el-table-column align="center" label="付款方式" width="80"> <template slot-scope="scope">
<template slot-scope="scope"> {{ Number(scope.row.已支付).toFixed(2) }}
{{ scope.row.付款方式 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column align="center" label="合同签订日期" width="110">
<el-table-column align="center" label="已付金额" width="80"> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }}
{{ Number(scope.row.已支付).toFixed(2) }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column align="center" label="发货节点" width="110">
<el-table-column align="center" label="销售经理" prop="营销经理" width="100"> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
{{ scope.row.营销经理 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column align="center" label="销售经理" prop="营销经理" width="100">
<el-table-column align="center" label="合同信息备注" width="120"> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.营销经理 }}
{{ scope.row.合同信息备注 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column align="center" label="合同编号" prop="合同编号" width="130">
<el-table-column align="center" label="合同签订日期" width="110"> <template slot-scope="scope">
<template slot-scope="scope"> <template>
{{ scope.row.合同签订日期&&scope.row.合同签订日期!=='1900/1/1' ? scope.row.合同签订日期 : '-' }} <el-tag slot="reference" type="mini">{{ scope.row.合同编号 }}</el-tag>
</template> </template>
</el-table-column> </template>
<el-table-column align="center" label="发货节点" width="110"> </el-table-column>
<template slot-scope="scope"> <el-table-column align="center" label="合同信息备注" width="120">
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }} <template slot-scope="scope">
</template> {{ scope.row.合同信息备注 }}
</el-table-column> </template>
</el-table> </el-table-column>
<div class="block"> </el-table>
<el-pagination <div class="block">
:current-page="PageCurrent" <el-pagination
:page-sizes="[10, 20, 30, 40]" :current-page="PageCurrent"
:page-size="PageSize" :page-sizes="[10, 20, 30, 40]"
:total="total" :page-size="PageSize"
layout="total, sizes, prev, pager, next, jumper" :total="total"
@size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper"
@current-change="handleCurrentChange"/> @size-change="handleSizeChange"
</div> @current-change="handleCurrentChange"/>
</div>
</el-col>
<el-col :span="9">
<el-table :data="tableData2" class="subTableHeader" border stripe style="text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="230" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</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="100">
<template slot-scope="scope">
{{ scope.row.机床状态 }}
</template>
</el-table-column>
</el-table>
</el-col>
</el-card> </el-card>
<!--营销经理选择--> <!--营销经理选择-->
@@ -729,6 +723,7 @@ export default {
} }
} }
selectMachine(row.项目流水号).then(response => { selectMachine(row.项目流水号).then(response => {
console.log(response.data)
this.tableData2 = response.data this.tableData2 = response.data
}) })
this.projectNum = row.项目流水号 this.projectNum = row.项目流水号

74
src/views/MarketingCenter/ContractCapitalManagement/index.vue
View File

@@ -88,49 +88,7 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column align="center" label="已完成进度" width="90">--> <el-table-column label="操作" align="center" width="60" fixed="right">
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.执行进度名 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="已到账金额（万元）" width="130">-->
<!-- <template slot-scope="scope">-->
<!-- {{ Number(scope.row.已支付).toFixed(2) }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="未到账金额（万元）" width="130">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="付款进度" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <div style="width: 130px">-->
<!-- <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系人" width="60">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.联系人 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.电话 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.银行账号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="税号" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.税号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block"> <div style="display: inline-block">
@@ -142,16 +100,26 @@
@click.stop="EditTableData(scope.row)"/> @click.stop="EditTableData(scope.row)"/>
</div> </div>
</el-tooltip> </el-tooltip>
<!-- <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">--> <el-tooltip :open-delay="1000" effect="dark" content="新增发票" placement="top">
<!-- <div style="display: inline-block">--> <div style="display: inline-block">
<!-- <el-button--> <el-button
<!-- style="margin-left: 20px"--> :disabled="scope.row.是否禁用编辑"
<!-- size="mini"--> type="text"
<!-- type="text"--> size="mini"
<!-- icon="el-icon-delete"--> icon="el-icon-circle-plus-outline"
<!-- @click.stop="dellist(scope.row)"/>--> @click.stop="EditTableData(scope.row)"/>
<!-- </div>--> </div>
<!-- </el-tooltip>--> </el-tooltip>
<!--<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
<!--<div style="display: inline-block">-->
<!--<el-button-->
<!--style="margin-left: 20px"-->
<!--size="mini"-->
<!--type="text"-->
<!--icon="el-icon-delete"-->
<!--@click.stop="dellist(scope.row)"/>-->
<!--</div>-->
<!--</el-tooltip>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>