设备管理优化

src/views/module_tpm/Equipment/EquipmentList.vue

@@ -151,7 +151,8 @@
       </a-table>
     </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>
 </template>
 
@@ -160,14 +161,14 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TpmEquipmentModal from './modules/TpmEquipmentModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import EquipmentModal from './modules/EquipmentModal.vue'
 
   export default {
-    name: 'TpmEquipmentList',
+    name: 'EquipmentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      TpmEquipmentModal
+        EquipmentModal
     },
     data () {
       return {

src/views/module_tpm/Equipment/modules/EquipmentForm.vue

@@ -71,7 +71,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'TpmEquipmentForm',
+    name: 'EquipmentForm',
     components: {
     },
     props: {

src/views/module_tpm/Equipment/modules/EquipmentModal.Style#Drawer.vue

@@ -7,7 +7,8 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <tpm-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tpm-equipment-form>
+    <!-- <tpm-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tpm-equipment-form> -->
+    <equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></equipment-form>
     <div class="drawer-footer">
       <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
@@ -16,13 +17,12 @@
 </template>
 
 <script>
-
-  import TpmEquipmentForm from './TpmEquipmentForm'
+  import EquipmentForm from './EquipmentForm.vue'
 
   export default {
-    name: 'TpmEquipmentModal',
+    name: 'EquipmentModal',
     components: {
-      TpmEquipmentForm
+        EquipmentForm
     },
     data () {
       return {

src/views/module_tpm/Equipment/modules/EquipmentModal.vue

@@ -8,17 +8,18 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <tpm-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tpm-equipment-form>
+    <!-- <tpm-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tpm-equipment-form> -->
+    <equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></equipment-form>
   </j-modal>
 </template>
 
 <script>
+  import EquipmentForm from './EquipmentForm.vue'
 
-  import TpmEquipmentForm from './TpmEquipmentForm'
   export default {
-    name: 'TpmEquipmentModal',
+    name: 'EquipmentModal',
     components: {
-      TpmEquipmentForm
+        EquipmentForm
     },
     data () {
       return {

src/views/module_tpm/EquipmentTree/EquipmentTreeList.vue

@@ -109,7 +109,8 @@
       </a-table>
     </div>
 
-    <tpmEquipmentTree-modal ref="modalForm" @ok="modalFormOk"></tpmEquipmentTree-modal>
+    <!-- <tpmEquipmentTree-modal ref="modalForm" @ok="modalFormOk"></tpmEquipmentTree-modal> -->
+    <equipment-tree-modal ref="modalForm" @ok="modalFormOk"></equipment-tree-modal>
   </a-card>
 </template>
 
@@ -117,15 +118,15 @@
 
   import { getAction, deleteAction } from '@/api/manage'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import TpmEquipmentTreeModal from './modules/TpmEquipmentTreeModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { filterObj } from '@/utils/util';
+  import EquipmentTreeModal from './modules/EquipmentTreeModal.vue'
 
   export default {
-    name: "TpmEquipmentTreeList",
+    name: "EquipmentTreeList",
     mixins:[JeecgListMixin],
     components: {
-      TpmEquipmentTreeModal
+        EquipmentTreeModal
     },
     data () {
       return {

src/views/module_tpm/EquipmentTree/modules/EquipmentTreeModal.vue

@@ -37,7 +37,7 @@
   import { duplicateCheck } from '@/api/api'
   import { validateDuplicateValue } from '@/utils/util'
   export default {
-    name: "TpmEquipmentTreeModal",
+    name: "EquipmentTreeModal",
     components: {
     },
     data () {