测试完成保养功能

wuxw
1 parent 325bf296
Showing 10 changed files with 74 additions and 110 deletions
src/components/inspection/addMaintainanceItem.vue
src/components/machine/addMachineType.vue
src/components/machine/deleteEquipmentAccount.vue
src/components/machine/editMachineType.vue
src/views/inspection/addMaintainancePlanList.vue
src/views/inspection/editMaintainancePlanList.vue
src/views/machine/editEquipmentAccountList.vue
src/views/machine/equipmentAccountDetailList.vue
src/views/machine/equipmentAccountList.vue
src/views/machine/machineTypeTreeManageList.vue
 <template>
-  <el-dialog :title="$t('maintainanceItem.add.title')" :visible.sync="visible" width="50%" @close="handleClose">
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+  <el-dialog :title="$t('maintainanceItem.add.title')" :visible.sync="visible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
       <el-form-item :label="$t('maintainanceItem.form.itemTitle')" prop="itemTitle">
         <el-input v-model="form.itemTitle" :placeholder="$t('maintainanceItem.form.itemTitlePlaceholder')" />
       </el-form-item>
 <template>
-  <el-dialog
-    :title="$t('machineTypeTree.add')"
-    :visible.sync="dialogVisible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+  <el-dialog :title="$t('common.add')" :visible.sync="dialogVisible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="text-left">
       <el-form-item :label="$t('machineTypeTree.machineTypeName')" prop="machineTypeName">
-        <el-input
-          v-model.trim="form.machineTypeName"
-          :placeholder="$t('machineTypeTree.requiredPlaceholder', {field: $t('machineTypeTree.machineTypeName')})"
-        ></el-input>
+        <el-input v-model.trim="form.machineTypeName"
+          :placeholder="$t('machineTypeTree.requiredPlaceholder', { field: $t('machineTypeTree.machineTypeName') })"></el-input>
       </el-form-item>
       <el-form-item :label="$t('machineTypeTree.machineTypeCode')" prop="machineTypeCode">
-        <el-input
-          v-model.trim="form.machineTypeCode"
-          :placeholder="$t('machineTypeTree.requiredPlaceholder', {field: $t('machineTypeTree.machineTypeCode')})"
-        ></el-input>
+        <el-input v-model.trim="form.machineTypeCode"
+          :placeholder="$t('machineTypeTree.requiredPlaceholder', { field: $t('machineTypeTree.machineTypeCode') })"></el-input>
       </el-form-item>
       <el-form-item :label="$t('machineTypeTree.status')" prop="isEnable">
         <el-radio-group v-model="form.isEnable">
@@ -25,52 +16,33 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item :label="$t('machineTypeTree.importanceLevel')" prop="importanceLevel">
-        <el-select
-          v-model="form.importanceLevel"
-          :placeholder="$t('machineTypeTree.requiredPlaceholder', {field: $t('machineTypeTree.importanceLevel')})"
-          style="width:100%"
-        >
-          <el-option
-            v-for="item in importanceLevels"
-            :key="item.statusCd"
-            :label="item.name"
-            :value="item.statusCd"
-          ></el-option>
+        <el-select v-model="form.importanceLevel"
+          :placeholder="$t('machineTypeTree.requiredPlaceholder', { field: $t('machineTypeTree.importanceLevel') })"
+          style="width:100%">
+          <el-option v-for="item in importanceLevels" :key="item.statusCd" :label="item.name"
+            :value="item.statusCd"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('machineTypeTree.seq')" prop="seq">
-        <el-input-number
-          v-model="form.seq"
-          :placeholder="$t('machineTypeTree.requiredPlaceholder', {field: $t('machineTypeTree.seq')})"
-          controls-position="right"
-          :min="1"
-          style="width:100%"
-        ></el-input-number>
+        <el-input-number v-model="form.seq"
+          :placeholder="$t('machineTypeTree.requiredPlaceholder', { field: $t('machineTypeTree.seq') })"
+          controls-position="right" :min="1" style="width:100%"></el-input-number>
       </el-form-item>
       <el-form-item :label="$t('machineTypeTree.unit')">
-        <el-input
-          v-model.trim="form.unit"
-          :placeholder="$t('machineTypeTree.optionalPlaceholder', {field: $t('machineTypeTree.unit')})"
-        ></el-input>
+        <el-input v-model.trim="form.unit"
+          :placeholder="$t('machineTypeTree.optionalPlaceholder', { field: $t('machineTypeTree.unit') })"></el-input>
       </el-form-item>
       <el-form-item :label="$t('machineTypeTree.warrantyDeadline')">
-        <el-date-picker
-          v-model="form.warrantyDeadline"
-          type="date"
-          :placeholder="$t('machineTypeTree.optionalPlaceholder', {field: $t('machineTypeTree.warrantyDeadline')})"
-          style="width:100%"
-          value-format="yyyy-MM-dd"
-        ></el-date-picker>
+        <el-date-picker v-model="form.warrantyDeadline" type="date"
+          :placeholder="$t('machineTypeTree.optionalPlaceholder', { field: $t('machineTypeTree.warrantyDeadline') })"
+          style="width:100%" value-format="yyyy-MM-dd"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('machineTypeTree.remark')">
-        <el-input
-          v-model.trim="form.remark"
-          type="textarea"
-          :placeholder="$t('machineTypeTree.optionalPlaceholder', {field: $t('machineTypeTree.remark')})"
-        ></el-input>
+        <el-input v-model.trim="form.remark" type="textarea"
+          :placeholder="$t('machineTypeTree.optionalPlaceholder', { field: $t('machineTypeTree.remark') })"></el-input>
       </el-form-item>
     </el-form>
-    
+
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">{{ $t('common.cancel') }}</el-button>
       <el-button type="primary" @click="handleSubmit">{{ $t('common.confirm') }}</el-button>
@@ -103,21 +75,21 @@ export default {
       importanceLevels: [],
       rules: {
         machineTypeName: [
-          { required: true, message: this.$t('machineTypeTree.requiredMessage', {field: this.$t('machineTypeTree.machineTypeName')}), trigger: 'blur' },
-          { max: 30, message: this.$t('machineTypeTree.maxLengthMessage', {length: 30}), trigger: 'blur' }
+          { required: true, message: this.$t('machineTypeTree.requiredMessage', { field: this.$t('machineTypeTree.machineTypeName') }), trigger: 'blur' },
+          { max: 30, message: this.$t('machineTypeTree.maxLengthMessage', { length: 30 }), trigger: 'blur' }
         ],
         machineTypeCode: [
-          { required: true, message: this.$t('machineTypeTree.requiredMessage', {field: this.$t('machineTypeTree.machineTypeCode')}), trigger: 'blur' },
-          { max: 30, message: this.$t('machineTypeTree.maxLengthMessage', {length: 30}), trigger: 'blur' }
+          { required: true, message: this.$t('machineTypeTree.requiredMessage', { field: this.$t('machineTypeTree.machineTypeCode') }), trigger: 'blur' },
+          { max: 30, message: this.$t('machineTypeTree.maxLengthMessage', { length: 30 }), trigger: 'blur' }
         ],
         isEnable: [
-          { required: true, message: this.$t('machineTypeTree.requiredMessage', {field: this.$t('machineTypeTree.status')}), trigger: 'change' }
+          { required: true, message: this.$t('machineTypeTree.requiredMessage', { field: this.$t('machineTypeTree.status') }), trigger: 'change' }
         ],
         importanceLevel: [
-          { required: true, message: this.$t('machineTypeTree.requiredMessage', {field: this.$t('machineTypeTree.importanceLevel')}), trigger: 'change' }
+          { required: true, message: this.$t('machineTypeTree.requiredMessage', { field: this.$t('machineTypeTree.importanceLevel') }), trigger: 'change' }
         ],
         seq: [
-          { required: true, message: this.$t('machineTypeTree.requiredMessage', {field: this.$t('machineTypeTree.seq')}), trigger: 'blur' }
+          { required: true, message: this.$t('machineTypeTree.requiredMessage', { field: this.$t('machineTypeTree.seq') }), trigger: 'blur' }
         ]
       }
     }
 <template>
-  <el-dialog
-    :title="$t('common.confirmOperation')"
-    :visible.sync="dialogVisible"
-    width="30%"
-    @close="handleClose">
+  <el-dialog :title="$t('common.delete')" :visible.sync="dialogVisible" width="30%" @close="handleClose">
     <div class="confirm-content">
-      <el-alert
-        :title="$t('equipmentAccount.confirmDelete')"
-        type="warning"
-        :closable="false"
-        show-icon>
+      <el-alert :title="$t('equipmentAccount.confirmDelete')" type="warning" :closable="false" show-icon>
       </el-alert>
     </div>
     <span slot="footer" class="dialog-footer">
 <template>
-  <el-dialog :title="$t('machineTypeTree.edit')" :visible.sync="dialogVisible" width="50%" @close="handleClose">
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+  <el-dialog :title="$t('machineTypeTree.edit')" :visible.sync="dialogVisible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" class="text-left">
       <el-form-item :label="$t('machineTypeTree.machineTypeName')" prop="machineTypeName">
         <el-input v-model.trim="form.machineTypeName"
           :placeholder="$t('machineTypeTree.requiredPlaceholder', { field: $t('machineTypeTree.machineTypeName') })"></el-input>
@@ -51,7 +51,7 @@
 </template>
 <script>
-import { updateMachineType,listMachineType } from '@/api/machine/machineTypeTreeManageApi'
+import { updateMachineType, listMachineType } from '@/api/machine/machineTypeTreeManageApi'
 import { getDict } from '@/api/community/communityApi'
 import { getCommunityId } from '@/api/community/communityApi'
@@ -123,9 +123,9 @@ export default {
       this._loadMachienType()
     },
     async _loadMachienType() {
-     
-     const res  =  await listMachineType({ communityId: getCommunityId(), typeId: this.form.typeId,page:1,row:1 });
-      this.form = {...res.data[0]}
+
+      const res = await listMachineType({ communityId: getCommunityId(), typeId: this.form.typeId, page: 1, row: 1 });
+      this.form = { ...res.data[0] }
     },
     handleClose() {
       this.$refs.form.resetFields()
 <template>
   <div class="add-maintainance-plan-container">
     <el-card>
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('addMaintainancePlan.title') }}</span>
       </div>
-      <el-form ref="form" :model="addMaintainancePlanInfo" label-width="120px">
+      <el-form ref="form" :model="addMaintainancePlanInfo" label-width="120px" class="text-left">
         <el-row :gutter="20">
           <el-col :span="24">
             <el-form-item :label="$t('addMaintainancePlan.planName')" prop="planName">
 <template>
   <div class="edit-maintainance-plan-container">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('editMaintainancePlan.title') }}</span>
       </div>
-      <el-form ref="form" :model="editMaintainancePlanInfo" label-width="120px">
+      <el-form ref="form" :model="editMaintainancePlanInfo" label-width="120px" class="text-left">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item :label="$t('editMaintainancePlan.planName')" prop="planName">
@@ -203,10 +203,11 @@ export default {
         const { data } = await listMaintainancePlan(params)
         if (data && data.length > 0) {
           Object.assign(this.editMaintainancePlanInfo, data[0])
-          this.editMaintainancePlanInfo.months = data[0].maintainanceMonth.split(',')
-          this.editMaintainancePlanInfo.days = data[0].maintainanceDay.split(',')
+          this.editMaintainancePlanInfo.months = data[0].maintainanceMonth.split(',').map(Number)
+          this.editMaintainancePlanInfo.days = data[0].maintainanceDay.split(',').map(Number)
           this.editMaintainancePlanInfo.everyDays = data[0].maintainanceEveryday
         }
+        console.log(this.editMaintainancePlanInfo)
       } catch (error) {
         this.$message.error(this.$t('editMaintainancePlan.fetchPlanError'))
       }
 <template>
   <div class="edit-equipment-account-container">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <h5>{{ $t('editEquipmentAccount.title') }}</h5>
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('editEquipmentAccount.title') }}</span>
       </div>
       <el-row :gutter="20">
@@ -125,22 +125,20 @@
     </el-card>
     <el-card>
-      <el-row :gutter="20" class="mt-20">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('equipmentAccountDetail.logTitle') }}</span>
+      </div>
+      <el-row :gutter="20" >
         <el-col :span="24">
-          <el-card shadow="never">
-            <div slot="header" class="flex justify-between">
-              <span>{{ $t('equipmentAccountDetail.logTitle') }}</span>
-            </div>
-            <el-table :data="equipmentAccountDetail.elogs" border style="width: 100%">
-              <el-table-column type="index" :label="$t('equipmentAccountDetail.serialNumber')" width="80"
-                align="center" />
-              <el-table-column prop="operatingCode" :label="$t('equipmentAccountDetail.operatingCode')" align="center" />
-              <el-table-column prop="operatingDescriptor" :label="$t('equipmentAccountDetail.operatingDescriptor')"
-                align="center" />
-              <el-table-column prop="createTime" :label="$t('equipmentAccountDetail.createTime')" align="center" />
-              <el-table-column prop="remark" :label="$t('equipmentAccountDetail.remark')" align="center" />
-            </el-table>
-          </el-card>
+          <el-table :data="equipmentAccountDetail.elogs" border style="width: 100%">
+            <el-table-column type="index" :label="$t('equipmentAccountDetail.serialNumber')" width="80"
+              align="center" />
+            <el-table-column prop="operatingCode" :label="$t('equipmentAccountDetail.operatingCode')" align="center" />
+            <el-table-column prop="operatingDescriptor" :label="$t('equipmentAccountDetail.operatingDescriptor')"
+              align="center" />
+            <el-table-column prop="createTime" :label="$t('equipmentAccountDetail.createTime')" align="center" />
+            <el-table-column prop="remark" :label="$t('equipmentAccountDetail.remark')" align="center" />
+          </el-table>
         </el-col>
       </el-row>
     </el-card>
@@ -267,6 +265,7 @@ export default {
   .form-item {
     margin-bottom: 18px;
     text-align: left;
+
     label {
       margin-right: 10px;
     }
@@ -59,7 +59,7 @@
           </el-form>
         </el-card>
-        <el-card class="box-card">
+        <el-card class="box-card margin-top">
           <el-table :data="equipmentAccountInfo.equipmentAccounts" border style="width: 100%"   @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center"></el-table-column>
             <el-table-column prop="machineName" :label="$t('equipmentAccount.machineName')"
@@ -113,7 +113,7 @@
     </el-row>
     <!-- 子组件 -->
-    <delete-equipment-account ref="deleteEquipmentAccount"></delete-equipment-account>
+    <delete-equipment-account ref="deleteEquipmentAccount" @success="listEquipmentAccounts"></delete-equipment-account>
     <view-equipment-account ref="viewEquipmentAccount"></view-equipment-account>
     <print-equipment-account ref="printEquipmentAccount"></print-equipment-account>
     <import-equipment ref="importEquipment"></import-equipment>
@@ -4,18 +4,18 @@
       <el-row :gutter="20">
         <el-col :span="4" style="padding-right:0">
-          <div  class="">
+          <div class="">
             <el-button-group>
-              <el-button type="primary" size="small" @click="openAddParentMachineTypeModal">
+              <el-button type="text" size="small" @click="openAddParentMachineTypeModal">
                 <i class="el-icon-plus"></i>{{ $t('machineTypeTree.addParent') }}
               </el-button>
-              <el-button type="primary" size="small" @click="openAddMachineTypeModal">
+              <el-button type="text" size="small" @click="openAddMachineTypeModal">
                 <i class="el-icon-plus"></i>{{ $t('machineTypeTree.addChild') }}
               </el-button>
-              <el-button type="primary" size="small" @click="openEditMachineTypeModel">
+              <el-button type="text" size="small" @click="openEditMachineTypeModel">
                 <i class="el-icon-edit"></i>{{ $t('machineTypeTree.edit') }}
               </el-button>
-              <el-button type="primary" size="small" @click="openDeleteMachineTypeModel">
+              <el-button type="text" size="small" @click="openDeleteMachineTypeModel">
                 <i class="el-icon-delete"></i>{{ $t('machineTypeTree.delete') }}
               </el-button>
             </el-button-group>
@@ -26,8 +26,8 @@
         </el-col>
         <el-col :span="20">
           <el-card class="box-card">
-            <div slot="header" class="clearfix">
-              <h3>{{ $t('machineTypeTree.detail') }}</h3>
+            <div slot="header" class="flex justify-between">
+              <span>{{ $t('machineTypeTree.detail') }}</span>
             </div>
             <div class="detail-content">
               <el-form label-width="120px">
@@ -82,7 +82,7 @@ import MachineTypeTree from &#39;@/components/machine/machineTypeTree&#39;
 import AddMachineType from '@/components/machine/addMachineType'
 import EditMachineType from '@/components/machine/editMachineType'
 import DeleteMachineType from '@/components/machine/deleteMachineType'
-import {listMachineType} from '@/api/machine/machineTypeTreeManageApi'
+import { listMachineType } from '@/api/machine/machineTypeTreeManageApi'
 export default {
   name: 'MachineTypeTreeManageList',
@@ -145,8 +145,8 @@ export default {
       this.$refs.deleteMachineType.open(this.machineTypeInfo)
     },
     async _loadMachienType() {
-     const res  =  await listMachineType({ communityId: getCommunityId(), typeId: this.machineTypeInfo.typeId,page:1,row:1 });
-      this.machineTypeInfo = {...res.data[0]}
+      const res = await listMachineType({ communityId: getCommunityId(), typeId: this.machineTypeInfo.typeId, page: 1, row: 1 });
+      this.machineTypeInfo = { ...res.data[0] }
     },
     handleSuccess() {
       this.$refs.machineTypeTree.refreshTree()