页面问题

dev-scheduling
taozi 4 months ago
parent 4c68f51e76
commit 44e6051165
  1. 8
      src/components/dialogCom/lookProcess.vue
  2. 650
      src/views/orderManagement/allocationMessQuery.vue
  3. 15
      src/views/orderManagement/components/exception/dataMissing.vue
  4. 12
      src/views/orderManagement/components/exception/deliveryDate.vue
  5. 19
      src/views/orderManagement/components/exception/processMissing.vue
  6. 21
      src/views/orderManagement/components/exception/resourceMissing.vue
  7. 194
      src/views/orderManagement/components/lookProcess.vue
  8. 428
      src/views/orderManagement/components/mold/addMoldDailog.vue
  9. 3
      src/views/orderManagement/components/mold/moldRecord.vue
  10. 14
      src/views/orderManagement/components/mold/moldRequire.vue
  11. 2
      src/views/orderManagement/components/orderUpdateDailog.vue
  12. 17
      src/views/orderManagement/components/priorityDialog.vue
  13. 73
      src/views/orderManagement/components/sinTerYieIdDialog.vue
  14. 98
      src/views/orderManagement/planYieIdOrder.vue
  15. 97
      src/views/orderManagement/plannedOrder.vue
  16. 60
      src/views/orderManagement/sinTerPlanOrder.vue
  17. 143
      src/views/orderManagement/sinTerYieIdOrder.vue
  18. 2
      src/views/productionManagement/components/addQuantity.vue
  19. 8
      src/views/productionManagement/components/coatingMater/addRequirements.vue
  20. 67
      src/views/productionManagement/components/coatingMater/assayedContent.vue
  21. 97
      src/views/productionManagement/components/coatingMater/assayedContentDialog.vue

@ -96,6 +96,7 @@ export default {
label: '零件名称',
prop: 'partName',
search: false,
width: 170,
},
{
label: '一级工艺计划(A)号',
@ -152,6 +153,7 @@ export default {
// });
},
cancel() {
this.setCrewShow = false;
this.$emit('cancel', false);
},
onLoad() {
@ -160,7 +162,9 @@ export default {
},
mounted() {
this.setCrewShow = this.isOpen
}
};
console.log(this.isOpen,90)
console.log(this.setCrewShow,80)
},
}
</script>
<style lang="scss" scoped></style>

@ -8,7 +8,7 @@
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
</template>
<template #menu-right>
@ -25,21 +25,21 @@
<el-tag class="ml-2" type="success" v-if="row.curStatusText == '已完工'"> {{
row.curStatusText }}</el-tag>
<el-tag class="ml-2" type="info" v-if="row.curStatusText == '已关闭'">{{ row.curStatusText
}}</el-tag>
}}</el-tag>
<el-tag class="ml-2" type="warning" v-if="row.curStatusText == '加工中'">{{ row.curStatusText
}}</el-tag>
}}</el-tag>
<el-tag class="ml-2" type="danger" v-if="row.curStatusText == '已退回'">{{ row.curStatusText
}}</el-tag>
}}</el-tag>
</template>
<template #menu="{ row }">
</template>
</avue-crud>
<!-- 加急 -->
<!-- <rushDialog :showDialog="isRushOpen" v-if="isRushOpen" @closeDialog="closeDialog"></rushDialog>
<!-- <rushDialog :showDialog="isRushOpen" v-if="isRushOpen" @closeDialog="closeDialog"></rushDialog>
<batchDialog :showDialog="isBatchOpen" v-if="isBatchOpen" @closeDialog="closeDialog"></batchDialog> -->
</basic-container>
@ -64,7 +64,7 @@ import rushDialog from './components/rushDialog.vue'
import batchDialog from './components/batchDialog.vue'
export default {
components: {
// rushDialog,
// batchDialog
},
@ -127,10 +127,10 @@ export default {
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
gridBtn: false,
searchLabelPosition: 'left',
searchLabelPosition: 'left',
@ -140,322 +140,322 @@ export default {
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
menu:false,
menu: false,
column: [
{
label: '配套单号',
prop: 'poCode',
search: true,
sortable: true,
width: 150,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '父件号',
prop: 'partCode',
search: false,
sortable: true,
width: 180,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '型号',
prop: 'productType',
search: false,
sortable: true,
disabled: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '生产标识',
prop: 'partName',
search: false,
sortable: true,
disabled: true,
span: 12,
width: 150,
headerAlign: 'center',
align: 'left',
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '需求日期',
prop: 'plate',
search: false,
sortable: true,
disabled: true,
span: 12,
width: 150,
headerAlign: 'center',
align: 'center',
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '父件批次',
prop: 'plate',
search: false,
sortable: true,
width: 120,
display: false,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '父件配套数',
prop: 'prodIdent',
search: false,
sortable: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '配套序号',
prop: 'useDept',
search: false,
sortable: true,
disabled: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '主制部门',
prop: 'poQty',
search: true,
sortable: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '计划标记',
prop: 'poArea',
search: false,
sortable: true,
width: 120,
span: 12,
disabled: true,
headerAlign: 'center',
align: 'center',
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '制造订单号',
prop: 'demandDate',
search: false,
sortable: true,
width: 150,
span: 12,
headerAlign: 'center',
align: 'center',
label: '配套单号',
prop: 'poCode',
search: true,
sortable: true,
width: 150,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '父件号',
prop: 'partCode',
search: false,
sortable: true,
width: 180,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '型号',
prop: 'productType',
search: false,
sortable: true,
disabled: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '生产标识',
prop: 'partName',
search: false,
sortable: true,
disabled: true,
span: 12,
width: 150,
headerAlign: 'center',
align: 'left',
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '需求日期',
prop: 'plate',
search: false,
sortable: true,
disabled: true,
span: 12,
width: 150,
headerAlign: 'center',
align: 'center',
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '父件批次',
prop: 'plate',
search: false,
sortable: true,
width: 120,
display: false,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '父件配套数',
prop: 'prodIdent',
search: false,
sortable: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '配套序号',
prop: 'useDept',
search: false,
sortable: true,
disabled: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '主制部门',
prop: 'poQty',
search: true,
sortable: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '计划标记',
prop: 'poArea',
search: false,
sortable: true,
width: 120,
span: 12,
disabled: true,
headerAlign: 'center',
align: 'center',
rules: [
{
required: false,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '制造订单号',
prop: 'demandDate',
search: false,
sortable: true,
width: 150,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '计划员',
prop: 'planUser',
search: false,
sortable: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '调度员',
prop: 'dispatcher',
search: false,
sortable: true,
searchLabelWidth: 100,
width: 170,
span: 12,
type: "date",
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '配套日期',
prop: 'releaseDate',
search: true,
sortable: true,
span: 24,
type: 'textarea',
width: 150,
headerAlign: 'center',
align: 'left',
type: 'date',
searchRange: true,
startPlaceholder: '开始时间',
endPlaceholder: "结束时间",
},
{
label: '保管员',
prop: 'createName1',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
{
label: '条码序号',
prop: 'index',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
{
label: '计划部门',
prop: 'planPart',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
{
label: '物料标识',
prop: 'materialCode',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
{
label: '备注',
prop: 'memo',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '计划员',
prop: 'planUser',
search: false,
sortable: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '调度员',
prop: 'releaseDate',
search: false,
sortable: true,
searchLabelWidth: 100,
width: 170,
span: 12,
type: "date",
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入角色名称',
trigger: 'blur',
},
],
},
{
label: '配套日期',
prop: 'memo',
search: true,
sortable: true,
span: 24,
type: 'textarea',
width: 150,
headerAlign: 'center',
align: 'left',
type:'date',
searchRange:true,
startPlaceholder: '开始时间',
endPlaceholder: "结束时间",
},
{
label: '保管员',
prop: 'createName',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
{
label: '条码序号',
prop: 'createName',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
{
label: '计划部门',
prop: 'createName',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
{
label: '物料标识',
prop: 'createName',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
{
label: '备注',
prop: 'createName',
search: false,
sortable: true,
span: 12,
headerAlign: 'center',
align: 'center',
width: 150,
},
],
},
data: [],
isRushOpen:false,//
isBatchOpen:false,//
isRushOpen: false,//
isBatchOpen: false,//
};
},
computed: {
@ -529,10 +529,10 @@ export default {
});
},
//
rushFn(){
rushFn() {
this.isRushOpen = true
},
closeDialog(){
closeDialog() {
this.isRushOpen = false
this.isBatchOpen = false
},
@ -829,6 +829,7 @@ export default {
"deptTypeTitle": "厂",
"keyValue": 47,
"memo": null,
"materialCode":'20230208',
"orders": "6",
"parentDeptId": 41,
"parentPath": null,
@ -968,6 +969,11 @@ export default {
"keyValue": 41417,
"memo": "同一批次,可提前交件",
"partCode": "21E100-001-3900-E34",
"dispatcher": "0300092",
"releaseDate": "2023-03-07 00:00:00",
"createName1": "0300091",
"index": 0,
"planPart":'2',
"partName": "LRMT振动机架底板",
"planType": 1,
"planUser": "0300092",

@ -219,7 +219,7 @@ export default {
},
{
label: '镀种小类',
prop: 'plate',
prop: 'plate1',
search: false,
sortable: true,
width: 120,
@ -389,11 +389,16 @@ export default {
methods: {
//
claseOrder() {
this.$confirm('确定将选择订单数据批量关闭?', {
claseOrder(){
//
if (this.selectionList.length === 0) {
this.$message.error('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'error',
})
.then(() => {
// return remove(row.id);
@ -447,6 +452,7 @@ export default {
this.loading = true;
this.data = [
{
id:1,
"alreadyBranchQty": 500.0,
"bsPlatingSmall": {
"bpsId": 5,
@ -1200,6 +1206,7 @@ export default {
"wcName": null
},
{
id:2,
"alreadyBranchQty": 200.0,
"bsPlatingSmall": {
"bpsId": 5,

@ -204,7 +204,7 @@ export default {
},
{
label: '镀种小类',
prop: 'plate',
prop: 'plate1',
search: false,
sortable: true,
width: 120,
@ -376,10 +376,15 @@ export default {
methods: {
//
claseOrder() {
this.$confirm('确定将选择订单数据批量关闭?', {
//
if (this.selectionList.length === 0) {
this.$message.error('请至少选择一条数据!')
return;
}
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'error',
})
.then(() => {
// return remove(row.id);
@ -665,6 +670,7 @@ export default {
"planType": 1,
"planUser": "3500371",
"plate": "Ct.P",
"plate1": "Ct",
"poArea": 0.0,
"poCode": "WO-P22120483",
"poId": 58382,

@ -204,7 +204,7 @@ export default {
},
{
label: '镀种小类',
prop: 'plate',
prop: 'plate1',
search: false,
sortable: true,
width: 120,
@ -426,10 +426,15 @@ export default {
methods: {
//
complianceCheck(){
//
if (this.selectionList.length === 0) {
this.$message.error('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据进行合规检验?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'error',
})
.then(() => {
// return remove(row.id);
@ -444,10 +449,15 @@ export default {
},
//
claseOrder() {
this.$confirm('确定将选择订单数据批量关闭?', {
//
if (this.selectionList.length === 0) {
this.$message.error('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'error',
})
.then(() => {
// return remove(row.id);
@ -735,6 +745,7 @@ export default {
"planType": 1,
"planUser": "3500371",
"plate": "Ct.P",
"plate1": "Ct11",
"poArea": 0.0,
"poCode": "WO-P22120483",
"poId": 58382,

@ -206,7 +206,7 @@ export default {
},
{
label: '镀种小类',
prop: 'plate',
prop: 'plateSubType',
search: false,
sortable: true,
width: 120,
@ -392,12 +392,17 @@ export default {
},
methods: {
//
//
complianceCheck(){
//
if (this.selectionList.length === 0) {
this.$message.error('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据进行合规检验?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'error',
})
.then(() => {
// return remove(row.id);
@ -412,10 +417,15 @@ export default {
},
//
claseOrder() {
this.$confirm('确定将选择订单数据批量关闭?', {
//
if (this.selectionList.length === 0) {
this.$message.error('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
type: 'error',
})
.then(() => {
// return remove(row.id);
@ -707,6 +717,7 @@ export default {
"planType": 1,
"planUser": "3500371",
"plate": "Ct.P",
"plateSubType": "P",
"poArea": 0.0,
"poCode": "WO-P22120483",
"poId": 58382,

@ -0,0 +1,194 @@
<template>
<el-dialog v-model="setCrewShow" :before-close="cancel" title="查看工艺路线" width="70%" @open="open" @opened="opened">
<el-card>
<el-descriptions :column="1" size="medium" class="margin-top" border>
<el-descriptions-item label="一级工艺路线">
<!-- {{ craftData.primaryCraft }} -->999
</el-descriptions-item>
</el-descriptions>
</el-card>
<avue-crud :option="option" :table-loading="loading" :data="data" 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>
export default {
components: {},
props: {
// ID
sourceId: {
type: String,
required: true, //
description: "调用当前组件的父组件标识,用于区分来源"
},
isOpen: {
type: Boolean,
default: false
},
rowItem: {
type: Object,
default: () => { }
}
},
data() {
return {
craftData: {},
height: 350,
firseqList: [],
setCrewShow: false,
query: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
option: {
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: 'partCode',
search: false,
width: 150,
},
{
label: '零件名称',
prop: 'partName',
search: false,
width: 170,
},
{
label: '一级工艺计划(A)号',
prop: 'firpp',
search: false,
width: 180,
},
{
label: '一级工艺计划名称',
prop: 'firppName',
search: false,
width: 180,
},
{
label: '一级工序(B)号',
prop: 'firseq',
search: false,
width: 180,
},
{
label: '一级工序名称',
prop: 'firseqName',
search: false,
width: 180,
},
{
label: '一级工序序号',
prop: 'firseqNo',
search: false,
width: 180,
},
],
},
data: [],
};
},
methods: {
open() {
if (this.sourceId === 'sinTerYieIdOrder') {
console.log('由sinTerYieIdOrder组件打开');
// A
} if (this.sourceId === 'planYieIdOrder') {
console.log('由planYieIdOrder父组件打开');
// B
} if (this.sourceId === 'plannedOrder') {
console.log('由plannedOrder111父组件打开');
// B
} if (this.sourceId === 'sinTerOrder') {
console.log('sinTerOrder');
// B
}
// 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;
// this.$emit('cancel', false);
// sourceId便
this.$emit('cancel', {
isOpen: false,
sourceId: this.sourceId
});
},
onLoad() {
this.loading = false
},
},
mounted() {
this.setCrewShow = this.isOpen
console.log(this.isOpen, 90)
console.log(this.setCrewShow, 80)
},
}
</script>
<style lang="scss" scoped></style>

@ -1,118 +1,147 @@
<template>
<el-dialog title="新增" append-to-body :modelValue="openShow" width="90%" @close="closeDialog" fullscreen>
<div style="margin-bottom: 12px;" v-if="moldAddMore">
<div style="margin-bottom: 12px" v-if="moldAddMore">
<el-button type="primary" @click="addTable">插入一行</el-button>
<el-button type="danger" @click="delTable">删除行</el-button>
<el-button type="danger" @click="delTable">删除选中</el-button>
</div>
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" width="80" label="序号" align="center">
</el-table-column>
<el-table-column prop="partCode" label="零件编码" align="center">
<template #header>
<span><i style="color:red">*</i>零件编码</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.partCode" :filterable="true" allow-create
@change="partCodeChange(scope.row)" >
<el-option label="零件一" value="1" />
<el-option label="零件二" value="2" />
</el-select>
</template>
</el-table-column>
<el-table-column prop="partName" label="零件名称" align="center">
<template #default="scope">
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
<el-table-column prop="moCode" label="工装号" align="center">
<template #header>
<span><i style="color:red">*</i>工装号</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.moCode" :filterable="true" allow-create
@change="frockChange(scope.row)">
<el-option label="工装一" value="1" />
<el-option label="工装二" value="2" />
</el-select>
</template>
</el-table-column>
<el-table-column prop="moName" label="工装名称" align="center">
<template #default="scope">
<span>{{ scope.row.moName }}</span>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center">
<template #header>
<span><i style="color:red">*</i>数量</span>
</template>
<template #default="scope">
<el-input-number v-model="scope.row.shuliang" :min="1" controls-position="right" style="width: 90%;"
@change="handleChange" />
</template>
</el-table-column>
<el-table-column prop="planType" label="计划类型" align="center">
<template #header>
<span><i style="color:red">*</i>计划类型</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.moCode" :filterable="true" allow-create
@change="frockChange(scope.row)">
<el-option label="计划类型一" value="1" />
<el-option label="计划类型二" value="2" />
</el-select>
</template>
</el-table-column>
<el-table-column prop="needDate" label="需求日期" align="center">
<template #header>
<span><i style="color:red">*</i>需求日期</span>
</template>
<template #default="scope">
<el-date-picker v-model="scope.row.needDate" type="date" placeholder="请选择"
style="width: 80%;" />
</template>
</el-table-column>
<el-table-column prop="quaLevel" label="生产标识" align="center">
<template #header>
<span><i style="color:red">*</i>生产标识</span>
</template>
<template #default="scope">
<el-input v-model="scope.row.quaLevel" />
</template>
</el-table-column>
<el-table-column prop="keeper.userName" label="保管员" align="center">
<template #header>
<span><i style="color:red">*</i>保管员</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.userName" :filterable="true" allow-create
@change="frockChange(scope.row)">
<el-option label="人员一" value="1" />
<el-option label="人员二" value="2" />
</el-select>
</template>
</el-table-column>
<el-table-column prop="memo" label="备注" align="center">
<template #default="scope">
<el-input v-model="scope.row.memo" />
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="100" align="left" v-if="moldAddMore">
<template #default="scope">
<el-button type="text"
@click.prevent="delTable(scope.row, scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<el-form ref="tableForm" :model="form" :rules="formRules" label-width="0px">
<div v-if="formError" class="error-message" style="color: #f56c6c; margin-bottom: 10px;">
{{ formError }}
</div>
<el-table :data="form.tableData" @select="selectChange" style="width: 100%" border>
<el-table-column type="selection" width="55" v-if="moldAddMore"></el-table-column>
<el-table-column type="index" width="80" label="序号" align="center"></el-table-column>
<el-table-column prop="partCode" label="零件编码" align="center">
<template #header>
<span><i style="color:red">*</i>零件编码</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].partCode`" :rules="formRules.partCode">
<el-select v-model="scope.row.partCode" :filterable="true" allow-create
@change="partCodeChange(scope.row)">
<el-option label="零件一" value="1" />
<el-option label="零件二" value="2" />
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="partName" label="零件名称" align="center">
<template #default="scope">
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
<el-table-column prop="moCode" label="工装号" align="center">
<template #header>
<span><i style="color:red">*</i>工装号</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].moCode`" :rules="formRules.moCode">
<el-select v-model="scope.row.moCode" :filterable="true" allow-create
@change="frockChange(scope.row)">
<el-option label="工装一" value="1" />
<el-option label="工装二" value="2" />
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="moName" label="工装名称" align="center">
<template #default="scope">
<span>{{ scope.row.moName }}</span>
</template>
</el-table-column>
<el-table-column prop="quantity" label="数量" align="center">
<template #header>
<span><i style="color:red">*</i>数量</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].shuliang`" :rules="formRules.shuliang">
<el-input-number v-model="scope.row.shuliang" :min="1" controls-position="right"
style="width: 90%;" @change="handleChange" />
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="planType" label="计划类型" align="center">
<template #header>
<span><i style="color:red">*</i>计划类型</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].planType`" :rules="formRules.planType">
<el-select v-model="scope.row.planType" :filterable="true" allow-create>
<el-option label="计划类型一" value="1" />
<el-option label="计划类型二" value="2" />
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="needDate" label="需求日期" align="center">
<template #header>
<span><i style="color:red">*</i>需求日期</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].needDate`" :rules="formRules.needDate">
<el-date-picker v-model="scope.row.needDate" type="date" placeholder="请选择"
style="width: 80%;" />
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="quaLevel" label="生产标识" align="center">
<template #header>
<span><i style="color:red">*</i>生产标识</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].quaLevel`" :rules="formRules.quaLevel">
<el-input v-model="scope.row.quaLevel" />
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="keeper.userName" label="保管员" align="center">
<template #header>
<span><i style="color:red">*</i>保管员</span>
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].userName`" :rules="formRules.userName">
<el-select v-model="scope.row.userName" :filterable="true" allow-create>
<el-option label="人员一" value="1" />
<el-option label="人员二" value="2" />
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="memo" label="备注" align="center">
<template #default="scope">
<el-input v-model="scope.row.memo" />
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="100" align="left" v-if="moldAddMore">
<template #default="scope">
<el-button type="text" @click.prevent="delTable(scope.row, scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
<el-button type="primary" @click="submitForm"> </el-button>
</span>
</template>
</el-dialog>
</template>
<script>
export default {
props: {
@ -128,64 +157,163 @@ export default {
data() {
return {
openShow: false,
tableData: []
}
formError: '',
form: {
tableData: []
},
formRules: {
tableData: [
{
required: true,
message: '请至少添加一行数据',
trigger: 'submit',
type: 'array'
},
{
validator: (rule, value, callback) => {
if (value.length === 0) {
callback(new Error('请至少添加一行数据'));
} else {
callback();
}
},
trigger: 'submit'
}
],
partCode: [
{ required: true, message: '请选择零件编码', trigger: ['change', 'submit'] }
],
moCode: [
{ required: true, message: '请选择工装号', trigger: ['change', 'submit'] }
],
shuliang: [
{ required: true, message: '请输入数量', trigger: ['change', 'submit'] },
{ type: 'number', min: 1, message: '数量不能小于1', trigger: ['change', 'submit'] }
],
planType: [
{ required: true, message: '请选择计划类型', trigger: ['change', 'submit'] }
],
needDate: [
{ required: true, message: '请选择需求日期', trigger: ['change', 'submit'] }
],
quaLevel: [
{ required: true, message: '请输入生产标识', trigger: ['blur', 'submit'] }
],
userName: [
{ required: true, message: '请选择保管员', trigger: ['change', 'submit'] }
]
}
};
},
mounted() {
this.openShow = this.showDialog
this.openShow = this.showDialog;
if (this.moldAddMore && this.form.tableData.length === 0) {
this.addTable();
}
},
methods: {
closeDialog() {
this.openShow = false
this.openShow = false;
this.$emit('closeDialog');
this.form.tableData = [];
this.formError = '';
this.$refs.tableForm?.resetFields();
},
selectChange(list, row) {
row._select = !row._select;
},
//
addTable() {
this.tableData.push({
code: '3',
No: '3',
number: '3',
shuliang: '',
shuliang: 0,
memo:''
})
this.form.tableData.push({
_select: false,
partCode: '',
partName: '',
moCode: '',
moName: '',
shuliang: 1,
planType: '',
needDate: '',
quaLevel: '',
userName: '',
memo: ''
});
},
//
delTable(row, index) {
this.tableData.splice(index, 1)
if (index !== undefined) {
this.form.tableData.splice(index, 1);
} else {
this.form.tableData = this.form.tableData.filter(item => !item._select);
}
},
partCodeChange(row) {
//
},
//
partCodeChange() {
// var row = this.$refs.xTable.getCurrentRecord();
// if (itemRow.frockOption != null && itemRow.frockOption.length > 0) {
// let name = '';
// itemRow.frockOption.forEach((item) => {
// if (item.value == itemRow.moCode) {
// name = item.name;
// }
// });
// this.$set(row, 'moName', name);
// } else {
// this.$set(row, 'moName', '');
// }
frockChange(row) {
//
},
//
frockChange(itemRow) {
// var row = this.$refs.xTable.getCurrentRecord();
// if (itemRow.frockOption != null && itemRow.frockOption.length > 0) {
// let name = '';
// itemRow.frockOption.forEach((item) => {
// if (item.value == itemRow.moCode) {
// name = item.name;
// }
// });
// this.$set(row, 'moName', name);
// } else {
// this.$set(row, 'moName', '');
// }
handleChange() {
//
},
submitForm() {
this.formError = '';
this.$refs.tableForm.validate((isValid) => {
if (!isValid) {
this.formError = '存在未完善的字段,请检查表格中的红色提示';
this.$nextTick(() => {
const firstError = document.querySelector('.el-form-item.is-error');
if (firstError) {
firstError.scrollIntoView({ behavior: 'smooth', block: 'center' });
}
});
return;
}
//
const submitData = this.form.tableData.map(row => {
const { _select, ...validData } = row;
return validData;
});
//
this.$message.success('提交成功');
this.closeDialog();
this.$emit('submitSuccess', submitData);
});
}
}
}
};
</script>
<style lang="scss" scoped></style>
<style lang="scss" scoped>
:deep(.el-table .el-form-item) {
margin-bottom: 0;
}
:deep(.el-form-item__error) {
font-size: 12px;
white-space: nowrap;
z-index: 10;
background: #fff;
padding: 2px 4px;
border: 1px solid #f56c6c;
border-radius: 4px;
}
.el-table__row {
height: 80px !important;
}
.el-table__cell {
vertical-align: middle !important;
}
.error-message {
font-size: 14px;
line-height: 1.5;
}
:deep(.el-table .el-table__cell) {
height: 50px !important;
padding: 0 !important;
line-height: 50px !important;
}
</style>

@ -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,

@ -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",

@ -53,7 +53,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="订单类型" prop="yieldType">
<el-select v-model="formData.yieldType" placeholder="请选择">
<el-select v-model="formData.yieldType" placeholder="请选择">
<el-option :value="1" label="热表订单" />
<el-option :value="2" label="烧结订单" />
</el-select>

@ -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
} }
}
</script>
<style lang="scss" scoped></style>

@ -0,0 +1,73 @@
<template>
<el-dialog title="优先级调整" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="当前优先级:">一级</el-form-item>
<el-form-item label="设置优先级:" prop="value1" required>
<el-select v-model="form.value1" placeholder="请选择" >
<el-option
label="一级"
:value="1">
</el-option>
<el-option
label="二级"
:value="2">
</el-option>
<el-option
label="三级"
:value="3">
</el-option>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
</span>
</template>
</el-dialog>
</template>
<script>
export default {
props: {
showDialog: {
type: Boolean,
default: false
},
},
data() {
return {
openShow:false,
form:{
value1:''
}
}
},
mounted(){
this.openShow = this.showDialog
},
methods:{
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
} }
}
</script>
<style lang="scss" scoped></style>

@ -32,14 +32,14 @@
</template>
<template #menu="{ row }">
<div class="menu-buttons">
<el-button type="primary" text plain size="small" @click="lookProcessRoute(row)">工艺路线
<el-button type="primary" text plain @click="lookProcessRoute(row)">工艺路线
</el-button>
<el-button type="primary" text plain size="small" @click.stop="priorityFn(row)">优先级调整
</el-button>
<el-button type="primary" text plain size="small" @click.stop="updateFn(row)">修改
</el-button>
<el-button type="primary" text plain size="small" @click.stop="confirmFn(row)">批量确认
<!-- <el-button type="primary" text plain size="small" @click.stop="priorityFn(row)">优先级调整
</el-button> -->
<el-button type="primary" text plain @click.stop="updateFn(row)">修改
</el-button>
<!-- <el-button type="primary" text plain size="small" @click.stop="confirmFn(row)">批量确认
</el-button> -->
</div>
</template>
</avue-crud>
@ -54,7 +54,15 @@
<orderUpdateDailog :showDialog="isUpdateOpen" v-if="isUpdateOpen" @closeDialog="closeDialog">
</orderUpdateDailog>
<!-- 优先级调整 -->
<priorityDialog :showDialog="isPriorityOpen" v-if="isPriorityOpen" @closeDialog="closeDialog"></priorityDialog>
<priorityDialog :showDialog="isPriorityOpen" v-if="isPriorityOpen" @closeDialog="closeDialog" @submitPriority="handlePrioritySubmit"></priorityDialog>
<!-- 工艺路线弹窗 -->
<lookProcess
:is-open="isOpen"
v-if="isOpen"
@cancel="closeDialog"
:rowData="rowItem"
sourceId="planYieIdOrder"
></lookProcess>
</basic-container>
</template>
@ -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,

@ -29,8 +29,8 @@
</template>
<template #menu-right> </template>
<template #poCode="{ row }">
<el-text type="primary">{{ row.poCode }}</el-text>
<template #plannedOrderNo1="{ row }">
<el-text type="primary">{{ row.plannedOrderNo1 }}</el-text>
</template>
<template #prodIdent="{ row }">
<el-tag>{{ row.prodIdent }}</el-tag>
@ -77,7 +77,14 @@
templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import>
<!-- 工艺路线弹窗 -->
<lookProcess
:is-open="isOpen"
v-if="isOpen"
@cancel="closeDialog"
:rowData="rowItem"
sourceId="plannedOrder"
></lookProcess>
</basic-container>
</template>
@ -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',

@ -65,12 +65,21 @@
templateName="试验项目模板.xlsx"
importUrl="/blade-desk/QA/CycleTestItem/import-excel"
@closeDialog="closeDialog"></basic-import>
<!-- 工艺路线弹窗 -->
<lookProcess
:is-open="isOpen"
v-if="isOpen"
@cancel="closeDialog"
:rowData="rowItem"
sourceId="sinTerOrder"
></lookProcess>
</basic-container>
</template>
<script>
import rushDialog from './components/rushDialog.vue';
import basicImport from '@/components/basic-import/main.vue'
import lookProcess from './components/lookProcess.vue'
import {
add,
getRole,
@ -87,7 +96,8 @@ import { validatenull } from '@/utils/validate';
export default {
components: {
rushDialog,
basicImport
basicImport,
lookProcess
},
data() {
return {
@ -140,7 +150,7 @@ export default {
editBtnText: '修改',
labelWidth: 120,
// searchLabelWidth: 120,
menuWidth: 230,
menuWidth: 150,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
@ -479,7 +489,7 @@ export default {
},
{
label: '未交付数量',
prop: 'createName',
prop: 'createDate',
search: false,
sortable: true,
span: 12,
@ -560,24 +570,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;
@ -585,6 +600,7 @@ export default {
closeDialog() {
this.isRushOpen = false;
this.isBatchOpen = false;
this.isOpen = false
},
inBatchesFn(row) {
this.rowItem = row;
@ -790,6 +806,7 @@ export default {
this.loading = true;
this.data = [
{
id: 1,
alreadyBranchQty: 104.0,
bsPlatingSmall: null,
bsProcedureQua: null,
@ -868,6 +885,7 @@ export default {
wcName: null,
},
{
id: 2,
alreadyBranchQty: 19.0,
bsPlatingSmall: null,
bsProcedureQua: null,

@ -8,7 +8,7 @@
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left>
<el-button type="primary" @click="batchClose()">批量取消</el-button>
<el-button type="primary" @click="batchClose()">批量关闭</el-button>
<el-button type="primary" @click.stop="priorityFn(row)">优先级调整</el-button>
</template>
<template #menu-right>
@ -39,13 +39,14 @@
<!-- <el-button type="primary" text plain style="border: 0; background-color: transparent !important"
@click.stop="batchClose(row)">优先级调整
</el-button> -->
<el-button type="primary" text plain style="border: 0; background-color: transparent !important"
@click.stop="updateFn(row)">修改
</el-button>
<el-button type="primary" text plain style="border: 0; background-color: transparent !important"
@click.stop="openGlassPlateDialog(row)" v-if="row.glassPlateIssuedStatus === 0">下发玻璃饼
</el-button>
<el-button type="primary" text plain style="border: 0; background-color: transparent !important"
@click.stop="openGlassPlateDialog(row)"
v-if="row.orderType === 0 && row.glassPlateIssuedStatus === 0">下发玻璃饼
</el-button>
</template>
</avue-crud>
@ -53,17 +54,14 @@
<!-- 加急 -->
<!-- <rushDialog :showDialog="isRushOpen" v-if="isRushOpen" @closeDialog="closeDialog"></rushDialog>
<batchDialog :showDialog="isBatchOpen" v-if="isBatchOpen" @closeDialog="closeDialog"></batchDialog> -->
<batchDialog :showDialog="isBatchOpen" v-if="isBatchOpen" @closeDialog="closeDialog"></batchDialog> -->
<!-- 修改弹窗 -->
<orderUpdateDailog :showDialog="isUpdateOpen" v-if="isUpdateOpen" @closeDialog="closeDialog">
</orderUpdateDailog>
<priorityDialog :showDialog="isPriorityOpen" v-if="isPriorityOpen" @closeDialog="closeDialog"></priorityDialog>
<sinTerYieIdDialog :showDialog="isPriorityOpen" v-if="isPriorityOpen" @closeDialog="closeDialog"
@submitPriority="handlePrioritySubmit"></sinTerYieIdDialog>
<!-- 玻璃饼下发弹窗 -->
<el-dialog
title="下发玻璃饼"
v-model="glassPlateDialog"
width="30%"
:before-close="closeGlassPlateDialog">
<el-dialog title="下发玻璃饼" v-model="glassPlateDialog" width="30%" :before-close="closeGlassPlateDialog">
<span>确定要下发玻璃饼吗</span>
<template #footer>
<span class="dialog-footer">
@ -72,6 +70,14 @@
</span>
</template>
</el-dialog>
<!-- 工艺路线弹窗 -->
<lookProcess
:is-open="isOpen"
v-if="isOpen"
@cancel="closeDialog"
:rowData="rowItem"
sourceId="sinTerYieIdOrder"
></lookProcess>
</basic-container>
</template>
@ -90,8 +96,8 @@ import {
import { mapGetters } from 'vuex';
import { validatenull } from '@/utils/validate';
import orderUpdateDailog from './components/orderUpdateDailog.vue'
import priorityDialog from './components/priorityDialog.vue'
import sinTerYieIdDialog from './components/sinTerYieIdDialog.vue'
import lookProcess from './components/lookProcess.vue'
// import rushDialog from './components/rushDialog.vue'
// import batchDialog from './components/batchDialog.vue'
export default {
@ -99,11 +105,12 @@ export default {
orderUpdateDailog,
// rushDialog,
// batchDialog
priorityDialog
sinTerYieIdDialog,
lookProcess
},
data() {
return {
isPriorityOpen: false,
isPriorityOpen: false,
isUpdateOpen: false,
inBatchesOpen: false,
platingSmallOpen: false,
@ -198,7 +205,7 @@ export default {
},
{
label: '生产单号',
prop: 'poCode',
prop: 'poCode1',
search: true,
sortable: true,
width: 150,
@ -233,7 +240,7 @@ export default {
},
{
label: '批次号',
prop: 'poCode',
prop: 'poCode2',
search: true,
sortable: true,
width: 150,
@ -288,7 +295,7 @@ export default {
},
{
label: '流程卡号',
prop: 'poCode',
prop: 'poCode3',
search: true,
sortable: true,
width: 150,
@ -305,7 +312,7 @@ export default {
},
{
label: '流转编号',
prop: 'poCode',
prop: 'poCode4',
search: true,
sortable: true,
width: 150,
@ -342,14 +349,38 @@ export default {
prop: 'orderType',
search: true,
sortable: true,
width: 150,
disabled: true,
width: 120,
span: 12,
headerAlign: 'center',
align: 'center',
type: 'select',
dicData: [
{
label: '烧结订单',
value: 0,
},
{
label: '玻璃饼订单',
value: 1,
},
{
label: '石墨模订单',
value: 2,
},
{
label: '插针订单',
value: 3,
},
{
label: '壳体订单',
value: 4,
},
],
rules: [
{
required: true,
message: '请输入角色名称',
required: false,
message: '请输入订单类型',
trigger: 'blur',
},
],
@ -371,24 +402,6 @@ export default {
},
],
},
// {
// label: '',
// prop: 'plate',
// search: false,
// sortable: true,
// width: 120,
// display: false,
// span: 12,
// headerAlign: 'center',
// align: 'center',
// rules: [
// {
// required: true,
// message: '',
// trigger: 'blur',
// },
// ],
// },
{
label: '生产标识',
prop: 'prodIdent',
@ -551,10 +564,12 @@ export default {
{
label: '玻璃饼下发状态',
prop: 'glassPlateIssuedStatus',
show: (row) => row.orderType === 0, // 0
search: true,
sortable: true,
width: 160,
span: 12,
searchLabelWidth: 150,
headerAlign: 'center',
align: 'center',
type: 'select',
@ -623,11 +638,8 @@ export default {
},
],
},
],
},
data: [],
isRushOpen: false,//
isBatchOpen: false,//
@ -667,16 +679,21 @@ export default {
},
},
methods: {
//
//
priorityFn() {
this.isPriorityOpen = true
},
closeDialog() {
this.isPriorityOpen = false
handlePrioritySubmit(data) {
this.$message.success(`优先级已调整为${data.priority === 1 ? '一级' : data.priority === 2 ? '二级' : '三级'}`);
},
//
updateFn() {
this.isUpdateOpen = true
},
//线
lookProcessRoute(row) {
this.isOpen = true;
this.rowItem = row;
},
//
batchReceiving() {
@ -698,6 +715,11 @@ export default {
},
//
batchClose() {
//
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm('确定将选择数据批量关闭?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -719,9 +741,11 @@ export default {
this.isRushOpen = true
},
closeDialog() {
this.isPriorityOpen = false
this.isRushOpen = false
this.isBatchOpen = false
this.isUpdateOpen = false
this.isOpen = false
},
//
openGlassPlateDialog(row) {
@ -738,14 +762,11 @@ export default {
if (this.currentRow) {
//
this.currentRow.glassPlateIssuedStatus = 1;
// API
// updateGlassPlateStatus(this.currentRow.id, 1).then(res => {
// this.$message.success('');
// }).catch(err => {
// this.$message.error('');
// });
this.$message.success('玻璃饼下发成功');
this.closeGlassPlateDialog();
}
@ -757,10 +778,7 @@ export default {
subclass() {
this.platingSmallOpen = true;
},
lookProcessRoute(row) {
this.isOpen = true;
this.rowItem = row;
},
cancel(refresh) {
if (refresh) {
this.$refs.myTable.load();
@ -956,6 +974,7 @@ export default {
{
id: 1,
"glassPlateIssuedStatus": 0,
"orderType": 0,
"alreadyBranchQty": 5.0,
"bsPlatingmedium": {
"bpsId": 4,
@ -1189,6 +1208,13 @@ export default {
"plate": "Ct.Ocd",
"poArea": 18.3376140803,
"poCode": "WO-2212149345",
"originalProductionOrderNo": "45566",
"returnWorkOrderNo":'2345',
"orderPriority": 1,
"poCode1": "12212149345",
"poCode2": "22212149345",
"poCode3": "32212149345",
"poCode4": "42212149345",
"poId": 41417,
"poQty": 5,
"primaryCraft": "库1-2(机加)-4(表)-库2",
@ -1208,7 +1234,8 @@ export default {
},
{
id: 2,
"glassPlateIssuedStatus": 1,
"glassPlateIssuedStatus": null,
"orderType": 4,
"alreadyBranchQty": 5.0,
"bsPlatingmedium": {
"bpsId": 6,
@ -1461,7 +1488,8 @@ export default {
},
{
id: 3,
"glassPlateIssuedStatus": 0,
"orderType": 1, //
"glassPlateIssuedStatus": null, //
"alreadyBranchQty": 3.0,
"bsPlatingmedium": {
"bpsId": 5,
@ -1715,6 +1743,7 @@ export default {
{
id: 4,
"glassPlateIssuedStatus": 1,
"orderType": 0, //
"alreadyBranchQty": 1.0,
"bsPlatingSmall": {
"bpsId": 6,

@ -9,8 +9,6 @@
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" prop="zuoyezhongxin">

@ -23,12 +23,12 @@
<add-dialog :add-dialog="addDialog" @closeDialog="closeDialog"></add-dialog>
<el-dialog append-to-body width="550px" title="审批" v-model="approveDialog">
<el-form ref="approveForm" :model="approveForm" :rules="approveRules">
<!-- <el-form-item label="审批结果" prop="approveREsult">
<el-form-item label="审批结果" prop="approveREsult">
<el-radio-group v-model="approveForm.approveREsult" @input="changeType">
<el-radio :label="1">审批通过</el-radio>
<el-radio :label="0">审批不通过</el-radio>
</el-radio-group>
</el-form-item> -->
</el-form-item>
<el-form-item label="审批意见" prop="approvalOpinion">
<el-input type="textarea" v-model="approveForm.approvalOpinion"></el-input>
</el-form-item>
@ -195,13 +195,13 @@ export default {
this.data = [
{
id: 1,
requiredCode: "001", workCenter: 1, goodsCode: 'wl_001', goodsName: "物料名称", goldPotassium: 20,
requiredCode: "001", workCenter: 1, goodsCode: 'wl_001', goodsName: "物料11名称", goldPotassium: 20,
silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 1,
ordersNumber: 15, createMan: '张三', createTime: '2025-10-20 11:20:32'
},
{
id: 2,
requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "物料名称", goldPotassium: 20,
requiredCode: "002", workCenter: 1, goodsCode: 'wl_002', goodsName: "物料名称", goldPotassium: 20,
silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 2,
ordersNumber: 15, createMan: '张三', createTime: '2025-10-20 11:20:32'
},

@ -1,30 +1,25 @@
<template>
<div>
<!-- 表格数据 -->
<avue-crud :option="option" :table-loading="loading" :data="data" 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">
<template #menu-left="row">
<el-button type="primary" @click="handleAdd">新增</el-button>
</template>
<template #menu-right>
</template>
<template #menu="{ row }">
<el-button type="text" @click="handleView(row)">详情</el-button>
</template>
</avue-crud>
<add-dialog :add-dialog="addDialog" @closeDialog="closeDialog"></add-dialog>
<!-- 新增 -->
<assayedContentDialog v-if="isAddOpen" :showDialog="isAddOpen" @closeDialog="closeDialog"></assayedContentDialog>
<assayedContentDialog v-if="isAddOpen" :showDialog="isAddOpen" @closeDialog="closeDialog"></assayedContentDialog>
</div>
</template>
<script>
import addDialog from '../addDialog.vue';
import coatingColumnData from '../../js/coatingColumnData';
import assayedContentDialog from './assayedContentDialog.vue'
@ -177,36 +172,36 @@ export default {
},
onLoad() {
this.data = [
{
id: 1,
requiredCode: "001", workCenter: 1, goodsCode: 'wl_001', goodsName: "物料名称", goldPotassium: 20,
silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 4,
ordersNumber: 15, createMan: '张三', createTime: '2025-10-20 11:20:32'
},
{
id: 2,
requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "物料名称", goldPotassium: 20,
silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 3,
ordersNumber: 15, createMan: '张三', createTime: '2025-10-20 11:20:32'
},
{
id: 3,
requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "物料名称", goldPotassium: 20,
silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 3,
ordersNumber: 15, createMan: '张三', createTime: '2025-10-20 11:20:32'
},
{
id: 4,
requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "物料名称", goldPotassium: 20,
silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 4,
ordersNumber: 15, createMan: '张三', createTime: '2025-10-20 11:20:32'
},
{
id: 5,
requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "物料名称", goldPotassium: 20,
silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 5,
ordersNumber: 15, createMan: '张三', createTime: '2025-10-20 11:20:32'
},
// {
// id: 1,
// requiredCode: "001", workCenter: 1, goodsCode: 'wl_001', goodsName: "1111", goldPotassium: 20,
// silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 4,
// ordersNumber: 15, createMan: '', createTime: '2025-10-20 11:20:32'
// },
// {
// id: 2,
// requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "", goldPotassium: 20,
// silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 3,
// ordersNumber: 15, createMan: '', createTime: '2025-10-20 11:20:32'
// },
// {
// id: 3,
// requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "", goldPotassium: 20,
// silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 3,
// ordersNumber: 15, createMan: '', createTime: '2025-10-20 11:20:32'
// },
// {
// id: 4,
// requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "", goldPotassium: 20,
// silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 4,
// ordersNumber: 15, createMan: '', createTime: '2025-10-20 11:20:32'
// },
// {
// id: 5,
// requiredCode: "002", workCenter: 1, goodsCode: 'wl_001', goodsName: "", goldPotassium: 20,
// silverPotassium: 30, coefficient: 2, usageAmount: 20, goodsDemandResidue: 20, status: 5,
// ordersNumber: 15, createMan: '', createTime: '2025-10-20 11:20:32'
// },
]
this.page.total = this.data.length
},

@ -1,37 +1,53 @@
<template>
<el-dialog title="含量检测" append-to-body :modelValue="openShow" width="40%" @close="closeDialog">
<!-- 合并为单个表单避免ref冲突 -->
<el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="90">
<el-row>
<el-col :span="12">
<el-form-item label="作业中心" prop="zuoyezhongxin">
<el-select v-model="ruleForm.zuoyezhongxin" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" />
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="化验时间" prop="huayanshijian">
<el-date-picker v-model="value1" type="date" placeholder="请选择" />
<!-- 修复日期选择器v-model绑定错误 -->
<el-date-picker
v-model="ruleForm.huayanshijian"
type="date"
placeholder="请选择"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
/>
</el-form-item>
</el-col>
</el-row>
<el-table :data="ruleForm.tableData" style="width: 100%">
<el-table-column type="index" label="序号" width="180" />
<el-table-column prop="name" label="作业槽" width="180" />
<el-table-column prop="address" label="测量值">
<template #header>
<span><i style="color:red">*</i>测量值</span>
</template>
<template #default="scope">
<!-- 将输入框放入form-item内部避免校验时的更新冲突 -->
<el-form-item
:prop="'tableData.' + scope.$index + '.address'"
:rules="[{ required: true, message: '请输入测量值', trigger: ['blur', 'change'] }]"
>
<el-input-number
v-model="scope.row.address"
controls-position="right"
@change="handleChange"
/>
</el-form-item>
</template>
</el-table-column>
</el-table>
</el-form>
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" label="序号" width="180" />
<el-table-column prop="name" label="作业槽" width="180" />
<el-table-column prop="address" label="测量值">
<template #header>
<span><i style="color:red">*</i>测量值</span>
</template>
<template #default="scope">
<el-input-number v-model="scope.row.address" controls-position="right"
@change="handleChange" />
</template>
</el-table-column>
</el-table>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog"> </el-button>
@ -40,6 +56,7 @@
</template>
</el-dialog>
</template>
<script>
export default {
props: {
@ -53,33 +70,26 @@ export default {
openShow: false,
ruleForm: {
huayanshijian: '',
zuoyezhongxin: ''
zuoyezhongxin: '',
tableData: [
{ address: null, name: '#16' },
{ address: null, name: '#15' },
{ address: null, name: '#14' },
{ address: null, name: '#13' },
{ address: null, name: '#12' }
]
},
rules: {
huayanshijian: [
{ required: true, message: '请选择', trigger: 'blur' },
{ required: true, message: '请选择化验时间', trigger:[ 'change', 'blur'] }
],
zuoyezhongxin: [
{ required: true, message: '请选择', trigger: 'blur' },
{ required: true, message: '请选择作业中心', trigger: ['change', 'blur'] }
]
},
options: [
{
label: '作业中心一',
value: '1'
},
{
label: '作业中心二',
value: '2'
},
],
tableData: [
{ address: null, name: '#16' },
{ address: null, name: '#15' },
{ address: null, name: '#14' },
{ address: null, name: '#13' },
{ address: null, name: '#12' }
{ label: '作业中心一1', value: '1' },
{ label: '作业中心二', value: '2' }
]
}
},
@ -90,8 +100,19 @@ export default {
closeDialog() {
this.openShow = false
this.$emit('closeDialog');
},
submit() {
this.$refs.ruleFormRef.validate((valid) => {
if (valid) {
console.log('提交数据:', this.ruleForm)
//
}
})
},
handleChange(value) {
// change
console.log('测量值变化:', value)
}
}
}
</script>
<style lang="scss" scoped></style>
</script>
Loading…
Cancel
Save