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

dev-scheduling
zhangdi 3 days ago
commit 610458855f
  1. 10
      src/views/processManagement/bathRefine/components/periodicalBatch.vue
  2. 4
      src/views/processManagement/bathRefine/components/periodicalClassDevice.vue

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<!-- 定期类检查项配置 --> <!-- 定期类检查项配置 -->
<avue-crud <avue-crud
:option="option" :option="option"
:table-loading="loading" :table-loading="loading"
@ -60,8 +60,8 @@ export default {
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
option: { option: {
height: 'auto', height: 'auto',
align: 'center', align: 'center',
@ -171,7 +171,7 @@ export default {
}, },
], ],
}, },
{ {
label: '审批状态', label: '审批状态',
prop: 'approvalStatus', prop: 'approvalStatus',
@ -294,7 +294,7 @@ export default {
this.showDialog = true; this.showDialog = true;
this.moldAddMore = true; this.moldAddMore = true;
}, },
searchReset() { searchReset() {
this.query = {}; this.query = {};
this.onLoad(this.page); this.onLoad(this.page);

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<!-- 定期类检查项配置 --> <!-- 定期类检查项配置 -->
<avue-crud <avue-crud
:option="option" :option="option"
:table-loading="loading" :table-loading="loading"
@ -59,7 +59,7 @@ export default {
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
option: { option: {
height: 'auto', height: 'auto',
align: 'center', align: 'center',

Loading…
Cancel
Save