+
插入一行
- 删除行
+ 删除选中行
-
-
-
-
-
- *零件编码
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.partName }}
-
-
-
-
- *工装号
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.moName }}
-
-
-
-
- *数量
-
-
-
-
-
-
-
- *计划类型
-
-
-
-
-
-
-
-
-
-
- *需求日期
-
-
-
-
-
-
-
- *生产标识
-
-
-
-
-
-
-
- *保管员
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
+
+
+
+ {{ formError }}
+
+
+
+
+
+
+
+
+ *零件编码
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.partName }}
+
+
+
+
+
+ *工装号
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.moName }}
+
+
+
+
+
+ *数量
+
+
+
+
+
+
+
+
+
+
+ *计划类型
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *需求日期
+
+
+
+
+
+
+
+
+
+
+ *生产标识
+
+
+
+
+
+
+
+
+
+
+ *保管员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
-
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/views/orderManagement/components/mold/moldRecord.vue b/src/views/orderManagement/components/mold/moldRecord.vue
index f3951cf..ca39d79 100644
--- a/src/views/orderManagement/components/mold/moldRecord.vue
+++ b/src/views/orderManagement/components/mold/moldRecord.vue
@@ -499,6 +499,7 @@ export default {
"createTime": "2024-01-25 16:06:40",
"erpWoCode": null,
"keeper": {
+ "userName": "崔殿龙",
"accountId": 602,
"card": null,
"createTime": "2023-04-06",
@@ -554,7 +555,7 @@ export default {
"partCode": "21E6-002-4245-B1",
"partName": "外购插座部件",
"planType": "21E6-002-4245-B1",
- "planTypeName": null,
+ "planTypeName": 1,
"poId": null,
"quaLevel": "11",
"quantity": 1,
diff --git a/src/views/orderManagement/components/mold/moldRequire.vue b/src/views/orderManagement/components/mold/moldRequire.vue
index f7475a4..dfaee44 100644
--- a/src/views/orderManagement/components/mold/moldRequire.vue
+++ b/src/views/orderManagement/components/mold/moldRequire.vue
@@ -152,7 +152,7 @@ export default {
},
{
label: '工装号',
- prop: 'poCode',
+ prop: 'toolingNo',
search: true,
sortable: true,
span: 12,
@@ -219,10 +219,15 @@ export default {
methods: {
// 关闭需求
closeNeed() {
- this.$confirm('确定将选择需求关闭?', {
+ // 检查是否选择了数据
+ if (this.selectionList.length === 0) {
+ this.$message.error('请至少选择一条数据!')
+ return;
+ }
+ this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning',
+ type: 'error',
})
.then(() => {
// return remove(row.id);
@@ -480,6 +485,9 @@ export default {
"plate": "Ep.Ni3b",
"poArea": 0.0,
"poCode": "WO-2211134240",
+ "poCode1": "4240",
+ "poCode2": "40",
+ "toolingNo" :"888",
"poId": 43933,
"poQty": 104,
"primaryCraft": "4(封接、表、涂色带)-库2",
diff --git a/src/views/orderManagement/components/orderUpdateDailog.vue b/src/views/orderManagement/components/orderUpdateDailog.vue
index 7dfcf8b..9baed5d 100644
--- a/src/views/orderManagement/components/orderUpdateDailog.vue
+++ b/src/views/orderManagement/components/orderUpdateDailog.vue
@@ -53,7 +53,7 @@
-
+
diff --git a/src/views/orderManagement/components/priorityDialog.vue b/src/views/orderManagement/components/priorityDialog.vue
index 8989184..c110cbb 100644
--- a/src/views/orderManagement/components/priorityDialog.vue
+++ b/src/views/orderManagement/components/priorityDialog.vue
@@ -51,8 +51,23 @@ export default {
closeDialog(){
this.openShow = false
this.$emit('closeDialog');
+ },
+ submit() {
+ if (!this.form.value1) {
+ this.$message.warning('请选择优先级');
+ return;
+ }
+ this.$emit('submitPriority', {
+ priority: this.form.value1
+ });
+ this.closeDialog();
}
- }
+ },
+
+ watch:{
+ showDialog(val){
+ this.openShow = val
+ } }
}
\ No newline at end of file
diff --git a/src/views/orderManagement/components/sinTerYieIdDialog.vue b/src/views/orderManagement/components/sinTerYieIdDialog.vue
new file mode 100644
index 0000000..c110cbb
--- /dev/null
+++ b/src/views/orderManagement/components/sinTerYieIdDialog.vue
@@ -0,0 +1,73 @@
+
+
+
+ 一级
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue
index 8a981d9..2f91d8a 100644
--- a/src/views/orderManagement/planYieIdOrder.vue
+++ b/src/views/orderManagement/planYieIdOrder.vue
@@ -32,14 +32,14 @@
@@ -54,7 +54,15 @@
-
+
+
+
@@ -72,7 +80,7 @@ import {
} from '@/api/system/role';
import { mapGetters } from 'vuex';
import { validatenull } from '@/utils/validate';
-
+import lookProcess from './components/lookProcess.vue'
// import rushDialog from './components/rushDialog.vue'
// import batchDialog from './components/batchDialog.vue'
import orderUpdateDailog from './components/orderUpdateDailog.vue'
@@ -80,9 +88,10 @@ import priorityDialog from './components/priorityDialog.vue'
export default {
components: {
orderUpdateDailog,
- priorityDialog
+ priorityDialog,
// rushDialog,
// batchDialog
+ lookProcess
},
data() {
return {
@@ -170,14 +179,14 @@ export default {
rules: [
{
required: true,
- message: '请输入角色名称',
+ message: '请输入计划单号',
trigger: 'blur',
},
],
},
{
label: '生产单号',
- prop: 'poCode',
+ prop: 'str0',
search: true,
sortable: true,
width: 150,
@@ -187,14 +196,14 @@ export default {
rules: [
{
required: true,
- message: '请输入角色名称',
+ message: '请输入生产单号',
trigger: 'blur',
},
],
},
{
label: '零件号',
- prop: 'partCode',
+ prop: 'str1',
search: true,
sortable: true,
width: 180,
@@ -205,14 +214,14 @@ export default {
rules: [
{
required: true,
- message: '请输入角色名称',
+ message: '请输入零件号',
trigger: 'blur',
},
],
},
{
label: '批次号',
- prop: 'poCode',
+ prop: 'str2',
search: true,
sortable: true,
width: 150,
@@ -222,7 +231,7 @@ export default {
rules: [
{
required: true,
- message: '请输入角色名称',
+ message: '请输入批次号',
trigger: 'blur',
},
],
@@ -240,14 +249,14 @@ export default {
rules: [
{
required: false,
- message: '请输入角色名称',
+ message: '请输入产品型号',
trigger: 'blur',
},
],
},
{
label: '产品名称',
- prop: 'partName',
+ prop: 'productName',
search: false,
sortable: true,
disabled: true,
@@ -258,14 +267,14 @@ export default {
rules: [
{
required: false,
- message: '请输入角色名称',
+ message: '请输入产品名称',
trigger: 'blur',
},
],
},
{
label: '流程卡号',
- prop: 'poCode',
+ prop: 'poCode1',
search: true,
sortable: true,
width: 150,
@@ -282,7 +291,7 @@ export default {
},
{
label: '流转编号',
- prop: 'poCode',
+ prop: 'poCode2',
search: true,
sortable: true,
width: 150,
@@ -306,6 +315,21 @@ export default {
span: 12,
headerAlign: 'center',
align: 'center',
+ type: 'select',
+ dicData: [
+ {
+ label: '一级',
+ value: '1',
+ },
+ {
+ label: '二级',
+ value: '2',
+ },
+ {
+ label: '三级',
+ value: '3',
+ },
+ ],
rules: [
{
required: true,
@@ -314,6 +338,7 @@ export default {
},
],
},
+
{
label: '镀种',
prop: 'plate',
@@ -425,7 +450,7 @@ export default {
prop: 'demandDate',
search: false,
sortable: true,
- width: 150,
+ width: 180,
span: 12,
headerAlign: 'center',
align: 'center',
@@ -507,8 +532,6 @@ export default {
},
],
},
-
-
{
label: '订单状态',
prop: 'curStatusText',
@@ -521,11 +544,11 @@ export default {
headerAlign: 'center',
align: 'center',
dicData: [{
- value: 2,
- label: '已退回'
+ value: 1,
+ label: '已下发'
}, {
- value: 4,
- label: '已派工'
+ value: 2,
+ label: '未下发'
}, {
value: 5,
label: '加工中'
@@ -604,6 +627,9 @@ export default {
priorityFn() {
this.isPriorityOpen = true
},
+ handlePrioritySubmit(data) {
+ this.$message.success(`优先级已调整为${data.priority === 1 ? '一级' : data.priority === 2 ? '二级' : '三级'}`);
+ },
// 修改
updateFn() {
this.isUpdateOpen = true
@@ -628,6 +654,11 @@ export default {
},
// 批量关闭
batchClose() {
+ // 检查是否选择了数据
+ if (this.selectionList.length === 0) {
+ this.$message.warning('请选择至少一条数据');
+ return;
+ }
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -653,6 +684,7 @@ export default {
this.isBatchOpen = false
this.isUpdateOpen = false
this.isPriorityOpen = false
+ this.isOpen = false
},
inBatchesFn(row) {
this.rowItem = row;
@@ -1129,11 +1161,17 @@ export default {
"plate": "Ct.Ocd",
"poArea": 18.3376140803,
"poCode": "WO-2212149345",
+ "str0": "12212149345",
+ "str1": "22212149345",
+ "str2": "49345",
+ "poCode1": "22121249345",
+ "poCode2": "2212149322245",
"poId": 41417,
"poQty": 5,
"primaryCraft": "库1-2(机加)-4(表)-库2",
"priority": 1,
"prodIdent": "JII",
+ "orderPriority":1,
"prodLine": "test",
"productType": "LRMT",
"releaseDate": "2022-12-28 09:07:31",
@@ -1400,6 +1438,8 @@ export default {
},
{
id: 3,
+ "orderType": 2, // 石墨模订单
+ "glassPlateIssuedStatus": null, // 非烧结订单,玻璃饼下发状态为空
"alreadyBranchQty": 3.0,
"bsPlatingmedium": {
"bpsId": 5,
@@ -1652,6 +1692,8 @@ export default {
},
{
id: 4,
+ "orderType": 0, // 烧结订单
+ "glassPlateIssuedStatus": 0, // 烧结订单,玻璃饼下发状态为未下发
"alreadyBranchQty": 1.0,
"bsPlatingSmall": {
"bpsId": 6,
diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue
index ac5837a..d3bd37e 100644
--- a/src/views/orderManagement/plannedOrder.vue
+++ b/src/views/orderManagement/plannedOrder.vue
@@ -29,8 +29,8 @@
-
- {{ row.poCode }}
+
+ {{ row.plannedOrderNo1 }}
{{ row.prodIdent }}
@@ -77,7 +77,14 @@
templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog">
-
+
+
@@ -98,11 +105,13 @@ import { validatenull } from '@/utils/validate';
import rushDialog from './components/rushDialog.vue';
import batchDialog from './components/batchDialog.vue';
import basicImport from '@/components/basic-import/main.vue';
+import lookProcess from './components/lookProcess.vue'
export default {
components: {
rushDialog,
batchDialog,
- basicImport
+ basicImport,
+ lookProcess
},
data() {
return {
@@ -181,7 +190,7 @@ export default {
column: [
{
label: '计划单号',
- prop: 'poCode',
+ prop: 'plannedOrderNo1',
search: true,
sortable: true,
width: 150,
@@ -198,7 +207,7 @@ export default {
},
{
label: '零件号',
- prop: 'partCode',
+ prop: 'plannedOrderNo2',
search: true,
sortable: true,
width: 180,
@@ -216,7 +225,7 @@ export default {
},
{
label: '产品型号',
- prop: 'productType',
+ prop: 'plannedOrderNo3',
search: false,
sortable: true,
disabled: true,
@@ -269,7 +278,7 @@ export default {
},
{
label: '镀种小类',
- prop: 'plate',
+ prop: 'plate1',
search: false,
sortable: true,
width: 120,
@@ -440,7 +449,7 @@ export default {
},
{
label: '已交付数量',
- prop: 'createName',
+ prop: 'createCount1',
search: false,
sortable: true,
hide: true,
@@ -450,7 +459,7 @@ export default {
},
{
label: '未交付数量',
- prop: 'createName',
+ prop: 'createCount',
search: false,
sortable: true,
hide: true,
@@ -495,7 +504,7 @@ export default {
},
{
label: '作业中心',
- prop: 'createName',
+ prop: 'workCenterName',
search: false,
sortable: true,
hide: true,
@@ -606,24 +615,29 @@ export default {
// });
});
},
- // 批量关闭
- batchClose() {
- this.$confirm('确定将选择数据批量关闭?', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then(() => {
- // return remove(row.id);
- })
- .then(() => {
- // this.onLoad(this.page);
- // this.$message({
- // type: 'success',
- // message: '操作成功!',
- // });
- });
- },
+ // 批量关闭
+ batchClose() {
+ // 检查是否选择了数据
+ if (this.selectionList.length === 0) {
+ this.$message.warning('请选择至少一条数据');
+ return;
+ }
+ this.$confirm('确定将选择数据批量关闭?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ // return remove(row.id);
+ })
+ .then(() => {
+ // this.onLoad(this.page);
+ // this.$message({
+ // type: 'success',
+ // message: '操作成功!',
+ // });
+ });
+ },
// 加急
rushFn() {
this.isRushOpen = true;
@@ -631,6 +645,7 @@ export default {
closeDialog() {
this.isRushOpen = false;
this.isBatchOpen = false;
+ this.isOpen = false
},
inBatchesFn(row) {
this.rowItem = row;
@@ -1064,20 +1079,20 @@ export default {
dsPart: null,
keyValue: 41417,
memo: '同一批次,可提前交件',
- partCode: '21E100-001-3900-E34',
+ plannedOrderNo2: '21E100-001-3900-E34',
partName: 'LRMT振动机架底板',
planType: 1,
planUser: '0300092',
plate: 'Ct.Ocd',
poArea: 18.3376140803,
- poCode: 'WO-2212149345',
+ plannedOrderNo1: 'WO-2212149345',
poId: 41417,
poQty: 5,
primaryCraft: '库1-2(机加)-4(表)-库2',
priority: 1,
prodIdent: 'JII',
prodLine: 'test',
- productType: 'LRMT',
+ plannedOrderNo3: 'LRMT',
releaseDate: '2022-12-28 09:07:31',
roamNo: 'B1269880',
routeNo: 'LX01-03-001',
@@ -1317,20 +1332,20 @@ export default {
dsPart: null,
keyValue: 41419,
memo: '可提前交件',
- partCode: '21E2-505-134-B1',
+ plannedOrderNo2: '21E2-505-134-B1',
partName: '左柜柜体喷漆部件',
planType: 1,
planUser: '0300009',
plate: null,
poArea: 0.0,
- poCode: 'WO-221047370',
+ plannedOrderNo1: 'WO-221047370',
poId: 41419,
poQty: 5,
primaryCraft: '库1、2-12(装配)-4(表)-12(装配)-库3',
priority: 1,
prodIdent: 'JIX',
prodLine: null,
- productType: 'Y/QAZ',
+ plannedOrderNo3: 'Y/QAZ',
releaseDate: '2022-10-12 09:02:31',
roamNo: null,
routeNo: 'LX12-02-007',
@@ -1570,20 +1585,20 @@ export default {
dsPart: null,
keyValue: 41420,
memo: null,
- partCode: '21E2-505-523-B1',
+ plannedOrderNo2: '21E2-505-523-B1',
partName: '客货舱设备架',
planType: 1,
planUser: '0300007',
plate: null,
poArea: 0.0,
- poCode: 'WO-221279741',
+ plannedOrderNo1: 'WO-221279741',
poId: 41420,
poQty: 3,
primaryCraft: '库1、2-12(装配)-4(表)-12(装配)-库3',
priority: 1,
prodIdent: 'JIX',
prodLine: null,
- productType: 'Y/QAZ',
+ plannedOrderNo3: 'Y/QAZ',
releaseDate: '2022-12-14 11:05:47',
roamNo: 'B1964845',
routeNo: 'LX12-02-007',
@@ -1865,20 +1880,20 @@ export default {
dsPart: null,
keyValue: 41418,
memo: 'SWSXJ017-00000075 0159,可提前交件',
- partCode: '21E2-505-134-B1',
+ plannedOrderNo2: '21E2-505-134-B1',
partName: '左柜柜体喷漆部件',
planType: 1,
planUser: '0300009',
plate: null,
poArea: 0.0,
- poCode: 'WO-221194871',
+ plannedOrderNo1: 'WO-221194871',
poId: 41418,
poQty: 1,
primaryCraft: '库1、2-12(装配)-4(表)-12(装配)-库3',
priority: 1,
prodIdent: 'JIX',
prodLine: null,
- productType: 'Y/QAZ',
+ plannedOrderNo3: 'Y/QAZ',
releaseDate: '2022-11-15 18:44:12',
roamNo: 'B2284606',
routeNo: 'LX12-02-007',
diff --git a/src/views/orderManagement/sinTerPlanOrder.vue b/src/views/orderManagement/sinTerPlanOrder.vue
index db1eb3f..1a4928c 100644
--- a/src/views/orderManagement/sinTerPlanOrder.vue
+++ b/src/views/orderManagement/sinTerPlanOrder.vue
@@ -65,12 +65,21 @@
templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog">
+
+
-
\ No newline at end of file
+
\ No newline at end of file