Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0
This commit is contained in:
zhangdingyu
38
src/api/Assembly/SparePartsOutStockRecord.js
Normal file
38
src/api/Assembly/SparePartsOutStockRecord.js
Normal file
@@ -0,0 +1,38 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 初始化机床项目
|
||||
export function initProject() {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_项目名称_查询数据'
|
||||
}
|
||||
})
|
||||
}
|
||||
// 组件查询
|
||||
export function searchgroup(num) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: 'PDM_组件名称_查询数据',
|
||||
param: '机床流水号=' + num
|
||||
}
|
||||
})
|
||||
}
|
||||
// 车间生产管理工艺_备料管理_备料出库记录_视图_查询数据
|
||||
export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_备料管理_备料出库记录_视图_查询数据',
|
||||
param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '车间生产管理工艺_零件工艺计划_零件状态_查询数据',
|
||||
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
|
||||
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
|
||||
pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
|
||||
@@ -55,14 +55,14 @@ export function getExport2(num) {
|
||||
})
|
||||
}
|
||||
// 查询分配后的标准件和外购件
|
||||
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6) {
|
||||
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_分配后',
|
||||
param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}`,
|
||||
param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
|
||||
@@ -171,14 +171,14 @@ export function setSafeValue(...params) {
|
||||
})
|
||||
}
|
||||
// 查询分配后的标准件和外购件
|
||||
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person) {
|
||||
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, type) {
|
||||
return request({
|
||||
url: '',
|
||||
method: 'post',
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_分配后',
|
||||
param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}`,
|
||||
param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&零件类型=${type}`,
|
||||
Pagination: pageCurrent + '&' + pageSize
|
||||
}
|
||||
})
|
||||
|
||||
@@ -31,7 +31,7 @@ export function searchTable1(...params) {
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_分配后_加供应商',
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
|
||||
param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`,
|
||||
Pagination: params[4] + '&' + params[5]
|
||||
}
|
||||
})
|
||||
|
||||
@@ -77,7 +77,7 @@ export function searchTable1(...params) {
|
||||
data: {
|
||||
type: '1',
|
||||
name: '采购管理_采购部采购_查询物料_分配后',
|
||||
param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}`,
|
||||
param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}`,
|
||||
Pagination: params[0] + '&' + params[1]
|
||||
}
|
||||
})
|
||||
|
||||
1
src/icons/svg/AssemblyExecution.svg
Normal file
1
src/icons/svg/AssemblyExecution.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="1559288249209" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1672" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M858.286829 415.34439V155.797854c0-48.577561-40.210732-92.135024-92.110049-92.135025h-92.110048V0h-51.949269v63.637854H248.657171V0H196.732878v63.637854H104.597854C56.045268 63.637854 12.487805 103.848585 12.487805 155.772878v634.755122c0 48.577561 40.210732 92.110049 92.110049 92.110049h341.666341c58.642732 72.029659 145.732683 122.280585 249.556293 122.280585 174.204878 0 314.892488-140.68761 314.892488-316.565854 0-117.235512-60.316098-217.71239-152.426147-272.983414zM101.276098 113.88878h92.085073v33.492293h55.271024v-33.467317h375.18361V147.356098h51.924293v-33.467318h90.411707c21.803707 0 40.210732 18.407024 40.210732 40.160781v92.135024H64.437073V152.401171c0-21.753756 15.060293-38.51239 36.839025-38.512391z m0 710.131513c-21.803707 0-40.210732-18.407024-40.210732-40.210732V296.460488h741.950439v92.110049c-33.492293-11.738537-73.678049-21.778732-112.215415-21.778732-174.179902 0-316.540878 140.68761-316.540878 316.540878 0 51.949268 11.738537 97.155122 33.492293 140.68761H101.251122z m592.871024 122.280585c-145.707707 0-262.94322-118.933854-262.94322-262.968195s118.908878-262.94322 262.94322-262.94322 266.314927 118.908878 266.314927 262.94322S839.854829 946.325854 694.147122 946.325854z" fill="#ffffff" p-id="1673"></path><path d="M736.03122 683.332683v-167.486439h-51.949269v219.410732h214.41561V683.332683z" fill="#ffffff" p-id="1674"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
1
src/icons/svg/DeliveryApplication.svg
Normal file
1
src/icons/svg/DeliveryApplication.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="1559288417172" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3010" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M958.750415 498.401284 818.891064 330.078671c-2.359744-2.859118-5.887081-4.500501-9.584286-4.500501l-206.881814 0 0-13.379729c0-35.311227-28.731368-64.030315-64.054875-64.030315L336.456427 248.168126c-27.634384-37.529755-72.125691-61.888536-122.30044-61.888536-83.807754 0-151.778822 67.946508-151.778822 151.755286 0 47.081295 21.440311 89.135086 55.082526 116.959805-0.001023-0.001023-0.00307-0.002047-0.004093-0.00307l0 232.80216c0 35.32453 28.730345 64.054875 64.029292 64.054875l6.746658 0c6.138814 48.365544 47.538713 85.875856 97.54564 85.875856 49.985438 0 91.384313-37.510312 97.523127-85.875856l155.070798 0c0.520863 0 1.035586-0.027629 1.554402-0.039909 0.25992 0.016373 0.517793 0.039909 0.781806 0.039909l135.633097 0c6.138814 48.365544 47.536666 85.875856 97.522104 85.875856 50.007951 0 91.407849-37.510312 97.546663-85.875856l26.183336 0c35.299971 0 64.030315-28.730345 64.030315-64.054875L961.622836 506.355443C961.621812 503.449253 960.600553 500.626975 958.750415 498.401284zM129.910257 325.577147l71.790046 0 0-93.149517c0-6.885827 5.570879-12.455683 12.455683-12.455683 6.885827 0 12.456706 5.569856 12.456706 12.455683l0 93.149517 2.140757 0c6.884804 0 12.455683 5.570879 12.455683 12.455683 0 6.885827-5.570879 12.456706-12.455683 12.456706l-2.159176 0c-0.194428 6.714935-5.676279 12.090363-12.438287 12.090363-6.760984 0-12.241812-5.376451-12.437264-12.090363l-71.808466 0c-6.885827 0-12.455683-5.570879-12.455683-12.456706C117.454574 331.149049 123.025453 325.577147 129.910257 325.577147zM285.777187 812.81109c-40.48097 0-73.420173-32.939203-73.420173-73.420173 0-40.46869 32.939203-73.396637 73.420173-73.396637 40.481993 0 73.396637 32.927947 73.396637 73.396637C359.172801 779.871887 326.258157 812.81109 285.777187 812.81109zM577.512574 687.791725c0 21.577434-17.564028 39.143509-39.142485 39.143509l-155.071821 0c-6.14086-48.345078-47.538713-85.851297-97.522104-85.851297-50.005904 0-91.40478 37.506219-97.54564 85.851297l-6.746658 0c-21.578458 0-39.118949-17.566074-39.118949-39.143509L142.364917 471.747227c21.376866 11.491729 45.821605 18.016329 71.790046 18.016329 83.808778 0 151.779845-67.898413 151.779845-151.730727 0-23.246447-5.237281-45.267996-14.583137-64.961524 0.001023 0.002047 0.00307 0.005117 0.004093 0.008186l187.013301 0c21.578458 0 39.142485 17.551748 39.142485 39.118949L577.511551 687.791725zM346.314958 263.377526c0 0 0.001023 0.001023 0.001023 0.001023C346.315982 263.378549 346.315982 263.377526 346.314958 263.377526zM348.068905 266.560008c0.00307 0.007163 0.007163 0.014326 0.011256 0.021489C348.075045 266.574335 348.071975 266.567171 348.068905 266.560008zM349.748151 269.791609c0.005117 0.010233 0.010233 0.021489 0.01535 0.031722C349.758384 269.813099 349.753267 269.801842 349.748151 269.791609zM773.860475 812.81109c-40.48097 0-73.396637-32.939203-73.396637-73.420173 0-40.46869 32.915667-73.396637 73.396637-73.396637 40.481993 0 73.421196 32.927947 73.421196 73.396637C847.281671 779.871887 814.342468 812.81109 773.860475 812.81109zM936.710446 687.791725c0 21.577434-17.540492 39.143509-39.119973 39.143509l-26.183336 0c-6.141884-48.345078-47.540759-85.851297-97.546663-85.851297-49.983391 0-91.38022 37.506219-97.521081 85.851297l-87.316671 0c8.390088-10.834766 13.402241-24.409946 13.402241-39.143509l0-337.302189 201.042829 0 59.041698 71.060429L757.68405 421.549965c-35.32453 0-64.054875 28.730345-64.054875 64.054875l0 40.212864c0 35.31225 28.730345 64.030315 64.054875 64.030315l179.026396 0L936.710446 687.791725zM936.710446 564.937676 757.68405 564.937676c-21.579481 0-39.143509-17.552771-39.143509-39.119973l0-40.212864c0-21.579481 17.564028-39.143509 39.143509-39.143509l124.678604 0c0.274246 0 0.541329-0.023536 0.810459-0.040932l53.537334 64.436568L936.710446 564.937676z" p-id="3011" fill="#ffffff"></path></svg>
|
||||
|
After Width: | Height: | Size: 4.1 KiB |
1
src/icons/svg/QualityInspectionInformationInquiry.svg
Normal file
1
src/icons/svg/QualityInspectionInformationInquiry.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="1559288344072" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2217" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M399.36 536.84A55 55 0 0 0 460.61 626l70.6 72.72a55 55 0 1 0 34.24-36.52l-73.3-75.51a55.29 55.29 0 0 0 0.38-19.8l69.5-69.5a55 55 0 1 0-1.67-100l-69.34-70a55 55 0 1 0-34.76 36l73.67 74.42a54.91 54.91 0 0 0 0.39 20.64l-67.93 67.93a55 55 0 0 0-63.03 10.46z" p-id="2218" fill="#ffffff"></path><path d="M891 164.57c-12.66-3.71-91.55-26.8-172.69-49.62C536.09 63.73 520.74 63.73 512.5 63.73h-1c-8.25 0-23.6 0-205.77 51.23-81.14 22.82-160 45.91-172.69 49.62a44.07 44.07 0 0 0-35.74 43.21v277.93c0 55.41 11.8 112.58 35.09 169.94a564.11 564.11 0 0 0 91.68 150.94C307 904.26 411.86 960.27 511.81 960.27v-64c-81.13 0-168.22-47.78-238.94-131.09C203 682.89 161.3 578.42 161.3 485.72V223.25c155.16-45.72 324.39-92.69 350.7-95.44 26.31 2.75 195.54 49.72 350.7 95.44v262.47c0 92.7-41.71 197.17-111.57 279.46-70.73 83.31-157.82 131.09-238.94 131.09v64c99.95 0 204.82-56 287.73-153.67a564.12 564.12 0 0 0 91.69-150.94c23.28-57.36 35.09-114.53 35.09-169.94V207.79a44.07 44.07 0 0 0-35.7-43.22z" p-id="2219" fill="#ffffff"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
1
src/icons/svg/SparePartsOutStockRecord.svg
Normal file
1
src/icons/svg/SparePartsOutStockRecord.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="1559288483929" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3811" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1011.76832 544.0768l-164.16256-435.42016h-176.91648v33.52576h135.02976l110.72 397.6448H678.5024L509.39392 696.2176 329.8816 539.82208H94.5408l110.6944-397.6448H342.8864v-33.52576H168.58112L7.28064 550.28224h0.90624a15.6672 15.6672 0 0 0-0.90624 5.22752v446.83264a15.64672 15.64672 0 0 0 15.60576 15.68256h978.2272a15.64672 15.64672 0 0 0 15.61088-15.68256v-446.83264a15.68256 15.68256 0 0 0-4.95616-11.43296z m-423.63904-341.09952h90.22976L506.79296 0 339.99872 202.97728H430.2336v219.84768h157.9008V202.97728z m-157.9008 270.58176h157.9008v-28.1856h-157.9008v28.1856z m-292.38272 471.22944l-27.27936-36.0704 252.48768-190.96064 109.12256 144.29184 284.16-186.56256-54.54848-72.14592 158.37696 21.98016-21.98016 158.37696-54.56384-72.13568-320.2304 213.83168-109.12256-144.2816-216.4224 163.67616z" fill="#ffffff" p-id="3812"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
159
src/views/Assembly/SparePartsOutStockRecord/index.vue
Normal file
159
src/views/Assembly/SparePartsOutStockRecord/index.vue
Normal file
@@ -0,0 +1,159 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-row>
|
||||
<span>机床编号:</span>
|
||||
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
|
||||
<el-option
|
||||
v-for="item in machineNumber"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
<div style="float: left">{{ item.label }}</div>
|
||||
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<span>组号:</span>
|
||||
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
|
||||
<el-option
|
||||
v-for="item in groupNumber"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span>零件图号:</span>
|
||||
<el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 200px" size="small" clearable/>
|
||||
<span class="demonstration">时间区间:</span>
|
||||
<el-date-picker
|
||||
v-model="startTime"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
style="width: 160px"
|
||||
type="date"
|
||||
placeholder="选择日期"/>
|
||||
<span class="demonstration">~</span>
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
style="width: 160px"
|
||||
type="date"
|
||||
placeholder="选择日期"/>
|
||||
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
|
||||
</el-row>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
|
||||
<el-table-column label="项目名称" align="center">
|
||||
<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">
|
||||
<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">
|
||||
<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">
|
||||
<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>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { initProject, searchgroup, selecttable } from '@/api/Assembly/SparePartsOutStockRecord'
|
||||
// import { mapGetters } from 'vuex'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
PartDrawingNumber: '',
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
startTime_check: '',
|
||||
endTime_check: '',
|
||||
machineNumberValue: '',
|
||||
machineNumber: [],
|
||||
groupNumberValue: '',
|
||||
groupNumber: [],
|
||||
tableData1: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
||||
},
|
||||
mounted() {
|
||||
this.initProject()
|
||||
},
|
||||
methods: {
|
||||
initProject() {
|
||||
initProject().then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.machineNumber.push({
|
||||
label: response.data[i].机床图号,
|
||||
name: response.data[i].项目名称,
|
||||
value: response.data[i].机床流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
machineChange() {
|
||||
this.groupNumberValue = ''
|
||||
this.groupNumber = []
|
||||
searchgroup(this.machineNumberValue).then(response => {
|
||||
for (let i = 0; i < response.data.length; i++) {
|
||||
this.groupNumber.push({
|
||||
label: response.data[i].组号,
|
||||
value: response.data[i].组件流水号
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
selecttable() {
|
||||
this.tableData1 = []
|
||||
if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
|
||||
if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
|
||||
if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) { this.check3 = 1 } else { this.check3 = 0 }
|
||||
if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
|
||||
if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
|
||||
selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime).then(response => {
|
||||
this.tableData1 = response.data
|
||||
console.log(response.data, 1111)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -75,7 +75,7 @@
|
||||
<el-table-column label="货位存量" align="center" width="180" prop="货位存量">
|
||||
<template slot-scope="scope">
|
||||
<template v-if="scope.row.changeValue">
|
||||
<el-input-number v-model="scope.row.货位存量" controls-position="right" size="mini" style="width: 90px"/>
|
||||
<el-input-number v-model="scope.row.货位存量" :min="0" :precision="2" controls-position="right" size="mini" style="width: 90px"/>
|
||||
<el-button class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
|
||||
</template>
|
||||
<span v-else>{{ scope.row.货位存量 }}</span>
|
||||
@@ -173,7 +173,7 @@
|
||||
</el-col>
|
||||
<el-col style="width: 210px">
|
||||
<span>货位存量:</span>
|
||||
<el-input-number v-model="localNumber" :min="0" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
|
||||
<el-input-number v-model="localNumber" :min="0" :precision="2" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
|
||||
</el-col>
|
||||
<el-col style="width: 180px">
|
||||
<span>是否为滞货:</span>
|
||||
|
||||
@@ -50,28 +50,28 @@
|
||||
<el-table
|
||||
v-loading="loading0"
|
||||
:data="tableData"
|
||||
style="width: 100%;max-height: 610px"
|
||||
height="610"
|
||||
style="width: 100%;max-height: 600px"
|
||||
height="600"
|
||||
size="mini"
|
||||
highlight-current-row
|
||||
border>
|
||||
<el-table-column align="center" label="序号" type="index" width="50px"/>
|
||||
<el-table-column align="center" label="机床图号" width="100px">
|
||||
<el-table-column align="center" label="序号" type="index" width="60px"/>
|
||||
<el-table-column align="center" label="机床图号" width="170px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="组号" width="60px">
|
||||
<el-table-column align="center" label="组号" width="140px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="零件图号" width="150px">
|
||||
<el-table-column align="center" label="零件图号" width="200px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="零件名称" width="100px">
|
||||
<el-table-column align="center" label="零件名称" width="180px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件名称 }}
|
||||
</template>
|
||||
@@ -81,15 +81,14 @@
|
||||
{{ scope.row.投产总数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="投产时间" width="100px">
|
||||
<el-table-column align="center" label="投产时间" width="130px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.传递时间 ? scope.row.传递时间 : '—' }}
|
||||
{{ scope.row.传递时间 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="零件状态" min-width="960px">
|
||||
<el-table-column align="center" label="零件状态" width="750px">
|
||||
<template slot-scope="scope">
|
||||
<el-steps id="StatusQuery" :active="scope.row.零件状态码" finish-status="success" simple>
|
||||
<el-step title="分配" />
|
||||
<el-steps :active="scope.row.考核状态" finish-status="success" simple>
|
||||
<el-step title="投产" />
|
||||
<el-step title="工艺" />
|
||||
<el-step title="定额" />
|
||||
@@ -352,10 +351,12 @@ export default {
|
||||
}
|
||||
this.loading0 = true
|
||||
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
|
||||
response.data.rows.map(v => {
|
||||
this.$set(v, '零件状态码', v.考核状态 ? parseInt(v.考核状态) - 2 : 0)
|
||||
v.传递时间 = v.传递时间 ? v.传递时间.split(' ')[0] : ''
|
||||
})
|
||||
for (let i = 0; i < response.data.rows.length; i++) {
|
||||
response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
|
||||
if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
|
||||
response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
|
||||
}
|
||||
}
|
||||
this.loading0 = false
|
||||
this.tableData = response.data.rows
|
||||
this.total = parseInt(response.data.total)
|
||||
@@ -490,8 +491,3 @@ export default {
|
||||
margin: 10px 0 10px 10px;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
#StatusQuery {
|
||||
padding: 8px 30px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
|
||||
<el-tab-pane label="标准件和外购件" name="标准件和外购件">
|
||||
<el-tab-pane label="外购件" name="外购件">
|
||||
<el-row style="margin-bottom: 5px">
|
||||
<span>项目名称:</span>
|
||||
<el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
|
||||
@@ -457,6 +457,11 @@
|
||||
<el-input v-model="scope.row.数量" size="mini" style="width:100%"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" width="60">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计量单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="询价备注" align="center" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.备注" size="mini" style="width:100%"/>
|
||||
@@ -503,7 +508,8 @@
|
||||
<td width="16.6%" colspan="2">图号</td>
|
||||
<td width="16.6%" colspan="2">名称</td>
|
||||
<td width="16.6%" colspan="2">规格</td>
|
||||
<td width="16.6%" colspan="2">数量</td>
|
||||
<td width="8.3%">数量</td>
|
||||
<td width="8.3%">单位</td>
|
||||
<td width="16.6%" colspan="2">单价</td>
|
||||
<td colspan="3">备注</td>
|
||||
</tr>
|
||||
@@ -809,7 +815,7 @@ export default {
|
||||
value: 2
|
||||
}
|
||||
],
|
||||
tabName: '标准件和外购件',
|
||||
tabName: '外购件',
|
||||
baseInfoLoading: false,
|
||||
dialogVisible5: false,
|
||||
form3: { // 询价单基础信息表单
|
||||
@@ -868,7 +874,7 @@ export default {
|
||||
materialName: '',
|
||||
materialSpec: '',
|
||||
materialModel: '',
|
||||
tableData11: [], // 标准件和外购件列表
|
||||
tableData11: [], // 外购件列表
|
||||
total11: 0,
|
||||
pageCurrent11: 1,
|
||||
pageSize11: 10,
|
||||
@@ -996,7 +1002,7 @@ export default {
|
||||
const data2 = res2.data.map(v => filterVal2.map(j => v[j]))
|
||||
dataGroup.push(data2)
|
||||
const headerGroup = [['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '待询价数量', '备注', '供货商'], ['任务分配时间', '项目名称', '机床图号', '组号', '名称', '图号或型号', '规格', '材料', '待询价数量', '备注', '供货商']]
|
||||
const sheetGroup = ['标准件和外购件（未询价）', '基本件（未询价）']
|
||||
const sheetGroup = ['外购件（未询价）', '基本件（未询价）']
|
||||
excel.export_json_to_excel({
|
||||
headerGroup: headerGroup,
|
||||
dataGroup: dataGroup,
|
||||
@@ -1149,7 +1155,7 @@ export default {
|
||||
filterHandler(value, row) { // 筛选供货商
|
||||
return row['供货商'] === value
|
||||
},
|
||||
searchTable11() { // 查询标准件和外购件列表
|
||||
searchTable11() { // 查询外购件列表
|
||||
let check1, check2, check3, check4, check5, check6
|
||||
this.materialName ? check1 = 1 : check1 = 0
|
||||
this.materialSpec ? check2 = 1 : check2 = 0
|
||||
@@ -1157,7 +1163,7 @@ export default {
|
||||
this.projectValue ? check4 = 1 : check4 = 0
|
||||
this.machineValue ? check5 = 1 : check5 = 0
|
||||
this.groupValue ? check6 = 1 : check6 = 0
|
||||
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
|
||||
searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => {
|
||||
this.tableData11 = response.data.rows
|
||||
this.total11 = response.data.total
|
||||
const remark = []
|
||||
@@ -1364,7 +1370,7 @@ export default {
|
||||
for (let i = 0; i < length; i++) {
|
||||
tr[i] = document.createElement('tr')
|
||||
tr[i].setAttribute('class', 'tableData')
|
||||
tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
|
||||
tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
|
||||
$('#tablehead').after(tr[i])
|
||||
}
|
||||
for (let j = 0; j < res.data.length; j++) {
|
||||
@@ -1373,7 +1379,8 @@ export default {
|
||||
document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
|
||||
document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
|
||||
document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
|
||||
document.getElementsByClassName('tableData')[j].children[6].innerHTML = res.data[j].备注
|
||||
document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
|
||||
document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
|
||||
}
|
||||
document.getElementById('inquirySheetNum').innerHTML = this.orderExport
|
||||
document.getElementById('supplier').innerHTML = ''
|
||||
@@ -1422,7 +1429,7 @@ export default {
|
||||
for (let i = 0; i < length; i++) {
|
||||
tr[i] = document.createElement('tr')
|
||||
tr[i].setAttribute('class', 'tableData')
|
||||
tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
|
||||
tr[i].innerHTML = `<td width="8.3%" height="30px"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" width="8.3%"/><td height="30px" width="8.3%"/><td height="30px" width="16.6%" colspan="2"/><td height="30px" colspan="3"/>`
|
||||
$('#tablehead').after(tr[i])
|
||||
}
|
||||
for (let j = 0; j < res.data.length; j++) {
|
||||
@@ -1431,7 +1438,8 @@ export default {
|
||||
document.getElementsByClassName('tableData')[j].children[2].innerHTML = res.data[j].物料名称 || res.data[j].零件名称
|
||||
document.getElementsByClassName('tableData')[j].children[3].innerHTML = res.data[j].物料规格 || res.data[j].规格
|
||||
document.getElementsByClassName('tableData')[j].children[4].innerHTML = res.data[j].数量
|
||||
document.getElementsByClassName('tableData')[j].children[6].innerHTML = res.data[j].备注
|
||||
document.getElementsByClassName('tableData')[j].children[5].innerHTML = res.data[j].计量单位
|
||||
document.getElementsByClassName('tableData')[j].children[7].innerHTML = res.data[j].备注
|
||||
}
|
||||
document.getElementById('inquirySheetNum').innerHTML = this.orderExport
|
||||
document.getElementById('supplier').innerHTML = ''
|
||||
|
||||
@@ -122,6 +122,11 @@
|
||||
{{ scope.row.数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" width="80">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计量单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-show="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%"/>
|
||||
@@ -361,6 +366,7 @@ export default {
|
||||
名称: response.data[i].组件零件流水号 ? response.data[i].物料名称 : response.data[i].零件名称,
|
||||
规格: response.data[i].组件零件流水号 ? response.data[i].物料规格 : response.data[i].规格,
|
||||
数量: response.data[i].数量,
|
||||
计量单位: response.data[i].计量单位,
|
||||
未税单价: 0,
|
||||
未税总额: 0,
|
||||
含税单价: 0,
|
||||
@@ -518,6 +524,7 @@ export default {
|
||||
<td>名称</td>
|
||||
<td>规格型号</td>
|
||||
<td>数量</td>
|
||||
<td>单位</td>
|
||||
<td>单价</td>
|
||||
<td>合计</td>
|
||||
<td>交货时间</td>
|
||||
@@ -569,6 +576,7 @@ export default {
|
||||
名称: v.名称,
|
||||
规格: v.规格,
|
||||
数量: Number(v.数量),
|
||||
计量单位: v.计量单位,
|
||||
单价: this.hasTax === '含税' ? v.含税单价 : v.未税单价,
|
||||
合计: (Number(v.数量) * (this.hasTax === '含税' ? Number(v.含税单价) : Number(v.未税单价))).toFixed(2),
|
||||
交货期: v.交货期 ? v.交货期.split(' ')[0] : '',
|
||||
@@ -576,7 +584,7 @@ export default {
|
||||
})
|
||||
})
|
||||
let mergeData = []
|
||||
mergeData = groupBy(merge, ['图号', '名称', '规格', '单价', '合计', '交货期', '备注'], (mergeData, v) => {
|
||||
mergeData = groupBy(merge, ['图号', '名称', '规格', '计量单位', '单价', '合计', '交货期', '备注'], (mergeData, v) => {
|
||||
mergeData = mergeData || 0
|
||||
mergeData += v.数量
|
||||
return mergeData
|
||||
@@ -587,7 +595,7 @@ export default {
|
||||
for (let i = 0; i < mergeData.length; i++) {
|
||||
tr[i] = document.createElement('tr')
|
||||
tr[i].setAttribute('class', 'tableData')
|
||||
tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
|
||||
tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
|
||||
const tableHead = $('#tableHead')
|
||||
tableHead ? tableHead.after(tr[i]) : ''
|
||||
}
|
||||
@@ -606,10 +614,11 @@ export default {
|
||||
document.getElementsByClassName('tableData')[j].children[4].innerHTML = mergeData[j].名称
|
||||
document.getElementsByClassName('tableData')[j].children[5].innerHTML = mergeData[j].规格
|
||||
document.getElementsByClassName('tableData')[j].children[6].innerHTML = mergeData[j].数量
|
||||
document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].单价
|
||||
document.getElementsByClassName('tableData')[j].children[8].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
|
||||
document.getElementsByClassName('tableData')[j].children[9].innerHTML = mergeData[j].交货期
|
||||
document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].备注
|
||||
document.getElementsByClassName('tableData')[j].children[7].innerHTML = mergeData[j].计量单位
|
||||
document.getElementsByClassName('tableData')[j].children[8].innerHTML = mergeData[j].单价
|
||||
document.getElementsByClassName('tableData')[j].children[9].innerHTML = (Number(mergeData[j].数量) * Number(mergeData[j].单价)).toFixed(2)
|
||||
document.getElementsByClassName('tableData')[j].children[10].innerHTML = mergeData[j].交货期
|
||||
document.getElementsByClassName('tableData')[j].children[11].innerHTML = mergeData[j].备注
|
||||
}
|
||||
}
|
||||
this.actualTotal = this.actualTotal.toFixed(2)
|
||||
|
||||
@@ -371,6 +371,11 @@
|
||||
<el-input v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.计量单位 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="参考价格" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.参考价格 }}
|
||||
@@ -383,7 +388,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="合计" align="center" min-width="100" prop="合计">
|
||||
<template slot-scope="scope">
|
||||
{{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
|
||||
{{ (Number(scope.row.单价||0) * Number(scope.row.数量||0)).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
|
||||
@@ -1130,7 +1135,7 @@ export default {
|
||||
if (index === 0) {
|
||||
sums[index] = '总价'
|
||||
} else if (index === 7) {
|
||||
const values = data.map(item => Number(parseFloat(item['单价']) * parseInt(item['数量'])))
|
||||
const values = data.map(item => Number(Number(item['单价']) * Number(item['数量'])))
|
||||
if (!values.every(value => isNaN(value))) {
|
||||
sums[index] = values.reduce((prev, curr) => {
|
||||
const value = Number(curr)
|
||||
@@ -1360,7 +1365,7 @@ export default {
|
||||
this.materialName ? check1 = 1 : check1 = 0
|
||||
this.materialSpec ? check2 = 1 : check2 = 0
|
||||
this.materialModel ? check3 = 1 : check3 = 0
|
||||
searchMaterial(this.pageCurrent00, this.pageSize00, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id).then(response => {
|
||||
searchMaterial(this.pageCurrent00, this.pageSize00, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, 1).then(response => {
|
||||
this.tableData00 = response.data.rows
|
||||
this.total00 = response.data.total
|
||||
const remark = []
|
||||
|
||||
@@ -24,7 +24,85 @@
|
||||
</el-card>
|
||||
|
||||
<el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
|
||||
<el-tab-pane label="标准件和外购件" name="标准件和外购件">
|
||||
<el-tab-pane label="标准件" name="标准件">
|
||||
<el-table :data="tableData0" size="mini" style="max-height: 600px" height="600px" border stripe>
|
||||
<el-table-column align="center" label="采购情况" width="80px">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="名称" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="型号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="规格" min-width="200px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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">
|
||||
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="到货数量" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="供应商" min-width="150px">
|
||||
<template slot-scope="scope">
|
||||
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="合同编号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.采购合同编号 || scope.row.离线合同编号 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="采购员" width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 || '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent0"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize0"
|
||||
:total="total0"
|
||||
style="margin-top:10px;display:inline-block;width:50%"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange0"
|
||||
@current-change="handleCurrentChange0"/>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="外购件" name="外购件">
|
||||
<el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe>
|
||||
<el-table-column align="center" label="采购情况" width="80px">
|
||||
<template slot-scope="scope">
|
||||
@@ -200,10 +278,14 @@ export default {
|
||||
machineNumber: [],
|
||||
groupNumberValue: '',
|
||||
groupNumber: [],
|
||||
PartType: '标准件和外购件',
|
||||
PartType: '标准件',
|
||||
tableData0: [],
|
||||
tableData1: [],
|
||||
tableData2: [],
|
||||
tableData3: [],
|
||||
pageCurrent0: 1,
|
||||
pageSize0: 20,
|
||||
total0: 0,
|
||||
pageCurrent1: 1,
|
||||
pageSize1: 20,
|
||||
total1: 0,
|
||||
@@ -247,18 +329,23 @@ export default {
|
||||
})
|
||||
},
|
||||
searchTable() {
|
||||
if (this.PartType === '标准件和外购件') {
|
||||
this.pageCurrent1 = 1
|
||||
this.pageSize1 = 20
|
||||
this.total1 = 0
|
||||
if (this.PartType === '标准件') {
|
||||
this.searchTable0()
|
||||
} else if (this.PartType === '外购件') {
|
||||
this.searchTable1()
|
||||
} else if (this.PartType === '基本件') {
|
||||
this.pageCurrent2 = 1
|
||||
this.pageSize2 = 20
|
||||
this.total2 = 0
|
||||
this.searchTable2()
|
||||
}
|
||||
},
|
||||
handleSizeChange0(val) {
|
||||
this.pageSize0 = val
|
||||
this.pageCurrent0 = 1
|
||||
this.searchTable0()
|
||||
},
|
||||
handleCurrentChange0(val) {
|
||||
this.pageCurrent0 = val
|
||||
this.searchTable0()
|
||||
},
|
||||
handleSizeChange1(val) {
|
||||
this.pageSize1 = val
|
||||
this.pageCurrent1 = 1
|
||||
@@ -277,11 +364,20 @@ export default {
|
||||
this.pageCurrent2 = val
|
||||
this.searchTable2()
|
||||
},
|
||||
searchTable1() { // 查询标准件和外购件
|
||||
searchTable0() { // 查询标准件
|
||||
let check1, check2
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1).then(response => {
|
||||
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1).then(response => {
|
||||
this.tableData0 = response.data.rows
|
||||
this.total0 = response.data.total
|
||||
})
|
||||
},
|
||||
searchTable1() { // 查询外购件
|
||||
let check1, check2
|
||||
this.machineNumberValue ? check1 = 1 : check1 = 0
|
||||
this.groupNumberValue ? check2 = 1 : check2 = 0
|
||||
searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2).then(response => {
|
||||
this.tableData1 = response.data.rows
|
||||
this.total1 = response.data.total
|
||||
})
|
||||
|
||||
@@ -1,7 +1,221 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-tabs v-model="tabName" type="border-card" @tab-click="searchTable1();searchTable2()">
|
||||
<el-tab-pane label="标准件和外购件" name="标准件和外购件">
|
||||
<el-tabs v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
|
||||
<el-tab-pane label="标准件" name="标准件">
|
||||
<el-row style="margin-bottom: 5px">
|
||||
<span style="margin-left: 0">项目名称:</span>
|
||||
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
|
||||
<el-option
|
||||
v-for="item in project"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span>机床图号:</span>
|
||||
<el-select v-model="machineValue" placeholder="机床图号" size="small" filterable clearable @change="machineChange">
|
||||
<el-option
|
||||
v-for="item in machine"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
<b style="float: left">{{ item.label }}</b>
|
||||
<b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-button
|
||||
type="success"
|
||||
size="small"
|
||||
icon="el-icon-search"
|
||||
style="margin-left: 10px"
|
||||
@click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
|
||||
<div style="float:right;">
|
||||
<span style="margin-left: 0">采购员:</span>
|
||||
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
|
||||
<el-option
|
||||
v-for="item in person"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-row>
|
||||
<el-row style="margin-bottom: 5px">
|
||||
<span style="margin-left: 0">组 号:</span>
|
||||
<el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
|
||||
<el-option
|
||||
v-for="item in group"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span style="margin-right: -10px">物料状态:</span>
|
||||
<el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
|
||||
<div style="float:right;padding-top:10px;">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
icon="el-icon-menu"
|
||||
style="margin-left: 10px"
|
||||
@click="allocateTask1">分配</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
icon="el-icon-back"
|
||||
style="margin-left: 10px"
|
||||
@click="executeReturn1">退回</el-button>
|
||||
</div>
|
||||
</el-row>
|
||||
<el-row style="margin-bottom: 15px">
|
||||
<span style="margin-left: 0">物料类别:</span>
|
||||
<el-select
|
||||
v-model="MaterialCategoryValue"
|
||||
placeholder="请选择"
|
||||
size="small"
|
||||
clearable
|
||||
@change="searchMaterialVariety">
|
||||
<el-option
|
||||
v-for="item in MaterialCategory"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
<span>物料品种:</span>
|
||||
<el-select
|
||||
v-model="MaterialVarietyValue"
|
||||
placeholder="请选择"
|
||||
size="small"
|
||||
clearable>
|
||||
<el-option
|
||||
v-for="item in MaterialVariety"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-row>
|
||||
<el-row style="margin-bottom: 15px">
|
||||
<span style="margin-left: 0">物料名称:</span>
|
||||
<el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
|
||||
<span>物料规格:</span>
|
||||
<el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
|
||||
<span>物料型号:</span>
|
||||
<el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
|
||||
</el-row>
|
||||
<el-row style="margin-bottom: 10px">
|
||||
<el-table v-loading="" :data="tableData0" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
|
||||
<el-table-column :selectable="selectable" align="center" type="selection"/>
|
||||
<el-table-column align="center" label="采购情况" min-width="80px">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
|
||||
<el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="项目名称" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.项目名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="机床图号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.机床图号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="组号" min-width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.组号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="物料类别" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料类别 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="物料品种" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料品种 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="图号或型号" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料型号 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="名称" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料名称 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="规格" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料规格 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="数量" min-width="80px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.零件数量 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="备注" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.备注 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="供货商" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.供货商 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">
|
||||
<template slot-scope="scope">
|
||||
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="计划到货时间" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.物料计划到货时间.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="生产分配时间" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.操作日期.split(' ')[0] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="采购分配时间" min-width="100px">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="撤回分配" min-width="100px" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
:disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
|
||||
type="primary"
|
||||
size="mini"
|
||||
icon="el-icon-back"
|
||||
@click="retract(scope.row)">撤回</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-row>
|
||||
<div class="block">
|
||||
<el-pagination
|
||||
:current-page="pageCurrent0"
|
||||
:page-sizes="[10, 20, 30, 40]"
|
||||
:page-size="pageSize0"
|
||||
:total="total0"
|
||||
style="display:inline-block;width:50%"
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange0"
|
||||
@current-change="handleCurrentChange0"/>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="外购件" name="外购件">
|
||||
<el-row style="margin-bottom: 5px">
|
||||
<span style="margin-left: 0">项目名称:</span>
|
||||
<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
|
||||
@@ -419,7 +633,7 @@ export default {
|
||||
value: 2
|
||||
}
|
||||
],
|
||||
tabName: '标准件和外购件',
|
||||
tabName: '标准件',
|
||||
partNum: '',
|
||||
partName: '',
|
||||
partSpec: '',
|
||||
@@ -472,12 +686,16 @@ export default {
|
||||
check2: 0,
|
||||
check3: 0,
|
||||
check4: 0,
|
||||
tableData0: [],
|
||||
tableData1: [],
|
||||
tableData2: [],
|
||||
standardAndPurchase: [],
|
||||
basic: [],
|
||||
groupAndPart: [],
|
||||
groupAndPartBasic: [],
|
||||
pageCurrent0: 1,
|
||||
pageSize0: 20,
|
||||
total0: 0,
|
||||
pageCurrent1: 1,
|
||||
pageSize1: 20,
|
||||
total1: 0,
|
||||
@@ -493,7 +711,7 @@ export default {
|
||||
])
|
||||
},
|
||||
created() {
|
||||
this.searchTable1() // 查表1
|
||||
this.searchTable0() // 查表1
|
||||
this.fetchData() // 初始化数据
|
||||
},
|
||||
methods: {
|
||||
@@ -520,6 +738,7 @@ export default {
|
||||
retract1(row.标准件和外购件流水号).then(res => {
|
||||
if (Number(res.data[0].result) === 1) {
|
||||
this.$message.success('撤回成功')
|
||||
this.searchTable0()
|
||||
this.searchTable1()
|
||||
} else {
|
||||
this.$message.error('撤回失败')
|
||||
@@ -585,7 +804,7 @@ export default {
|
||||
this.MaterialVarietyValue = ''
|
||||
this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety', this.MaterialCategoryValue)
|
||||
},
|
||||
searchTable1() { // 查询标准件和外购件
|
||||
searchTable0() { // 查询标准件
|
||||
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
|
||||
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
|
||||
this.projectValue ? this.check3 = 1 : this.check3 = 0
|
||||
@@ -595,8 +814,22 @@ export default {
|
||||
this.materialName ? this.check4 = 1 : this.check4 = 0
|
||||
this.materialSpec ? check2 = 1 : check2 = 0
|
||||
this.materialModel ? check3 = 1 : check3 = 0
|
||||
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel).then(response => {
|
||||
console.log(response.data.rows)
|
||||
searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1).then(response => {
|
||||
this.tableData0 = response.data.rows
|
||||
this.total0 = response.data.total
|
||||
})
|
||||
},
|
||||
searchTable1() { // 查询外购件
|
||||
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
|
||||
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
|
||||
this.projectValue ? this.check3 = 1 : this.check3 = 0
|
||||
let check0, check1, check2, check3
|
||||
this.machineValue ? check0 = 1 : check0 = 0
|
||||
this.groupValue ? check1 = 1 : check1 = 0
|
||||
this.materialName ? this.check4 = 1 : this.check4 = 0
|
||||
this.materialSpec ? check2 = 1 : check2 = 0
|
||||
this.materialModel ? check3 = 1 : check3 = 0
|
||||
searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
|
||||
this.tableData1 = response.data.rows
|
||||
this.total1 = response.data.total
|
||||
})
|
||||
@@ -648,6 +881,7 @@ export default {
|
||||
allocateTask1(this.standardAndPurchase, this.personValue).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('操作成功')
|
||||
this.searchTable0()
|
||||
this.searchTable1()
|
||||
} else { this.$message.error('操作失败') }
|
||||
})
|
||||
@@ -687,6 +921,15 @@ export default {
|
||||
filterHandler(value, row) {
|
||||
return parseInt(row['人员编号']) === parseInt(value)
|
||||
},
|
||||
handleSizeChange0(val) {
|
||||
this.pageSize0 = val
|
||||
this.pageCurrent0 = 1
|
||||
this.searchTable0()
|
||||
},
|
||||
handleCurrentChange0(val) {
|
||||
this.pageCurrent0 = val
|
||||
this.searchTable0()
|
||||
},
|
||||
handleSizeChange1(val) {
|
||||
this.pageSize1 = val
|
||||
this.pageCurrent1 = 1
|
||||
@@ -717,6 +960,7 @@ export default {
|
||||
executeReturn1(this.standardAndPurchase, this.groupAndPart).then(response => {
|
||||
if (response.data[0].result === '1') {
|
||||
this.$message.success('操作成功')
|
||||
this.searchTable0()
|
||||
this.searchTable1()
|
||||
} else { this.$message.error('操作失败') }
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user