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

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

Browse Source
This commit is contained in:
liushuai
2020-04-14 20:17:10 +08:00
parent d40d67c5ca ec2394249c
commit 083cab6815
12 changed files with 132 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/Outsourcing/OutsourcingTaskExecution.js
View File

@@ -115,7 +115,7 @@ export function editData1(Number, manufacturers, freight, Explain) {
})
}
// 新建外协加工任务单
export function addTable(contractNumber, personNum, manufacturers, time, freight) {
export function addTable(contractNumber, personNum, manufacturers, time, time2, freight) {
return request({
url: '',
method: 'post',
@@ -124,12 +124,12 @@ export function addTable(contractNumber, personNum, manufacturers, time, freight
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_增加数据',
param: '表单号=' + contractNumber + '=string&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '=int&任务下达日期=' + time + '=string&运费=' + freight + '=int'
param: '表单号=' + contractNumber + '&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '&任务下达日期=' + time + '&到货日期=' + time2 + '&运费=' + freight
}
})
}
// 外协加工任务单修改
export function editData(Number, manufacturers, freight, Explain) {
export function editData(Number, manufacturers, freight, Explain, time2) {
return request({
url: '',
method: 'post',
@@ -138,7 +138,7 @@ export function editData(Number, manufacturers, freight, Explain) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain
param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain + '&到货日期=' + time2
}
})
}
@@ -152,7 +152,7 @@ export function deleteData(Number) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_删除数据',
param: '外协加工任务单流水号=' + Number + '=int'
param: '外协加工任务单流水号=' + Number
}
})
}
@@ -166,7 +166,7 @@ export function deleteData1(Number) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单明细_删除数据',
param: '外协加工任务单明细流水号=' + Number + '=int'
param: '外协加工任务单明细流水号=' + Number
}
})
}
@@ -181,7 +181,7 @@ export function getNumber(time) {
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理_外协加工任务单_查询数据_单据编号',
param: '任务下达日期=' + time + '=string&表单号=1=string=output'
param: '任务下达日期=' + time + '&表单号=1=string=output'
}
})
}

1
src/api/TechnologyCenter/ImportParts.js
View File

@@ -420,6 +420,7 @@ export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num
}
})
}
// 传递零件
export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, num8, num9, id, oldId, oldNum, peopleid) {
return request({

26
src/utils/index.js
View File

@@ -68,3 +68,29 @@ export function formatTime(time, option) {
)
}
}
function zeroFill(i) {
if (i >= 0 && i <= 9) {
return '0' + i
} else {
return i
}
}
export function getNowDAY() { // 默认显示今天
// 获取当前时间
const date = new Date()
const month = zeroFill(date.getMonth() + 1)
const day = zeroFill(date.getDate())
const time = date.getFullYear() + '-' + month + '-' + day
return time
}
export function get90DAY() { // 3个月显示今天
var Data = new Date()
Data.setTime(Data.getTime() - 3600 * 1000 * 24 * 90)
const month = zeroFill(Data.getMonth() + 1)
const day = zeroFill(Data.getDate())
const time = Data.getFullYear() + '-' + month + '-' + day
return time
}

62
src/utils/request.js
View File

@@ -1,6 +1,6 @@
import axios from 'axios'
import Cookies from 'js-cookie'
import store from '@/store'
// import Cookies from 'js-cookie'
// import store from '@/store'
export const wsuri = `ws://123.56.95.229:61101//WebMoudule//websocket`
export const name = `OP8888`
@@ -33,16 +33,16 @@ const service = axios.create({
// && config.data.name !== '菜单系统模块_通知信息_查询数据' && config.data.name !== '菜单系统模块_首页信息_查询数据1' && config.data.name !== '菜单系统模块_首页信息_查询数据2'
service.interceptors.request.use(config => {
if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') {
getSession_id().then(res => {
if (res === 0) {
store.dispatch('FedLogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
alert('此账号已异地登录，请查重新登录')
})
}
})
}
// if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') {
// getSession_id().then(res => {
// if (res === 0) {
// store.dispatch('FedLogOut').then(() => {
// location.reload() // 为了重新实例化vue-router对象 避免bug
// alert('此账号已异地登录，请查重新登录')
// })
// }
// })
// }
return config
}, error => {
Promise.reject(error)
@@ -50,22 +50,22 @@ service.interceptors.request.use(config => {
export default service
async function getSession_id() {
const id = Cookies.get('id')
const session_id = Cookies.get('session_id')
const param = {
url: url,
method: 'post',
data: {
type: '1',
name: '菜单系统模块_用户sessionID_查询数据',
param: '人员编号=' + id
}
}
const res = await axios(param)
if (session_id !== res.data[0].session_id) {
return 0
} else {
return 1
}
}
// async function getSession_id() {
// const id = Cookies.get('id')
// const session_id = Cookies.get('session_id')
// const param = {
// url: url,
// method: 'post',
// data: {
// type: '1',
// name: '菜单系统模块_用户sessionID_查询数据',
// param: '人员编号=' + id
// }
// }
// const res = await axios(param)
// if (session_id !== res.data[0].session_id) {
// return 0
// } else {
// return 1
// }
// }

27
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -21,7 +21,7 @@
:value="item.value"/>
</el-select>
<el-input v-model="Name" placeholder="物料名称、规格、型号" clearable style="width: 200px" size="small"/>
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=300;pageCurrent1=1;pageSize1=300;pageCurrent2=1;pageSize2=300;pageCurrent4=1;pageSize4=20;searchTable()">查询</el-button>
<el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=10;pageCurrent1=1;pageSize1=10;pageCurrent2=1;pageSize2=10;pageCurrent4=1;pageSize4=10;searchTable()">查询</el-button>
<el-switch
v-model="PickingValue"
active-color="#13ce66"
@@ -33,7 +33,7 @@
</div>
<el-tabs v-model="PartType" type="card" @tab-click="searchTable()">
<el-tab-pane label="标准件" name="标准件">
<el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 867px" height="500px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading0" ref="multipleTable" :data="tableData0" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120" show-overflow-tooltip>
<template slot-scope="scope">
@@ -89,7 +89,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="外购件" name="外购件">
<el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 867px" height="500px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading1" ref="multipleTable" :data="tableData1" size="mini" style="max-height: 600px;width: 867px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="43"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -145,7 +145,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="基本件" name="基本件">
<el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 976px" height="500px" border stripe @selection-change="handleSelectionChange">
<el-table v-loading="loading2" ref="multipleTable" :data="tableData2" size="mini" style="max-height: 600px;width: 976px" height="320px" border stripe @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="42"/>
<el-table-column align="center" prop="机床图号" label="机床图号" width="120px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -206,7 +206,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="离线采购件" name="离线采购件">
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 823px;" height="500px" @selection-change="handleSelectionChange1">
<el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 823px;" height="355px" @selection-change="handleSelectionChange1">
<el-table-column :selectable="selectable1" type="selection" align="center" width="42"/>
<el-table-column label="物料名称" prop="物料名称" align="center" width="153" show-overflow-tooltip>
<template slot-scope="scope">
@@ -422,16 +422,19 @@
import { initPickPerson, initMachineProject, searchgroup, searchTable, searchList, createList, dropList, selectIntoList, searchListDetail, dropListDetail, searchListDetailMX, searchPart, IntoMateerial } from '@/api/Inventory/CreatePickingList'
import request from '@/utils/request'
import { mapGetters } from 'vuex'
import { getNowDAY, get90DAY } from '@/utils/index'
export default {
name: 'CreatePickingList',
data() {
// var getNowDAY;
return {
createList_disable: false,
selectInto_disable: false,
审批情况: '',
peopleName: '',
ListMX: '',
startTime: '',
startTime: [get90DAY(), getNowDAY()],
// startTime: [],
PartType: '基本件',
machineNumberValue: '',
machineNumber: [],
@@ -453,20 +456,20 @@ export default {
tableData1: [],
tableData2: [],
pageCurrent0: 1,
pageSize0: 300,
pageSize0: 10,
total0: 0,
pageCurrent1: 1,
pageSize1: 300,
pageSize1: 10,
total1: 0,
pageCurrent2: 1,
pageSize2: 300,
pageSize2: 10,
total2: 0,
pickListTable1: [],
pageCurrent3: 1,
pageSize3: 20,
pageSize3: 10,
total3: 0,
pageCurrent4: 1,
pageSize4: 20,
pageSize4: 10,
total4: 0,
pickListTable2: [],
dialogFormVisible1: false,
@@ -505,6 +508,8 @@ export default {
mounted() {
this.fetchData()
this.searchList()
console.log(getNowDAY(), get90DAY(), 'time')
// this.startTime = [get90DAY(). getNowDAY()]
},
methods: {
// 审批通过

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

@@ -24,7 +24,7 @@
<el-button type="distribution" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
</el-row>
</div>
<el-table v-loading="loading" :data="tableData1" stripe highlight-current-row border height="550px" style="width: 865px" size="mini">
<el-table v-loading="loading" :data="tableData1" stripe highlight-current-row border height="550px" style="width: 1040px" size="mini">
<el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
@@ -64,6 +64,16 @@
<span v-else>{{ scope.row.货位存量 }}</span>
</template>
</el-table-column>
<el-table-column label="盘点人" prop="盘点人" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.盘点人 }}
</template>
</el-table-column>
<el-table-column label="盘点时间" prop="盘点时间" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.盘点时间 | formatTime }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button v-if="scope.row.changeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
@@ -306,12 +316,14 @@ export default {
data: {
type: '2',
name: `库存管理_库存盘点_物料货位数量_修改数据`,
param: `货位存量=${row.货位存量}&物料流水号=${row.物料流水号}&货位流水号=${row.货位流水号}&物料来源=${row.物料来源}`
param: `货位存量=${row.货位存量}&物料流水号=${row.物料流水号}&货位流水号=${row.货位流水号}&物料来源=${row.物料来源}&盘点人编号=${this.$store.state.user.id}`
}
}
request(param).then(res => {
if (res.data[0].result === '1') {
this.$message.success('操作成功')
// 查询
this.searchMaterial()
row.changeValue = false
} else {
this.$message.error('操作失败')

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

@@ -20,7 +20,7 @@
<el-button :disabled="审批未通过===true" size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
</div>
</el-card>
<div style="width: 21%;float: left;margin-right: 10px">
<div style="width: 25%;float: left;margin-right: 10px">
<el-card>
<el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="570px" @row-click="clickList">
<el-table-column prop="领料单编号" label="领料单编号" show-overflow-tooltip align="center" width="95px">
@@ -33,7 +33,7 @@
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="70px">
<el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="140px">
<template slot-scope="scope">
{{ scope.row.领料单备注 }}
</template>

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

@@ -171,6 +171,10 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if (this.pickListTable2.length === 0) {
this.$message.error('空领料单，不能审批！')
return
}
const param = {
url: '',
method: 'post',

12
src/views/Outsourcing/OutsourcingPartsQuery/index.vue
View File

@@ -21,7 +21,7 @@
<el-table-column label="外协状态" align="center" width="80px">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.外协状态)==1" type="primary" size="mini">未提交</el-tag>
<el-tag v-if="Number(scope.row.到货状态)===9" type="success" size="mini">未外协</el-tag>
<el-tag v-if="Number(scope.row.外协状态)===0" type="success" size="mini">未外协</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)!==1" type="warning" size="mini">未到货</el-tag>
<el-tag v-if="Number(scope.row.外协状态)==2 && Number(scope.row.到货状态)===1" type="success" size="mini">已到货</el-tag>
</template>
@@ -73,7 +73,12 @@
</el-table-column>
<el-table-column label="外协日期" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.任务下达日期.split(' ')[0] }}
{{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }}
</template>
</el-table-column>
<el-table-column label="规定到货日期" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.到货日期 ? scope.row.到货日期.split(' ')[0] : scope.row.到货日期 }}
</template>
</el-table-column>
<el-table-column label="外协员" align="center" width="70" show-overflow-tooltip>
@@ -121,7 +126,7 @@ export default {
procedure: [],
procedureTime: [],
pageCurrent: 1,
pageSize: 50,
pageSize: 500,
tableData1: []
}
},
@@ -186,7 +191,6 @@ export default {
check2 = 1
}
searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], this.pageSize, this.pageCurrent).then(response => {
console.log(response, 1111)
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false

21
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -109,9 +109,9 @@
<el-input v-positive="'float'" v-model="scope.row.加工价格_成交" class="editWorkTime" type="number" style="text-align: right" size="small" @change="saveAct(scope.row)" @blur="filterNuber(scope.row.加工价格_成交, scope.$index, '加工价格_成交')"/>
</template>
</el-table-column>
<el-table-column label="机加工开始时间" align="center" width="150px">
<el-table-column label="到货日期" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.机加工开始时间 }}
{{ scope.row.到货日期 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80px">
@@ -139,6 +139,16 @@
placeholder="下达任务日期"
value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="到货日期" prop="到货日期" style="margin-left: 70px">
<el-date-picker
v-model="form.到货日期"
type="date"
size="small"
style="width:200px"
default-value
placeholder="到货日期"
value-format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="外协厂家" prop="外协厂家" style="margin-left: 70px">
<el-select v-model="form.外协厂家" placeholder="选择外协厂家" filterable clearable size="small" style="width:200px">
<el-option
@@ -230,6 +240,7 @@ export default {
form: {
表单号: '',
下达任务日期: '',
到货日期: '',
外协厂家: '',
运费: null
},
@@ -372,7 +383,7 @@ export default {
this.List3.push({
外协加工任务单明细流水号: response.data[i].外协加工任务单明细流水号,
加工价格_成交: response.data[i].加工价格_成交.toFixed(2),
机加工开始时间: response.data[i].机加工开始时间 ? response.data[i].机加工开始时间.split(' ')[0] : '',
到货日期: response.data[i].到货日期,
零件图号: response.data[i].零件图号,
零件名称: response.data[i].零件名称,
批次数量: response.data[i].批次数量,
@@ -455,7 +466,7 @@ export default {
this.$message.error('请输入数字')
} else {
this.handleAdd_disable = true
addTable(this.form.表单号, this.id, this.form.外协厂家, this.form.下达任务日期, this.form.运费).then(response => {
addTable(this.form.表单号, this.id, this.form.外协厂家, this.form.下达任务日期, this.form.到货日期, this.form.运费).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
@@ -476,7 +487,7 @@ export default {
// 提交编辑
submitEdit() {
this.handleAdd_disable = true
editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain).then(response => {
editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain, this.form.到货日期).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false

11
src/views/Outsourcing/OutsourcingTaskQuery/index.vue
View File

@@ -35,11 +35,7 @@
<el-card>
<el-button :disabled="loading" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">收货</el-button>
<el-table v-loading="loading" :data="List3" border size="mini" height="595" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column
:selectable="selectable"
type="selection"
align="center"
width="55"/>
<el-table-column :selectable="selectable" type="selection" align="center" width="55"/>
<el-table-column label="收货状态" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.到货状态===1" type="success" size="small" style="margin: 0px">已收货</el-tag>
@@ -61,6 +57,11 @@
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="计划到货日期" align="center" >
<template slot-scope="scope">
{{ scope.row.到货日期 }}
</template>
</el-table-column>
</el-table>
</el-card>
</el-col>

2
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -736,8 +736,8 @@ export default {
for (let i = 0; i < this.tableDataAll.length; i++) {
const data = this.tableDataAll[i]
const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
console.log(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.分类码, data.整改类型, data.id, data.前id, data.前图号或者型号)
const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.分类码, data.整改类型, data.id, data.前id, data.前图号或者型号, this.id)
await sleep(10)
if (resp.data[0].result === '0') {
this.err++