Pārlūkot izejas kodu

优化送检工单名称

LLL 1 gadu atpakaļ
vecāks
revīzija
01ee9b521a

+ 11 - 3
src/views/module_cmms/submission/SubmissionList.vue

@@ -96,7 +96,8 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
+          <a-divider type="vertical" />
+          <a @click="fankui">反馈</a>
           <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
@@ -117,6 +118,7 @@
     </div>
 
     <cmms-submission-modal ref="modalForm" @ok="modalFormOk"></cmms-submission-modal>
+    <SubmissionEquipmentModalFK ref="modalFormFK" @ok="modalFormOk"> </SubmissionEquipmentModalFK>
   </a-card>
 </template>
 
@@ -126,13 +128,14 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import CmmsSubmissionModal from './modules/SubmissionModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import SubmissionEquipmentModalFK from "./modulesFK/SubmissionEquipmentModalFK.vue";
 
   export default {
     name: 'CmmsSubmissionList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsSubmissionModal
+      CmmsSubmissionModal,
+      SubmissionEquipmentModalFK,
     },
     data () {
       return {
@@ -220,6 +223,11 @@
         fieldList.push({type:'string',value:'returnNum',text:'返回设备数量',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList
+      },
+      fankui: function () {
+        this.$refs.modalFormFK.title = "送检信息反馈";
+        this.$refs.modalFormFK.disableSubmit = false;
+        this.$refs.modalFormFK.visible = true;
       }
     }
   }

+ 1 - 1
src/views/module_cmms/submission/modules/SubmissionForm.vue

@@ -40,7 +40,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsSubmissionForm',
+    name: 'SubmissionForm',
     components: {
     },
     props: {

+ 4 - 4
src/views/module_cmms/submission/modules/SubmissionModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-submission-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-submission-form>
+    <submission-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></submission-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 +17,12 @@
 
 <script>
 
-  import CmmsSubmissionForm from './SubmissionForm'
+  import SubmissionForm from './SubmissionForm'
 
   export default {
-    name: 'CmmsSubmissionModal',
+    name: 'SubmissionModal',
     components: {
-      CmmsSubmissionForm
+      SubmissionForm
     },
     data () {
       return {

+ 4 - 4
src/views/module_cmms/submission/modules/SubmissionModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-submission-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-submission-form>
+    <submission-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></submission-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CmmsSubmissionForm from './SubmissionForm'
+  import SubmissionForm from './SubmissionForm'
   export default {
-    name: 'CmmsSubmissionModal',
+    name: 'SubmissionModal',
     components: {
-      CmmsSubmissionForm
+      SubmissionForm
     },
     data () {
       return {

+ 4 - 4
src/views/module_cmms/submissionEquipment/SubmissionEquipmentList.vue

@@ -89,7 +89,7 @@
       </a-table>
     </div>
 
-    <cmms-submission-equipment-modal ref="modalForm" @ok="modalFormOk"></cmms-submission-equipment-modal>
+    <submission-equipment-modal ref="modalForm" @ok="modalFormOk"></submission-equipment-modal>
   </a-card>
 </template>
 
@@ -98,14 +98,14 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import CmmsSubmissionEquipmentModal from './modules/SubmissionEquipmentModal'
+  import SubmissionEquipmentModal from './modules/SubmissionEquipmentModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
-    name: 'CmmsSubmissionEquipmentList',
+    name: 'SubmissionEquipmentList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      CmmsSubmissionEquipmentModal
+      SubmissionEquipmentModal
     },
     data () {
       return {

+ 2 - 2
src/views/module_cmms/submissionEquipment/modules/SubmissionEquipmentForm.vue

@@ -60,7 +60,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'CmmsSubmissionEquipmentForm',
+    name: 'SubmissionEquipmentForm',
     components: {
     },
     props: {
@@ -136,7 +136,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }

+ 4 - 4
src/views/module_cmms/submissionEquipment/modules/SubmissionEquipmentModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <cmms-submission-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></cmms-submission-equipment-form>
+    <submission-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></submission-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>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import CmmsSubmissionEquipmentForm from './SubmissionEquipmentForm'
+  import SubmissionEquipmentForm from './SubmissionEquipmentForm'
 
   export default {
-    name: 'CmmsSubmissionEquipmentModal',
+    name: 'SubmissionEquipmentModal',
     components: {
-      CmmsSubmissionEquipmentForm
+      SubmissionEquipmentForm
     },
     data () {
       return {

+ 4 - 4
src/views/module_cmms/submissionEquipment/modules/SubmissionEquipmentModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <cmms-submission-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></cmms-submission-equipment-form>
+    <submission-equipment-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></submission-equipment-form>
   </j-modal>
 </template>
 
 <script>
 
-  import CmmsSubmissionEquipmentForm from './SubmissionEquipmentForm'
+  import SubmissionEquipmentForm from './SubmissionEquipmentForm'
   export default {
-    name: 'CmmsSubmissionEquipmentModal',
+    name: 'SubmissionEquipmentModal',
     components: {
-      CmmsSubmissionEquipmentForm
+      SubmissionEquipmentForm
     },
     data () {
       return {