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

生产和工艺管理页面调整

Browse Source
dev-scheduling
zhangdi 3 months ago
parent 1a43cf8f11
commit a5943d607b
11 changed files with 242 additions and 209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/App.vue
  2. 10
      src/api/processManagement/taskProcessing.js
  3. 16
      src/views/a-template/table.vue
  4. 100
      src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
  5. 2
      src/views/processManagement/components/processMainte/processPlanning.vue
  6. 67
      src/views/productionManagement/blbWorkOrder/components/glass.vue
  7. 65
      src/views/productionManagement/blbWorkOrder/components/others.vue
  8. 3
      src/views/productionManagement/frontTooling.vue
  9. 92
      src/views/productionManagement/productionMonitoring.vue
  10. 22
      src/views/productionManagement/reworkOrder.vue
  11. 69
      src/views/productionManagement/sinTerWorkOrder/index.vue

5
src/App.vue
Unescape View File

@ -108,4 +108,9 @@ body,
} }
} }
.avue-crud__header{
min-height: 30px !important;
margin-bottom:0!important;
}
</style> </style>

10
src/api/processManagement/taskProcessing.js
Unescape View File

@ -270,4 +270,14 @@ export const craftBatchRemoval = (params) => {
method: 'post', method: 'post',
params: params, params: params,
}); });
}
// 局部镀零件下拉数据 /BA/LocallyPlatedPart/listForSelect
export const getLocallyPlatedPartList = (params) => {
return request({
url: '/blade-desk/BA/LocallyPlatedPart/listForSelect',
method: 'get',
params: params,
});
} }

16
src/views/a-template/table.vue
Unescape View File

@ -26,12 +26,6 @@
</template> </template>
<script> <script>
// import {
// getListPersonAbility,
// removePersonAbility,
// addPersonAbility,
// updatePersonAbility,
// } from '@/api/productionSchedulingPlan/scheduling';
export default { export default {
components: {}, components: {},
data() { data() {
@ -39,7 +33,7 @@ export default {
form: {}, form: {},
selectionList: [], selectionList: [],
query: {}, query: {},
loading: true, loading: false,
page: { page: {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
@ -90,22 +84,17 @@ export default {
{ {
label: '配套人', label: '配套人',
prop: 'partCode', prop: 'partCode',
bind: 'dsPart.partCode',
search: true, search: true,
sortable: true, sortable: true,
width: 150,
span: 12, span: 12,
}, },
{ {
label: '配套时间', label: '配套时间',
prop: 'partName', prop: 'partName',
bind: 'dsPart.partName',
search: true, search: true,
sortable: true, sortable: true,
width: 150,
span: 12, span: 12,
}, },
], ],
}, },
@ -201,7 +190,7 @@ export default {
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; // this.loading = true;
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// this.data = res.data.data.records; // this.data = res.data.data.records;
// this.loading = false; // this.loading = false;
@ -213,3 +202,4 @@ export default {
mounted() {}, mounted() {},
}; };
</script> </script>
d

100
src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
Unescape View File

@ -2,7 +2,7 @@
<div> <div>
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-size: 20px">基本信息</span> <span style="font-size: 16px">基本信息</span>
</div> </div>
<el-form <el-form
ref="testForm" ref="testForm"
@ -185,8 +185,8 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="有效期:" prop="periodOfValidity"> <el-form-item label="有效期:" prop="periodOfValidity">
<el-radio-group v-model="formData.periodOfValidity" @change="periodOfValidityFn"> <el-radio-group v-model="formData.periodOfValidity" @change="periodOfValidityFn">
<el-radio value="1" size="large">长期有效</el-radio> <el-radio value="1">长期有效</el-radio>
<el-radio value="2" size="large">自定义</el-radio> <el-radio value="2">自定义</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -196,7 +196,6 @@
:max="100000" :max="100000"
:min="0" :min="0"
v-model="formData.expirationPeriod" v-model="formData.expirationPeriod"
precision="0"
controls-position="right" controls-position="right"
placeholder="请输入" placeholder="请输入"
style="width: 250px" style="width: 250px"
@ -209,7 +208,6 @@
:max="100000" :max="100000"
:min="0" :min="0"
v-model="formData.advanceRemind" v-model="formData.advanceRemind"
precision="0"
controls-position="right" controls-position="right"
placeholder="请输入" placeholder="请输入"
style="width: 250px" style="width: 250px"
@ -286,40 +284,45 @@
v-if="partType == '热表' || (partType == '烧结' && formData.isGlassCake)" v-if="partType == '热表' || (partType == '烧结' && formData.isGlassCake)"
> >
<el-form-item label="工艺校验:" prop="sinTer"> <el-form-item label="工艺校验:" prop="sinTer">
<el-checkbox v-model="formData.goldMark" v-if="partType == '热表'" <div style="width: 100%">
>镀金标识</el-checkbox <el-checkbox v-model="formData.goldMark" disabled v-if="partType == '热表'"
> >镀金标识</el-checkbox
<el-checkbox >
v-model="formData.markingsTest" <el-checkbox
@change="setDataLocal" v-model="formData.markingsTest"
:true-label="'1'" @change="setDataLocal"
:false-label="'0'" :true-label="'1'"
>涂色标</el-checkbox :false-label="'0'"
> >涂色标</el-checkbox
<el-checkbox >
v-model="formData.fluorescenceCheck" <el-checkbox
@change="setDataLocal" v-model="formData.fluorescenceCheck"
v-if="partType == '热表'" @change="setDataLocal"
:true-label="'1'" v-if="partType == '热表'"
:false-label="'0'" :true-label="'1'"
>荧光检</el-checkbox :false-label="'0'"
> >荧光检</el-checkbox
<el-checkbox >
v-model="formData.hotDispose" <el-checkbox
@change="setDataLocal" v-model="formData.hotDispose"
v-if="partType == '热表'" @change="setDataLocal"
:true-label="'1'" v-if="partType == '热表'"
:false-label="'0'" :true-label="'1'"
>热处理检验</el-checkbox :false-label="'0'"
> >热处理检验</el-checkbox
<el-checkbox >
v-model="formData.inkjetPrinting" <el-checkbox
@change="setDataLocal" v-model="formData.inkjetPrinting"
v-if="partType == '热表'" @change="setDataLocal"
:true-label="'1'" v-if="partType == '热表'"
:false-label="'0'" :true-label="'1'"
>喷码</el-checkbox :false-label="'0'"
> >喷码</el-checkbox
>
</div>
<div style="width: 100%" v-if="formData.goldMark">
<el-text class="mx-1" type="danger">本零件需要编制一级和二级工艺！</el-text>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -331,7 +334,7 @@
style="margin-top: 24px" style="margin-top: 24px"
> >
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-size: 20px">子件信息</span> <span style="font-size: 16px">子件信息</span>
</div> </div>
<avue-crud <avue-crud
:option="option" :option="option"
@ -363,6 +366,7 @@ import {
getPartDetail, getPartDetail,
authorizedAccomplish, authorizedAccomplish,
getPlatingList, getPlatingList,
getLocallyPlatedPartList,
} from '@/api/processManagement/taskProcessing'; } from '@/api/processManagement/taskProcessing';
export default { export default {
@ -607,10 +611,17 @@ export default {
mounted() { mounted() {
this.disabled = this.dialogType == 'view' ? true : false; this.disabled = this.dialogType == 'view' ? true : false;
// this.formData = this.dsPartInfo; // this.formData = this.dsPartInfo;
this.getLocallyPlatedPartList();
this.getPartDetails(); this.getPartDetails();
this.getPlatingList(); this.getPlatingList();
}, },
methods: { methods: {
// 获取局部镀零件列表
getLocallyPlatedPartList() {
getLocallyPlatedPartList().then(res => {
this.locallyPlatedData = res.data.data;
});
},
getPlatingList() { getPlatingList() {
getPlatingList().then(res => { getPlatingList().then(res => {
this.plateList = res.data.data; this.plateList = res.data.data;
@ -641,6 +652,15 @@ export default {
} else { } else {
this.formData.isGlassCake = true; this.formData.isGlassCake = true;
} }
// 如果当前零件号在局部镀金列表里面 镀金标识禁用 this.getLocallyPlatedPartList();
let selPart = this.locallyPlatedData.filter(item => {
return item.partCode == this.formData.partCode;
});
if (selPart.lenght > 0) {
if(this.partType==''){
this.formData.goldMark = true
}
}
}); });
}, },

2
src/views/processManagement/components/processMainte/processPlanning.vue
Unescape View File

@ -648,6 +648,7 @@ export default {
contextMenuLeft: 0, contextMenuLeft: 0,
contextNodeData: null, contextNodeData: null,
contextTreeNode: null, contextTreeNode: null,
locallyPlatedData:[]
}; };
}, },
@ -669,6 +670,7 @@ export default {
document.removeEventListener('contextmenu', this.closeContextMenu); document.removeEventListener('contextmenu', this.closeContextMenu);
}, },
methods: { methods: {
// 获取涂色标、涂色带、涂箭头的系数 // 获取涂色标、涂色带、涂箭头的系数
getDictionary() { getDictionary() {
getDictionary({ code: 'part_info' }).then(res => { getDictionary({ code: 'part_info' }).then(res => {

67
src/views/productionManagement/blbWorkOrder/components/glass.vue
Unescape View File

@ -194,7 +194,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '下一工序', label: '下一工序',
@ -202,7 +202,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '订单状态', label: '订单状态',
@ -211,7 +211,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
dicUrl: '/blade-system/dict/dictionary?code=order_status', dicUrl: '/blade-system/dict/dictionary?code=order_status',
props: { props: {
label: 'dictValue', label: 'dictValue',
@ -224,7 +224,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '加工班组', label: '加工班组',
@ -232,7 +232,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
hide: true, hide: true,
}, },
{ {
@ -241,7 +241,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
hide: true, hide: true,
}, },
{ {
@ -250,7 +250,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '计划单号', label: '计划单号',
@ -258,7 +258,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '返工单号', label: '返工单号',
@ -266,7 +266,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '零件号', label: '零件号',
@ -274,7 +274,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '批次号', label: '批次号',
@ -282,7 +282,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '产品型号', label: '产品型号',
@ -290,7 +290,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '产品名称', label: '产品名称',
@ -298,7 +298,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '流程卡号', label: '流程卡号',
@ -307,7 +307,7 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
hide: true, hide: true,
width: 200, width: 150,
}, },
{ {
@ -316,7 +316,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '生产标识', label: '生产标识',
@ -324,7 +324,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '生产数量', label: '生产数量',
@ -332,7 +332,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '订单优先级', label: '订单优先级',
@ -341,7 +341,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, searchLabelWidth: 100,
}, },
@ -352,7 +352,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, searchLabelWidth: 100,
hide:true, hide:true,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority', dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
@ -367,7 +367,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '需求交期', label: '需求交期',
@ -375,7 +375,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '会议要求周期', label: '会议要求周期',
@ -383,7 +383,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '调度员', label: '调度员',
@ -391,7 +391,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
@ -399,10 +399,10 @@ export default {
prop: 'planTime', prop: 'planTime',
sortable: true, sortable: true,
filter: true, filter: true,
selectWidth: 150, searchLabelWidth: 90,
span: 12, span: 12,
search: true, search: true,
width: 200, width: 150,
searchSpan: 8, searchSpan: 8,
type: 'datetimerange', type: 'datetimerange',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
@ -423,7 +423,7 @@ export default {
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
startPlaceholder: '时间日期开始', startPlaceholder: '时间日期开始',
endPlaceholder: '时间日期结束', endPlaceholder: '时间日期结束',
width: 200, width: 150,
}, },
{ {
label: '镀后入库时间', label: '镀后入库时间',
@ -433,7 +433,7 @@ export default {
span: 12, span: 12,
search: true, search: true,
searchSpan: 8, searchSpan: 8,
width: 200, width: 150,
type: 'datetimerange', type: 'datetimerange',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
@ -441,6 +441,7 @@ export default {
endPlaceholder: '结束日期', endPlaceholder: '结束日期',
rangeSeparator: '-', rangeSeparator: '-',
searchRange: true, searchRange: true,
searchLabelWidth: 90,
}, },
{ {
label: '生产数量', label: '生产数量',
@ -448,7 +449,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '入库数量', label: '入库数量',
@ -456,7 +457,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '试验数量', label: '试验数量',
@ -464,7 +465,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '报废数量', label: '报废数量',
@ -472,7 +473,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '备注', label: '备注',
@ -480,7 +481,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
], ],
}, },
@ -588,7 +589,7 @@ export default {
getList( getList(
page.currentPage, page.currentPage,
page.pageSize, page.pageSize,
Object.assign(params, this.query, { yieldType: '12003' }) Object.assign(params, this.query, { yieldType: '120003' })
).then(res => { ).then(res => {
this.data = res.data.data.records; this.data = res.data.data.records;
this.loading = false; this.loading = false;

65
src/views/productionManagement/blbWorkOrder/components/others.vue
Unescape View File

@ -194,7 +194,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '下一工序', label: '下一工序',
@ -202,7 +202,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '订单状态', label: '订单状态',
@ -211,7 +211,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
dicUrl: '/blade-system/dict/dictionary?code=order_status', dicUrl: '/blade-system/dict/dictionary?code=order_status',
props: { props: {
label: 'dictValue', label: 'dictValue',
@ -224,7 +224,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '加工班组', label: '加工班组',
@ -232,7 +232,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
hide: true, hide: true,
}, },
{ {
@ -241,7 +241,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
hide: true, hide: true,
}, },
{ {
@ -250,7 +250,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '计划单号', label: '计划单号',
@ -258,7 +258,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '返工单号', label: '返工单号',
@ -266,7 +266,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '零件号', label: '零件号',
@ -274,7 +274,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '批次号', label: '批次号',
@ -282,7 +282,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '产品型号', label: '产品型号',
@ -290,7 +290,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '产品名称', label: '产品名称',
@ -298,7 +298,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '流程卡号', label: '流程卡号',
@ -307,7 +307,7 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
hide: true, hide: true,
width: 200, width: 150,
}, },
{ {
@ -316,7 +316,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '生产标识', label: '生产标识',
@ -324,7 +324,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '生产数量', label: '生产数量',
@ -332,7 +332,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '订单优先级', label: '订单优先级',
@ -341,7 +341,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, searchLabelWidth: 100,
}, },
@ -352,7 +352,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, searchLabelWidth: 100,
hide:true, hide:true,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority', dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
@ -367,7 +367,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '需求交期', label: '需求交期',
@ -375,7 +375,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '会议要求周期', label: '会议要求周期',
@ -383,7 +383,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '调度员', label: '调度员',
@ -391,7 +391,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
@ -402,7 +402,7 @@ export default {
selectWidth: 150, selectWidth: 150,
span: 12, span: 12,
search: true, search: true,
width: 200, width: 150,
searchSpan: 8, searchSpan: 8,
type: 'datetimerange', type: 'datetimerange',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
@ -411,6 +411,7 @@ export default {
endPlaceholder: '结束日期', endPlaceholder: '结束日期',
rangeSeparator: '-', rangeSeparator: '-',
searchRange: true, searchRange: true,
searchLabelWidth: 90,
}, },
{ {
label: '计划完工时间', label: '计划完工时间',
@ -423,7 +424,8 @@ export default {
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
startPlaceholder: '时间日期开始', startPlaceholder: '时间日期开始',
endPlaceholder: '时间日期结束', endPlaceholder: '时间日期结束',
width: 200, width: 150,
searchLabelWidth: 90,
}, },
{ {
label: '镀后入库时间', label: '镀后入库时间',
@ -433,7 +435,7 @@ export default {
span: 12, span: 12,
search: true, search: true,
searchSpan: 8, searchSpan: 8,
width: 200, width: 150,
type: 'datetimerange', type: 'datetimerange',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
@ -441,6 +443,7 @@ export default {
endPlaceholder: '结束日期', endPlaceholder: '结束日期',
rangeSeparator: '-', rangeSeparator: '-',
searchRange: true, searchRange: true,
searchLabelWidth: 90,
}, },
{ {
label: '生产数量', label: '生产数量',
@ -448,7 +451,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '入库数量', label: '入库数量',
@ -456,7 +459,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '试验数量', label: '试验数量',
@ -464,7 +467,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '报废数量', label: '报废数量',
@ -472,7 +475,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '备注', label: '备注',
@ -480,7 +483,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
], ],
}, },

3
src/views/productionManagement/frontTooling.vue
Unescape View File

@ -65,7 +65,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
searchLabelWidth: 120, // searchLabelWidth: 120,
menu: false, menu: false,
menuWidth: 220, menuWidth: 220,
dialogWidth: 1200, dialogWidth: 1200,
@ -209,6 +209,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
searchLabelWidth: 90,
}, },
{ {
label: '需求交期', label: '需求交期',

92
src/views/productionManagement/productionMonitoring.vue
Unescape View File

@ -221,18 +221,16 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
fixed: 'left', fixed: 'left',
width: 200, width: 180,
searchLabelWidth: 100,
}, },
{ {
label: '当前工序', label: '当前工序',
prop: 'ppsName', prop: 'ppsName',
fixed: 'left',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '下一工序', label: '下一工序',
@ -240,7 +238,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '订单状态', label: '订单状态',
@ -249,7 +247,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, //order_status width: 150, //order_status
dicUrl: '/blade-system/dict/dictionary?code=order_status', dicUrl: '/blade-system/dict/dictionary?code=order_status',
props: { props: {
label: 'dictValue', label: 'dictValue',
@ -262,8 +260,8 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, // searchLabelWidth: 100,
}, },
{ {
label: '加工单位', label: '加工单位',
@ -273,7 +271,7 @@ export default {
fixed: 'left', fixed: 'left',
overHidden: true, overHidden: true,
hide: true, hide: true,
width: 200, width: 150,
}, },
{ {
label: '加工班组', label: '加工班组',
@ -281,7 +279,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
hide: true, hide: true,
}, },
{ {
@ -290,9 +288,9 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
hide: true, hide: true,
searchLabelWidth: 100, // searchLabelWidth: 100,
}, },
{ {
label: '生产订单号', label: '生产订单号',
@ -301,8 +299,8 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
// hide: true, // hide: true,
width: 200, width: 150,
searchLabelWidth: 100, // searchLabelWidth: 100,
}, },
{ {
label: '计划单号', label: '计划单号',
@ -311,7 +309,7 @@ export default {
sortable: true, sortable: true,
// hide: true, // hide: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '返工单号', label: '返工单号',
@ -319,7 +317,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '零件号', label: '零件号',
@ -327,7 +325,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '批次号', label: '批次号',
@ -335,7 +333,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '流程卡号', label: '流程卡号',
@ -344,7 +342,7 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
hide: true, hide: true,
width: 200, width: 150,
}, },
{ {
label: '产品型号', label: '产品型号',
@ -352,7 +350,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '产品名称', label: '产品名称',
@ -360,7 +358,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: 'MES流程卡号', label: 'MES流程卡号',
@ -368,7 +366,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '生产标识', label: '生产标识',
@ -376,7 +374,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '镀种信息', label: '镀种信息',
@ -384,7 +382,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '生产数量', label: '生产数量',
@ -392,7 +390,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '面积(dm²)', label: '面积(dm²)',
@ -400,7 +398,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '单批次面积', label: '单批次面积',
@ -408,7 +406,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '订单优先级', label: '订单优先级',
@ -417,8 +415,8 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, // searchLabelWidth: 100,
}, },
{ {
@ -428,8 +426,8 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, // searchLabelWidth: 100,
hide:true, hide:true,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority', dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
props: { props: {
@ -443,7 +441,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '需求交期', label: '需求交期',
@ -451,7 +449,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '会议要求周期', label: '会议要求周期',
@ -459,7 +457,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '调度员', label: '调度员',
@ -467,7 +465,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '协作计划', label: '协作计划',
@ -475,7 +473,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '计划下达时间', label: '计划下达时间',
@ -483,10 +481,10 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
selectWidth: 150, selectWidth: 150,
searchLabelWidth: 100, searchLabelWidth: 90,
span: 12, span: 12,
search: true, search: true,
width: 200, width: 150,
searchSpan: 8, searchSpan: 8,
type: 'date', type: 'date',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
@ -508,7 +506,7 @@ export default {
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
startPlaceholder: '时间日期开始', startPlaceholder: '时间日期开始',
endPlaceholder: '时间日期结束', endPlaceholder: '时间日期结束',
width: 200, width: 150,
}, },
{ {
@ -519,8 +517,8 @@ export default {
span: 12, span: 12,
search: true, search: true,
searchSpan: 8, searchSpan: 8,
width: 200, width: 150,
searchLabelWidth: 100, searchLabelWidth: 90,
type: 'date', type: 'date',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
@ -538,7 +536,7 @@ export default {
hide: true, hide: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
dicData: [ dicData: [
{ {
@ -561,7 +559,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '入库数量', label: '入库数量',
@ -569,7 +567,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '试验数量', label: '试验数量',
@ -577,7 +575,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '报废数量', label: '报废数量',
@ -585,7 +583,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
@ -594,7 +592,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
], ],
}, },

22
src/views/productionManagement/reworkOrder.vue
Unescape View File

@ -99,7 +99,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
label: '路线编号', label: '路线编号',
@ -111,7 +111,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
label: '发生单位', label: '发生单位',
@ -123,7 +123,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
@ -136,7 +136,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
label: '数量', label: '数量',
@ -148,7 +148,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
label: '处理意见', label: '处理意见',
@ -160,7 +160,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
label: '工艺路线', label: '工艺路线',
@ -172,7 +172,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
label: '批次号', label: '批次号',
@ -184,7 +184,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
label: '需求交期', label: '需求交期',
@ -196,7 +196,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
label: '接收状态', label: '接收状态',
@ -219,7 +219,7 @@ export default {
}, },
], ],
span: 24, span: 24,
width: 200, width: 150,
}, },
{ {
@ -232,7 +232,7 @@ export default {
editDisplay: false, editDisplay: false,
viewDisplay: false, viewDisplay: false,
span: 24, span: 24,
width: 200, width: 150,
}, },
], ],
}, },

69
src/views/productionManagement/sinTerWorkOrder/index.vue
Unescape View File

@ -171,7 +171,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 260, menuWidth: 260,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
@ -199,7 +199,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '下一工序', label: '下一工序',
@ -207,7 +207,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '订单状态', label: '订单状态',
@ -216,7 +216,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
dicUrl: '/blade-system/dict/dictionary?code=order_status', dicUrl: '/blade-system/dict/dictionary?code=order_status',
props: { props: {
label: 'dictValue', label: 'dictValue',
@ -229,7 +229,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '加工班组', label: '加工班组',
@ -237,7 +237,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
hide: true, hide: true,
}, },
{ {
@ -246,7 +246,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
hide: true, hide: true,
}, },
{ {
@ -255,7 +255,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '计划单号', label: '计划单号',
@ -263,7 +263,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '返工单号', label: '返工单号',
@ -271,7 +271,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '零件号', label: '零件号',
@ -279,7 +279,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '批次号', label: '批次号',
@ -287,7 +287,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '产品型号', label: '产品型号',
@ -295,7 +295,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '产品名称', label: '产品名称',
@ -303,7 +303,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '流程卡号', label: '流程卡号',
@ -312,7 +312,7 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
hide: true, hide: true,
width: 200, width: 150,
}, },
{ {
@ -321,7 +321,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '生产标识', label: '生产标识',
@ -329,7 +329,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '生产数量', label: '生产数量',
@ -337,7 +337,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '订单优先级', label: '订单优先级',
@ -346,8 +346,8 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, // searchLabelWidth: 100,
}, },
{ {
@ -357,7 +357,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
searchLabelWidth: 100, searchLabelWidth: 100,
hide:true, hide:true,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority', dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
@ -372,7 +372,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '需求交期', label: '需求交期',
@ -380,7 +380,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '会议要求周期', label: '会议要求周期',
@ -388,7 +388,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '调度员', label: '调度员',
@ -396,7 +396,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
@ -407,7 +407,7 @@ export default {
selectWidth: 150, selectWidth: 150,
span: 12, span: 12,
search: true, search: true,
width: 200, width: 150,
searchSpan: 8, searchSpan: 8,
type: 'datetimerange', type: 'datetimerange',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
@ -416,6 +416,7 @@ export default {
endPlaceholder: '结束日期', endPlaceholder: '结束日期',
rangeSeparator: '-', rangeSeparator: '-',
searchRange: true, searchRange: true,
searchLabelWidth: 90,
}, },
{ {
label: '计划完工时间', label: '计划完工时间',
@ -428,7 +429,8 @@ export default {
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
startPlaceholder: '时间日期开始', startPlaceholder: '时间日期开始',
endPlaceholder: '时间日期结束', endPlaceholder: '时间日期结束',
width: 200, width: 150,
searchLabelWidth: 90,
}, },
{ {
label: '镀后入库时间', label: '镀后入库时间',
@ -438,7 +440,7 @@ export default {
span: 12, span: 12,
search: true, search: true,
searchSpan: 8, searchSpan: 8,
width: 200, width: 150,
type: 'datetimerange', type: 'datetimerange',
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
@ -446,6 +448,7 @@ export default {
endPlaceholder: '结束日期', endPlaceholder: '结束日期',
rangeSeparator: '-', rangeSeparator: '-',
searchRange: true, searchRange: true,
searchLabelWidth: 90,
}, },
{ {
label: '生产数量', label: '生产数量',
@ -453,7 +456,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '入库数量', label: '入库数量',
@ -461,7 +464,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '试验数量', label: '试验数量',
@ -469,7 +472,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '报废数量', label: '报废数量',
@ -477,7 +480,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
{ {
label: '备注', label: '备注',
@ -485,7 +488,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 150,
}, },
], ],
}, },

Write Preview
Loading…
Cancel
Save