维修管理优化

src/views/module_cmms/repairManage/RepairManageList.vue

@@ -5,19 +5,29 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备名称">
-              <a-input placeholder="请输入设备名称" v-model="queryParam.equipmentname"></a-input>
+            <a-form-item label="工单编号">
+              <a-input placeholder="请输入工单编号" v-model="queryParam.repaircode"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="优先级">
-              <j-dict-select-tag  v-model="queryParam.priority"  placeholder="请输入优先级" dictCode="repair_priority"/>
+            <a-form-item label="工单名称">
+              <a-input placeholder="请输入工单名称" v-model="queryParam.repairname"></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" placeholder="请选择设备" dict="tpm_equipment,equipmentname,id" />
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="优先级">
+                <j-dict-select-tag  v-model="queryParam.priority"  placeholder="请输入优先级" dictCode="repair_priority"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="待办人">
-                <a-input placeholder="请输入待办人" v-model="queryParam.repairuser"></a-input>
+                <j-dict-select-tag v-model="queryParam.repairuser" placeholder="请选择待办人" dictCode="sys_user,realname,id"/>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -49,26 +59,26 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('维修工单')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('维修工单')">导出</a-button> -->
+      <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
+      </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <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"
@@ -80,9 +90,9 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap cmms-table"
         @change="handleTableChange">
+        <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -117,9 +127,9 @@
         </span>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" :disabled="record.repairstatus === '1'">编辑</a>
           <a-divider type="vertical" />
-          <a @click="handleDisptch(record)">派单</a>
+          <a @click="handleDisptch(record)" :disabled="record.repairstatus === '1'">派单</a>
           <!--  :disabled="record.repairuser" -->
 
           <a-divider type="vertical" />
@@ -130,11 +140,12 @@
                 <a @click="handleDrawerDetail(record)">详情</a>
               </a-menu-item>
               <a-menu-item>
-                <a @click="handleFreeze(record)">冻结</a>
+                <a v-if="record.repairstatus === '0'" @click="handleFreeze(record, '1')">冻结</a>
+                <a v-if="record.repairstatus === '1'" @click="handleFreeze(record, '0')">解冻</a>
               </a-menu-item>
-              <a-menu-item>
+              <a-menu-item :disabled="record.repairstatus === '1'">
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
+                  <a :disabled="record.repairstatus === '1'">删除</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
@@ -153,6 +164,7 @@
 
 <script>
 
+  import { putAction } from '@/api/manage'
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -324,8 +336,37 @@
         this.$refs.modalForm.dispatch(record);
       },
       // 冻结
-      handleFreeze(record){
-        
+      handleFreeze(record, val){
+        var title, content
+        var that = this
+        if(val === '0'){
+          // 当前是1 冻结状态 是解冻方法
+          title = '是否解冻此工单?'
+          content = '解冻后可进行正常维修操作'
+        }
+        if(val === '1'){
+          // 当前是0 正常状态 是冻结方法
+          title = '是否冻结此工单?'
+          content = '冻结后不可进行任何操作'
+        }
+        this.$confirm({
+          title: title,
+          content: content,
+          onOk() {
+            record.repairstatus = val
+            putAction(that.url.freeze,record).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.loadData()
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          },
+          onCancel() {},
+        });
       },
       customCellDetail(record){
         return {

src/views/module_cmms/repairMy/RepairMyList.vue

@@ -5,21 +5,31 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备名称">
-              <a-input placeholder="请输入设备名称" v-model="queryParam.equipmentname"></a-input>
+            <a-form-item label="工单编号">
+              <a-input placeholder="请输入工单编号" v-model="queryParam.repaircode"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="优先级">
-              <j-dict-select-tag  v-model="queryParam.priority"  placeholder="请输入优先级" dictCode="repair_priority"/>
+            <a-form-item label="工单名称">
+              <a-input placeholder="请输入工单名称" v-model="queryParam.repairname"></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" placeholder="请选择设备" dict="tpm_equipment,equipmentname,id" />
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="待办人">
-                <a-input placeholder="请输入待办人" v-model="queryParam.repairuser"></a-input>
+              <a-form-item label="优先级">
+                <j-dict-select-tag  v-model="queryParam.priority"  placeholder="请输入优先级" dictCode="repair_priority"/>
               </a-form-item>
             </a-col>
+            <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="待办人">
+                <j-dict-select-tag v-model="queryParam.repairuser" placeholder="请选择待办人" dictCode="sys_user,realname,id"/>
+              </a-form-item>
+            </a-col> -->
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="维修状态">
                 <j-dict-select-tag  v-model="queryParam.status"  placeholder="请选择维修状态" dictCode="repair_handle_status"/>
@@ -49,12 +59,12 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('维修工单')">导出</a-button>
+      <!-- <a-button type="primary" icon="download" @click="handleExportXls('维修工单')">导出</a-button> -->
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload> -->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
       <!-- <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>
@@ -65,10 +75,10 @@
 
     <!-- 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"
@@ -111,14 +121,14 @@
         </span>
         <span slot="status" slot-scope="text, record">
           <a-tag v-if="record.status === '0'" color="orange">{{ text }}</a-tag>
-          <a-tag v-if="record.status === '1' || record.priority === '2'" color="blue">{{ text }}</a-tag>
+          <a-tag v-if="record.status === '1' || record.status === '2'" color="blue">{{ text }}</a-tag>
           <a-tag v-if="record.status === '3'">{{ text }}</a-tag>
         </span>
         
         <span slot="action" slot-scope="text, record">
-          <a @click="handleFeedback(record)">维修反馈</a>
-          <a-divider type="vertical" />
-          <a @click="handleDetail(record)">详情</a>
+          <a @click="handleFeedback(record)" :disabled="record.repairstatus === '1'">维修反馈</a>
+          <!-- <a-divider type="vertical" /> -->
+          <!-- <a @click="handleDetail(record)">详情</a> -->
         </span>
 
       </a-table>
@@ -146,7 +156,7 @@
         description: '维修工单管理页面',
         // 表头
         columns: [
-          {
+        {
             title: '序号',
             dataIndex: '',
             key:'rowIndex',
@@ -163,9 +173,11 @@
             scopedSlots: { customRender: 'priority' }
           },
           {
-            title:'维修工单编号',
+            title:'工单编号',
             align:"center",
-            dataIndex: 'repaircode'
+            dataIndex: 'repaircode',
+            // customCell: (record, index)=>{ return this.customCellDetail(record, index, 'customerName')}
+            // customCell: this.customCellDetail
           },
           {
             title:'工单名称',
@@ -177,11 +189,11 @@
             align:"center",
             dataIndex: 'equipmentname'
           },
-          // {
-          //   title:'设备编号',
-          //   align:"center",
-          //   dataIndex: 'equipmentcode'
-          // },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'equipmentcode'
+          },
           {
             title:'故障日期',
             align:"center",
@@ -196,6 +208,16 @@
             dataIndex: 'faultdesc'
           },
           {
+            title:'录入人',
+            align:"center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'待办人',
+            align:"center",
+            dataIndex: 'repairuser_dictText'
+          },
+          {
             title:'维修时间',
             align:"center",
             dataIndex: 'repairdate',
@@ -208,26 +230,22 @@
             align:"center",
             dataIndex: 'feedback'
           },
-          {
-            title:'维修结果？',
-            align:"center",
-            dataIndex: 'result'
-          },
-          {
-            title:'工单状态',
-            align:"center",
-            dataIndex: 'repairstatus_dictText'
-          },
-          {
-            title:'关联ID：巡检、点检、保养的ID',
-            align:"center",
-            dataIndex: 'relid'
-          },
-          {
-            title:'录入人',
-            align:"center",
-            dataIndex: 'createBy'
-          },
+
+          // {
+          //   title:'设备ID',
+          //   align:"center",
+          //   dataIndex: 'equipmentid'
+          // },
+          // {
+          //   title:'维修结果',
+          //   align:"center",
+          //   dataIndex: 'result'
+          // },
+          // {
+          //   title:'关联ID',
+          //   align:"center",
+          //   dataIndex: 'relid'
+          // },
           // {
           //   title:'创建时间',
           //   align:"center",
@@ -242,6 +260,11 @@
           //   dataIndex: 'remark'
           // },
           {
+            title:'工单状态',
+            align:"center",
+            dataIndex: 'repairstatus_dictText'
+          },
+          {
             title:'维修状态',
             align:"center",
             fixed:"right",
@@ -254,7 +277,7 @@
             dataIndex: 'action',
             align:"center",
             fixed:"right",
-            width:147,
+            width:152,
             scopedSlots: { customRender: 'action' }
           }
         ],

src/views/module_cmms/repairMy/modules/RepairMyForm.vue

@@ -3,12 +3,12 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-model-item label="维修工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repaircode">
               <a-input v-model="model.repaircode" placeholder="请输入维修工单编号" disabled></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-model-item label="维修工单名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairname">
               <a-input v-model="model.repairname" placeholder="请输入工单名称" disabled></a-input>
             </a-form-model-item>
@@ -18,14 +18,14 @@
               <a-input v-model="model.equipmentname" placeholder="请输入设备名称" disabled></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="故障日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultdate">
               <j-date placeholder="请选择故障日期" v-model="model.faultdate"  style="width: 100%" disabled/>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="故障描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultdesc">
-              <a-input v-model="model.faultdesc" placeholder="请输入故障描述" disabled></a-input>
+              <a-textarea v-model="model.faultdesc" placeholder="请输入故障描述" disabled></a-textarea>
             </a-form-model-item>
           </a-col>
           <!-- <a-col :span="24">
@@ -35,12 +35,12 @@
           </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="维修反馈" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="feedback">
-              <a-input v-model="model.feedback" placeholder="请输入维修反馈"  ></a-input>
+              <a-textarea v-model="model.feedback" placeholder="请输入维修反馈"  ></a-textarea>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="维修时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairdate">
-              <j-date placeholder="请选择维修时间" v-model="model.repairdate"  style="width: 100%" />
+              <j-date placeholder="请选择维修时间" v-model="model.repairdate"  style="width: 100%" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -55,7 +55,7 @@
           </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"></a-input>
+              <a-textarea v-model="model.remark" placeholder="请输入备注"></a-textarea>
             </a-form-model-item>
           </a-col>
         </a-row>