Merge remote-tracking branch 'origin/master'

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(record)">反馈</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(record) {
+        this.$refs.modalFormFK.title = "送检信息反馈";
+        this.$refs.modalFormFK.disableSubmit = false;
+        this.$refs.modalFormFK.fankui(record.id);
       }
     }
   }

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: {

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 {

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 {

src/views/module_cmms/submission/modulesFK/SubmissionEquipmentFormFK.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="center">
+    <a-table
+      ref="table"
+      size="small"
+      :scroll="{x:true}"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="sjsbdataPoint"
+      :pagination="false"
+      class="j-table-force-nowrap">
+    </a-table>
+
+  </div>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import SubmissionEquipmentModalFK from "@views/module_cmms/submission/modulesFK/SubmissionEquipmentModalFK";
+import {getAction, httpAction} from "@api/manage";
+
+export default {
+  name: 'SubmissionEquipmentformFK',
+  mixins:[JeecgListMixin, mixinDevice],
+  components: {
+    SubmissionEquipmentModalFK
+  },
+  data () {
+    return {
+      //送检工单设备查询参数
+      queryParam: {},
+      // 送检设备及相关数据
+      sjsbdataPoint: [],
+      model:{
+      },
+      description: '送检工单设备表管理页面',
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key:'rowIndex',
+          width:60,
+          align:"center",
+          customRender:function (t,r,index) {
+            return parseInt(index)+1;
+          }
+        },
+        {
+          title:'送检工单id',
+          align:"center",
+          dataIndex: 'cmmsSubmissionId'
+        },
+        {
+          title:'设备',
+          align:"center",
+          dataIndex: 'equipmentid_dictText'
+        },
+        {
+          title:'检定日期',
+          align:"center",
+          dataIndex: 'submissionDate'
+        },
+        {
+          title:'检定结果',
+          align:"center",
+          dataIndex: 'submissionResult_dictText'
+        },
+        {
+          title:'有效日期',
+          align:"center",
+          dataIndex: 'submissionEffectiveDate'
+        },
+        {
+          title:'班组确认',
+          align:"center",
+          dataIndex: 'teamConfirm'
+        },
+        {
+          title:'备注',
+          align:"center",
+          dataIndex: 'remark'
+        },
+        {
+          title:'送检状态',
+          align:"center",
+          dataIndex: 'submissionStatus_dictText'
+        },
+        {
+          title:'送回日期',
+          align:"center",
+          dataIndex: 'submissionReturnDate'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align:"center",
+          fixed:"right",
+          width:147,
+          scopedSlots: { customRender: 'fk' }
+        }
+      ],
+      url: {
+        list: "/cmmsSubmissionEquipment/cmmsSubmissionEquipment/list",
+
+      },
+    }
+  },
+  // created() {
+  //   // 获取送检设备及相关数据
+  //   // const cmmsSubmissionId = { cmmsSubmissionId: '1752140648575492098' };
+  //   // this.getSJSBOptions(cmmsSubmissionId)
+  // },
+  methods: {
+    getSJSBOptions(cmmsSubmissionId) {
+      getAction(this.url.list, {cmmsSubmissionId:cmmsSubmissionId}).then((res) => {
+        this.sjsbdataPoint = res.result.records
+      })
+    },
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>

src/views/module_cmms/submission/modulesFK/SubmissionEquipmentModalFK.vue

@@ -0,0 +1,67 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <SubmissionEquipmentFormFK ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></SubmissionEquipmentFormFK>
+  </j-modal>
+</template>
+
+<script>
+
+import SubmissionEquipmentFormFK from './SubmissionEquipmentFormFK'
+export default {
+  name: 'SubmissionEquipmentModalFK',
+  components: {
+    SubmissionEquipmentFormFK
+  },
+  data () {
+    return {
+      title:'',
+      width:1200,
+      visible: false,
+      disableSubmit: false,
+      cmmsSubmissionId:''
+    }
+  },
+  methods: {
+    fankui(id){
+      this.visible=true
+      this.$nextTick(()=>{
+        this.$refs.realForm.getSJSBOptions(id);
+      })
+    },
+    // add () {
+    //   this.visible=true
+    //   this.$nextTick(()=>{
+    //     this.$refs.realForm.add();
+    //   })
+    // },
+    // edit (record) {
+    //   this.visible=true
+    //   this.$nextTick(()=>{
+    //     this.$refs.realForm.edit(record);
+    //   })
+    // },
+    close () {
+      this.$emit('close');
+      this.visible = false;
+    },
+    handleOk () {
+      this.$refs.realForm.submitForm();
+    },
+    submitCallback(){
+      this.$emit('ok');
+      this.visible = false;
+    },
+    handleCancel () {
+      this.close()
+    }
+  }
+}
+</script>

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 {

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;
             })
           }
-         
+
         })
       },
     }

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 {

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 {

src/views/module_cmms/upkeep/UpkeepList.vue

@@ -18,20 +18,20 @@
       </a-upload> -->
       <!-- 高级查询区域 -->
       <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
+      </a-dropdown> -->
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
         <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+      </div> -->
 
       <a-table
         ref="table"
@@ -43,7 +43,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
@@ -68,10 +67,11 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)">反馈</a>
+          <!-- <a @click="handleEdit(record)">编辑</a> -->
 
-          <a-divider type="vertical" />
-          <a-dropdown>
+          <!-- <a-divider type="vertical" /> -->
+          <!-- <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
               <a-menu-item>
@@ -83,7 +83,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -122,35 +122,30 @@
             }
           },
           {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
-          },
-          {
             title:'保养工单编号',
             align:"center",
             dataIndex: 'upkeepcode'
           },
-          {
-            title:'保养名称(标题)',
-            align:"center",
-            dataIndex: 'upkeepname'
-          },
-          {
-            title:'保养计划ID',
-            align:"center",
-            dataIndex: 'upkeepplanid'
-          },
-          {
-            title:'保养工作项目ID',
-            align:"center",
-            dataIndex: 'upkeepprojid'
-          },
-          {
-            title:'工作项目名称',
-            align:"center",
-            dataIndex: 'projectname'
-          },
+          // {
+          //   title:'保养名称(标题)',
+          //   align:"center",
+          //   dataIndex: 'upkeepname'
+          // },
+          // {
+          //   title:'保养计划ID',
+          //   align:"center",
+          //   dataIndex: 'upkeepplanid'
+          // },
+          // {
+          //   title:'保养工作项目ID',
+          //   align:"center",
+          //   dataIndex: 'upkeepprojid'
+          // },
+          // {
+          //   title:'工作项目名称',
+          //   align:"center",
+          //   dataIndex: 'projectname'
+          // },
           {
             title:'计划名称',
             align:"center",
@@ -161,46 +156,51 @@
             align:"center",
             dataIndex: 'address'
           },
-          {
-            title:'厂商名称',
-            align:"center",
-            dataIndex: 'supplier'
-          },
-          {
-            title:'厂商电话',
-            align:"center",
-            dataIndex: 'suppliertel'
-          },
-          {
-            title:'联系人',
-            align:"center",
-            dataIndex: 'linker'
-          },
-          {
-            title:'联系人电话',
-            align:"center",
-            dataIndex: 'linkertel'
-          },
+          // {
+          //   title:'厂商名称',
+          //   align:"center",
+          //   dataIndex: 'supplier'
+          // },
+          // {
+          //   title:'厂商电话',
+          //   align:"center",
+          //   dataIndex: 'suppliertel'
+          // },
+          // {
+          //   title:'联系人',
+          //   align:"center",
+          //   dataIndex: 'linker'
+          // },
+          // {
+          //   title:'联系人电话',
+          //   align:"center",
+          //   dataIndex: 'linkertel'
+          // },
           {
             title:'负责人',
             align:"center",
-            dataIndex: 'chargeruser'
-          },
-          {
-            title:'描述',
-            align:"center",
-            dataIndex: 'upkeepdesc'
+            dataIndex: 'chargeruser_dict'
           },
+          // {
+          //   title:'描述',
+          //   align:"center",
+          //   dataIndex: 'upkeepdesc'
+          // },
           {
             title:'状态：0待处理、1已通知、2未执行、3未完成、4已完成',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'status_dict'
           },
           {
-            title:'处理意见',
+            title:'备注',
             align:"center",
-            dataIndex: 'opinion'
+            dataIndex: 'remark'
           },
+          // {
+          //   title:'处理意见',
+          //   align:"center",
+          //   dataIndex: 'opinion'
+          // },
           {
             title: '操作',
             dataIndex: 'action',

src/views/module_cmms/upkeepPlan/UpkeepPlanList.vue

@@ -29,10 +29,16 @@
             </a-form-item>
           </a-col> -->
           <template v-if="toggleSearchStatus">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="保养项编号">
                 <a-input placeholder="请输入保养项编号" v-model="queryParam.itemcode"></a-input>
               </a-form-item>
+            </a-col> -->
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="设备">
+                <j-search-select-tag v-model="queryParam.equipmentid" dict="tpm_equipment,equipmentname,id"  placeholder="请选择设备"/>
+                <!-- <a-input placeholder="请输入保养项编号" v-model="queryParam.itemcode"></a-input> -->
+              </a-form-item>
             </a-col>
           </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -361,11 +367,14 @@
             httpurl+=that.url.edit;
             if (record.status == 1) {
               that.model.id = record.id
+              that.model.equipmentid = record.equipmentid
               that.model.status = 0
             } else {
               that.model.id = record.id
+              that.model.equipmentid = record.equipmentid
               that.model.status = 1
             }
+            console.log("0101",that.model)
             httpAction(httpurl,that.model,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);