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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
bryan sun
2019-11-28 15:53:35 +08:00
parent 50861907a5 5f5451c225
commit a9f8a4dd08
17 changed files with 171 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/api/ManufacturingCenter/ProcessTaskAssignment.js
View File

@@ -97,30 +97,6 @@ export function getTable00(PageCurrent, PageSize, num) {
} }
}) })
} }
// 保存
export function save(num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_工艺任务分配_保存数据',
param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
}
})
}
// // 模糊查询
// export function fuzzyQuery(num) {
// return request({
// url: '',
// method: 'post',
// data: {
// type: '1',
// name: '车间生产管理工艺_传递后_机床名称_查询数据_模糊查询',
// param: '机床图号=' + num + '&是否传递=2&考核状态=3&工艺任务分配状态=1&定额任务分配状态=1'
// }
// })
// }
// 工艺定额人员查询 // 工艺定额人员查询
export function initPerson() { export function initPerson() {
return request({ return request({
@@ -133,3 +109,27 @@ export function initPerson() {
} }
}) })
} }
// 保存
export function save(num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_工艺任务分配_保存数据',
param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
}
})
}
// 保存
export function save2(num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_工艺任务分配_保存数据',
param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
}
})
}

6
src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
View File

@@ -37,14 +37,14 @@ export function payTime(num, time) {
}) })
} }
// 修改扣款数据、扣款说明 // 修改扣款数据、扣款说明
export function WithdrawingEdit(num, quality, plan, Other, Explain) { export function WithdrawingEdit(num, quality, Explain) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间生产管理_外协加工任务单_修改数据', name: '车间生产管理_外协扣款_编辑数据',
param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款_计划=' + plan + '&扣款_其他=' + Other + '&扣款说明=' + Explain param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款说明=' + Explain
} }
}) })
} }

2
src/utils/request.js
View File

@@ -26,7 +26,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 MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

48
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -3,16 +3,16 @@
<el-card> <el-card>
<div slot="header"> <div slot="header">
<el-row style="margin-bottom:-10px!important;"> <el-row style="margin-bottom:-10px!important;">
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px; width: 120px;"/> <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 150px;" @keyup.enter.native="pageCurrent=1;pageSize=20;searchMaterial()"/>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/> <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/> <!--<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
<el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate"> <!--<el-select v-model="inventoryNameValue" placeholder="仓库" style="margin-bottom: 10px; width: 120px;" size="small" clearable @change="getLocate">-->
<el-option <!--<el-option-->
v-for="item in inventoryName" <!--v-for="item in inventoryName"-->
:key="item.value" <!--:key="item.value"-->
:label="item.label" <!--:label="item.label"-->
:value="item.value"/> <!--:value="item.value"/>-->
</el-select> <!--</el-select>-->
<el-select v-model="locateNameValue" placeholder="货位名称" style="margin-top: 10px; width: 120px;" size="small" clearable> <el-select v-model="locateNameValue" placeholder="货位名称" style="margin-top: 10px; width: 120px;" size="small" clearable>
<el-option <el-option
v-for="item in locateName" v-for="item in locateName"
@@ -85,18 +85,18 @@
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="新增" center style="min-height: 300px" width="880px">
<el-row> <el-row>
<el-col style="width: 240px"> <el-col style="width: 280px">
<span>物料名称:</span> <span>名称规格型号:</span>
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/> <el-input v-model="materialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;" @keyup.enter.native="pageCurrent01=1;pageSize01=20;searchMaterial01()"/>
</el-col>
<el-col style="width: 240px">
<span>物料规格:</span>
<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>
</el-col>
<el-col style="width: 240px">
<span>物料型号:</span>
<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>
</el-col> </el-col>
<!--<el-col style="width: 240px">-->
<!--<span>物料规格:</span>-->
<!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px;" clearable/>-->
<!--</el-col>-->
<!--<el-col style="width: 240px">-->
<!--<span>物料型号:</span>-->
<!--<el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px;" clearable/>-->
<!--</el-col>-->
<el-col style="width: 80px"> <el-col style="width: 80px">
<el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=20;searchMaterial01()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" @click="pageCurrent01=1;pageSize01=20;searchMaterial01()">查询</el-button>
</el-col> </el-col>
@@ -134,7 +134,7 @@
@current-change="handleCurrentChange01"/> @current-change="handleCurrentChange01"/>
</div><hr> </div><hr>
<el-row> <el-row>
<el-col style="width: 210px"> <el-col v-show="false" style="width: 210px">
<span>仓库:</span> <span>仓库:</span>
<el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate"> <el-select v-model="inventoryNameValue" style="margin-bottom: 10px;" size="small" clearable @change="getLocate">
<el-option <el-option
@@ -206,6 +206,7 @@ export default {
mounted() { mounted() {
this.initData() this.initData()
this.searchMaterial() this.searchMaterial()
this.getLocate()
}, },
methods: { methods: {
// 初始化数据 // 初始化数据
@@ -236,8 +237,7 @@ export default {
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '库存管理_货位主文件_查询数据', name: '库存管理_货位主文件_查询数据_2019-11-28'
param: `仓库流水号=${this.inventoryNameValue}`
} }
} }
request(param).then(res => { request(param).then(res => {

4
src/views/Inventory/MaterialOut/index.vue
View File

@@ -436,9 +436,9 @@ export default {
}, },
// 领料确认 // 领料确认
inputPassword() { inputPassword() {
this.form3.outTypeValue = '' this.form3.outTypeValue = 21
this.form3.password = '' this.form3.password = ''
this.form3.department = '' this.form3.department = '装配'
this.dialogFormVisible3 = true this.dialogFormVisible3 = true
}, },
selectable(row, index) { // 控制某行是否可选 selectable(row, index) { // 控制某行是否可选

38
src/views/Inventory/OfflinePartOut/index.vue
View File

@@ -1,19 +1,19 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row style="margin-bottom: 10px"> <el-row style="margin: 5px">
<span>物料名称：</span> <span>名称规格型号：</span>
<el-input v-model="materialName" placeholder="物料名称" clearable size="small"/> <el-input v-model="materialName" placeholder="名称规格型号" clearable size="small" @keyup.enter.native="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()"/>
<span>物料规格：</span> <!--<span>物料规格：</span>-->
<el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/> <!--<el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>-->
<!--<span>物料型号：</span>-->
<!--<el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>-->
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
</el-row> </el-row>
<span>物料型号：</span>
<el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="440" @row-click="searchoutRecord"> <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="600" @row-click="searchoutRecord">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" prop="物料名称" align="center" min-width="120"> <el-table-column label="物料名称" prop="物料名称" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -30,11 +30,11 @@
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80"> <!--<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.仓库名称 }} <!--{{ scope.row.仓库名称 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="货位名称" align="center" min-width="80"> <el-table-column label="货位名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.货位名称 }} {{ scope.row.货位名称 }}
@@ -65,7 +65,7 @@
</div> </div>
</el-card> </el-card>
<el-card> <el-card v-show="false">
<el-table v-loading="listLoading1" :data="tableDataOut" size="mini" stripe border style="width: 100%;" height="250"> <el-table v-loading="listLoading1" :data="tableDataOut" size="mini" stripe border style="width: 100%;" height="250">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="物料名称" align="center" min-width="80"> <el-table-column label="物料名称" align="center" min-width="80">
@@ -169,7 +169,7 @@
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<!--</el-form-item>--> <!--</el-form-item>-->
<el-form-item label="领料部门" prop="DirectNumber" label-width="100px" size="small"> <el-form-item label="领料部门" prop="department" label-width="100px" size="small">
<el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/> <el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/>
</el-form-item> </el-form-item>
<el-form-item label="领料人" prop="DirectNote" label-width="100px"> <el-form-item label="领料人" prop="DirectNote" label-width="100px">
@@ -220,7 +220,8 @@ export default {
{ required: true, message: '请输入数量', trigger: 'blur' }, { required: true, message: '请输入数量', trigger: 'blur' },
{ validator: checkNum, trigger: 'blur' } { validator: checkNum, trigger: 'blur' }
], ],
DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }] DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }],
department: [{ required: true, message: '请输入领料部门', trigger: 'blur' }]
}, },
locateNumber: '', locateNumber: '',
materialNumber: '', materialNumber: '',
@@ -346,12 +347,13 @@ export default {
}, },
// 打开表单 // 打开表单
parOut(row) { parOut(row) {
this.dialogFormVisible = true this.form.department = '装配车间'
this.locateNumber = row.货位流水号 this.locateNumber = row.货位流水号
this.materialNumber = row.物料流水号 this.materialNumber = row.物料流水号
this.partnumber = row.货位存量 this.partnumber = row.货位存量
this.离线合同明细流水号 = row.离线合同明细流水号 this.离线合同明细流水号 = row.离线合同明细流水号
this.组件零件基本件流水号 = row.组件零件基本件流水号 this.组件零件基本件流水号 = row.组件零件基本件流水号
this.dialogFormVisible = true
}, },
// 重置表单 // 重置表单
callOff() { callOff() {

10
src/views/Inventory/PurchaseInRecord/index.vue
View File

@@ -19,11 +19,12 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-input v-model="name" placeholder="名称" style="width:150px;margin-left: 10px" clearable size="small"/> <el-input v-model="name" placeholder="名称图号规格" style="width:150px;margin-left: 10px" clearable size="small" @keyup.enter.native="searchRecord()"/>
<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" /> <!--<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />-->
<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" /> <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
</el-row> </el-row>
<el-row style="margin-bottom:10px"> <el-row v-show="false" style="margin-bottom:10px">
<el-date-picker <el-date-picker
v-model="inTime" v-model="inTime"
type="daterange" type="daterange"
@@ -34,7 +35,6 @@
style="width:250px;margin-left: 0px" style="width:250px;margin-left: 0px"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间"/> end-placeholder="结束时间"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card style="width: 900px"> <el-card style="width: 900px">

10
src/views/Inventory/PurchaseOutRecord/index.vue
View File

@@ -19,11 +19,12 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-input v-model="name" placeholder="名称" clearable size="small" style="width:150px;margin-left: 10px" /> <el-input v-model="name" placeholder="名称图号规格" clearable size="small" style="width:150px;margin-left: 10px" @keyup.enter.native="pageCurrent1=1;pageSize1=100;searchRecord()"/>
<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" /> <!--<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />-->
<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" /> <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
</el-row> </el-row>
<el-row style="margin-bottom:10px"> <el-row v-show="false" style="margin-bottom:10px">
<el-date-picker <el-date-picker
v-model="outTime" v-model="outTime"
type="daterange" type="daterange"
@@ -34,7 +35,6 @@
style="width:250px;margin-left: 0px" style="width:250px;margin-left: 0px"
start-placeholder="开始时间" start-placeholder="开始时间"
end-placeholder="结束时间"/> end-placeholder="结束时间"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card style="width: 900px"> <el-card style="width: 900px">

7
src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
View File

@@ -37,11 +37,11 @@
</el-row> </el-row>
<el-row> <el-row>
<span>操作者:</span> <span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/> <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:120px; margin-top: 10px;margin-bottom: 10px"/>
<span>零件图号:</span> <span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:200px"/> <el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:150px"/>
<span>工艺名称:</span> <span>工艺名称:</span>
<el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:200px"/> <el-input v-model="technologyName" placeholder="工艺名称" size="small" clearable style="width:150px"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button> <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="新增补录工时" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="新增补录工时" placement="top">
<el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button> <el-button type="primary" class="el-icon-plus" size="small" style="margin: 10px 0 0 10px" @click="addSupplement();">新增</el-button>
@@ -507,7 +507,6 @@ export default {
this.partNumber ? check4 = 1 : check4 = 0 this.partNumber ? check4 = 1 : check4 = 0
this.startTime2 && this.endTime2 ? check5 = 1 : check5 = 0 this.startTime2 && this.endTime2 ? check5 = 1 : check5 = 0
searchTable(this.technologyName, check1, this.workerName, check2, check3, this.endTime1, this.startTime1, this.partNumber, check4, check5, this.endTime2, this.startTime2, this.pageCurrent, this.pageSize).then(res => { searchTable(this.technologyName, check1, this.workerName, check2, check3, this.endTime1, this.startTime1, this.partNumber, check4, check5, this.endTime2, this.startTime2, this.pageCurrent, this.pageSize).then(res => {
console.log(res.data.rows, 898989)
this.tableData = res.data.rows this.tableData = res.data.rows
this.total = res.data.total this.total = res.data.total
this.tableData.map(v => { this.tableData.map(v => {

3
src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
View File

@@ -633,7 +633,8 @@ export default {
}, },
opclickshowPanel($event) { opclickshowPanel($event) {
if ($event.path[2].id !== undefined && $event.path[2].id !== null && $event.path[2].id !== '') { if ($event.path[2].id !== undefined && $event.path[2].id !== null && $event.path[2].id !== '') {
var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.232&port=61101' // var aaa = 'http://192.168.1.232/webpage/MesWebFun02.htm?opname=' + $event.path[2].id + '&ip=192.168.1.232&port=61101'
var aaa = 'http://192.168.1.232:8007/#/login?OPNAME=' + $event.path[2].id
window.open(aaa) window.open(aaa)
} }
}, },

29
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -3,7 +3,6 @@
<el-card> <el-card>
<div> <div>
<el-row> <el-row>
<!-- <span style="margin-left: 10px">机床号：</span>-->
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px;width:150px" clearable @change="machineChange"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px;width:150px" clearable @change="machineChange">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
@@ -14,17 +13,14 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option> </el-option>
</el-select> </el-select>
<!-- <span style="margin-left: 10px">组号：</span>--> <el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:100px" size="small" clearable>
<el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:150px" size="small" clearable>
<el-option <el-option
v-for="item in groupNumber" v-for="item in groupNumber"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<!-- <span style="margin-left: 10px">零件号：</span>--> <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 250px; margin:0px 10px;width:150px"/>
<el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px; margin:0px 10px;width:150px"/>
<!-- <span style="margin-left: 10px">工艺员：</span>-->
<el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px;width:150px" clearable > <el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px;width:150px" clearable >
<el-option <el-option
v-for="item in person" v-for="item in person"
@@ -33,6 +29,9 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button> <el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
<el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
<el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
</el-tooltip>
</el-row> </el-row>
</div> </div>
</el-card> </el-card>
@@ -64,22 +63,22 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" width="130px"> <el-table-column label="零件图号" prop="零件图号" show-overflow-tooltip align="center" min-width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="90px"> <el-table-column label="零件名称" prop="零件名称" show-overflow-tooltip align="center" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投产数量" align="center" width="90px"> <el-table-column label="数量" align="center" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工艺员" prop="工艺员" align="center" width="90px"> <el-table-column label="工艺员" prop="工艺员" align="center" width="75px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺员 }} {{ scope.row.工艺员 }}
</template> </template>
@@ -90,21 +89,13 @@
:current-page="pageCurrent" :current-page="pageCurrent"
:page-sizes="[5, 10, 20, 300]" :page-sizes="[5, 10, 20, 300]"
:page-size="pageSize" :page-size="pageSize"
:pager-count="5"
:total="total" :total="total"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
</div> </div>
</el-card> </el-card>
<el-card>
<div>
<el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
<div style="display: inline-block">
<el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
</div>
</el-tooltip>
</div>
</el-card>
</el-col> </el-col>
<el-col style="width: 1000px"> <el-col style="width: 1000px">
<el-card v-if="tableData2.length"> <el-card v-if="tableData2.length">

24
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -24,6 +24,7 @@
</el-select> </el-select>
<el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button> <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
<el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button> <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
<el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="currency">保存</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-table
@@ -159,7 +160,10 @@ export default {
PageCurrent: 1, PageCurrent: 1,
PageSize: 50, PageSize: 50,
total: 0, total: 0,
Craftsmens: [] // 工艺员 Craftsmens: [], // 工艺员
通用件图号: [],
通用件规格: [],
工艺员: []
} }
}, },
created() { created() {
@@ -292,6 +296,7 @@ export default {
工艺结束时间: response.data.rows[i].工艺计划结束时间, 工艺结束时间: response.data.rows[i].工艺计划结束时间,
数量: response.data.rows[i].批次数量, 数量: response.data.rows[i].批次数量,
投产时间: response.data.rows[i].操作时间, 投产时间: response.data.rows[i].操作时间,
规格: response.data.rows[i].规格,
工艺员: '', 工艺员: '',
人员编号: '', 人员编号: '',
工艺计划流水号: response.data.rows[i].工艺计划流水号 工艺计划流水号: response.data.rows[i].工艺计划流水号
@@ -356,7 +361,6 @@ export default {
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val this.multipleSelection = val
console.log(val)
}, },
save() { save() {
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -376,6 +380,22 @@ export default {
}) })
} }
} }
},
// 直接保存工艺
currency() {
this.通用件图号 = []
this.通用件规格 = []
this.工艺员 = []
this.multipleSelection.map(v => {
if (!v.工艺员) {
return false
}
console.log(111)
this.通用件图号.push(v.零件号)
this.通用件规格.push(v.规格)
this.工艺员.push(v.工艺员)
})
console.log(this.通用件图号, this.通用件规格, this.工艺员)
} }
} }
} }

6
src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
View File

@@ -14,7 +14,7 @@
</el-option> </el-option>
</el-select> </el-select>
<span>组号:</span> <span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号"> <el-select v-model="Group" size="small" style="width: 100px" clearable placeholder="组号">
<el-option <el-option
v-for="item in Groups" v-for="item in Groups"
:key="item.value" :key="item.value"
@@ -23,8 +23,9 @@
</el-select> </el-select>
<span>零件号:</span> <span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/> <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row> </el-row>
<el-row> <el-row v-if="false">
<span class="demonstration">计划下达时间:</span> <span class="demonstration">计划下达时间:</span>
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
@@ -41,7 +42,6 @@
style="width: 160px" style="width: 160px"
type="date" type="date"
placeholder="选择日期"/> placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>

44
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -22,7 +22,7 @@
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
</el-card> </el-card>
<el-row> <el-row>
<el-col style="width: 400px"> <el-col style="width: 350px">
<el-card> <el-card>
<el-table <el-table
v-loading="loading" v-loading="loading"
@@ -35,22 +35,22 @@
border border
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
@row-click="searchTable2"> @row-click="searchTable2">
<el-table-column label="操作者" align="center" width="110px" show-overflow-tooltip> <el-table-column label="操作者" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划工时" align="center"> <el-table-column label="计划工时" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.理论加工时间段 }} {{ scope.row.理论加工时间段 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="加工工时" align="center"> <el-table-column label="加工工时" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.实际加工时间段 }} {{ scope.row.实际加工时间段 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="完成数量" align="center"> <el-table-column label="完成数量" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成数量 }} {{ scope.row.完成数量 }}
</template> </template>
@@ -66,15 +66,15 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col style="margin-left: 0px;width: 810px"> <el-col style="margin-left: 0px;width: 860px">
<el-card> <el-card>
<el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="700px" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" size="mini" stripe highlight-current-row style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="170px" show-overflow-tooltip> <el-table-column label="零件图号" align="center" width="140px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" align="center" width="90px" show-overflow-tooltip> <el-table-column label="零件名称" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -84,7 +84,7 @@
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="完成数量" align="center" width="70px"> <el-table-column label="完成数" align="center" width="60px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成数量 }} {{ scope.row.完成数量 }}
</template> </template>
@@ -94,11 +94,11 @@
{{ scope.row.质检结果 }} {{ scope.row.质检结果 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="不合格数" align="center" width="70px"> <!--<el-table-column label="不合格数" align="center" width="70px">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.不合格数量 }} <!--{{ scope.row.不合格数量 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column label="计划工时" align="center" width="70px"> <el-table-column label="计划工时" align="center" width="70px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.理论加工时间段 }} {{ scope.row.理论加工时间段 }}
@@ -109,7 +109,12 @@
{{ scope.row.实际加工时间段 }} {{ scope.row.实际加工时间段 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="完成时间" align="center" width="100px"> <el-table-column label="加工开始" align="center" width="135px">
<template slot-scope="scope">
{{ scope.row.加工开始时间 }}
</template>
</el-table-column>
<el-table-column label="加工完成" align="center" width="135px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.加工完成时间 }} {{ scope.row.加工完成时间 }}
</template> </template>
@@ -145,10 +150,10 @@ export default {
loading2: '', loading2: '',
pageCurrent: 1, pageCurrent: 1,
pageSize: 10000, pageSize: 10000,
total: '', total: 0,
pageCurrent2: 1, pageCurrent2: 1,
pageSize2: 10000, pageSize2: 10000,
total2: '', total2: 0,
timeCheck: '', timeCheck: '',
operater: '' operater: ''
} }
@@ -166,8 +171,6 @@ export default {
if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) { if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) {
this.timeCheck = 1 this.timeCheck = 1
} else { } else {
// this.startTime = ''
// this.endTime = ''
this.timeCheck = 0 this.timeCheck = 0
} }
searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => { searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
@@ -197,7 +200,8 @@ export default {
不合格数量: response.data.rows[i].不合格数量, 不合格数量: response.data.rows[i].不合格数量,
理论加工时间段: response.data.rows[i].理论加工时间段, 理论加工时间段: response.data.rows[i].理论加工时间段,
实际加工时间段: response.data.rows[i].实际加工时间段, 实际加工时间段: response.data.rows[i].实际加工时间段,
加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间.split(' ')[0] : '' 加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '',
加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : ''
}) })
} }
} }

4
src/views/ManufacturingCenter/ShopScheduling/index.vue
View File

@@ -13,7 +13,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-row> </el-row>
<el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="710" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu"> <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="600" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
@@ -51,7 +51,7 @@
:page-sizes="[50, 100, 200, 500, 1000]" :page-sizes="[50, 100, 200, 500, 1000]"
:page-size="pageSize" :page-size="pageSize"
:total="total" :total="total"
:pager-count="5" :pager-count="4"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>

2
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -563,7 +563,7 @@ export default {
}, },
// 扣款编辑 // 扣款编辑
WithdrawingEdit() { WithdrawingEdit() {
WithdrawingEdit(this.liushuihao, this.form2.质量, this.form2.计划, this.form2.其他, this.form2.扣款说明).then(response => { WithdrawingEdit(this.liushuihao, this.form2.质量, this.form2.扣款说明).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('修改成功') this.$message.success('修改成功')
this.searchTable() this.searchTable()

40
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -70,17 +70,12 @@
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="计划数量" width="100px">
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="技术下达数量" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件数量 || '—' }} {{ scope.row.零件数量 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同采购数量" width="100px"> <el-table-column align="center" label="采购数量" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
</template> </template>
@@ -105,6 +100,11 @@
{{ scope.row.姓名 || '—' }} {{ scope.row.姓名 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination
@@ -158,17 +158,12 @@
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="计划数量" width="100px">
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="技术下达数量" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件数量 || '—' }} {{ scope.row.零件数量 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同采购数量" width="100px"> <el-table-column align="center" label="采购数量" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
</template> </template>
@@ -193,6 +188,11 @@
{{ scope.row.姓名 || '—' }} {{ scope.row.姓名 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination
@@ -251,12 +251,7 @@
{{ scope.row.供货商 || '—' }} {{ scope.row.供货商 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip> <el-table-column align="center" label="计划数量" width="100px">
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
<el-table-column align="center" label="技术下达数量" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件数量 || '—' }} {{ scope.row.零件数量 || '—' }}
</template> </template>
@@ -286,6 +281,11 @@
{{ scope.row.姓名 || '—' }} {{ scope.row.姓名 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 || '—' }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination