|
@@ -151,7 +151,8 @@
|
|
</a-table>
|
|
</a-table>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- <tpm-equipment-modal ref="modalForm" @ok="modalFormOk"></tpm-equipment-modal>
|
|
|
|
|
|
+ <!-- <tpm-equipment-modal ref="modalForm" @ok="modalFormOk"></tpm-equipment-modal> -->
|
|
|
|
+ <equipment-modal ref="modalForm" @ok="modalFormOk"></equipment-modal>
|
|
</a-card>
|
|
</a-card>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -160,14 +161,14 @@
|
|
import '@/assets/less/TableExpand.less'
|
|
import '@/assets/less/TableExpand.less'
|
|
import { mixinDevice } from '@/utils/mixin'
|
|
import { mixinDevice } from '@/utils/mixin'
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|
- import TpmEquipmentModal from './modules/TpmEquipmentModal'
|
|
|
|
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
|
|
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
|
|
|
|
+ import EquipmentModal from './modules/EquipmentModal.vue'
|
|
|
|
|
|
export default {
|
|
export default {
|
|
- name: 'TpmEquipmentList',
|
|
|
|
|
|
+ name: 'EquipmentList',
|
|
mixins:[JeecgListMixin, mixinDevice],
|
|
mixins:[JeecgListMixin, mixinDevice],
|
|
components: {
|
|
components: {
|
|
- TpmEquipmentModal
|
|
|
|
|
|
+ EquipmentModal
|
|
},
|
|
},
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|