suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

Browse Source
dev-scheduling
zhangdi 2 months ago
parent c90f620b84 5c0bd65a5c
commit 900d27ddf6
24 changed files with 874 additions and 1667 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/api/orderManagement/allocationMessQuery.js
  2. 12
      src/api/orderManagement/planYieIdOrder.js
  3. 17
      src/api/orderManagement/sinTerPlanOrder.js
  4. 29
      src/api/outsourcingManagement/performanceCalculate.js
  5. 11
      src/api/outsourcingManagement/performanceCheck.js
  6. 11
      src/api/outsourcingManagement/performanceReview.js
  7. 8
      src/api/qualityManagement/productionTesting/productionQuality.js
  8. 397
      src/views/oem/performanceCalculate/components/millMeritsProduce.vue
  9. 402
      src/views/oem/performanceCalculate/components/millMeritsQuality.vue
  10. 140
      src/views/oem/performanceCheck/index.vue
  11. 116
      src/views/oem/performanceReview/index.vue
  12. 1144
      src/views/orderManagement/allocationMessQuery.vue
  13. 2
      src/views/orderManagement/components/exception/dataMissing.vue
  14. 2
      src/views/orderManagement/components/exception/deliveryDate.vue
  15. 2
      src/views/orderManagement/components/exception/processMissing.vue
  16. 2
      src/views/orderManagement/components/exception/resourceMissing.vue
  17. 208
      src/views/orderManagement/components/lookProcess.vue
  18. 6
      src/views/orderManagement/plannedOrder.vue
  19. 3
      src/views/orderManagement/sinTerPlanOrder.vue
  20. 2
      src/views/periodicTesting/projectCycle.vue
  21. 2
      src/views/periodicTesting/testProject.vue
  22. 2
      src/views/periodicTesting/testTask.vue
  23. 9
      src/views/productionTesting/InspectionTemplate.vue
  24. 4
      src/views/productionTesting/productionQuality.vue

10
src/api/orderManagement/allocationMessQuery.js
Unescape View File

@ -1,13 +1,9 @@
import request from '@/axios';
//列表接口
export const getList = (current, size, params) => {
export const getList = (params) => {
return request({
url: '/blade-desk/order/yieldOrder/pageAllocation',
url: '/blade-desk/order/yieldPlan/pageAllocation',
method: 'get',
params: {
...params,
current,
size,
},
params
});
};

12
src/api/orderManagement/planYieIdOrder.js
Unescape View File

@ -90,7 +90,11 @@ export const getProdIdentList = () => {
});
};
// 获取生产工艺路线
export const getProcessRouting = (params) => {
return request({
url: '/api/blade-desk/order/yieldOrder/getCraftList',
method: 'post',
params,
});
};

17
src/api/orderManagement/sinTerPlanOrder.js
Unescape View File

@ -54,3 +54,20 @@ export const closeBatchs = ids => {
params: ids,
});
};
// 获取工艺路线
export const getProcessRoute = (params) => {
return request({
url: `/api/blade-desk/order/yieldPlan/getCraftData/${params.yieldPlanId}`,
method: 'get',
});
};
// 获取工序接口
export const getProcess = (params) => {
return request({
url: `/api/blade-desk/order/yieldPlan/getFirstProcess/${params.partCode}`,
method: 'get',
});
};

29
src/api/outsourcingManagement/performanceCalculate.js
Unescape View File

@ -0,0 +1,29 @@
// 外协厂家绩效计算
import request from '@/axios';
// 获取列表
export const getList = params => {
return request({
url: '/api/blade-desk/mesOemMerits/page',
method: 'get',
params
});
};
// 维护厂家绩效
export const maintenanceData = row => {
return request({
url: '/api/blade-desk/mesOemMerits/maintenance',
method: 'post',
data: row
});
};
// 校对厂家绩效
export const checkData = row => {
return request({
url: '/api/blade-desk/mesOemMerits/proofread',
method: 'post',
data: row
});
};

11
src/api/outsourcingManagement/performanceCheck.js
Unescape View File

@ -0,0 +1,11 @@
// 外协厂家绩效评审
import request from '@/axios';
// 获取列表
export const getList = params => {
return request({
url: '/api/blade-desk/mesOemMerits/page',
method: 'get',
params
});
};

11
src/api/outsourcingManagement/performanceReview.js
Unescape View File

@ -0,0 +1,11 @@
// 外协厂家绩效审核
import request from '@/axios';
// 获取列表
export const getList = params => {
return request({
url: '/api/blade-desk/mesOemMerits/page',
method: 'get',
params
});
};

8
src/api/qualityManagement/productionTesting/productionQuality.js
Unescape View File

@ -101,11 +101,11 @@ export const goQualityRecord = (data) => {
};
// 合格证跳转
export const goCertificate = (params) => {
export const goCertificate = (data) => {
return request({
url: '/api/blade-desk/QA/reviewQualification',
method: 'get',
params
url: '/api/blade-desk/QA/InspectionTask/reviewQualification',
method: 'post',
data
});
};

397
src/views/oem/performanceCalculate/components/millMeritsProduce.vue
Unescape View File

@ -21,17 +21,60 @@
</template>
<template #menu-right> </template>
<template #menu="scope"> </template>
<template #produceTsTarget="scope">
<template #produceStatus="scope">
<el-tag v-if="scope.row.produceStatus == 1">未维护</el-tag>
<el-tag v-else type="success">待校对</el-tag>
</template>
<template #jhzsReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #jhzsReality="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).jhzsReality === null || maintenanceArr.find(item => item.id == row.id).jhzsReality === '') && 'error'" v-model="row.jhzsReality"></el-input>
</template>
<template #zdljReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #zdljReality="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).zdljReality === null || maintenanceArr.find(item => item.id == row.id).zdljReality === '') && 'error'" v-model="row.zdljReality"></el-input>
</template>
<template #qqxReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #qqxReality="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).qqxReality === null || maintenanceArr.find(item => item.id == row.id).qqxReality === '') && 'error'" v-model="row.qqxReality"></el-input>
</template>
<template #produceTsReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #produceTsReality="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).produceTsReality === null || maintenanceArr.find(item => item.id == row.id).produceTsReality === '') && 'error'" v-model="row.produceTsReality"></el-input>
</template>
<template #growAbility-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #growAbility="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).growAbility === null || maintenanceArr.find(item => item.id == row.id).growAbility === '') && 'error'" v-model="row.growAbility"></el-input>
</template>
</avue-crud>
</template>
<script>
import {getList,maintenanceData,checkData} from "@/api/outsourcingManagement/performanceCalculate"
export default {
data() {
return {
selectionList: [],
loading:false,
query:{},
option: {
height: "auto",
calcHeight: 32,
@ -83,26 +126,17 @@ export default {
column: [
{
label: "工艺能力",
prop: "plate",
prop: "caName",
sortable: true,
filter: true,
span: 24,
search: false,
width: 130,
type: "select",
dicData: [
{
label: "镀金",
},
{
label: "镀银",
},
],
},
{
label: "厂家代码",
prop: "bsOemCustomer.ocCode",
bind: "bsOemCustomer.ocCode",
prop: "oemCode",
// bind: "bsOemCustomer.ocCode",
search: false,
sortable: true,
filter: true,
@ -110,8 +144,8 @@ export default {
},
{
label: "厂家名称",
prop: "bsOemCustomer.ocName",
bind: "bsOemCustomer.ocName",
prop: "oemName",
// bind: "bsOemCustomer.ocName",
search: false,
sortable: true,
filter: true,
@ -135,8 +169,8 @@ export default {
sortable: true,
filter: true,
span: 24,
cell: true,
rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
// cell: true,
// rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
},
],
},
@ -158,8 +192,8 @@ export default {
sortable: true,
filter: true,
span: 24,
cell: true,
rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
// cell: true,
// rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
},
],
},
@ -181,8 +215,8 @@ export default {
sortable: true,
filter: true,
span: 24,
cell: true,
rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
// cell: true,
// rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
},
],
},
@ -204,8 +238,8 @@ export default {
sortable: true,
filter: true,
span: 24,
cell: true,
rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
// cell: true,
// rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
},
],
},
@ -219,14 +253,14 @@ export default {
sortable: true,
filter: true,
span: 24,
cell: true,
rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
// cell: true,
// rules: [{ required: true, message: "请输入姓名", trigger: "blur" }],
},
],
},
{
label: "状态",
prop: "produceTsTarget",
prop: "produceStatus",
search: false,
sortable: true,
filter: true,
@ -234,6 +268,8 @@ export default {
},
],
},
maintenanceArr:[],
otherData:[],
form: {},
page: {
pageSize: 10,
@ -243,27 +279,63 @@ export default {
};
},
methods: {
calcData(a,b){
// 需要比较的字段
const fieldsToCheck = ['jhzsReality','zdljReality','qqxReality', 'produceTsReality', 'growAbility'];
const c = b.filter((itemB, index) => {
// 策略 A: 如果两个数组顺序严格一致，直接使用索引匹配 (最快)
const itemA = a[index];
// 策略 B: 如果顺序可能不一致，需要通过 id 查找 (更稳健，但如果有重复 ID 会匹配到第一个)
// const itemA = a.find(item => item.id === itemB.id);
if (!itemA) return false; // a 中找不到对应的项，视情况决定是否保留，这里暂不保留
// 检查指定字段是否有任何一个不相等
const isDifferent = fieldsToCheck.some(key => {
return itemA[key] !== itemB[key];
});
return isDifferent;
});
return c
},
maintenanceClick() {
// this.$refs.myTable.fullValidate((errMap) => {
// if (errMap) {
// return;
// }
// const dataList = this.$refs.myTable.getRecordset().updateRecords;
// this.$ajax
// .post('oemMerits/maintenance', {
// dataList,
// status: 2,
// type: 'produce'
// })
// .then((res) => {
// if (res.code === 0) {
// this.$message.success('维护成功');
// this.queryTable();
// }
// });
// });
console.log('this.otherData-------------',this.otherData)
console.log('this.data-------------',this.data)
console.log('c-------------',this.calcData(this.otherData,this.data))
this.maintenanceArr = this.calcData(this.otherData,this.data)
let jhzhError = this.maintenanceArr.find(item => item.jhzsReality === null)
let zdljError = this.maintenanceArr.find(item => item.zdljReality === null)
let qqxError = this.maintenanceArr.find(item => item.qqxReality === null)
let produceError = this.maintenanceArr.find(item => item.produceTsReality === null)
let growError = this.maintenanceArr.find(item => item.growAbility === null)
if(jhzhError || zdljError || qqxError || produceError || growError){
this.$message.error('请填写表格中红框数据')
return
}
maintenanceData({type:"produce",oemMeritsEntities:this.maintenanceArr}).then(res =>{
if(res.data.code === 200){
this.$message.success('维护成功')
this.onLoad()
}
})
},
proofreadClick() {
let checkArr = this.data.filter(item => item.produceStatus == 2)
checkData({
oemMeritsEntities:checkArr,
type:'produce'
}).then(res =>{
if(res.data.code === 200){
this.$message.success('校对成功')
this.onLoad()
}
})
// const dataList = this.$refs.myTable.getTableData().tableData;
// this.$ajax
// .post('oemMerits/proofread', {
@ -295,115 +367,136 @@ export default {
},
onLoad() {
this.loading = true;
this.data = [
{
$cellEdit: true,
bsOemCustomer: {
abbreviation: "L076",
address: "aaa",
codeAndName: "L076/L076",
contactMan: "aaa",
contactPhone: "aaa",
craftAbility:
"镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
curStatus: 0,
curStatusText: "正常供货",
email: "aaa",
keyValue: 21,
limitType: 0,
ocCode: "L076",
ocId: 21,
ocName: "L076",
oemPassword: null,
partCodeYesOrNo: false,
qualification: 10,
qualificationTitle: null,
region: "陕西省",
updateTime: "2023-04-14 18:33:49",
},
createMan: {
userId: 541,
userName: "崔殿龙",
},
createTime: "2023-11-10 18:06:40",
keyValue: 1,
oaaId: 1,
plate: "222",
},
{
$cellEdit: true,
bsOemCustomer: {
abbreviation: "L120",
address: "aaa",
codeAndName: "L120/L120",
contactMan: "aaa",
contactPhone: "aaa",
craftAbility: "不锈钢涂福斯润滑剂、DL零件包装、",
curStatus: 0,
curStatusText: "正常供货",
email: "aaa",
keyValue: 2,
limitType: 0,
ocCode: "L120",
ocId: 2,
ocName: "L120",
oemPassword: null,
partCodeYesOrNo: false,
qualification: 0,
qualificationTitle: "民品&普军",
region: "江苏省",
updateTime: "2023-04-14 18:33:49",
},
createMan: {
userId: 541,
userName: "崔殿龙",
},
createTime: "2023-11-10 18:06:40",
keyValue: 4,
oaaId: 4,
plate: "222",
},
{
$cellEdit: true,
bsOemCustomer: {
abbreviation: "L070",
address: "aaa",
codeAndName: "L070/L070",
contactMan: "aaa",
contactPhone: "aaa",
craftAbility: "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
curStatus: 0,
curStatusText: "正常供货",
email: "aaa",
keyValue: 5,
limitType: 0,
ocCode: "L070",
ocId: 5,
ocName: "L070",
oemPassword: null,
partCodeYesOrNo: false,
qualification: 10,
qualificationTitle: null,
region: "江苏省",
updateTime: "2023-04-14 18:33:49",
},
createMan: {
userId: 541,
userName: "崔殿龙",
},
createTime: "2023-12-06 17:24:48",
keyValue: 21,
oaaId: 21,
plate: "222",
},
];
this.page.total = this.data.length;
this.loading = false;
setTimeout(() => {
this.selectionClear();
}, 500);
getList({
current:this.page.currentPage,
size:this.page.pageSize,
produceStatusList:"1,2",
statusList:"1,2",
...this.query,
}).then((res) => {
this.data = res.data.data.records
this.otherData = JSON.parse(JSON.stringify(res.data.data.records));
this.page.total = res.data.data.total;
this.loading = false;
})
// this.data = [
// {
// $cellEdit: true,
// bsOemCustomer: {
// abbreviation: "L076",
// address: "aaa",
// codeAndName: "L076/L076",
// contactMan: "aaa",
// contactPhone: "aaa",
// craftAbility:
// "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
// curStatus: 0,
// curStatusText: "正常供货",
// email: "aaa",
// keyValue: 21,
// limitType: 0,
// ocCode: "L076",
// ocId: 21,
// ocName: "L076",
// oemPassword: null,
// partCodeYesOrNo: false,
// qualification: 10,
// qualificationTitle: null,
// region: "陕西省",
// updateTime: "2023-04-14 18:33:49",
// },
// createMan: {
// userId: 541,
// userName: "崔殿龙",
// },
// createTime: "2023-11-10 18:06:40",
// keyValue: 1,
// oaaId: 1,
// plate: "222",
// },
// {
// $cellEdit: true,
// bsOemCustomer: {
// abbreviation: "L120",
// address: "aaa",
// codeAndName: "L120/L120",
// contactMan: "aaa",
// contactPhone: "aaa",
// craftAbility: "不锈钢涂福斯润滑剂、DL零件包装、",
// curStatus: 0,
// curStatusText: "正常供货",
// email: "aaa",
// keyValue: 2,
// limitType: 0,
// ocCode: "L120",
// ocId: 2,
// ocName: "L120",
// oemPassword: null,
// partCodeYesOrNo: false,
// qualification: 0,
// qualificationTitle: "民品&普军",
// region: "江苏省",
// updateTime: "2023-04-14 18:33:49",
// },
// createMan: {
// userId: 541,
// userName: "崔殿龙",
// },
// createTime: "2023-11-10 18:06:40",
// keyValue: 4,
// oaaId: 4,
// plate: "222",
// },
// {
// $cellEdit: true,
// bsOemCustomer: {
// abbreviation: "L070",
// address: "aaa",
// codeAndName: "L070/L070",
// contactMan: "aaa",
// contactPhone: "aaa",
// craftAbility: "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
// curStatus: 0,
// curStatusText: "正常供货",
// email: "aaa",
// keyValue: 5,
// limitType: 0,
// ocCode: "L070",
// ocId: 5,
// ocName: "L070",
// oemPassword: null,
// partCodeYesOrNo: false,
// qualification: 10,
// qualificationTitle: null,
// region: "江苏省",
// updateTime: "2023-04-14 18:33:49",
// },
// createMan: {
// userId: 541,
// userName: "崔殿龙",
// },
// createTime: "2023-12-06 17:24:48",
// keyValue: 21,
// oaaId: 21,
// plate: "222",
// },
// ];
// this.page.total = this.data.length;
// this.loading = false;
// setTimeout(() => {
// this.selectionClear();
// }, 500);
},
},
};
</script>
<style lang="scss" scoped></style>
<style lang="scss" scoped>
.error {
::v-deep .el-input__wrapper {
// background: red;
// border:none
border:1px solid #ff0000 !important;
}
}
</style>

402
src/views/oem/performanceCalculate/components/millMeritsQuality.vue
Unescape View File

@ -18,6 +18,84 @@
<template #menu="scope">
</template>
<template #qualityStatus="scope">
<el-tag v-if="scope.row.qualityStatus == 1">未维护</el-tag>
<el-tag v-else type="success">待校对</el-tag>
</template>
<template #hgxTarget-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #hgxTarget="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).hgxTarget === null || maintenanceArr.find(item => item.id == row.id).hgxTarget === '') && 'error'" v-model="row.hgxTarget"></el-input>
</template>
<template #hgxReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #hgxReality="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).hgxReality === null || maintenanceArr.find(item => item.id == row.id).hgxReality === '') && 'error'" v-model="row.hgxReality"></el-input>
</template>
<template #dppmTarget-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #dppmTarget="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).dppmTarget === null || maintenanceArr.find(item => item.id == row.id).dppmTarget === '') && 'error'" v-model="row.dppmTarget"></el-input>
</template>
<template #dppmReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #dppmReality="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).dppmReality === null || maintenanceArr.find(item => item.id == row.id).dppmReality === '') && 'error'" v-model="row.dppmReality"></el-input>
</template>
<template #djcwReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #djcwReality="{ row }">
<el-input :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).djcwReality === null || maintenanceArr.find(item => item.id == row.id).djcwReality === '') && 'error'" v-model="row.djcwReality"></el-input>
</template>
<template #qualityTsReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #qualityTsReality="{ row }">
<el-input-number controls-position="right" style="width:90%;" :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).qualityTsReality === null || maintenanceArr.find(item => item.id == row.id).qualityTsReality === '') && 'error'" v-model="row.qualityTsReality"></el-input-number>
</template>
<template #pcxReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #pcxReality="{ row }">
<el-input-number controls-position="right" style="width:90%;" :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).pcxReality === null || maintenanceArr.find(item => item.id == row.id).pcxReality === '') && 'error'" v-model="row.pcxReality"></el-input-number>
</template>
<template #dywReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #dywReality="{ row }">
<el-input-number controls-position="right" style="width:90%;" :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).dywReality === null || maintenanceArr.find(item => item.id == row.id).dywReality === '') && 'error'" v-model="row.dywReality"></el-input-number>
</template>
<template #qlwtReality-header="{ column }">
<span style="color: red;margin-right:5px;">*</span>{{column.label}}
</template>
<template #qlwtReality="{ row }">
<el-input-number controls-position="right" style="width:90%;" :class="maintenanceArr.length > 0
&& maintenanceArr.find(item => item.id == row.id)
&& (maintenanceArr.find(item => item.id == row.id).qlwtReality === null || maintenanceArr.find(item => item.id == row.id).qlwtReality === '') && 'error'" v-model="row.qlwtReality"></el-input-number>
</template>
<!-- <template #hgxReality-header="{ column }">
<i style="color:red">*</i>{{ (column || {}).label }}
</template> -->
@ -25,6 +103,7 @@
</div>
</template>
<script>
import { getList,maintenanceData,checkData } from "@/api/outsourcingManagement/performanceCalculate"
export default {
components: {
@ -32,6 +111,10 @@ export default {
data() {
return {
selectionList: [],
loading:false,
query: {},
maintenanceArr:[],
otherData:[],
option: {
height: 'auto',
calcHeight: 32,
@ -81,26 +164,16 @@ export default {
column: [
{
label: '工艺能力',
prop: 'plate',
prop: 'caName',
sortable: true,
filter: true,
span: 24,
search: false,
width: 130,
type:'select',
dicData:[
{
label:'镀金'
},
{
label:'镀银'
}
]
},
{
label: '厂家代码',
prop: 'bsOemCustomer.ocCode',
bind: 'bsOemCustomer.ocCode',
prop: 'oemCode',
search: false,
sortable: true,
filter: true,
@ -109,8 +182,8 @@ export default {
},
{
label: '厂家名称',
prop: 'bsOemCustomer.ocName',
bind: 'bsOemCustomer.ocName',
prop: 'oemName',
// bind: 'bsOemCustomer.ocName',
search: false,
sortable: true,
filter: true,
@ -129,7 +202,6 @@ export default {
filter: true,
span: 24,
width: 120,
cell: true,
rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' }
]
@ -142,7 +214,6 @@ export default {
filter: true,
span: 24,
width: 120,
cell: true,
rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' }
]
@ -161,7 +232,6 @@ export default {
filter: true,
span: 24,
width: 120,
cell: true,
rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' }
]
@ -174,7 +244,6 @@ export default {
filter: true,
span: 24,
width: 120,
cell: true,
rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' }
]
@ -202,7 +271,6 @@ export default {
filter: true,
span: 24,
width: 120,
cell: true,
rules: [
{ required: true, message: '请输入姓名', trigger: 'blur' }
]
@ -324,7 +392,7 @@ export default {
},
{
label: '状态',
prop: 'omStatusTitle',
prop: 'qualityStatus',
search: false,
sortable: true,
filter: true,
@ -345,6 +413,66 @@ export default {
}
},
methods: {
calcData(a,b){
// 需要比较的字段
const fieldsToCheck = ['djcwReality','qualityTsReality','pcxReality', 'dywReality', 'qlwtReality','dppmTarget',
'dppmReality','hgxTarget','hgxReality'];
const c = b.filter((itemB, index) => {
// 策略 A: 如果两个数组顺序严格一致，直接使用索引匹配 (最快)
const itemA = a[index];
// 策略 B: 如果顺序可能不一致，需要通过 id 查找 (更稳健，但如果有重复 ID 会匹配到第一个)
// const itemA = a.find(item => item.id === itemB.id);
if (!itemA) return false; // a 中找不到对应的项，视情况决定是否保留，这里暂不保留
// 检查指定字段是否有任何一个不相等
const isDifferent = fieldsToCheck.some(key => {
return itemA[key] !== itemB[key];
});
return isDifferent;
});
return c
},
maintenanceClick(){
this.maintenanceArr = this.calcData(this.otherData,this.data)
console.log('main------------',this.maintenanceArr)
let djcwError = this.maintenanceArr.find(item => item.djcwReality === null)
let qualityError = this.maintenanceArr.find(item => item.qualityTsReality === null)
let pcxError = this.maintenanceArr.find(item => item.pcxReality === null)
let dywError = this.maintenanceArr.find(item => item.dywReality === null)
let qlwtError = this.maintenanceArr.find(item => item.qlwtReality === null)
let dppmTargetError = this.maintenanceArr.find(item => item.dppmTarget === null)
let dppmRealityError = this.maintenanceArr.find(item => item.dppmReality === null)
let hgxTargetError = this.maintenanceArr.find(item => item.hgxTarget === null)
let hgxRealityError = this.maintenanceArr.find(item => item.hgxReality === null)
if(djcwError || qualityError || pcxError || dywError || qlwtError || dppmTargetError || dppmRealityError || hgxTargetError || hgxRealityError){
this.$message.error('请填写表格中红框数据')
return
}
maintenanceData({type:"quality",oemMeritsEntities:this.maintenanceArr}).then(res =>{
if(res.data.code === 200){
this.$message.success('维护成功')
this.onLoad()
}
})
},
proofreadClick(){
let checkArr = this.data.filter(item => item.qualityStatus == 2)
checkData({
oemMeritsEntities:checkArr,
type:'quality'
}).then(res =>{
if(res.data.code === 200){
this.$message.success('校对成功')
this.onLoad()
}
})
},
addEdit() {
this.isOpen = true
},
@ -396,114 +524,134 @@ export default {
},
onLoad() {
this.loading = true
this.data = [
{
$cellEdit: true,
"bsOemCustomer": {
"abbreviation": "L076",
"address": "aaa",
"codeAndName": "L076/L076",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 21,
"limitType": 0,
"ocCode": "L076",
"ocId": 21,
"ocName": "L076",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 10,
"qualificationTitle": null,
"region": "陕西省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-11-10 18:06:40",
"keyValue": 1,
"oaaId": 1,
"plate": "222"
},
{
$cellEdit: true,
"bsOemCustomer": {
"abbreviation": "L120",
"address": "aaa",
"codeAndName": "L120/L120",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 2,
"limitType": 0,
"ocCode": "L120",
"ocId": 2,
"ocName": "L120",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 0,
"qualificationTitle": "民品&普军",
"region": "江苏省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-11-10 18:06:40",
"keyValue": 4,
"oaaId": 4,
"plate": "222"
},
{
$cellEdit: true,
"bsOemCustomer": {
"abbreviation": "L070",
"address": "aaa",
"codeAndName": "L070/L070",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 5,
"limitType": 0,
"ocCode": "L070",
"ocId": 5,
"ocName": "L070",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 10,
"qualificationTitle": null,
"region": "江苏省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-12-06 17:24:48",
"keyValue": 21,
"oaaId": 21,
"plate": "222"
}
]
this.page.total = this.data.length
this.loading = false
setTimeout(() => {
this.selectionClear()
}, 500)
getList({
current:this.page.currentPage,
size:this.page.pageSize,
qualityStatusList:'1,2',
statusList:"1,2",
...this.query,
}).then((res) => {
this.data = res.data.data.records
this.otherData = JSON.parse(JSON.stringify(res.data.data.records));
this.page.total = res.data.data.total
this.loading = false
})
// this.data = [
// {
// $cellEdit: true,
// "bsOemCustomer": {
// "abbreviation": "L076",
// "address": "aaa",
// "codeAndName": "L076/L076",
// "contactMan": "aaa",
// "contactPhone": "aaa",
// "craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
// "curStatus": 0,
// "curStatusText": "正常供货",
// "email": "aaa",
// "keyValue": 21,
// "limitType": 0,
// "ocCode": "L076",
// "ocId": 21,
// "ocName": "L076",
// "oemPassword": null,
// "partCodeYesOrNo": false,
// "qualification": 10,
// "qualificationTitle": null,
// "region": "陕西省",
// "updateTime": "2023-04-14 18:33:49"
// },
// "createMan": {
// "userId": 541,
// "userName": "崔殿龙"
// },
// "createTime": "2023-11-10 18:06:40",
// "keyValue": 1,
// "oaaId": 1,
// "plate": "222"
// },
// {
// $cellEdit: true,
// "bsOemCustomer": {
// "abbreviation": "L120",
// "address": "aaa",
// "codeAndName": "L120/L120",
// "contactMan": "aaa",
// "contactPhone": "aaa",
// "craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
// "curStatus": 0,
// "curStatusText": "正常供货",
// "email": "aaa",
// "keyValue": 2,
// "limitType": 0,
// "ocCode": "L120",
// "ocId": 2,
// "ocName": "L120",
// "oemPassword": null,
// "partCodeYesOrNo": false,
// "qualification": 0,
// "qualificationTitle": "民品&普军",
// "region": "江苏省",
// "updateTime": "2023-04-14 18:33:49"
// },
// "createMan": {
// "userId": 541,
// "userName": "崔殿龙"
// },
// "createTime": "2023-11-10 18:06:40",
// "keyValue": 4,
// "oaaId": 4,
// "plate": "222"
// },
// {
// $cellEdit: true,
// "bsOemCustomer": {
// "abbreviation": "L070",
// "address": "aaa",
// "codeAndName": "L070/L070",
// "contactMan": "aaa",
// "contactPhone": "aaa",
// "craftAbility": "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
// "curStatus": 0,
// "curStatusText": "正常供货",
// "email": "aaa",
// "keyValue": 5,
// "limitType": 0,
// "ocCode": "L070",
// "ocId": 5,
// "ocName": "L070",
// "oemPassword": null,
// "partCodeYesOrNo": false,
// "qualification": 10,
// "qualificationTitle": null,
// "region": "江苏省",
// "updateTime": "2023-04-14 18:33:49"
// },
// "createMan": {
// "userId": 541,
// "userName": "崔殿龙"
// },
// "createTime": "2023-12-06 17:24:48",
// "keyValue": 21,
// "oaaId": 21,
// "plate": "222"
// }
// ]
// this.page.total = this.data.length
// this.loading = false
// setTimeout(() => {
// this.selectionClear()
// }, 500)
}
}
}
</script>
<style lang="scss" scoped></style>
<style lang="scss" scoped>
.error {
::v-deep .el-input__wrapper {
// background: red;
// border:none
border:1px solid #ff0000 !important;
}
}
</style>

140
src/views/oem/performanceCheck/index.vue
Unescape View File

@ -19,6 +19,7 @@
</basic-container>
</template>
<script>
import {getList} from "@/api/outsourcingManagement/performanceCheck"
export default {
components: {
@ -26,6 +27,8 @@ export default {
data() {
return {
selectionList: [],
loading:false,
query:{},
option: {
height: 'auto',
calcHeight: 32,
@ -76,26 +79,16 @@ export default {
column: [
{
label: '工艺能力',
prop: 'plate',
prop: 'caName',
sortable: true,
filter: true,
span: 24,
search: false,
width: 130,
type:'select',
dicData:[
{
label:'镀金'
},
{
label:'镀银'
}
]
width: 130,
},
{
label: '厂家代码',
prop: 'bsOemCustomer.ocCode',
bind: 'bsOemCustomer.ocCode',
prop: 'oemCode',
search: false,
sortable: true,
filter: true,
@ -104,8 +97,7 @@ export default {
},
{
label: '厂家名称',
prop: 'bsOemCustomer.ocName',
bind: 'bsOemCustomer.ocName',
prop: 'oemName',
search: false,
sortable: true,
filter: true,
@ -701,112 +693,18 @@ export default {
},
onLoad() {
this.loading = true
this.data = [
{
$cellEdit: true,
"bsOemCustomer": {
"abbreviation": "L076",
"address": "aaa",
"codeAndName": "L076/L076",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 21,
"limitType": 0,
"ocCode": "L076",
"ocId": 21,
"ocName": "L076",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 10,
"qualificationTitle": null,
"region": "陕西省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-11-10 18:06:40",
"keyValue": 1,
"oaaId": 1,
"plate": "222"
},
{
$cellEdit: true,
"bsOemCustomer": {
"abbreviation": "L120",
"address": "aaa",
"codeAndName": "L120/L120",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 2,
"limitType": 0,
"ocCode": "L120",
"ocId": 2,
"ocName": "L120",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 0,
"qualificationTitle": "民品&普军",
"region": "江苏省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-11-10 18:06:40",
"keyValue": 4,
"oaaId": 4,
"plate": "222"
},
{
$cellEdit: true,
"bsOemCustomer": {
"abbreviation": "L070",
"address": "aaa",
"codeAndName": "L070/L070",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 5,
"limitType": 0,
"ocCode": "L070",
"ocId": 5,
"ocName": "L070",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 10,
"qualificationTitle": null,
"region": "江苏省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-12-06 17:24:48",
"keyValue": 21,
"oaaId": 21,
"plate": "222"
}
]
this.page.total = this.data.length
this.loading = false
setTimeout(() => {
this.selectionClear()
}, 500)
getList({
current:this.page.currentPage,
size:this.page.pageSize,
produceStatusList:"3",
qualityStatusList:"3",
statusList:"2",
...this.query,
}).then((res) => {
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.loading = false;
})
}
}
}

116
src/views/oem/performanceReview/index.vue
Unescape View File

@ -20,6 +20,7 @@
</basic-container>
</template>
<script>
import {getList} from "@/api/outsourcingManagement/performanceReview"
export default {
components: {
@ -27,6 +28,8 @@ export default {
data() {
return {
selectionList: [],
loading:false,
query:{},
option: {
height: 'auto',
calcHeight: 32,
@ -758,109 +761,16 @@ export default {
},
onLoad() {
this.loading = true
this.data = [
{
"bsOemCustomer": {
"abbreviation": "L076",
"address": "aaa",
"codeAndName": "L076/L076",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "镀银、挂镀银、喷砂、涂色标、铜合金化学镀镍、电镀镍、DL零件包装",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 21,
"limitType": 0,
"ocCode": "L076",
"ocId": 21,
"ocName": "L076",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 10,
"qualificationTitle": null,
"region": "陕西省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-11-10 18:06:40",
"keyValue": 1,
"oaaId": 1,
"plate": "222"
},
{
"bsOemCustomer": {
"abbreviation": "L120",
"address": "aaa",
"codeAndName": "L120/L120",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "不锈钢涂福斯润滑剂、DL零件包装、",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 2,
"limitType": 0,
"ocCode": "L120",
"ocId": 2,
"ocName": "L120",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 0,
"qualificationTitle": "民品&普军",
"region": "江苏省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-11-10 18:06:40",
"keyValue": 4,
"oaaId": 4,
"plate": "222"
},
{
"bsOemCustomer": {
"abbreviation": "L070",
"address": "aaa",
"codeAndName": "L070/L070",
"contactMan": "aaa",
"contactPhone": "aaa",
"craftAbility": "滚镀金或振镀金、局部镀厚金、闪镀金、镀铂金、局部退火",
"curStatus": 0,
"curStatusText": "正常供货",
"email": "aaa",
"keyValue": 5,
"limitType": 0,
"ocCode": "L070",
"ocId": 5,
"ocName": "L070",
"oemPassword": null,
"partCodeYesOrNo": false,
"qualification": 10,
"qualificationTitle": null,
"region": "江苏省",
"updateTime": "2023-04-14 18:33:49"
},
"createMan": {
"userId": 541,
"userName": "崔殿龙"
},
"createTime": "2023-12-06 17:24:48",
"keyValue": 21,
"oaaId": 21,
"plate": "222"
}
]
this.page.total = this.data.length
this.loading = false
setTimeout(() => {
this.selectionClear()
}, 500)
getList({
current:this.page.currentPage,
size:this.page.pageSize,
statusList:"3,4",
...this.query,
}).then((res) => {
this.data = res.data.data.records
this.page.total = res.data.data.total
this.loading = false
})
}
}
}

1144
src/views/orderManagement/allocationMessQuery.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/orderManagement/components/exception/dataMissing.vue
Unescape View File

@ -17,7 +17,7 @@
@row-update="rowUpdate"
>
<template #menu-left>
<el-button type="primary" @click="claseOrder()" plain>关闭订单</el-button>
<el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
</template>
<template #menu-right> </template>

2
src/views/orderManagement/components/exception/deliveryDate.vue
Unescape View File

@ -17,7 +17,7 @@
@row-update="rowUpdate"
>
<template #menu-left>
<el-button type="primary" @click="claseOrder()" plain>关闭订单</el-button>
<el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
</template>
<template #menu-right> </template>

2
src/views/orderManagement/components/exception/processMissing.vue
Unescape View File

@ -18,7 +18,7 @@
>
<template #menu-left>
<el-button type="primary" @click="complianceCheck()">合规校验</el-button>
<el-button type="primary" @click="claseOrder()" plain>关闭订单</el-button>
<el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
</template>
<template #menu-right> </template>

2
src/views/orderManagement/components/exception/resourceMissing.vue
Unescape View File

@ -18,7 +18,7 @@
>
<template #menu-left>
<el-button type="primary" @click="complianceCheck()">合规校验</el-button>
<el-button type="primary" @click="claseOrder()" plain>关闭订单</el-button>
<el-button type="primary" @click="claseOrder()" >关闭订单</el-button>
</template>
<template #menu-right> </template>

208
src/views/orderManagement/components/lookProcess.vue
Unescape View File

@ -7,7 +7,7 @@
@open="open"
@opened="opened"
>
<el-card>
<el-card v-if="sourceId == 'plannedOrder' || sourceId == 'sinTerOrder'">
<el-descriptions :column="1" size="medium" class="margin-top" border>
<el-descriptions-item label="一级工艺路线">
<!-- {{ craftData.primaryCraft }} -->{{ primaryCraft }}
@ -15,6 +15,7 @@
</el-descriptions>
</el-card>
<avue-crud
v-if="sourceId == 'plannedOrder' || sourceId == 'sinTerOrder'"
:option="option"
:table-loading="loading"
:data="data"
@ -31,10 +32,30 @@
@on-load="onLoad"
>
</avue-crud>
<avue-crud
v-if="sourceId == 'planYieIdOrder' || sourceId == 'sinTerYieIdOrder'"
:option="option1"
:table-loading="loading"
:data="data1"
v-model="form"
v-model:page="page"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
</avue-crud>
</el-dialog>
</template>
<script>
import { getFirstProcess } from '@/api/orderManagement/planYieIdOrder';
import { getProcessRouting } from '@/api/orderManagement/planYieIdOrder';
import { getProcessRoute,getProcess } from '@/api/orderManagement/sinTerPlanOrder';
// import {} from "@/api/orderManagement/planYieIdOrder"
export default {
components: {},
props: {
@ -54,7 +75,12 @@ export default {
},
id: {
type: String,
default:''
},
checkPart:{
type: String,
default:''
}
},
data() {
return {
@ -117,13 +143,13 @@ export default {
column: [
{
label: '零件号',
prop: 'partCode',
prop: 'partcode',
search: false,
width: 150,
},
{
label: '零件名称',
prop: 'partName',
prop: 'partname',
search: false,
width: 170,
},
@ -135,7 +161,7 @@ export default {
},
{
label: '一级工艺计划名称',
prop: 'firppName',
prop: 'firppname',
search: false,
width: 180,
},
@ -147,13 +173,13 @@ export default {
},
{
label: '一级工序名称',
prop: 'firseqName',
prop: 'firseqname',
search: false,
width: 180,
},
{
label: '一级工序序号',
prop: 'firseqNo',
prop: 'firseqno',
search: false,
width: 180,
},
@ -161,51 +187,163 @@ export default {
},
data: [],
option1:{
tip: false,
simplePage: true,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
searchIndex: 3,
tree: false,
border: true,
index: true,
selection: false,
viewBtn: false,
delBtn: false,
addBtn: false,
editBtnText: '修改',
labelWidth: 120,
// searchLabelWidth: 120,
menuWidth: 330,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
filterBtn: false,
searchShowBtn: false,
excelBtn: false,
index: true,
showOverflowTooltip: true,
menu: false,
// refreshBtn:false,
// columnBtn:false,
// gridBtn :false,
header: false,
searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: 'left',
gridBtn: false,
searchMenuPosition: 'right',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
align: 'center',
column: [
{
label: '工序号',
prop: 'craftNo',
search: false,
// width: 150,
},
{
label: '工序代码',
prop: 'partname',
search: false,
// width: 170,
},
{
label: '工序名称',
prop: 'firpp',
search: false,
// width: 180,
},
// {
// label: '额定加工工时(min)',
// prop: 'firppname',
// search: false,
// width: 180,
// },
// {
// label: '加工班组',
// prop: 'firseq',
// search: false,
// width: 180,
// },
// {
// label: '外协厂商',
// prop: 'firseqname',
// search: false,
// width: 180,
// },
// {
// label: '计划开始时间',
// prop: 'startTime',
// search: false,
// width: 180,
// },
// {
// label: '计划结束时间',
// prop: 'endTime',
// search: false,
// width: 180,
// },
// {
// label: '工序描述',
// prop: 'makeMemo',
// search: false,
// width: 180,
// },
],
},
data1:[],
};
},
methods: {
async open() {
console.log(this.id)
try {
const res = await getFirstProcess(this.id );
if (res.status === 200) {
this.primaryCraft = '一级工艺';
this.data = res.data.records1;
}
} catch (err) {
console.log(err);
}
// console.log(this.id)
// try {
// const res = await getFirstProcess(this.id );
// if (res.status === 200) {
// this.primaryCraft = '一级工艺';
// this.data = res.data.records1;
// }
// } catch (err) {
// console.log(err);
// }
console.log('sourde----------',this.sourceId)
console.log('checkPart----------',this.checkPart)
if (this.sourceId === 'sinTerYieIdOrder') {
console.log('由sinTerYieIdOrder组件打开');
// 父组件A的专属逻辑
getProcessRouting({id:this.id}).then(res =>{
console.log('res---------',res)
this.data1 = res.data.data
})
}
if (this.sourceId === 'planYieIdOrder') {
console.log('由planYieIdOrder父组件打开');
// 父组件B的专属逻辑
getProcessRouting({id:this.id}).then(res =>{
console.log('res---------',res)
this.data1 = res.data.data
})
}
if (this.sourceId === 'plannedOrder') {
console.log('由plannedOrder111父组件打开');
// 父组件B的专属逻辑
const processRes = await getProcessRoute({
yieldPlanId:this.id
})
console.log('processRes',processRes)
this.primaryCraft = processRes.data.data.primaryCraft
const partRes = await getProcess({
partCode:this.checkPart
})
console.log('partRes',partRes)
}
if (this.sourceId === 'sinTerOrder') {
console.log('sinTerOrder');
// 父组件B的专属逻辑
const processRes = await getProcessRoute({
yieldPlanId:this.id
})
console.log('processRes',processRes)
this.primaryCraft = processRes.data.data.primaryCraft
const partRes = await getProcess({
partCode:this.checkPart
})
console.log('partRes',partRes)
}
// this.$ajax
// .get('planOrder/getCraftData/' + this.rowItem.poId)
// .then((res) => {
// if (this.$ifAjax(res)) {
// this.craftData = res.data;
// }
// });
// this.$ajax
// .get('planOrder/getFirseqData/' + this.rowItem.partCode)
// .then((res1) => {
// if (this.$ifAjax(res1)) {
// this.firseqList = res1.data;
// }
// });
},
cancel() {
this.setCrewShow = false;

6
src/views/orderManagement/plannedOrder.vue
Unescape View File

@ -89,6 +89,7 @@
:rowData="rowItem"
sourceId="plannedOrder"
:id="id"
:checkPart="checkPart"
></lookProcess>
</basic-container>
</template>
@ -105,7 +106,7 @@ import {
update,
} from '@/api/system/role';
import { closeBatchs,getHotList } from '@/api/orderManagement/sinTerPlanOrder';
import { closeBatchs,getHotList,getProcessRoute,getProcess } from '@/api/orderManagement/sinTerPlanOrder';
import { mapGetters } from 'vuex';
import { validatenull } from '@/utils/validate';
@ -573,6 +574,7 @@ export default {
data: [],
isRushOpen: false, //加急弹框
isBatchOpen: false, //分批处理
checkPart:"",
};
},
computed: {
@ -684,7 +686,9 @@ export default {
this.platingSmallOpen = true;
},
lookProcessRoute(row) {
console.log('row----------',row)
this.id=row.id
this.checkPart = row.partCode
this.isOpen = true;
this.rowItem = row;
},

3
src/views/orderManagement/sinTerPlanOrder.vue
Unescape View File

@ -77,6 +77,7 @@
:rowData="rowItem"
sourceId="sinTerOrder"
:id="id"
:checkPart="checkPart"
></lookProcess>
</basic-container>
</template>
@ -528,6 +529,7 @@ export default {
data: [],
isRushOpen: false,
checkPart:"",
};
},
computed: {
@ -639,6 +641,7 @@ export default {
},
lookProcessRoute(row) {
this.id = row.id;
this.checkPart = row.partCode;
this.isOpen = true;
this.rowItem = row;
},

2
src/views/periodicTesting/projectCycle.vue
Unescape View File

@ -29,7 +29,7 @@
<el-button type="success" @click="handleUser">人员设置</el-button>
<el-button type="primary" @click="handleCycle">批量设置周期</el-button>
<el-button type="warning" @click="handleExport" plain>导出</el-button>
<el-button type="warning" @click="handleExport" >导出</el-button>
</template>
<template #menu-right>
<el-button type="primary" @click="handleImport">导入</el-button>

2
src/views/periodicTesting/testProject.vue
Unescape View File

@ -19,7 +19,7 @@
<template #menu-left>
<el-button type="primary" @click="handleAdd">新增</el-button>
<el-button type="danger" @click="handleDeletes">删除</el-button>
<el-button type="warning" @click="handleExport" plain>导出</el-button>
<el-button type="warning" @click="handleExport" >导出</el-button>
</template>
<template #menu-right>
<el-button type="primary" @click="handleImport">导入</el-button>

2
src/views/periodicTesting/testTask.vue
Unescape View File

@ -20,7 +20,7 @@
>
<template #menu-left>
<el-button @click="handleIssue" type="primary" v-if="permission.issue_btn"> 转派 </el-button>
<el-button type="warning" plain @click="handleExport">导出</el-button>
<el-button type="warning" @click="handleExport">导出</el-button>
</template>
<template #menu-right="{ size }">
<el-button type="warning" plain @click="handleSearch(1)">临期</el-button>

9
src/views/productionTesting/InspectionTemplate.vue
Unescape View File

@ -52,7 +52,15 @@
<el-input v-model="formData.priority" placeholder="请输入优先级"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分类" prop="category">
<el-select v-model="formData.category">
<el-option v-for="item in typeData" :key="item.id" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div v-if="title == '新增'">
<el-button type="primary" @click="insertEvent()">插入一行</el-button>
@ -561,6 +569,7 @@ export default {
inspectionTemplateCode:this.formData.inspectionTemplateCode,
name:this.formData.name,
priority:this.formData.priority,
category:this.formData.category,
detailList:this.tidList.length > 0 ? this.tidList : []
}
if(this.title == '新增'){

4
src/views/productionTesting/productionQuality.vue
Unescape View File

@ -902,7 +902,7 @@ export default {
goQualityRecord({
id:this.checkedId
}).then(res =>{
window.open(res.data.data.url)
window.open(res.data.data)
})
},
// 跳转合格证
@ -910,7 +910,7 @@ export default {
goCertificate({
id:this.checkedId
}).then(res =>{
window.open(res.data.data.url)
window.open(res.data.data)
})
},
getRowClass(row, index) {

Write Preview
Loading…
Cancel
Save