Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0
This commit is contained in:
bryan sun
539
src/api/ManufacturingCenter/ProcessPlanningNew.js
Normal file
539
src/api/ManufacturingCenter/ProcessPlanningNew.js
Normal file
@@ -0,0 +1,539 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询零件未编制（包含借用件）
|
||||
export function getPartnames3(num1, num2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员机床组号或图号查',
|
||||
param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 查询零件已编制（包含借用件）
|
||||
export function getPartnames4(num1, num2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件_按人员机床组号或图号查',
|
||||
param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 典艺查询<高精原有数据>
|
||||
export function searchProcess11(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_原零件工艺查询_MESWORK',
|
||||
param: '零件图号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
// 典艺查询<高精原有数据>
|
||||
export function numChange(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_原零件工艺明细查询_MESWORK',
|
||||
param: '典艺流水号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
// 保存主表工艺
|
||||
export function selectRequest(num0, num1, num2, num3, request0) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
|
||||
param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
|
||||
}
|
||||
})
|
||||
}
|
||||
// 初始化 工艺员A
|
||||
export function initCraftmen() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
|
||||
param: '考核部门编号=20'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 查询 未编制 零件号
|
||||
export function getPartnames1(num1, num2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员查',
|
||||
param: '工艺人员编号=' + num1 + '&零件图号=' + num2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 初始化 已编制 零件号
|
||||
export function getPartnames2(num1, num2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件',
|
||||
param: '工艺人员编号=' + num1 + '&零件图号=' + num2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 零件详细信息
|
||||
export function detailInfo(serialNum) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_查已投产零件信息',
|
||||
param: '工艺计划流水号=' + serialNum + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 初始化材质
|
||||
export function getMaterial(pageCurrent, pageSize) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_材质表_查询数据',
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
}
|
||||
// 根据材质名称查材质
|
||||
export function searchMaterial(pageCurrent, pageSize, name) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_材质表_查询数据_根据材料名称',
|
||||
param: '材料名称=' + name,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
}
|
||||
// 典型工艺选择零件分类A
|
||||
export function typicalProcess() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_基础表_典型工艺名称_分类_查询数据'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 典型工艺选择零件名称、工艺号、备注
|
||||
export function FcK(serialNum) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_查典型工艺名称',
|
||||
param: '典型工艺名称分类流水号=' + serialNum + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 典型工艺查询
|
||||
export function searchProcess(check1, a, check2, b, check3, c) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_基础表_典型工艺名称_查询数据_综合查询',
|
||||
param: '典型工艺名称分类流水号_check=' + check1 + '=bit&典型工艺名称分类流水号=' + a + '=int&典型工艺流水号_check=' + check2 + '=bit&典型工艺流水号=' + b + '=int&典型工艺流水号1_check=' + check3 + '=bit&典型工艺流水号1=' + c + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 初始化工艺名称
|
||||
export function processNameClick() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 工艺名称查询
|
||||
export function processNameSelect(val) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_基础表_工艺名称_查询数据',
|
||||
param: '工艺分类流水号_check=1=bit&工艺分类流水号=' + val + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 工艺要求查询
|
||||
export function processRequestSelect(val) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理_基础表_工艺要求_查询数据',
|
||||
param: '工艺编号=' + val + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 初始化公差A
|
||||
export function initTolerance() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_基础表_公差对照表_查询数据'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 公差查询
|
||||
export function searchTolerance(val1, val2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_基础表_公差对照表_公差_查询数据',
|
||||
param: '输入数值=' + val1 + '&参数=' + val2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 工艺定额人员查询
|
||||
export function initPerson() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
|
||||
param: '考核部门编号=9'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 完艺工艺查询
|
||||
export function searchWYgongyi(check1, tuhao, check2, bianhao, check3, start, end, check4, name) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_查询数据_根据零件图号查询已投产的工艺计划流水号',
|
||||
param: '零件图号_check=' + check1 + '&零件图号=' + tuhao + '&工艺员编号_check=' + check2 + '&工艺员编号=' + bianhao + '&工艺时间_check=' + check3 + '&工艺开始时间=' + start + '=datetime&工艺结束时间=' + end + '=datetime&零件名称_check=' + check4 + '&零件名称=' + name
|
||||
}
|
||||
})
|
||||
}
|
||||
// 完艺工艺要求查询
|
||||
export function gongyiYQ(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_查询数据',
|
||||
param: '工艺计划流水号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
// 完艺工艺拷贝
|
||||
export function gongyiCopy(num1, num2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
|
||||
param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 主界面选择零件号查主表
|
||||
export function mainTable(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工序_查询工序信息',
|
||||
param: '工艺计划流水号=' + num + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 主界面主表难度等级修改
|
||||
export function hardEdit(num, hard) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_修改数据_工艺难度等级',
|
||||
param: '工序流水号=' + num + '=int&工艺难度等级=' + hard
|
||||
}
|
||||
})
|
||||
}
|
||||
// 主界面主表工艺要求修改
|
||||
export function requestEdit(num, request0) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_修改数据_工艺要求_根据工序流水号',
|
||||
param: '工序流水号=' + num + '=int&工艺要求=' + request0
|
||||
}
|
||||
})
|
||||
}
|
||||
// 主界面主表插入功能
|
||||
export function insertOne(num0, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_修改数据_工艺计划流水号和工序流水号',
|
||||
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 主界面主表删除功能
|
||||
export function deleteOne(num0, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_删除数据_工序流水号',
|
||||
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 主界面主表上移功能
|
||||
export function upOne(num0, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_修改数据_上移工序',
|
||||
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 主界面主表下移功能
|
||||
export function downOne(num0, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_修改数据_下移工序',
|
||||
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 保存变更材质
|
||||
export function saveMaterial(num0, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工艺计划_修改零件材料',
|
||||
param: '工艺计划流水号=' + num0 + '&材料流水号=' + num1
|
||||
}
|
||||
})
|
||||
}
|
||||
// 核准保存
|
||||
export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num4, weight, area, num5, level) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划',
|
||||
param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 粘贴
|
||||
export function pasteTable(oldNum, newNum) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工艺计划_拷贝零件工艺',
|
||||
param: '工艺计划流水号旧=' + oldNum + '&工艺计划流水号新=' + newNum
|
||||
}
|
||||
})
|
||||
}
|
||||
// 删除
|
||||
export function deleteTable(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_删除零件工艺',
|
||||
param: '工艺计划流水号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
// 在制零件工艺修改
|
||||
export function returnEdit(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_在制零件工艺调整_修改工艺',
|
||||
param: '工艺计划流水号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
// 查询工艺记录
|
||||
export function searchRecord(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_在制零件工艺调整_查询工艺',
|
||||
param: '工艺计划流水号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
// 重量拷贝
|
||||
export function WeightCopy(num, num2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_重量拷贝_工艺计划流水号',
|
||||
param: '工艺计划流水号=' + num + '&重量信息=' + num2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 保存变更材质
|
||||
export function saveWeight(num0, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工艺计划_修改零件重量',
|
||||
param: '工艺计划流水号=' + num0 + '&重量=' + num1
|
||||
}
|
||||
})
|
||||
}
|
||||
// 单件工时改变
|
||||
export function singleChange(val1, val2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_单件准结定额_修改数据',
|
||||
param: '工序流水号=' + val1 + '&单件定额工时=' + val2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 准结工时改变
|
||||
export function readyChange(val1, val2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_单件准结定额_修改数据',
|
||||
param: '工序流水号=' + val1 + '&准结定额工时=' + val2
|
||||
}
|
||||
})
|
||||
}
|
||||
// 未编制定额保存
|
||||
export function TableAddLi1(a, b) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_定额任务分配_保存数据',
|
||||
param: '工艺计划流水号=' + a + '=string&人员编号=' + b + '=string'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 已编制定额保存
|
||||
export function TableAddLi(a, b, c, num0, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_增加数据_修改数据',
|
||||
param: '单件定额工时=' + a + '=string&准结定额工时=' + b + '=string&零件图号=' + c + '=string&工序流水号=' + num0 + '=int&工艺计划流水号=' + num1 + '=int'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 修改备注
|
||||
export function modifyRemark(...params) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工艺计划_工艺修改记录_增加数据',
|
||||
param: `修改人员编号=${params[0]}&修改备注=${params[1]}&工艺计划流水号=${params[2]}`
|
||||
}
|
||||
})
|
||||
}
|
||||
export function editGongyi(num, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_修改数据_2027zdyNew',
|
||||
param: `工艺计划流水号=${num}&工艺编号=${num1}`
|
||||
}
|
||||
})
|
||||
}
|
||||
export function dropGongyi(num, num1) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '2',
|
||||
name: '车间生产管理工艺_零件工序_删除数据_2027zdyNew',
|
||||
param: `工艺计划流水号=${num}&工序流水号=${num1}`
|
||||
}
|
||||
})
|
||||
}
|
||||
86
src/api/ManufacturingCenter/ShopScheduling.js
Normal file
86
src/api/ManufacturingCenter/ShopScheduling.js
Normal file
@@ -0,0 +1,86 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 初始化工艺
|
||||
export function getPerson() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '3',
|
||||
name: 'SELECT 姓名,人员编号 FROM 人事档案管理_人员名单 inner join dbo.人事档案管理_基础表_部门 on 人事档案管理_人员名单.考核部门编号=人事档案管理_基础表_部门.考核部门编号 where 人事档案管理_人员名单.考核部门编号=12 and 人员编号 <> 82 order by 姓名 '
|
||||
}
|
||||
})
|
||||
}
|
||||
export function getParts(pageCurrent, pageSize) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_车间排产_零件查询',
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
}
|
||||
export function getGongxu(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '3',
|
||||
name: `select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 = 6 and 工艺计划流水号=${num} order by 工序顺序`
|
||||
}
|
||||
})
|
||||
}
|
||||
export function searchTableData2(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '3',
|
||||
name: `select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} and 工序状态<>4 order by 工序顺序`
|
||||
}
|
||||
})
|
||||
}
|
||||
export function XuanRu(num, num2) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '4',
|
||||
name: `update 车间生产管理工艺_零件工序 set 排产人员=${num},排产时间= GETDATE() where 工序流水号=${num2}`
|
||||
}
|
||||
})
|
||||
}
|
||||
export function XuanChu(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '4',
|
||||
name: `update 车间生产管理工艺_零件工序 set 排产人员= null,排产时间= null where 工序流水号=${num}`
|
||||
}
|
||||
})
|
||||
}
|
||||
export function panDuan(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '3',
|
||||
name: ` select 状态,工艺计划流水号 from
|
||||
(
|
||||
select 工艺计划流水号,零件名称,投产数量,机床图号,组号,(零件图号+' '+规格) as 图号及规格
|
||||
,计划开始时间,计划结束时间,排产人员,排产时间,
|
||||
(case when SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) = 0 then 2 else
|
||||
case when COUNT(*) > SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) then 1 else 0 end end) as 状态
|
||||
from dbo.车间生产管理工艺_插件排产查询_视图
|
||||
where 工艺编号 is not null and 工艺编号<>0 and 工艺计划流水号 is not null and 考核状态 =6
|
||||
group by 工艺计划流水号,零件名称,投产数量,机床图号,组号,零件图号,规格,计划开始时间,计划结束时间,排产人员,排产时间
|
||||
) as a
|
||||
where 工艺计划流水号=${num}
|
||||
order by 图号及规格
|
||||
`
|
||||
}
|
||||
})
|
||||
}
|
||||
1
src/icons/svg/ShopScheduling.svg
Normal file
1
src/icons/svg/ShopScheduling.svg
Normal file
@@ -0,0 +1 @@
|
||||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978842550" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.248 1024 0 794.752 0 512 0 229.205333 229.248 0 512 0s512 229.205333 512 512c0 282.752-229.248 512-512 512z m0-938.666667C276.352 85.333333 85.333333 276.352 85.333333 512s191.018667 426.666667 426.666667 426.666667 426.666667-191.018667 426.666667-426.666667S747.648 85.333333 512 85.333333z m213.333333 640h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z m0-170.666666h-42.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333334h298.666666a42.666667 42.666667 0 0 1 85.333334 0h42.666666a42.666667 42.666667 0 0 1 0 85.333334z m0-170.666667h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z" p-id="1499"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
@@ -48,11 +48,12 @@
|
||||
.hover-row td{
|
||||
background: RGB(236 245 255)!important;
|
||||
}
|
||||
.el-table td, .is-leaf{
|
||||
background-color: rgb(255, 255, 255);
|
||||
color: black;
|
||||
font-weight:400
|
||||
}
|
||||
//表格行颜色9745
|
||||
//.el-table td, .is-leaf{
|
||||
// background-color: rgb(255, 255, 255);
|
||||
// color: black;
|
||||
// font-weight:400
|
||||
//}
|
||||
.el-table--striped .el-table__body tr.el-table__row--striped td{
|
||||
background-color: #d8dde6;/*修改斑马线表格背景*/
|
||||
}
|
||||
|
||||
@@ -278,3 +278,15 @@ h3 {
|
||||
.el-tabs--border-card>.el-tabs__content {
|
||||
padding: 15px 15px 0px 15px!important;
|
||||
}
|
||||
//.el-table__header-wrapper {
|
||||
// height: 25px!important;
|
||||
//}
|
||||
/* 设置表主体的高度 */
|
||||
.el-table__body td,.el-table__body th{
|
||||
padding:1px!important;
|
||||
height: 25px!important;
|
||||
}
|
||||
/* 设置表头的高度 */
|
||||
.el-table__header td,.el-table__header th{
|
||||
padding:0px!important;
|
||||
}
|
||||
|
||||
@@ -237,6 +237,7 @@ export default {
|
||||
},
|
||||
// 查询离线合同明细
|
||||
async searchContractDetail() {
|
||||
this.table1 = []
|
||||
if (this.contractValue && this.searchType === '2') {
|
||||
this.qrCode = this.contractValue
|
||||
} else if (!this.supplierValue) {
|
||||
|
||||
@@ -175,7 +175,7 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.getMachine()
|
||||
this.searchTable()
|
||||
// this.searchTable()
|
||||
this.searchTable2()
|
||||
},
|
||||
methods: {
|
||||
|
||||
1661
src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
Normal file
1661
src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
Normal file
File diff suppressed because it is too large
Load Diff
@@ -341,7 +341,6 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
|
||||
<el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
|
||||
<el-row>
|
||||
@@ -396,7 +395,6 @@
|
||||
</el-table>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
|
||||
<el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
|
||||
<el-row>
|
||||
@@ -471,7 +469,6 @@
|
||||
</el-table>
|
||||
</el-form>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
|
||||
<el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
|
||||
<el-table-column align="center" label="考勤编号" width="150">
|
||||
|
||||
@@ -186,7 +186,8 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
|
||||
<script>
|
||||
import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
|
||||
import request from '@/utils/request'
|
||||
export default {
|
||||
data() {
|
||||
|
||||
306
src/views/ManufacturingCenter/ShopScheduling/index.vue
Normal file
306
src/views/ManufacturingCenter/ShopScheduling/index.vue
Normal file
@@ -0,0 +1,306 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-row>
|
||||
<el-col style="width: 650px">
|
||||
<el-card style="height: 800px">
|
||||
<el-row style="margin-top: 5px">
|
||||
<el-select v-model="PersonValue" filterable placeholder="操作者" size="small" style="width: 100px;float: right" @change="searchTableData2">
|
||||
<el-option
|
||||
v-for="item in Person"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</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-column
|
||||
label="序号"
|
||||
type="index"
|
||||
align="center"
|
||||
width="50"/>
|
||||
<el-table-column label="图号及规格" align="center" width="190px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.图号及规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="制品名称" align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.投产数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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="90px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计划结束时间 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block" style="margin-top: 10px;">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent"
|
||||
:page-sizes="[50, 100, 200, 500, 1000]"
|
||||
:page-size="pageSize"
|
||||
:total="total"
|
||||
:pager-count="5"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col style="width: 650px">
|
||||
<el-card style="height: 800px">
|
||||
<el-table :data="tableData2" height="380" highlight-current-row size="mini" style="width: 100%" border stripe @row-dblclick="XuanChu">
|
||||
<el-table-column label="零件图号" align="center" width="190px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="制品名称" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工序名" align="center" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工艺名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.投产数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作者" align="center" width="70px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-table :data="tableData3" :row-class-name="tableData3ClassName" height="393" size="mini" style="width: 100%" border @row-dblclick="XuanRu">
|
||||
<el-table-column label="序号" align="center" width="50px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工序顺序 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="工序名" align="center">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.工艺名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作者" align="center" width="90px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="排产时间" align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.排产时间 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="完成日期" align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.完成日期 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { getPerson, getParts, getGongxu, XuanRu, XuanChu, searchTableData2, panDuan } from '@/api/ManufacturingCenter/ShopScheduling'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
index: 0,
|
||||
工艺计划流水号: '',
|
||||
PersonValue: '',
|
||||
Person: [],
|
||||
loading1: false,
|
||||
loading2: false,
|
||||
loading3: false,
|
||||
tableData1: [],
|
||||
tableData2: [],
|
||||
tableData3: [],
|
||||
total: 0, // 总条数
|
||||
pageSize: 500,
|
||||
pageCurrent: 1
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getPerson()
|
||||
this.getParts()
|
||||
},
|
||||
methods: {
|
||||
getPerson() {
|
||||
this.PersonValue = ''
|
||||
this.Person = []
|
||||
getPerson().then(response => {
|
||||
response.data.map(v => {
|
||||
this.Person.push({
|
||||
label: v.姓名,
|
||||
value: v.人员编号
|
||||
})
|
||||
})
|
||||
this.PersonValue = this.Person[0].value
|
||||
this.searchTableData2()
|
||||
})
|
||||
},
|
||||
getParts() {
|
||||
this.tableData1 = []
|
||||
this.loading1 = true
|
||||
getParts(this.pageCurrent, this.pageSize).then(response => {
|
||||
response.data.rows.map(v => {
|
||||
this.tableData1.push({
|
||||
工艺计划流水号: v.工艺计划流水号,
|
||||
图号及规格: v.图号及规格,
|
||||
零件名称: v.零件名称,
|
||||
投产数量: v.投产数量,
|
||||
计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
|
||||
计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
|
||||
状态: v.状态
|
||||
})
|
||||
})
|
||||
this.total = response.data.total
|
||||
this.loading1 = false
|
||||
})
|
||||
},
|
||||
getGongxu(row) {
|
||||
this.loading3 = true
|
||||
this.tableData3 = []
|
||||
this.index = row.index
|
||||
this.工艺计划流水号 = row.工艺计划流水号
|
||||
getGongxu(row.工艺计划流水号).then(response => {
|
||||
response.data.map(v => {
|
||||
this.tableData3.push({
|
||||
工序流水号: v.工序流水号,
|
||||
工序状态: v.工序状态,
|
||||
工序顺序: v.工序顺序,
|
||||
工艺名称: v.工艺名称,
|
||||
姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
|
||||
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
|
||||
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
|
||||
工序间是否外协: v.工序间是否外协
|
||||
})
|
||||
})
|
||||
this.loading3 = false
|
||||
})
|
||||
},
|
||||
tableData1ClassName({ row, rowIndex }) {
|
||||
row.index = rowIndex
|
||||
if (row.状态 === '1') {
|
||||
return 'CJPClingjianjinxing'
|
||||
}
|
||||
},
|
||||
tableData3ClassName({ row, rowIndex }) {
|
||||
if (row.工序状态 === 4) {
|
||||
return 'CJPCgongxuwancheng'
|
||||
}
|
||||
if (row.工序间是否外协 === 2) {
|
||||
return 'CJPCxujianwaixie'
|
||||
}
|
||||
},
|
||||
searchTableData2() {
|
||||
this.loading2 = true
|
||||
this.tableData2 = []
|
||||
searchTableData2(this.PersonValue).then(response => {
|
||||
this.tableData2 = response.data
|
||||
this.loading2 = false
|
||||
})
|
||||
},
|
||||
XuanRu(row) {
|
||||
if (row.工序状态 !== 4 && row.工序间是否外协 !== 2) {
|
||||
XuanRu(this.PersonValue, row.工序流水号).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.tableData1[this.index].状态 = '1'
|
||||
this.loading3 = true
|
||||
this.tableData3 = []
|
||||
getGongxu(this.工艺计划流水号).then(response => {
|
||||
response.data.map(v => {
|
||||
this.tableData3.push({
|
||||
工序流水号: v.工序流水号,
|
||||
工序状态: v.工序状态,
|
||||
工序顺序: v.工序顺序,
|
||||
工艺名称: v.工艺名称,
|
||||
姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
|
||||
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
|
||||
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
|
||||
工序间是否外协: v.工序间是否外协
|
||||
})
|
||||
})
|
||||
this.loading3 = false
|
||||
})
|
||||
this.searchTableData2()
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
XuanChu(row) {
|
||||
XuanChu(row.工序流水号).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
panDuan(row.工艺计划流水号).then(res => {
|
||||
if (res.data[0].状态 === 0) {
|
||||
this.tableData1.map(v => {
|
||||
if (parseInt(v.工艺计划流水号) === parseInt(res.data[0].工艺计划流水号)) {
|
||||
v.状态 = ''
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
this.loading3 = true
|
||||
this.tableData3 = []
|
||||
getGongxu(this.工艺计划流水号).then(response => {
|
||||
response.data.map(v => {
|
||||
this.tableData3.push({
|
||||
工序流水号: v.工序流水号,
|
||||
工序状态: v.工序状态,
|
||||
工序顺序: v.工序顺序,
|
||||
工艺名称: v.工艺名称,
|
||||
姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
|
||||
排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
|
||||
完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
|
||||
工序间是否外协: v.工序间是否外协
|
||||
})
|
||||
})
|
||||
this.loading3 = false
|
||||
})
|
||||
this.searchTableData2()
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSizeChange(val) {
|
||||
this.tableData3 = []
|
||||
this.pageSize = val
|
||||
this.getParts()
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
this.tableData3 = []
|
||||
this.pageCurrent = val
|
||||
this.getParts()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.CJPCgongxuwancheng{
|
||||
background: #d8e5f6 !important;
|
||||
}
|
||||
.CJPClingjianjinxing{
|
||||
background: #9bd7fc !important;
|
||||
}
|
||||
.CJPCxujianwaixie{
|
||||
background: #e6eaee !important;
|
||||
}
|
||||
</style>
|
||||
@@ -2,40 +2,31 @@
|
||||
<div class="app-container">
|
||||
<!--顶栏结构-->
|
||||
<el-card>
|
||||
<!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
|
||||
<!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
|
||||
<span>招标企业:</span>
|
||||
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:200px;margin: 3px 0" placeholder="请输入招标企业"/>
|
||||
<span style="margin-left: 10px">保金类型:</span>
|
||||
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 200px">
|
||||
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px 0" placeholder="请输入招标企业"/>
|
||||
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择保金类型" size="small" style="width: 150px">
|
||||
<el-option
|
||||
v-for="item in TypeOfGoldDeposit"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">投标人:</span>
|
||||
<el-input v-model="Bidder" clearable size="small" style="width:200px" placeholder="请选择" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
|
||||
<el-row>
|
||||
<span>开始日期: </span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;margin: 3px 0"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<span style="margin-left: 10px">结束日期: </span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 200px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
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-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
|
||||
</el-row>
|
||||
<el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择投标人" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 150px;margin: 3px 0"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 150px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
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-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
|
||||
</el-card>
|
||||
|
||||
<!--投标保证金表格-->
|
||||
|
||||
@@ -2,32 +2,25 @@
|
||||
<div>
|
||||
<el-card>
|
||||
<el-row>
|
||||
<span>项目名称：</span>
|
||||
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-bottom:10px" size="small">
|
||||
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right:5px;width:150px" size="small">
|
||||
<el-option
|
||||
v-for="item in entryName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">机床型号：</span>
|
||||
<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()"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>开始日期：</span>
|
||||
<el-input v-model="machine" clearable size="small" style="margin-right:5px;width:150px" placeholder="请输入机床型号"/>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right:5px;width:150px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
style="margin-right:5px;width:150px"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<span style="margin-left: 10px">结束日期：</span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 200px;"
|
||||
style="width: 150px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
:expand-row-keys="expands"
|
||||
:data="tableData1"
|
||||
style="width: 100%;"
|
||||
height="500px"
|
||||
height="600px"
|
||||
highlight-current-row
|
||||
border
|
||||
stripe
|
||||
|
||||
@@ -2,32 +2,25 @@
|
||||
<div class="app-container">
|
||||
<el-card style="background: rgb(233,240,250)">
|
||||
<div>
|
||||
<span>项目名称：</span>
|
||||
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:200px;margin-top: 3px;">
|
||||
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin-top: 3px;">
|
||||
<el-option
|
||||
v-for="item in entryName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-left: 10px">机床型号：</span>
|
||||
<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();param = 1" @clear="clear()"/>
|
||||
</div>
|
||||
<div style="margin-top: 10px">
|
||||
<span style="margin-top: 20px">开始日期：</span>
|
||||
<el-input v-model="machine" clearable size="small" style="width:150px" placeholder="请输入机床型号"/>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:140px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
style="width: 150px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<span style="margin-left: 10px">结束日期：</span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 200px;margin-bottom: 3px;"
|
||||
style="width: 150px;margin-bottom: 3px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
@@ -44,7 +37,7 @@
|
||||
:expand-row-keys="expands"
|
||||
highlight-current-row
|
||||
style="width: 100%;margin: 3px 0px"
|
||||
height="500"
|
||||
height="700"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
@@ -146,7 +139,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="发货节点" width="85">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.图纸会签节点 : '-' }}
|
||||
{{ scope.row.发货节点&&scope.row.发货节点!=='1900/1/1' ? scope.row.发货节点 : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="安装调试节点" width="100">
|
||||
|
||||
@@ -3,30 +3,24 @@
|
||||
<!--查询条件-->
|
||||
<el-card>
|
||||
<el-row>
|
||||
<span>项目名称：</span>
|
||||
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-bottom: 10px" size="small" clearable>
|
||||
<el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 5px" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in entryName"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</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()"/>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<span>开始日期：</span>
|
||||
<el-input v-model="MarketingManagerValue" clearable size="small" style="margin-right: 5px;width: 150px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
style="width: 200px;"
|
||||
style="margin-right: 5px;width: 150px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
placeholder="请选择开始日期"/>
|
||||
<span style="margin-left: 10px">结束日期：</span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 200px;"
|
||||
style="width: 150px;"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
type="date"
|
||||
@@ -40,8 +34,8 @@
|
||||
v-loading="listLoading1"
|
||||
:data="tableData1"
|
||||
highlight-current-row
|
||||
style="width: 100%;margin-top: 3px"
|
||||
height="460"
|
||||
style="width: 1360px;margin-top: 3px"
|
||||
height="550"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
@@ -88,7 +82,7 @@
|
||||
<el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="合同信息备注">
|
||||
<el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
<el-table
|
||||
v-loading="listLoading1"
|
||||
:data="tableData1"
|
||||
style="width: 100%;margin-top: 3px;"
|
||||
height="500"
|
||||
style="margin-top: 3px;width: 1355px"
|
||||
height="600"
|
||||
border
|
||||
stripe
|
||||
size="mini"
|
||||
@@ -79,12 +79,12 @@
|
||||
{{ scope.row.电话 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="合同信息备注">
|
||||
<el-table-column align="center" label="合同信息备注" width="130" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="210px">
|
||||
<el-table-column label="操作" align="center" width="210px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="scope.row.是否禁用增加履约保证金"
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
<el-table
|
||||
v-loading="listLoadingProject"
|
||||
:data="projectTableData"
|
||||
style="width: 100%;margin-top: 3px;"
|
||||
style="width: 1360px;margin-top: 3px;"
|
||||
height="650"
|
||||
border
|
||||
stripe
|
||||
@@ -65,7 +65,7 @@
|
||||
{{ scope.row.姓名 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="客户名称" prop="客户名称" width="250" show-overflow-tooltip>
|
||||
<el-table-column align="center" label="客户名称" prop="客户名称" width="200" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.客户名称 }}
|
||||
</template>
|
||||
@@ -80,7 +80,7 @@
|
||||
{{ scope.row.电话 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="合同信息备注" >
|
||||
<el-table-column align="center" label="合同信息备注" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.合同信息备注 }}
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user