Merge remote-tracking branch 'origin/master'

src/views/module_cmms/spotcheckContent/SpotcheckContentList.vue

@@ -109,7 +109,8 @@
       </a-table>
     </div>
 
-    <cmms-spotcheck-content-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-content-modal>
+    <!-- <cmms-spotcheck-content-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-content-modal> -->
+    <spotcheck-content-modal ref="modalForm" @ok="modalFormOk"></spotcheck-content-modal>
   </a-card>
 </template>
 
@@ -118,15 +119,15 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsSpotcheckContentModal from './modules/CmmsSpotcheckContentModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { httpAction, getAction } from '@/api/manage'
+  import SpotcheckContentModal from './modules/SpotcheckContentModal.vue'
 
   export default {
-    name: 'CmmsSpotcheckContentList',
+    name: 'SpotcheckContentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsSpotcheckContentModal
+      SpotcheckContentModal
     },
     data () {
       return {

src/views/module_cmms/spotcheckContent/index.vue

@@ -3,17 +3,18 @@
         <div class="left">
         </div>
         <div class="right">
-            <cmms-spotcheck-content-list></cmms-spotcheck-content-list>
+            <!-- <cmms-spotcheck-content-list></cmms-spotcheck-content-list> -->
+            <spotcheck-content-list></spotcheck-content-list>
         </div>
     </div>
 </template>
 
 <script>
-import CmmsSpotcheckContentList from './CmmsSpotcheckContentList.vue';
+import SpotcheckContentList from './SpotcheckContentList.vue';
 
     export default({
         components: {
-            CmmsSpotcheckContentList
+            SpotcheckContentList
         },
         data () {
             return {

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentForm.vue

@@ -55,7 +55,8 @@
           :loading="loading"
           class="j-table-force-nowrap">
         </a-table>
-        <cmms-spotcheck-content-modal-add ref="modalForm" @ok="modalFormOk" :modelForm="model" :dataList="model.spotcheckContentItemList" @customEvent="handleCustomEvent"></cmms-spotcheck-content-modal-add>
+        <!-- <cmms-spotcheck-content-modal-add ref="modalForm" @ok="modalFormOk" :modelForm="model" :dataList="model.spotcheckContentItemList" @customEvent="handleCustomEvent"></cmms-spotcheck-content-modal-add> -->
+        <spotcheck-content-modal-add  ref="modalForm" @ok="modalFormOk" :modelForm="model" :dataList="model.spotcheckContentItemList" @customEvent="handleCustomEvent"></spotcheck-content-modal-add>
       </a-form-model>
     </j-form-container>
   </a-spin>
@@ -69,13 +70,13 @@
 
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
-import CmmsSpotcheckContentModalAdd from './CmmsSpotcheckContentModalAdd.vue'
+  import SpotcheckContentModalAdd from './SpotcheckContentModalAdd.vue'
 
   export default {
-    name: 'CmmsSpotcheckContentForm',
+    name: 'SpotcheckContentForm',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-        CmmsSpotcheckContentModalAdd
+        SpotcheckContentModalAdd
     },
     props: {
       //表单禁用

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentModal.Style#Drawer.vue

@@ -7,7 +7,8 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-content-form>
+    <!-- <cmms-spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-content-form> -->
+    <spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></spotcheck-content-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>
@@ -17,12 +18,12 @@
 
 <script>
 
-  import CmmsSpotcheckContentForm from './CmmsSpotcheckContentForm'
+  import SpotcheckContentForm from './SpotcheckContentForm.vue'
 
   export default {
-    name: 'CmmsSpotcheckContentModal',
+    name: 'SpotcheckContentModal',
     components: {
-      CmmsSpotcheckContentForm
+        SpotcheckContentForm
     },
     data () {
       return {

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentModal.vue

@@ -7,19 +7,19 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-content-form>
+    <!-- <cmms-spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-content-form> -->
+    <spotcheck-content-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></spotcheck-content-form>
   </u-modal>
 </template>
 
 <script>
-import UModal from '../../../../components/module_ems/UModal/UModal.vue'
-
-  import CmmsSpotcheckContentForm from './CmmsSpotcheckContentForm'
+  import UModal from '../../../../components/module_ems/UModal/UModal.vue'
+  import SpotcheckContentForm from './SpotcheckContentForm.vue'
   export default {
-    name: 'CmmsSpotcheckContentModal',
+    name: 'SpotcheckContentModal',
     components: {
-      CmmsSpotcheckContentForm,
-        UModal
+        UModal,
+        SpotcheckContentForm
     },
     data () {
       return {

src/views/module_cmms/spotcheckContent/modules/SpotcheckContentModalAdd.vue

@@ -28,7 +28,7 @@
 import { httpAction, getAction } from '@/api/manage'
   
   export default {
-    name: 'CmmsSpotcheckContentModalAdd',
+    name: 'SpotcheckContentModalAdd',
     components: {
         
     },

src/views/module_cmms/spotcheckItem/SpotcheckItemList.vue

@@ -131,7 +131,8 @@
       </a-table>
     </div>
 
-    <cmms-spotcheck-item-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-item-modal>
+    <!-- <cmms-spotcheck-item-modal ref="modalForm" @ok="modalFormOk"></cmms-spotcheck-item-modal> -->
+    <spotcheck-item-modal ref="modalForm" @ok="modalFormOk"></spotcheck-item-modal>
   </a-card>
 </template>
 
@@ -140,14 +141,14 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsSpotcheckItemModal from './modules/CmmsSpotcheckItemModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import SpotcheckItemModal from './modules/SpotcheckItemModal.vue'
 
   export default {
-    name: 'CmmsSpotcheckItemList',
+    name: 'SpotcheckItemList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsSpotcheckItemModal
+      SpotcheckItemModal
     },
     data () {
       return {

src/views/module_cmms/spotcheckItem/modules/SpotcheckItemForm.vue

@@ -62,7 +62,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsSpotcheckItemForm',
+    name: 'SpotcheckItemForm',
     components: {
     },
     props: {

src/views/module_cmms/spotcheckItem/modules/SpotcheckItemModal.Style#Drawer.vue

@@ -7,7 +7,8 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-item-form>
+    <!-- <cmms-spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-spotcheck-item-form> -->
+    <spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></spotcheck-item-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>
@@ -17,12 +18,12 @@
 
 <script>
 
-  import CmmsSpotcheckItemForm from './CmmsSpotcheckItemForm'
+  import SpotcheckItemForm from './SpotcheckItemForm.vue'
 
   export default {
-    name: 'CmmsSpotcheckItemModal',
+    name: 'SpotcheckItemModal',
     components: {
-      CmmsSpotcheckItemForm
+        SpotcheckItemForm
     },
     data () {
       return {

src/views/module_cmms/spotcheckItem/modules/SpotcheckItemModal.vue

@@ -8,17 +8,18 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-item-form>
+    <!-- <cmms-spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-spotcheck-item-form> -->
+    <spotcheck-item-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></spotcheck-item-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CmmsSpotcheckItemForm from './CmmsSpotcheckItemForm'
+  import SpotcheckItemForm from './SpotcheckItemForm.vue'
   export default {
-    name: 'CmmsSpotcheckItemModal',
+    name: 'SpotcheckItemModal',
     components: {
-      CmmsSpotcheckItemForm
+        SpotcheckItemForm
     },
     data () {
       return {