qqq
This commit is contained in:
@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
|
||||
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
|
||||
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
|
||||
const service = axios.create({
|
||||
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
|
||||
baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`,
|
||||
timeout: 1500000 // 请求超时时间
|
||||
})
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<el-card>
|
||||
<el-row>
|
||||
<span>机床编号:</span>
|
||||
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin: 3px 0" clearable @change="machineChange()">
|
||||
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin: 3px 0;width: 130px" clearable @change="machineChange()">
|
||||
<el-option
|
||||
v-for="item in machineNumber"
|
||||
:key="item.value"
|
||||
@@ -14,7 +14,7 @@
|
||||
</el-option>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">组号:</span>
|
||||
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
|
||||
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" style="width: 130px" clearable>
|
||||
<el-option
|
||||
v-for="item in groupNumber"
|
||||
:key="item.value"
|
||||
@@ -22,13 +22,13 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">零件图号:</span>
|
||||
<el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 200px" size="small" clearable/>
|
||||
<el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 130px" size="small" clearable/>
|
||||
<span class="demonstration" style="margin-left: 10px">时间区间:</span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
style="width: 160px"
|
||||
style="width: 130px"
|
||||
type="date"
|
||||
placeholder="选择日期"/>
|
||||
<span class="demonstration">~</span>
|
||||
@@ -36,14 +36,14 @@
|
||||
v-model="endTime"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
style="width: 160px"
|
||||
style="width: 130px"
|
||||
type="date"
|
||||
placeholder="选择日期"/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=20; pageCurrent=1;selecttable()">查询</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 3px" height="700px">
|
||||
<el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 3px" height="550px">
|
||||
<el-table-column label="项目名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
|
||||
@@ -14,9 +14,8 @@
|
||||
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getTableData">查询</el-button>
|
||||
<el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" @click="handleAdd">增加</el-button>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<el-table v-loading="loading" :data="tableData" highlight-current-row border style="height: 500px">
|
||||
<el-table v-loading="loading" :data="tableData" stripe highlight-current-row border style="height: 500px">
|
||||
<el-table-column label="设备名称" align="center" >
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备名称 }}
|
||||
@@ -34,8 +33,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" >
|
||||
<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 type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
|
||||
<el-button type="primary" size="mini" icon="el-icon-edit" style="margin-left:10px" plain @click="handleEdit(scope.row)">编辑</el-button>
|
||||
<el-button type="danger" size="mini" icon="el-icon-delete" plain @click="handleDelete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -50,8 +49,7 @@
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-dialog :visible.sync="dialogFormVisible" title="选择人员" center style="min-height: 300px">
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="选择人员" center style="min-height: 300px">
|
||||
<span>部门名称:</span>
|
||||
<el-select v-model="departmentValue" placeholder="部门名称" size="small" clearable style="width:180px" @change="getTablePeople">
|
||||
<el-option
|
||||
@@ -91,8 +89,7 @@
|
||||
<el-button type="primary" @click="dialogFormVisible = false">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible_form" center style="min-height: 300px" width="400px">
|
||||
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible_form" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
|
||||
<el-form-item label="设备名称" prop="设备名称">
|
||||
<el-select v-model="form.设备流水号" placeholder="设备名称" style="width:200px" size="small" clearable filterable>
|
||||
@@ -117,7 +114,7 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="cancel">取消</el-button>
|
||||
<el-button @click="cancel">取消</el-button>
|
||||
<el-button v-show="title === '增加'" type="primary" @click="submitAdd()">确定</el-button>
|
||||
<el-button v-show="title === '编辑'" type="primary" @click="submitEdit()">确定</el-button>
|
||||
</div>
|
||||
@@ -245,7 +242,7 @@ export default {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
span{
|
||||
margin: 20px;
|
||||
}
|
||||
/*span{*/
|
||||
/*margin: 20px;*/
|
||||
/*}*/
|
||||
</style>
|
||||
|
||||
@@ -3,10 +3,14 @@
|
||||
<el-row>
|
||||
<el-col :span="7">
|
||||
<el-card>
|
||||
<el-row style="margin-bottom: 10px">
|
||||
<span>工艺分类:</span>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-button type="primary" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
|
||||
<el-button size="small" style="margin-left: 10px" type="warning" icon="el-icon-edit-outline" @click="editProcessClassification()">编辑</el-button>
|
||||
<el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" @click="delProcessClassification()">删除</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="17">
|
||||
@@ -28,7 +32,7 @@
|
||||
border
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%"
|
||||
height="800">
|
||||
height="550">
|
||||
<el-table-column align="center" label=" " width="50px">
|
||||
<template slot-scope="scope">
|
||||
<el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
|
||||
@@ -56,7 +60,7 @@
|
||||
highlight-current-row
|
||||
stripe
|
||||
border
|
||||
height="800"
|
||||
height="550"
|
||||
width="100%"
|
||||
@expand-change="searchTechnologicalRequirementsOfProcessNum">
|
||||
<el-table-column type="expand" label="详情">
|
||||
@@ -135,7 +139,6 @@
|
||||
<el-button type="primary" @click="submit1('form1')">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="编辑工艺分类" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
|
||||
<el-form-item label="工艺分类" prop="ProcessClassification">
|
||||
@@ -147,7 +150,6 @@
|
||||
<el-button type="primary" @click="submit1('form1')">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="新增工艺" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
|
||||
<el-form-item label="工艺名称" prop="Process">
|
||||
@@ -162,7 +164,6 @@
|
||||
<el-button type="primary" @click="submit1('form2')">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="编辑工艺" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
|
||||
<el-form-item label="工艺名称" prop="Process">
|
||||
@@ -177,7 +178,6 @@
|
||||
<el-button type="primary" @click="submit1('form2')">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="新增工艺要求" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" >
|
||||
<el-form-item label="工艺要求" prop="Process">
|
||||
@@ -189,7 +189,6 @@
|
||||
<el-button type="primary" @click="submit1('form3')">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible6" title="编辑工艺要求" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" >
|
||||
<el-form-item label="工艺要求" prop="TechnologicalRequirements">
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
size="mini"
|
||||
highlight-current-row
|
||||
border
|
||||
height="380">
|
||||
height="550">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
@@ -80,7 +80,7 @@
|
||||
<el-pagination
|
||||
v-if="!listLoading1"
|
||||
:current-page="pageCurrent"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-sizes="[15, 20, 30, 40]"
|
||||
:page-size="pageSize"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@@ -109,7 +109,7 @@ export default {
|
||||
tableData1: [],
|
||||
listLoading1: false,
|
||||
total: 0, // 总条数
|
||||
pageSize: 10,
|
||||
pageSize: 15,
|
||||
pageCurrent: 1
|
||||
}
|
||||
},
|
||||
@@ -175,6 +175,7 @@ export default {
|
||||
})
|
||||
},
|
||||
handleSizeChange(val) {
|
||||
this.pageCurrent = 1
|
||||
this.pageSize = val
|
||||
this.getTableData()
|
||||
},
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
</el-select>
|
||||
<span>零件图号:</span>
|
||||
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
|
||||
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
|
||||
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=15;total = 0">查询</el-button>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
@@ -34,7 +34,7 @@
|
||||
highlight-current-row
|
||||
class="table"
|
||||
border
|
||||
height="380">
|
||||
height="550">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
@@ -85,7 +85,7 @@
|
||||
<el-pagination
|
||||
v-if="!listLoading1"
|
||||
:current-page="pageCurrent"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-sizes="[15, 20, 30, 40]"
|
||||
:page-size="pageSize"
|
||||
:total="total"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@@ -114,7 +114,7 @@ export default {
|
||||
tableData1: [],
|
||||
listLoading1: false,
|
||||
total: 0, // 总条数
|
||||
pageSize: 10,
|
||||
pageSize: 15,
|
||||
pageCurrent: 1
|
||||
}
|
||||
},
|
||||
@@ -180,6 +180,7 @@ export default {
|
||||
})
|
||||
},
|
||||
handleSizeChange(val) {
|
||||
this.pageCurrent = 1
|
||||
this.pageSize = val
|
||||
this.getTableData()
|
||||
},
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
<el-table
|
||||
:data="tableData"
|
||||
:stripe="true"
|
||||
height="440"
|
||||
height="550"
|
||||
size="mini"
|
||||
highlight-current-row
|
||||
style="width: 100%;"
|
||||
@@ -67,12 +67,12 @@
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="完成数量" align="center" min-width="100px">
|
||||
<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" min-width="100px">
|
||||
<el-table-column label="工艺名称" align="center" min-width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工艺名称 }}
|
||||
</template>
|
||||
@@ -92,12 +92,12 @@
|
||||
{{ scope.row.加工完成时间 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实际工时" align="center" min-width="100px">
|
||||
<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" min-width="100px">
|
||||
<el-table-column label="修补数量" align="center" min-width="70px">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.isEditing">
|
||||
<el-input v-model="scope.row.数量" class="edit-input" size="mini"/>
|
||||
@@ -105,7 +105,7 @@
|
||||
<span v-else>{{ scope.row.数量 }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="修补工时" align="center" min-width="100px">
|
||||
<el-table-column label="修补工时" align="center" min-width="70px">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.isEditing">
|
||||
<el-input v-model="scope.row.修补工时" class="edit-input" size="mini"/>
|
||||
@@ -123,7 +123,7 @@
|
||||
{{ scope.row.修补人 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" min-width="300" fixed="right">
|
||||
<el-table-column label="操作" align="center" min-width="200" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="scope.row.isEditing" type="mini" plain size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
|
||||
<el-button v-if="scope.row.isEditing" class="cancel-btn" plain size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
|
||||
@@ -157,7 +157,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="650px">
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="补录工时" center style="min-height: 300px" width="650px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="80px" class="demo-ruleForm">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
|
||||
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
|
||||
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
|
||||
<el-button type="info" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
|
||||
<el-button type="warning" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
v-loading="listLoading2"
|
||||
:data="tableData2"
|
||||
style="width: 100%;max-height: 400px;"
|
||||
stripe
|
||||
size="mini"
|
||||
height="300"
|
||||
highlight-current-row
|
||||
@@ -98,6 +99,7 @@
|
||||
v-loading="listLoading"
|
||||
:data="tableData"
|
||||
style="width: 100%;max-height: 400px;"
|
||||
stripe
|
||||
size="mini"
|
||||
height="300"
|
||||
highlight-current-row
|
||||
@@ -155,6 +157,7 @@
|
||||
v-loading="listLoading1"
|
||||
:data="tableData1"
|
||||
style="width: 100%;max-height: 400px;"
|
||||
stripe
|
||||
size="mini"
|
||||
height="300"
|
||||
highlight-current-row
|
||||
@@ -397,5 +400,7 @@ export default {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
.el-card{
|
||||
margin: 0px!important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
|
||||
<el-card>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form label-width="270px" label-position="right" class="Time">
|
||||
<el-form-item v-show="false">
|
||||
@@ -94,6 +92,8 @@
|
||||
v-loading="listLoading"
|
||||
:data="tableData"
|
||||
border
|
||||
stripe
|
||||
highlight-current-row
|
||||
style="width: 100%;max-height: 400px"
|
||||
height="400"
|
||||
@selection-change="handleSelectionChange"
|
||||
@@ -172,6 +172,7 @@
|
||||
:disabled="checked_hebing"
|
||||
size="mini"
|
||||
type="primary"
|
||||
plain
|
||||
@click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
|
||||
<!--<el-button-->
|
||||
<!--size="mini"-->
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
<span>零件图号:</span>
|
||||
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
|
||||
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
|
||||
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
|
||||
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="back()">打回</el-button>
|
||||
<el-button size="small" icon="el-icon-success" type="info" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
|
||||
<el-button size="small" icon="el-icon-success" type="danger" style="margin-left: 10px" @click="back()">打回</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
|
||||
@@ -44,7 +44,7 @@
|
||||
<span>零件图号:</span>
|
||||
<el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
|
||||
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
|
||||
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
|
||||
<el-button size="small" icon="el-icon-success" type="warning" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
|
||||
|
||||
@@ -70,6 +70,7 @@ export default {
|
||||
methods: {
|
||||
fetchData() {
|
||||
this.project = []
|
||||
console.log(1111)
|
||||
initProject().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.project.push({
|
||||
|
||||
@@ -199,7 +199,7 @@
|
||||
<span>请购单号:</span>
|
||||
<el-input v-model="PurchaseOrder" size="small" style="width: 200px" placeholder="请购单号" clearable/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1()">查询</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 15px" @click="handleAdd()">创建</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 15px" @click="handleAdd()">新增</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<el-card>
|
||||
@@ -373,9 +373,8 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="400px">
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="新增请购单" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
|
||||
|
||||
<el-form-item label="请购车间" prop="请购车间">
|
||||
<el-input
|
||||
v-model="form.请购车间"
|
||||
@@ -407,7 +406,7 @@
|
||||
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="更改数量" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
|
||||
<el-form-item label="数量" prop="数量">
|
||||
<el-input
|
||||
@@ -420,7 +419,7 @@
|
||||
<el-button type="primary" @click="submitEdit1('form3')">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog :visible.sync="dialogFormVisible4" title="使用库存" center style="min-height: 300px" width="400px">
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="使用库存" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="110px" class="demo-ruleForm">
|
||||
<el-form-item label="数量" prop="数量">
|
||||
<el-input-number v-model="form4.数量" :min="0" :max="100" size="small" style="width:200px"/>
|
||||
@@ -432,6 +431,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
v-el-drag-dialog
|
||||
:visible.sync="dialogFormVisible1"
|
||||
title="基本件打回信息"
|
||||
center
|
||||
@@ -443,6 +443,7 @@
|
||||
size="mini"
|
||||
style="width: 97%;max-height: 300px"
|
||||
height="400"
|
||||
stripe
|
||||
highlight-current-row
|
||||
border>
|
||||
<el-table-column align="center" label="零件图号">
|
||||
@@ -502,6 +503,7 @@
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
v-el-drag-dialog
|
||||
:visible.sync="dialogFormVisible2"
|
||||
title="外购件和标准件打回信息"
|
||||
center
|
||||
@@ -513,6 +515,7 @@
|
||||
size="mini"
|
||||
style="width: 97%;max-height: 300px"
|
||||
height="400"
|
||||
stripe
|
||||
highlight-current-row
|
||||
border>
|
||||
<el-table-column align="center" label="物料名称">
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<div>
|
||||
<el-row>
|
||||
<span style="margin-left: 10px">机床号:</span>
|
||||
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 3px" clearable @change="machineChange">
|
||||
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-bottom: 10px" clearable @change="machineChange">
|
||||
<el-option
|
||||
v-for="item in machineNumber"
|
||||
:key="item.value"
|
||||
@@ -23,6 +24,8 @@
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">零件号:</span>
|
||||
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span style="margin-left: 10px">工艺员:</span>
|
||||
<el-select v-model="personValue" placeholder="工艺员" size="small" clearable >
|
||||
<el-option
|
||||
@@ -32,6 +35,7 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card>
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
:data="tableData"
|
||||
style="width: 100%;"
|
||||
size="mini"
|
||||
height="770"
|
||||
height="500"
|
||||
highlight-current-row
|
||||
border
|
||||
stripe
|
||||
@selection-change="handleSelectionChange">
|
||||
<el-table-column align="center" type="selection"/>
|
||||
<el-table-column align="center" label="零件号">
|
||||
<el-table-column align="center" label="零件号" min-width="160">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件号 }}
|
||||
</template>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
|
||||
<el-card>
|
||||
<div style="margin-top: -10px;">
|
||||
<el-row>
|
||||
@@ -59,6 +58,7 @@
|
||||
:data="tableData"
|
||||
:row-class-name="tableRowClassName"
|
||||
border
|
||||
stripe
|
||||
style="max-height: 400px;margin-top:10px"
|
||||
height="400"
|
||||
@selection-change="handleSelectionChange"
|
||||
@@ -168,19 +168,20 @@
|
||||
:data="tableData1"
|
||||
class="table"
|
||||
borde
|
||||
stripe
|
||||
style="max-height: 500px"
|
||||
height="500">
|
||||
<el-table-column label="零件图号" align="center" width="240">
|
||||
<el-table-column label="零件图号" align="center" min-width="160">
|
||||
<template slot-scope="scope">
|
||||
{{ 零件图号[scope.$index] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件名称" align="center" width="160">
|
||||
<el-table-column label="零件名称" align="center" width="140">
|
||||
<template slot-scope="scope">
|
||||
{{ 零件名称[scope.$index] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="零件数量" align="center" width="100">
|
||||
<el-table-column label="零件数量" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ 投产数量[scope.$index] }}
|
||||
</template>
|
||||
@@ -412,10 +413,10 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="200px" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="180px" align="center" fixed="right">
|
||||
<template slot-scope="scope" align="center">
|
||||
<el-button size="mini" type="primary" @click="adjustFunc(scope.$index)">调整</el-button>
|
||||
<el-button size="mini" type="danger" icon="el-icon-upload2" @click="xuanChu(scope.$index)">选出</el-button>
|
||||
<el-button size="mini" type="primary" plain @click="adjustFunc(scope.$index)">调整</el-button>
|
||||
<el-button size="mini" type="danger" plain icon="el-icon-upload2" @click="xuanChu(scope.$index)">选出</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -1646,4 +1647,7 @@ export default {
|
||||
background-color: lightgreen!important;
|
||||
border: 1px solid #1f2d3d;
|
||||
}
|
||||
.el-card{
|
||||
margin: 0px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -6,9 +6,8 @@
|
||||
<el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
|
||||
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增</el-button>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<el-table v-loading="loading0" :data="tableData" height="770" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
|
||||
<el-table v-loading="loading0" :data="tableData" height="500" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
|
||||
<el-table-column
|
||||
label="序号"
|
||||
type="index"
|
||||
@@ -80,7 +79,6 @@
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" 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>
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
<!--零件报废补投-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
|
||||
<el-card>
|
||||
<div>
|
||||
<el-row>
|
||||
<span>项目名称:</span>
|
||||
<el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:200px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
|
||||
<el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:200px;margin-bottom: 10px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
|
||||
<el-option
|
||||
v-for="item in ProjectName"
|
||||
:key="item.value"
|
||||
@@ -28,12 +27,13 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 15px">零件图号:</span>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>零件图号:</span>
|
||||
<el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 200px" clearable/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 20px" @click="currentPage1=1; fetchTableData()">查询</el-button>
|
||||
</div>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
@@ -99,7 +99,7 @@
|
||||
width="100px"
|
||||
>
|
||||
<template slot-scope="scope" >
|
||||
<el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" size="small" @click="handleEdit(scope.row)">停产</el-button>
|
||||
<el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" plain size="small" @click="handleEdit(scope.row)">停产</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -114,7 +114,6 @@
|
||||
@current-change="handleCurrentChange1"/>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<el-table
|
||||
v-loading="loading2"
|
||||
@@ -182,7 +181,6 @@
|
||||
@current-change="handleCurrentChange2"/>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<div>停产后,将重新补投两种零件,一种是接着加工(执行原来的加工计划),另一种是从第一序重新加工(重新制定零件的加工计划),补投的零件号后加B</div>
|
||||
<div style="margin-top: 20px; display: block">
|
||||
@@ -201,7 +199,6 @@
|
||||
<el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-card v-show="false">
|
||||
<el-table
|
||||
:data="tableData4"
|
||||
@@ -236,8 +233,7 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
|
||||
<el-dialog :visible.sync="dialogeditVisible" :title="title" width="400px" center >
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible" :title="title" width="400px" center >
|
||||
<el-form ref="form" :model="form" label-position="left">
|
||||
<el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
|
||||
<el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
|
||||
@@ -282,7 +278,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :visible.sync="dialogeditVisible1" title="停产记录" width="400px" center>
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible1" title="停产记录" width="400px" center>
|
||||
<el-form ref="form2" :model="form2" label-position="left">
|
||||
<el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
|
||||
<el-input v-model="form2.reason" auto-complete="off"/>
|
||||
@@ -530,7 +526,7 @@ export default {
|
||||
|
||||
<style scoped>
|
||||
.el-card{
|
||||
margin-bottom: 15px;
|
||||
margin-bottom:0px;
|
||||
}
|
||||
.el-date-editor{
|
||||
width:200px;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<el-table :data="List" border size="small" height="500px">
|
||||
<el-table :data="List" border size="small" stripe highlight-current-row height="500px">
|
||||
<el-table-column label="设备名称" align="center" >
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.设备名称 }}
|
||||
@@ -61,8 +61,8 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="200px" fixed="right" >
|
||||
<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 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 type="danger" size="mini" icon="el-icon-delete" plain @click="handleDelete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -93,7 +93,7 @@
|
||||
</el-tooltip>
|
||||
</el-card>
|
||||
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
|
||||
<el-dialog v-el-drag-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="120px" class="demo-ruleForm">
|
||||
<el-row>
|
||||
<el-col :span = "12">
|
||||
@@ -169,7 +169,7 @@
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="callOff('form')">取消</el-button>
|
||||
<el-button @click="callOff('form')">取消</el-button>
|
||||
<el-button type="primary" @click="submit('form')">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
@@ -395,6 +395,6 @@ export default {
|
||||
</script>
|
||||
<style scoped>
|
||||
.el-card{
|
||||
margin-bottom: 15px;
|
||||
margin-bottom: 1px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card>
|
||||
<el-row>
|
||||
<span>项目名称:</span>
|
||||
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin: 3px" size="small">
|
||||
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-bottom:10px" size="small">
|
||||
<el-option
|
||||
v-for="item in entryName"
|
||||
:key="item.value"
|
||||
@@ -13,7 +14,9 @@
|
||||
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
|
||||
<span style="margin-left: 10px">营销经理:</span>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
|
||||
<span style="margin-left: 10px">开始日期:</span>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>开始日期:</span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
@@ -30,6 +33,7 @@
|
||||
type="date"
|
||||
placeholder="请选择结束日期"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
@@ -40,7 +44,7 @@
|
||||
:expand-row-keys="expands"
|
||||
highlight-current-row
|
||||
style="width: 100%; margin-top: 3px"
|
||||
height="600"
|
||||
height="500"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
{{ scope.row.税号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="140">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="编辑" placement="top">
|
||||
<div style="display: inline-block">
|
||||
@@ -192,7 +192,7 @@
|
||||
{{ scope.row.本次收款时间 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="250">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="编辑" placement="top">
|
||||
<div style="display: inline-block">
|
||||
@@ -222,28 +222,28 @@
|
||||
align="center"
|
||||
label="付款批次"
|
||||
type="index"
|
||||
width="150"/>
|
||||
<el-table-column align="center" label="应收金额(万元)" width="180px">
|
||||
width="70"/>
|
||||
<el-table-column align="center" label="应收金额(万元)" width="118px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.应收金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="已收金额(万元)" width="180px">
|
||||
<el-table-column align="center" label="已收金额(万元)" width="118px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.已收金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="未收金额(万元)" width="200px">
|
||||
<el-table-column align="center" label="未收金额(万元)" width="118px">
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="转下阶段收款金额" width="200px">
|
||||
<el-table-column align="center" label="转下阶段收款金额" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.转下阶段金额 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="收款阶段" width="200px">
|
||||
<el-table-column align="center" label="收款阶段" width="169px">
|
||||
<template slot-scope="scope">
|
||||
<el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
|
||||
<el-option
|
||||
@@ -254,7 +254,7 @@
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="截止时间" width="200px">
|
||||
<el-table-column align="center" label="截止时间" width="156px">
|
||||
<template slot-scope="scope">
|
||||
<span>后</span>
|
||||
<el-input v-model="scope.row.提前x天提醒" size="mini" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
|
||||
@@ -285,7 +285,7 @@
|
||||
</el-popover>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="140">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="110">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="收款" placement="top">
|
||||
<div style="display: inline-block">
|
||||
@@ -473,7 +473,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="AccountsReceivableVisible" width="60%" >
|
||||
<el-dialog v-el-drag-dialog :visible.sync="AccountsReceivableVisible" title="查看收款信息" center width="65%">
|
||||
<el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border stripe>
|
||||
<el-table-column property="date" label="项目名称" align="center" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
@@ -510,7 +510,7 @@
|
||||
{{ scope.row.状态 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column property="date" label="操作" align="center" width="150px">
|
||||
<el-table-column property="date" label="操作" align="center" width="130px">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="立即收款" placement="top">
|
||||
<div style="display: inline-block">
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
type="date"
|
||||
placeholder="请选择结束日期"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
|
||||
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
|
||||
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card>
|
||||
@@ -41,14 +41,14 @@
|
||||
:row-key="getRowKeys"
|
||||
:expand-row-keys="expands"
|
||||
style="width: 100%"
|
||||
height="700"
|
||||
height="460"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
@expand-change="selectMachine">
|
||||
<el-table-column type="expand" label="详情">
|
||||
<template slot-scope="scope">
|
||||
<el-table :data="tableData2" border style="width: 612px; text-align: center" size="mini">
|
||||
<el-table :data="tableData2" class="" border stripe style="width: 612px; text-align: center" size="mini">
|
||||
<el-table-column label="设备型号" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
@@ -68,12 +68,12 @@
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="warning"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="editMachine(scope.row);flag = 2">编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="deleteMachine(scope.row)">删除</el-button>
|
||||
</template>
|
||||
@@ -88,7 +88,7 @@
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="项目名称" width="150">
|
||||
<el-table-column align="center" label="项目名称" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
</template>
|
||||
@@ -98,7 +98,7 @@
|
||||
{{ scope.row.合同签订日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="合同信息备注" width="150">
|
||||
<el-table-column align="center" label="合同信息备注" min-width="200">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
@@ -108,16 +108,19 @@
|
||||
<el-button
|
||||
size="mini"
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
plain
|
||||
type="primary"
|
||||
icon="el-icon-edit"
|
||||
@click.stop="handleEdit(scope.row)">编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
@click.stop="handleDelete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
@@ -135,7 +138,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
<!--新增合同信息对话框-->
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
|
||||
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
@@ -172,8 +175,7 @@
|
||||
<el-button type="primary" @click="submit('form')">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
|
||||
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
|
||||
<el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
|
||||
<el-form-item v-show="flag != 2" label="项目名称" prop="项目名称">
|
||||
<el-input v-model="form1.项目名称" size="small" style="width:200px"/>
|
||||
|
||||
@@ -278,12 +278,12 @@
|
||||
style="width: 795px;margin-right: 10px"
|
||||
clearable/>
|
||||
</div>
|
||||
<el-divider content-position="right"><el-button :disabled="disabledPick" type="text" icon="el-icon-edit" @click="function_Pick">选货</el-button></el-divider>
|
||||
<el-divider content-position="right"><el-button :disabled="disabledPick" size="mini" type="text" icon="el-icon-edit" @click="function_Pick">选货</el-button></el-divider>
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="tableData"
|
||||
highlight-current-row
|
||||
style="width: 100%"
|
||||
style="width: 100%;margin-top: 20px"
|
||||
height="560"
|
||||
border
|
||||
size="mini">
|
||||
@@ -327,7 +327,7 @@
|
||||
{{ scope.row.设计者 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150px">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="130px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="disabledDetailsDelete"
|
||||
@@ -503,7 +503,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :visible.sync="dialogFormVisibleSearch" center style="min-height: 700px" width="95%">
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleSearch" center style="height: 600px" width="98%">
|
||||
<div>
|
||||
<el-table
|
||||
:data="tableDataSearchList"
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
<div>
|
||||
<!--查询条件-->
|
||||
<el-card>
|
||||
<el-row>
|
||||
<span>项目名称:</span>
|
||||
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>
|
||||
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-bottom: 10px" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in entryName"
|
||||
:key="item.value"
|
||||
@@ -12,7 +13,9 @@
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">营销经理:</span>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
|
||||
<span style="margin-left: 10px">开始日期:</span>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>开始日期:</span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
@@ -29,6 +32,7 @@
|
||||
type="date"
|
||||
placeholder="请选择结束日期"/>
|
||||
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<!--项目表格-->
|
||||
<el-card>
|
||||
@@ -89,7 +93,7 @@
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150px">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="130px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
@@ -174,7 +178,7 @@
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="130">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="编辑" placement="top">
|
||||
<div style="display: inline-block">
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
v-loading="listLoading1"
|
||||
:data="tableData1"
|
||||
style="width: 100%;margin-top: 3px;"
|
||||
height="600"
|
||||
height="500"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
@@ -84,7 +84,7 @@
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="300px">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="210px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="scope.row.是否禁用增加履约保证金"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
|
||||
<el-card>
|
||||
<el-row>
|
||||
<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:200px;margin-bottom: 10px"/>
|
||||
<span>外协厂家:</span>
|
||||
<el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:200px" clearable/>
|
||||
<span>下达任务日期:</span>
|
||||
@@ -11,6 +11,8 @@
|
||||
type="date"
|
||||
size="small"
|
||||
placeholder="选择日期"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>单据状态:</span>
|
||||
<el-select v-model="documentStatus" filterable placeholder="请选择" size="small" clearable>
|
||||
<el-option
|
||||
@@ -24,10 +26,10 @@
|
||||
</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;
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
|
||||
<span>机床图号</span>
|
||||
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
|
||||
<el-option
|
||||
@@ -18,7 +17,6 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
|
||||
<span>组号</span>
|
||||
<el-select v-model="groupValue" placeholder="请选择组号" filterable size="small">
|
||||
<el-option
|
||||
@@ -27,7 +25,6 @@
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
|
||||
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
|
||||
</el-card>
|
||||
<el-card>
|
||||
@@ -52,9 +49,10 @@
|
||||
:data="tableData"
|
||||
highlight-current-row
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
style="width: 100%;max-height: 520px"
|
||||
height="520">
|
||||
height="460">
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
@@ -75,26 +73,27 @@
|
||||
<el-table-column
|
||||
label="零件名称"
|
||||
align="center"
|
||||
min-width="100px">
|
||||
min-width="140px">
|
||||
<template slot-scope="scope">{{ scope.row.零件名称 }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="组号"
|
||||
align="center"
|
||||
min-width="100px">
|
||||
min-width="60px">
|
||||
<template slot-scope="scope">{{ scope.row.组号 }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="零件数量"
|
||||
min-width="70"
|
||||
align="center">
|
||||
<template slot-scope="scope">{{ scope.row.零件数量 }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="部件数量" align="center">
|
||||
<el-table-column label="部件数量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.部件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="机床数量" align="center">
|
||||
<el-table-column label="机床数量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床数量 }}
|
||||
</template>
|
||||
@@ -140,6 +139,7 @@
|
||||
:disabled="Number(id)!==0"
|
||||
size="mini"
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
@@ -162,7 +162,8 @@
|
||||
:data="tableDataWB"
|
||||
style="width: 100%;min-height: 600px;"
|
||||
size="mini"
|
||||
height="600"
|
||||
stripe
|
||||
height="500"
|
||||
highlight-current-row
|
||||
border>
|
||||
<el-table-column
|
||||
@@ -230,11 +231,12 @@
|
||||
{{ scope.row.整改类型 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="200">
|
||||
<el-table-column label="操作" fixed="right" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="Number(id)!==0"
|
||||
size="mini"
|
||||
plsin
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)">删除</el-button>
|
||||
@@ -443,9 +445,9 @@ export default {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
span{
|
||||
margin: 20px;
|
||||
}
|
||||
/*span{*/
|
||||
/*margin: 20px;*/
|
||||
/*}*/
|
||||
.wrapper{
|
||||
width: 225px;
|
||||
height: 50px;
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0"/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="back">打回</el-button>
|
||||
<el-button type="danger" size="small" icon="el-icon-download" style="margin-left: 10px" @click="back">打回</el-button>
|
||||
<el-table v-loading="loading1" :data="tableData1" border stripe highlight-current-row style="width: 100%;margin-top:3px;" height="330" size="mini" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" align="center" width="55"/>
|
||||
<el-table-column label="零件图号" min-width="100" align="center">
|
||||
@@ -75,7 +75,7 @@
|
||||
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购单</el-button>
|
||||
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button>
|
||||
<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button>
|
||||
</div>
|
||||
<el-table v-loading="" :data="tableData2" border stripe h style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
|
||||
<el-table-column label="单号状态" align="center" width="100" fixed="left">
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<span>发票号:</span>
|
||||
<el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0" clearable/>
|
||||
<el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 130px" clearable/>
|
||||
<span style="margin-left: 10px">供应商:</span>
|
||||
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
|
||||
<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width:130px" clearable/>
|
||||
<span style="margin-left: 10px">传送人:</span>
|
||||
<el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:200px">
|
||||
<el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:130px">
|
||||
<el-option
|
||||
v-for="item in selectPerson1"
|
||||
:key="item.value"
|
||||
@@ -14,7 +14,7 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">接收人:</span>
|
||||
<el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:200px">
|
||||
<el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:130px">
|
||||
<el-option
|
||||
v-for="item in selectPerson"
|
||||
:key="item.value"
|
||||
@@ -34,9 +34,8 @@
|
||||
style="margin-left: 10px"
|
||||
@click="addTable1()">新增</el-button>
|
||||
</el-card>
|
||||
|
||||
<el-card>
|
||||
<el-table v-loading="" :data="tableData1" size="mini" style="margin-top: 3px" height="750px" stripe border highlight-current-row @expand-change="searchTable02">
|
||||
<el-table v-loading="" :data="tableData1" size="mini" style="margin-top: 3px" height="550px" stripe border highlight-current-row @expand-change="searchTable02">
|
||||
<el-table-column type="expand" label="详情">
|
||||
<template slot-scope="scope">
|
||||
<el-table :data="gridData" class="subTableHeader" stripe border size="mini" show-summary style="width: 40%">
|
||||
@@ -132,7 +131,7 @@
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="25%">
|
||||
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="30%">
|
||||
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px">
|
||||
<el-form-item label="供应商名称" prop="供应商名称">
|
||||
<el-input v-model="form1.供应商名称" size="small" readonly>
|
||||
@@ -613,7 +612,7 @@ export default {
|
||||
.el-input{
|
||||
width:200px
|
||||
}
|
||||
span{margin: 10px 0px;
|
||||
span{margin: 1px 0px;
|
||||
}
|
||||
.searchForm .el-form-item{
|
||||
margin-top: 1px;
|
||||
|
||||
@@ -100,17 +100,17 @@
|
||||
{{ scope.row.物料零件编码 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="材料" align="center" min-width="100">
|
||||
<el-table-column label="材料" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.材料 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" min-width="100">
|
||||
<el-table-column label="单位" align="center" min-width="55">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" align="center" min-width="100">
|
||||
<el-table-column label="数量" align="center" min-width="55">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.批次数量 }}
|
||||
</template>
|
||||
@@ -120,22 +120,22 @@
|
||||
{{ scope.row.备注1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="重量" align="center" min-width="100">
|
||||
<el-table-column label="重量" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.重量1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单价" align="center" min-width="100">
|
||||
<el-table-column label="单价" align="center" min-width="55">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.单价 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合计" align="center" min-width="100">
|
||||
<el-table-column label="合计" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.批次数量 * scope.row.单价 * scope.row.重量1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" min-width="100">
|
||||
<el-table-column label="操作" align="center" min-width="70">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" content="到货" placement="top">
|
||||
<div style="display: inline-block">
|
||||
|
||||
Reference in New Issue
Block a user