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

序间外协、营销合同样式

Browse Source
This commit is contained in:
Vergil
2020-02-12 15:37:05 +08:00
parent 61e2240bb7
commit fd48b37ef1
2 changed files with 14 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -1,7 +1,6 @@
<template>
<div class="app-container">
<el-card>
<!-- style="background: rgb(233,240,250)"-->
<div>
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 3px 10px;">
<el-option
@@ -10,23 +9,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!-- <el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>-->
<el-input v-model="customerName1" clearable size="small" style="width:150px;margin: 0px 10px" placeholder="请输入客户名称"/>
<!-- <el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>-->
<!-- <el-date-picker-->
<!-- v-model="startTime"-->
<!-- style="width: 150px;"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- placeholder="请选择开始日期"/>-->
<!-- <el-date-picker-->
<!-- v-model="endTime"-->
<!-- style="width: 150px;margin-bottom: 3px;"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- size="small"-->
<!-- type="date"-->
<!-- placeholder="请选择结束日期"/>-->
<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()" >查询</el-button>
<el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
</div>
@@ -48,12 +31,12 @@
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData2" class="subTableHeader" size="mini" border stripe style="width: 482px; text-align: center">
<el-table-column label="设备型号" align="center" width="140">
<template slot-scope="scope">
<el-table-column label="机床名称" align="center" width="140">
<template slot-scope="机床图号">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="设备名称" align="center" width="160" show-overflow-tooltip>
<el-table-column label="机床名称" align="center" width="160" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>
@@ -92,22 +75,6 @@
<el-table-column align="center" label="合同编号" prop="合同编号" width="130">
<template slot-scope="scope">
{{ scope.row.合同编号 }}
<!-- <template>-->
<!-- <el-popover-->
<!-- placement="right"-->
<!-- width="200"-->
<!-- trigger="hover">-->
<!-- <div v-show="!scope.row.招标企业" style="text-align: center">-->
<!-- <h4 style="margin: 5px 0">未缴纳投标保证金</h4>-->
<!-- </div>-->
<!-- <div v-show="scope.row.招标企业">-->
<!-- <h4>招标企业： {{ scope.row.招标企业 }}</h4>-->
<!-- <h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>-->
<!-- <h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>-->
<!-- </div>-->
<!-- <el-tag slot="reference" size="mini">{{ scope.row.合同编号 }}</el-tag>-->
<!-- </el-popover>-->
<!-- </template>-->
</template>
</el-table-column>
<el-table-column align="center" label="客户名称" prop="客户名称" width="190" show-overflow-tooltip>
@@ -140,48 +107,23 @@
{{ scope.row.营销经理 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="会签节点" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.图纸会签节点&&scope.row.图纸会签节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="预验收节点" width="110">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.设备预验收节点&&scope.row.设备预验收节点!=='1900/1/1' ? scope.row.设备预验收节点 : '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="发货节点" width="85">
<template slot-scope="scope">
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="安装调试节点" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.安装调试节点&&scope.row.安装调试节点!=='1900/1/1' ? scope.row.安装调试节点 : '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.联系人 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.电话 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="合同备注" width="120">
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="300">
<el-table-column label="操作" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-circle-plus-outline"
@click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button
@@ -189,7 +131,7 @@
type="text"
icon="el-icon-edit-outline"
style="margin-left: 20px"
@click.stop="handleEdit(scope.row)">修改</el-button>
@click.stop="handleEdit(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
@@ -199,7 +141,7 @@
type="text"
icon="el-icon-delete"
style="margin-left: 20px"
@click.stop="handleDelete(scope.row)">删除</el-button>
@click.stop="handleDelete(scope.row)"/>
</div>
</el-tooltip>
</template>
@@ -217,34 +159,6 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<!-- <el-card v-show="ExecutionProgressShow">-->
<!-- <div>-->
<!-- <h4 style="display: inline-block;margin: 3px;">项目进度</h4>-->
<!-- <div style="display: inline-block; float:right">-->
<!-- <span>已完成进度：</span>-->
<!-- <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">-->
<!-- <el-option-->
<!-- v-for="item in executionProgress"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- :disabled ="item.disabled"/>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-steps :active="ExecutionProgress" finish-status="success" process-status="process " style="margin-left: 10px">-->
<!-- <el-step :description="time1" title="签订合同" icon="el-icon-edit-outline"/>-->
<!-- <el-step :description="time2" title="图纸会签" icon="el-icon-picture-outline"/>-->
<!-- <el-step :description="time3" title="加工制造" icon="el-icon-setting"/>-->
<!-- <el-step :description="time4" title="预备验收" icon="el-icon-view"/>-->
<!-- <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>-->
<!-- <el-step :description="time6" title="安装调试" icon="el-icon-time"/>-->
<!-- <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>-->
<!-- <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>-->
<!-- </el-steps>-->
<!-- </div>-->
<!-- </el-card>-->
<el-card v-show="uploader" style="min-height: 145px;">
<h4 style="margin: 3px;">纪要文件</h4>
<div style="float: left;">
@@ -416,17 +330,6 @@
<!--营销经理选择-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<!-- <span>姓名：</span>-->
<!-- <el-input v-model="name" clearable size="small" style="width: 200px"/>-->
<!-- <el-button size="small" type="success" style="margin-left: 10px" icon="el-icon-search" @click="searchName">查询</el-button>-->
<!--<span>责权省份：</span>-->
<!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
<!--<el-option-->
<!--v-for="item in Province"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<div style="margin-top: 15px;">
<el-table :data="tableData4" border style="width: 200px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
<el-table-column label="部门" align="center" >
@@ -441,11 +344,6 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<!-- <el-table-column label="性别" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.性别 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</div>
<div slot="footer" class="dialog-footer">
@@ -522,36 +420,12 @@
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 350px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
<!-- <el-table-column label="省份" align="center" width="80">-->
<!-- <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-column label="联系人" align="center" width="80">-->
<!-- <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>
<!-- <el-pagination-->
<!-- :current-page="PageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="PageSize1"-->
<!-- :total="total1"-->
<!-- style="margin-top: 10px"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<div slot="footer" class="dialog-footer">
<el-button @click="offCustomerChange">取消</el-button>
<el-button type="primary" @click="getCustomerCode">确 定</el-button>

18
src/views/Outsourcing/PreorderAssociation/index.vue
View File

@@ -1,8 +1,8 @@
<template>
<div>
<el-col :span="10">
<el-col style="width: auto">
<el-card>
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 150px" placeholder="机床号" @change="typeChange1()">
<el-select v-model="toolNumValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="机床号" @change="typeChange1()">
<el-option
v-for="item in toolNum"
:key="item.value"
@@ -12,16 +12,16 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 100px" placeholder="组号">
<el-select v-model="NumValue" clearable filterable size="small" style="margin-bottom:10px;width: 120px" placeholder="组号">
<el-option
v-for="item in Num"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:150px"/>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px"/>
<el-button size="small" icon="el-icon-search" type="primary" plain @click="pageSize1=50; pageCurrent1=1;searchTable()">查询</el-button>
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName2" size="mini" highlight-current-row height="550px" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column label="零件图号" prop="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -56,10 +56,10 @@
</div>
</el-card>
</el-col>
<el-col :span="14">
<el-col style="width: auto">
<el-card>
<el-button size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" border element-loading-text="拼命加载中" size="small">
<el-table-column label="序号" type="index" align="center" width="50"/>
<el-table-column label="加工状态" width="100" align="center">
<template slot-scope="scope">
@@ -320,14 +320,10 @@ export default {
}
</style>
<style>
.el-table .waixie {
background: #AEF199 !important;
}
.XJWXwx{
background: #9bd7fc !important;
}
.XJWXywc{
background: rgb(103,194,58) !important;
}
</style>