This commit is contained in:
xingquansheng
2019-09-21 17:08:22 +08:00
parent 52e223101a
commit 50c66e917e
36 changed files with 401 additions and 386 deletions

View File

@@ -46,11 +46,9 @@
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize2=10; pageCurrent2=1;searchPartNum()">查询</el-button>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" highlight-current-row height="370" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
<el-table v-loading="loading2" :data="tableData2" highlight-current-row stripe height="385" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
<el-table-column
label=" "
type="index"
@@ -66,17 +64,17 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" width="220px">
<el-table-column label="材料" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="种类" align="center" width="180px">
<el-table-column label="种类" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件类型名称 }}
</template>
</el-table-column>
<el-table-column label="投产数量" align="center" width="180px">
<el-table-column label="投产数量" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
@@ -123,10 +121,9 @@
@current-change="handleCurrentChange2"/>
</div>
</el-card>
<el-card>
<el-table v-loading="loading0" :data="tableData" :summary-method="getSummaries" border style="width: 100%;max-height: 390px;" height="340px" size="small" stripe show-summary>
<el-table-column label="序号" width="80" align="center" type="index"/>
<el-table v-loading="loading0" :data="tableData" :summary-method="getSummaries" highlight-current-row border style="width: 100%;max-height: 390px;" height="260px" size="small" stripe show-summary>
<el-table-column label="序号" width="80" align="center" type="index" />
<el-table-column label="工艺名称" width="200" align="center">
<template slot-scope="scope">
<el-input v-model="tableData[scope.$index].工艺名称" size="mini" placeholder="工艺名称" readonly/>
@@ -410,13 +407,10 @@ export default {
</script>
<style scoped>
span{
margin: 10px 0 10px 10px;
}
.el-date-editor{
width:150px
}
.el-card{
margin-bottom: 15px;
margin: 0px;
}
</style>

View File

@@ -2,16 +2,15 @@
<div class="app-container">
<el-card>
<span>厂家名称</span>
<el-input v-model="ManufacturerName" clearable size="small" style="width:200px;margin:10px;"/>
<span>电话</span>
<el-input v-model="phNumber" size="small" clearable style="width:200px;margin:10px;"/>
<span>厂家名称:</span>
<el-input v-model="ManufacturerName" clearable size="small" style="width:200px"/>
<span>电话:</span>
<el-input v-model="phNumber" size="small" clearable style="width:200px"/>
<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
</el-card>
<el-card>
<el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border>
<el-table v-loading="loading0" :data="tableData" height="550" style="width: 100%;" border>
<el-table-column
label=" "
align="center"
@@ -27,17 +26,17 @@
{{ scope.row.外协厂家简称 }}
</template>
</el-table-column>
<el-table-column label="地址" align="center" width="280px">
<el-table-column label="地址" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.地址 }}
</template>
</el-table-column>
<el-table-column label="联系人" align="center" width="120px">
<el-table-column label="联系人" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.联系人 }}
</template>
</el-table-column>
<el-table-column label="电话" align="center" width="200px">
<el-table-column label="电话" align="center" width="130px">
<template slot-scope="scope">
{{ scope.row.电话 }}
</template>
@@ -52,6 +51,7 @@
<el-button
size="mini"
type="primary"
plain
class="el-icon-edit"
@click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
<!--<el-button-->
@@ -74,8 +74,7 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" :title="title1" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -277,7 +276,7 @@ export default {
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.title1 = '增加'
this.title1 = '新增外协厂家'
this.form.ManufacturerName = ''
this.form.ManufacturerNumber = ''
this.form.address = ''
@@ -327,7 +326,7 @@ export default {
this.form.ManufacturerAbbreviation = row.外协厂家简称
this.form.attention = row.关注
this.dialogFormVisible = true
this.title1 = '编辑'
this.title1 = '编辑外协厂家'
this.CoManufacturerFlowNumber1 = row.外协厂家流水号
},
// 编辑确定
@@ -406,10 +405,10 @@ export default {
</script>
<style scoped>
.el-card{
margin-bottom: 15px;
}
.el-input{
width: 210px;
}
.el-card{
margin: 0px;
}
</style>

View File

@@ -1,6 +1,5 @@
<template>
<div class="app-container">
<el-card>
<span>工艺名称</span>
<el-input v-model="Code" placeholder="工艺名称" clearable size="small" style="width: 15%;top: 1px;"/>
@@ -25,7 +24,7 @@
size="small"
tooltip-effect="dark"
style="width: 100%;"
height="650">
height="700">
<el-table-column
align="center"
label="序号"
@@ -34,13 +33,13 @@
<el-table-column
align="center"
label="工艺名称"
width="300">
width="200">
<template slot-scope="scope">{{ scope.row.工艺名称 }}</template>
</el-table-column>
<el-table-column
align="center"
label="工艺名称简称"
width="280">
width="200">
<template slot-scope="scope">{{ scope.row.工艺名称简称 }}</template>
</el-table-column>
@@ -74,12 +73,14 @@
<el-button
size="mini"
type="primary"
plain
class="el-icon-edit"
@click="handleEdit(scope.$index, scope.row, 'form')">编辑</el-button>
<el-button
v-if="false"
size="mini"
type="danger"
plain
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
</template>
@@ -98,7 +99,7 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm" label-width="100px" style="width: 90%;margin: auto">
<el-row style="margin: 2px 0 30px 30px;">
<el-radio-group v-model="radio">
@@ -372,4 +373,7 @@ export default {
background-color: #7EE3FC;
border: 1px solid #1f2d3d;
}
.el-card{
margin: 0px;
}
</style>

View File

@@ -54,134 +54,135 @@
<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;total=null;pageCurrent2=1;pageSize2=10;total2=null;searchTable()">查询</el-button>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中" @row-click="getParts">
<el-table v-loading="loading" :data="tableData" height="580" size="mini" stripe style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中" @row-click="getParts">
<el-table-column
label=" "
label="序号"
type="index"
align="center"
width="50"/>
<el-table-column label="付款状态" width="100" align="center">
<el-table-column label="付款状态" width="70" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
<el-tag v-else type="info" size="small">未付</el-tag>
<el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
<el-tag v-else type="info" size="small">未付</el-tag>
</template>
</el-table-column>
<el-table-column label="到货状态" width="100" align="center">
<el-table-column label="到货状态" width="70" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
<el-tag v-else type="info" size="small">未到</el-tag>
<el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
<el-tag v-else type="info" size="small">未到</el-tag>
</template>
</el-table-column>
<el-table-column label="表单号" align="center" width="280px">
<el-table-column label="表单号" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.表单号 }}
</template>
</el-table-column>
<el-table-column label="外协厂家名称" align="center" width="280px">
<el-table-column label="外协厂家名称" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
</template>
</el-table-column>
<el-table-column label="任务下达日期" align="center" width="280px">
<el-table-column label="任务下达日期" align="center" min-width="125px">
<template slot-scope="scope">
{{ scope.row.任务下达日期 }}
</template>
</el-table-column>
<el-table-column label="外协员" align="center" width="120px">
<el-table-column label="外协员" align="center" width="80px">
<template slot-scope="scope">
{{ scope.row.外协员姓名 }}
</template>
</el-table-column>
<el-table-column label="加工价格" align="center">
<el-table-column label="预算总价" align="center" width="140px">
<el-table-column label="预算总价" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.加工价格_预算_总价 }}
</template>
</el-table-column>
<el-table-column label="成交总价" align="center" width="140px">
<el-table-column label="成交总价" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.加工价格_成交_总价 }}
</template>
</el-table-column>
</el-table-column>
<el-table-column label="材料费" align="center" width="140px">
<el-table-column label="材料费" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.材料价格_价格_总价 }}
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="140px">
<el-table-column label="运费" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.运费 }}
</template>
</el-table-column>
<el-table-column label="其他费用" align="center" width="140px">
<el-table-column label="其他费用" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.其他价格_总价 }}
</template>
</el-table-column>
<el-table-column label="总价" align="center" width="140px">
<el-table-column label="总价" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.总价 }}
</template>
</el-table-column>
<el-table-column label="扣款" align="center">
<el-table-column label="质量" align="center" width="140px">
<el-table-column label="质量" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.扣款_质量 }}
</template>
</el-table-column>
<el-table-column label="计划" align="center" width="140px">
<el-table-column label="计划" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.扣款_计划 }}
</template>
</el-table-column>
<el-table-column label="其他" align="center" width="140px">
<el-table-column label="其他" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.扣款_其他 }}
</template>
</el-table-column>
</el-table-column>
<el-table-column label="应付金额" align="center" width="140px">
<el-table-column label="应付金额" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.应付总额 }}
</template>
</el-table-column>
<el-table-column label="付款日期" align="center" width="240px">
<el-table-column label="入库" align="center" width="140px">
<el-table-column label="入库" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.入库时间 }}
</template>
</el-table-column>
<el-table-column label="计划" align="center" width="140px">
<el-table-column label="计划" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.计划付款时间 }}
</template>
</el-table-column>
<el-table-column label="实际" align="center" width="140px">
<el-table-column label="实际" align="center" min-width="70px">
<template slot-scope="scope">
{{ scope.row.实际付款时间 }}
</template>
</el-table-column>
</el-table-column>
<el-table-column label="扣款说明" align="center" width="240px">
<el-table-column label="扣款说明" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.扣款说明 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="300px" fixed="right">
<el-table-column label="操作" align="center" width="280px" fixed="right">
<template slot-scope="scope">
<el-button
:disabled="scope.row.实际付款时间!==''"
size="mini"
type="primary"
plain
class="el-icon-check"
@click="editType1(scope.row, 'form');param = 0">到票</el-button>
<el-button
:disabled="scope.row.实际付款时间!==''"
size="mini"
type="primary"
plain
class="el-icon-edit"
@click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
<el-button
@@ -207,7 +208,7 @@
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" height="370" show-summary style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" size="mini" stripe height="370" show-summary style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="发票号" align="center" width="230px">
<template slot-scope="scope">
{{ scope.row.发票号 }}
@@ -249,12 +250,14 @@
:disabled="fukuanshijian!==''"
size="mini"
type="primary"
plain
class="el-icon-edit"
@click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
<el-button
:disabled="fukuanshijian!==''"
size="mini"
type="danger"
plain
class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
</template>
@@ -273,7 +276,7 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible2" title="扣款" center style="min-height: 300px" width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="扣款" center style="min-height: 300px" width="800px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="质量" style="margin-left: 200px">
<el-input v-model="form2.质量" placeholder="质量" size="small" style="width:200px"/>
@@ -609,7 +612,7 @@ export default {
if (this.count1 !== 1) {
this.$refs[formName].resetFields()
}
this.title1 = '增加'
this.title1 = '到票'
this.renwudan = row.外协加工任务单流水号
this.form.发票号 = ''
this.form.开户行 = ''
@@ -743,7 +746,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin: 0px;
}
.el-table .fukuan {
background: #AEF199;

View File

@@ -1,33 +1,35 @@
<template>
<div class="app-container">
<el-card>
<span>表单号:</span>
<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px"/>
<span>外协厂家:</span>
<el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:200px" clearable/>
<span>下达任务日期:</span>
<el-date-picker
type="date"
size="small"
placeholder="选择日期"/>
<span>单据状态:</span>
<el-select v-model="documentStatus" filterable placeholder="请选择" size="small" clearable>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
<el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">增加</el-button>
<el-row>
<span>表单号:</span>
<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px;margin-bottom: 10px"/>
<span>外协厂家:</span>
<el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:200px" clearable/>
<span>下达任务日期:</span>
<el-date-picker
type="date"
size="small"
placeholder="选择日期"/>
</el-row>
<el-row>
<span>单据状态:</span>
<el-select v-model="documentStatus" filterable placeholder="请选择" size="small" clearable>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
<el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">增加</el-button>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="List" highlight-current-row height="350" border @row-click="searchProcess" >
<el-table v-loading="loading2" :data="List" highlight-current-row height="350" size="mini" stripe border @row-click="searchProcess" >
<el-table-column label="单据状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.单据状态==='成交'" type="success" size="small">成交</el-tag>
@@ -61,8 +63,8 @@
</el-table-column>
<el-table-column label="操作" align="center" min-width="200px">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.单据状态==='成交'" type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
<el-button type="primary" size="mini" icon="el-icon-edit" plain style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
<el-button :disabled="scope.row.单据状态==='成交'" plain type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -78,7 +80,6 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<span>零件号:</span>
<el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
@@ -88,6 +89,8 @@
ref="multipleTable"
:data="List1"
border
size="mini"
stripe
highlight-current-row
height="450"
tooltip-effect="dark"
@@ -101,32 +104,32 @@
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" >
<el-table-column label="零件图号" align="center" width="120px" >
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" >
<el-table-column label="零件名称" align="center" min-width="140px" >
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" >
<el-table-column label="数量" align="center" width="65px" >
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料费" align="center" >
<el-table-column label="材料费" align="center" width="65px" >
<template slot-scope="scope">
{{ scope.row.材料费 }}
</template>
</el-table-column>
<el-table-column label="分类" align="center" >
<el-table-column label="分类" align="center" width="65px" >
<template slot-scope="scope">
{{ scope.row.外协分类 }}
</template>
</el-table-column>
<el-table-column label="投产" align="center" >
<el-table-column label="投产" align="center" width="65px" >
<template slot-scope="scope">
{{ scope.row.传递时间_短 }}
</template>
@@ -154,9 +157,8 @@
</el-table>
<el-button type="info" size="mini" icon="el-icon-arrow-down" style="margin-left:10px;margin-top: 15px" @click="getSpareParts">选入零件</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="List3" :summary-method="getSummaries" :row-class-name="tableRowClassName" show-summary>
<el-table v-loading="loading" :data="List3" :summary-method="getSummaries" stripe size="mini" :row-class-name="tableRowClassName" show-summary>
<el-table-column :index="indexMethod" label="序号" align="center" type="index" width="50px"/>
<el-table-column label="零件图号" align="center" width="200px">
<template slot-scope="scope">
@@ -321,11 +323,12 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete1(scope.$index)">移除</el-button>
</template>
@@ -340,7 +343,6 @@
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 15px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
</div>
</el-card>
<el-card v-show="card">
<div id="RWD">
<table cellspacing="0px" align="center" width="100%" style="">
@@ -409,13 +411,12 @@
</table>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
<div align="center">
<el-input v-model="input" size="small" clearable style="width:200px"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="searchData()">查询</el-button>
</div>
<el-table :data="List2" max-height="370" highlight-current-row @row-click="handleCurrentChange3">
<el-table :data="List2" max-height="370" stripe size="mini" highlight-current-row @row-click="handleCurrentChange3">
<el-table-column label="外协厂家" align="center" >
<template slot-scope="scope">
{{ scope.row.外协厂家名称 }}
@@ -426,13 +427,12 @@
<el-button type="warning" size="small" icon="el-icon-edit-outline" @click="submit1">提交</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="表单号" prop="表单号" style="margin-left: 200px">
<el-input v-model="form.表单号" placeholder="表单号" size="small" style="width:200px" disabled/>
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
<el-form-item label="表单号" prop="表单号" style="margin-left: 70px">
<el-input v-model="form.表单号" placeholder="表单号" size="small" style="width:70px" disabled/>
</el-form-item>
<el-form-item label="下达任务日期" prop="下达任务日期" style="margin-left: 200px">
<el-form-item label="下达任务日期" prop="下达任务日期" style="margin-left: 70px">
<el-date-picker
v-model="form.下达任务日期"
type="date"
@@ -443,12 +443,12 @@
placeholder="下达任务日期"
value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="外协厂家" prop="外协厂家" style="margin-left: 200px">
<el-form-item label="外协厂家" prop="外协厂家" style="margin-left: 70px">
<el-input v-model="form.外协厂家" readonly placeholder="外协厂家" size="small" style="width:200px" clearable>
<el-button slot="append" icon="el-icon-search" @click="onFocus1();param=1"/>
</el-input>
</el-form-item>
<el-form-item label="运费" prop="运费" style="margin-left: 200px">
<el-form-item label="运费" prop="运费" style="margin-left: 70px">
<el-input v-model="form.运费" placeholder="运费" size="small" style="width:200px" clearable/>
</el-form-item>
</el-form>
@@ -457,7 +457,6 @@
<el-button type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -805,9 +804,9 @@ export default {
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.title === '增加') {
if (this.title === '增加外协表单') {
this.submitAdd()
} else if (this.title === '编辑') {
} else if (this.title === '编辑外协表单') {
this.submitEdit()
}
}
@@ -817,7 +816,7 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.title = '增加'
this.title = '增加外协表单'
var time = new Date()
var month = time.getMonth() + 1
var day = time.getDate()
@@ -1265,7 +1264,7 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.title = '编辑'
this.title = '编辑外协表单'
this.dialogFormVisible = true
this.form.表单号 = row.表单号
this.form.运费 = row.运费
@@ -1614,7 +1613,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
margin: 0px;
}
span{
margin: 10px 0 10px 10px;

View File

@@ -3,9 +3,9 @@
<el-card>
<span>表单号:</span>
<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px"/>
<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:150px"/>
<span>外协厂家:</span>
<el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:200px" clearable/>
<el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:150px" clearable/>
<span>下达任务日期:</span>
<el-date-picker
v-model="time"
@@ -17,7 +17,7 @@
</el-card>
<el-card>
<el-table v-loading="loading2" :data="List" highlight-current-row height="350" border @row-click="searchProcess" >
<el-table v-loading="loading2" :data="List" highlight-current-row stripe size="mini" height="350" border @row-click="searchProcess" >
<el-table-column label="付款状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
@@ -68,6 +68,8 @@
ref="multipleTable"
:data="List3"
border
stripe
size="mini"
highlight-current-row
height="450"
tooltip-effect="dark"
@@ -792,10 +794,7 @@ export default {
<style scoped>
.el-card{
margin-bottom: 15px;
}
span{
margin: 10px 0 10px 10px;
margin-bottom: 0px;
}
</style>
<style>

View File

@@ -43,28 +43,28 @@
</el-card>
<el-card>
<el-table v-loading="loading1" :data="tableData1" highlight-current-row height="350" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table v-loading="loading1" :data="tableData1" size="mini" highlight-current-row stripe height="450px" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table-column
label=" "
label="序号"
type="index"
align="center"
width="50"/>
<el-table-column label="零件图号" align="center" width="380px">
<el-table-column label="零件图号" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="320px">
<el-table-column label="零件名称" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" width="280px">
<el-table-column label="材料" align="center">
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="种类" align="center" width="280px">
<el-table-column label="种类" align="center" width="220px">
<template slot-scope="scope">
{{ scope.row.零件类型名称 }}
</template>
@@ -87,15 +87,14 @@
@current-change="handleCurrentChange1"/>
</div>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;" border element-loading-text="拼命加载中" size="small">
<el-table v-loading="loading2" :data="tableData2" height="450" style="width: 100%;" border stripe element-loading-text="拼命加载中" size="small">
<el-table-column
label=" "
label="序号"
type="index"
align="center"
width="50"/>
<el-table-column label="加工状态" width="100" align="center">
<el-table-column label="加工状态" width="75" align="center">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</el-tag>
<el-tag v-if="parseInt(scope.row.工序状态)===4&&parseInt(scope.row.工艺编号)!==29" size="small">已完成</el-tag>
@@ -103,18 +102,18 @@
<el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
</template>
</el-table-column>
<el-table-column label="序间外协" width="100" align="center">
<el-table-column label="序间外协" width="75" align="center">
<template slot-scope="scope">
<el-checkbox :disabled="parseInt(scope.row.工序状态)!==3||parseInt(scope.row.工艺编号)===29" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
</template>
</el-table-column>
<el-table-column label="是否外协" width="100" align="center">
<el-table-column label="是否外协" width="750" align="center">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small"></el-tag>
<el-tag v-else size="small"></el-tag>
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" width="220px">
<el-table-column label="工艺名称" align="center" min-width="120px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
@@ -124,22 +123,22 @@
<el-input v-model="scope.row.工艺要求" :autosize="{ minRows: 1, maxRows: 1}" size="mini" readonly type="textarea"/>
</template>
</el-table-column>
<el-table-column label="机加工计划开始日期" align="center" width="150px">
<el-table-column label="机加工计划开始" align="center" width="105px">
<template slot-scope="scope">
{{ scope.row.机加工开始时间 }}
</template>
</el-table-column>
<el-table-column label="机加工计划结束日期" align="center" width="150px">
<el-table-column label="机加工计划结束" align="center" width="105px">
<template slot-scope="scope">
{{ scope.row.机加工结束时间 }}
</template>
</el-table-column>
<el-table-column label="工序计划" align="center" width="150px">
<el-table-column label="工序计划" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.计划日期 }}
</template>
</el-table-column>
<el-table-column label="工序工时" align="center">
<el-table-column label="工序工时" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.工序工时 }}
</template>
@@ -376,11 +375,8 @@ export default {
</script>
<style scoped>
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin-bottom: 15px;
margin:0px;
}
</style>
<style>