diff --git a/src/api/orderManagement/planYieIdOrder.js b/src/api/orderManagement/planYieIdOrder.js
index 8e60c062..09d1cfb3 100644
--- a/src/api/orderManagement/planYieIdOrder.js
+++ b/src/api/orderManagement/planYieIdOrder.js
@@ -97,4 +97,13 @@ export const getProcessRouting = (params) => {
method: 'post',
params,
});
+};
+
+// 子件下达
+export const subItemAssignment = (params) => {
+ return request({
+ url: '/api/blade-desk/order/yieldOrder/subItemAssignment',
+ method: 'post',
+ params,
+ });
};
\ No newline at end of file
diff --git a/src/views/oem/oemOrder/index.vue b/src/views/oem/oemOrder/index.vue
index 7471df14..c6b4ed37 100644
--- a/src/views/oem/oemOrder/index.vue
+++ b/src/views/oem/oemOrder/index.vue
@@ -384,43 +384,28 @@ export default {
},
{
label: "优先级",
- prop: "priority",
- // bind: "prWorkOrder.priority",
+ prop: "priorityName",
sortable: 'custom',
search: true,
overHidden: true,
width: 120,
- type: "select",
- headerAlign: "center",
- // align: "left",
- dicUrl: "/api/blade-system/dict/dictionary?code=orderPriority",
- props: {
- label: "dictValue",
- value: "dictKey"
- }
- // dicData: [
- // {
- // value: 1,
- // label: "正常-白色",
- // },
- // {
- // value: 2,
- // label: "项目要求日期急件-橙色",
- // },
- // {
- // value: 3,
- // label: "合同急件-黄色",
- // },
- // {
- // value: 4,
- // label: "绩效零件-青色",
- // },
- // {
- // value: 5,
- // label: "调度标注急件-蓝色",
- // },
- // ],
},
+ // {
+ // label: "优先级",
+ // prop: "priority",
+ // sortable: 'custom',
+ // search: true,
+ // overHidden: true,
+ // width: 120,
+ // hide: true,
+ // type: "select",
+ // headerAlign: "center",
+ // dicUrl: "/api/blade-system/dict/dictionary?code=orderPriority",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // }
+ // },
{
label: "使用部门",
prop: "deptName",
diff --git a/src/views/orderManagement/sinTerYieIdOrder.vue b/src/views/orderManagement/sinTerYieIdOrder.vue
index a40d0ff3..f9c44365 100644
--- a/src/views/orderManagement/sinTerYieIdOrder.vue
+++ b/src/views/orderManagement/sinTerYieIdOrder.vue
@@ -1,23 +1,10 @@
-
+
批量关闭
优先级调整
@@ -33,8 +20,7 @@
{{ row.curStatusText }}
- {{ row.curStatusText }}
+ {{ row.curStatusText }}
{{
row.curStatusText
}}
@@ -46,36 +32,23 @@
}}
- 工艺路线
+ 工艺路线
- 修改
+ 修改
-
+ 子件下达
+
+ 下发玻璃饼
+ v-if="(row.orderType === 0 && row.glassPlateIssuedStatus === 0) && permission.sj_order_issue_glass_cake">下发玻璃饼
@@ -91,29 +64,13 @@
-->
-
+
-
+
-
+
确定要下发玻璃饼吗？
-
+
@@ -141,6 +92,7 @@ import {
closeBatchs,
updatePreference,
saveGlassCake,
+ subItemAssignment
} from '@/api/orderManagement/planYieIdOrder';
import {
add,
@@ -223,7 +175,7 @@ export default {
editBtnText: '修改',
labelWidth: 120,
searchLabelWidth: 'auto',
- menuWidth: 140,
+ menuWidth: 180,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
@@ -246,12 +198,16 @@ export default {
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
+ tree: true,
+ selectable: (row) => row.isParent === true,
+
+
column: [
{
label: '计划单号',
prop: 'ypCode',
search: true,
- searchOrder:5,
+ searchOrder: 5,
sortable: 'custom',
width: 150,
span: 12,
@@ -270,7 +226,7 @@ export default {
prop: 'yoCode',
search: true,
sortable: 'custom',
- searchOrder:4,
+ searchOrder: 4,
width: 150,
span: 12,
headerAlign: 'center',
@@ -287,7 +243,7 @@ export default {
label: '零件号',
prop: 'partCode',
search: true,
- searchOrder:2,
+ searchOrder: 2,
sortable: 'custom',
width: 180,
span: 12,
@@ -361,7 +317,7 @@ export default {
prop: 'cardNo',
search: true,
sortable: 'custom',
- searchOrder:20,
+ searchOrder: 20,
width: 150,
span: 12,
headerAlign: 'center',
@@ -408,12 +364,12 @@ export default {
trigger: 'blur',
},
],
- dicData:[
- { label:'1级-极高紧急度',value:15001 },
- { label:'2级-高紧急度',value:15002 },
- { label:'3级-中紧急度',value:15003 },
- { label:'4级-低紧急度',value:15004 },
- { label:'5级-正常',value:15005 },
+ dicData: [
+ { label: '1级-极高紧急度', value: 15001 },
+ { label: '2级-高紧急度', value: 15002 },
+ { label: '3级-中紧急度', value: 15003 },
+ { label: '4级-低紧急度', value: 15004 },
+ { label: '5级-正常', value: 15005 },
]
},
{
@@ -435,11 +391,11 @@ export default {
// YIELD_TYPE_5("插针", 12005),
// YIELD_TYPE_6("石墨模", 12006),
// {label: '热表订单', value: 12001},
- {label: '烧结订单', value: 12002},
- {label: '玻璃饼', value: 12003},
- {label: '壳体', value: 12004},
- {label: '插针', value: 12005},
- {label: '石墨模', value: 12006}
+ { label: '烧结订单', value: 12002 },
+ { label: '玻璃饼', value: 12003 },
+ { label: '壳体', value: 12004 },
+ { label: '插针', value: 12005 },
+ { label: '石墨模', value: 12006 }
// {
// label: '烧结订单',
// value: 0,
@@ -593,7 +549,7 @@ export default {
},
],
},
- {
+ {
label: '计划部门编码',
prop: 'planDeptCode',
search: false,
@@ -760,8 +716,8 @@ export default {
width: '140',
display: false,
// RECEIVE_STATUS_NO( name:"未接收",
-// RECEIVE_STATUS_YES(name:"已接收",
-// code:11000),code:11001)
+ // RECEIVE_STATUS_YES(name:"已接收",
+ // code:11000),code:11001)
dicData: [
{
value: 11000,
@@ -774,17 +730,17 @@ export default {
],
},
{
- label:"接收人",
+ label: "接收人",
prop: 'receiveUserName',
width: '140',
},
{
- label:"接收时间",
+ label: "接收时间",
prop: 'receiveTime',
width: '140',
sortable: 'custom',
},
- {
+ {
label: '创建时间',
prop: 'createTime',
width: '140',
@@ -856,9 +812,9 @@ export default {
this.query.asc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
-
+
this.query.orderByField = orderByField;
- this.query.asc = order === 'ascending'?true:false;
+ this.query.asc = order === 'ascending' ? true : false;
}
// // 重新加载数据
this.onLoad(this.page, this.query);
@@ -897,6 +853,27 @@ export default {
this.id = row.id;
this.isUpdateOpen = true;
},
+ // 子件下达
+ sendOrderFn(row) {
+ this.$confirm('确定此数据进行子件下达?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ subItemAssignment({ id: row.id }).then(res => {
+ this.loading = true
+ this.onLoad(this.page);
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ }).catch(err => {
+ this.loading = false
+ })
+ })
+
+ },
//工艺路线
lookProcessRoute(row) {
this.id = row.id;
@@ -929,7 +906,7 @@ export default {
return;
}
let tmp = this.selectionList.filter(item => item.status === 10015 || item.status === 10021)
- if(tmp.length > 0){
+ if (tmp.length > 0) {
this.$message.error('请勿选择状态为【已完工】或【已关闭】的数据');
return
}
@@ -947,7 +924,7 @@ export default {
this.onLoad(this.page);
}
});
-
+
})
.catch(() => {
// this.onLoad(this.page);
@@ -987,7 +964,7 @@ export default {
if (this.currentRow) {
// 更新玻璃饼下发状态为已下发
this.currentRow.glassPlateIssuedStatus = 1;
- saveGlassCake({yieldPlanId:this.id}).then(res => {
+ saveGlassCake({ yieldPlanId: this.id }).then(res => {
this.$message.success('玻璃饼下发成功');
}).catch(err => {
this.$message.error('玻璃饼下发失败');
@@ -1197,17 +1174,20 @@ export default {
try {
let param = {
...this.query,
- releaseDateStart:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[0]).format('YYYY-MM-DD') : null,
- releaseDateEnd:this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[1]).format('YYYY-MM-DD') : null,
+ releaseDateStart: this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[0]).format('YYYY-MM-DD') : null,
+ releaseDateEnd: this.query.releaseDate && this.query.releaseDate.length != 0 ? this.$dayjs(this.query.releaseDate[1]).format('YYYY-MM-DD') : null,
}
- if(param.releaseDate) delete param.releaseDate;
- console.log('para-----------',param)
+ if (param.releaseDate) delete param.releaseDate;
+ console.log('para-----------', param)
const res = await getSinterOrderList({
- current:this.page.currentPage,
- size:this.page.pageSize,
+ current: this.page.currentPage,
+ size: this.page.pageSize,
...param
})
this.data = res.data.data.records;
+ this.data.forEach(item => {
+ item.isParent = true
+ })
this.page.total = res.data.data.total;
} catch (err) {
console.log(err);
@@ -1215,6 +1195,11 @@ export default {
this.loading = false;
},
},
- mounted() {},
+ mounted() { },
};
+
diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue
index 431590f4..1538478f 100644
--- a/src/views/productionManagement/blbWorkOrder/components/glass.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue
@@ -376,7 +376,6 @@ export default {
{
label: '订单优先级',
prop: 'priorityName',
- type: 'select',
search: false,
sortable: true,
overHidden: true,