维保根据原型修改

imcs-ui/src/views/zuihou/repairManger/maintenanceLog/Index.vue

@@ -189,6 +189,7 @@
     methods: {
       editClose() {
         this.dialog.isVisible = false
+        this.search()
       },
       editSuccess() {
         this.search()
@@ -293,6 +294,9 @@
         this.tenantEvent.isVisible = true
       },
       fetch(params = {}) {
+        // 刷新页面checkbox更新
+        this.tableKey = !this.tableKey
+        this.selection = []
         this.loading = true
         if (this.queryParams.timeRange) {
           this.queryParams.map.createTime_st = this.queryParams.timeRange[0]

imcs-ui/src/views/zuihou/repairManger/maintenanceLog/components/Edit.vue

@@ -18,22 +18,12 @@
       <!--下次维保时间-->
       <el-form-item
         :label="$t(&quot;resource.table.repair.maintenanceTime&quot;)"
-        prop="maintenanceStartTime"
+        prop="maintenanceTime"
       >
         <el-date-picker
-          v-model="maintenance.maintenanceStartTime"
+          v-model="maintenance.maintenanceTime"
           type="datetime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t(&quot;common.pleaseSelect&quot;)"
-          style="width: 50%;"
-          :picker-options="pickerOptions"
-        />
-      </el-form-item>
-      <el-form-item prop="maintenanceEndTime">
-        <el-date-picker
-          v-model="maintenance.maintenanceEndTime"
-          type="datetime"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd"
           :placeholder="$t(&quot;common.pleaseSelect&quot;)"
           style="width: 50%;"
           :picker-options="pickerOptions"
@@ -154,10 +144,7 @@
         width: this.initWidth(),
         confirmDisabled: false,
         rules: {
-          maintenanceStartTime: [
-            {required: true, message: this.$t("rules.require"), trigger: 'blur'}
-          ],
-          maintenanceEndTime: [
+          maintenanceTime: [
             {required: true, message: this.$t("rules.require"), trigger: 'blur'}
           ]
         },
@@ -214,6 +201,7 @@
         }
       },
       setMaintenanceInfo(data,opeType) {
+          console.log(data)
         this.type = opeType
         if(opeType==='add'){
           this.maintenance.repairId = data

imcs-ui/src/views/zuihou/repairManger/repair/Index.vue

@@ -133,23 +133,17 @@
         width="200"
         align="center"
       >
-        <template slot-scope="{ row }">
+        <template slot-scope="{ row }" id="">
           <el-progress
             :text-inside="true"
             :stroke-width="24"
             :percentage="row.process"
             show-text="true"
             :format="setItemText(row)"
+            :color="setItemColor(row)"
           />
         </template>
       </el-table-column>
-      <!--维保开始时间-->
-      <el-table-column
-        prop="repairStartTime"
-        :label="$t(&quot;resource.table.repair.repairStartTime&quot;)"
-        :show-overflow-tooltip="true"
-        width="120"
-      />
       <!--维保结束时间-->
       <el-table-column
         prop="repairEndTime"
@@ -179,23 +173,10 @@
       >
         <template slot-scope="{ row }">
           <el-tag :type="row.status=='1' ? 'success' : 'danger'">
-            {{ row.status=='1' ? $t("common.show") : $t("common.hide") }}
+            {{ row.status=='1' ? '启用' : '冻结' }}
           </el-tag>
         </template>
       </el-table-column>
-      <!--备注-->
-      <el-table-column
-        prop="remark"
-        :label="$t(&quot;resource.table.repair.remark&quot;)"
-        :show-overflow-tooltip="true"
-        width="120"
-      />
-      <!--排序-->
-      <el-table-column
-        prop="weight"
-        :label="$t(&quot;resource.table.repair.weight&quot;)"
-        width="50px"
-      />
       <!--创建时间-->
       <el-table-column
         prop="createTime"
@@ -210,7 +191,7 @@
       />
       <!--操作人-->
       <el-table-column
-        prop="createUserDesc"
+        prop="operationName"
         :label="$t(&quot;resource.table.repair.createUserDesc&quot;)"
         width="180px"
       />
@@ -285,9 +266,10 @@
       :visible.sync="equipmentVisible"
       width="80%"
       custom-class="dialogNoTop"
+      @close="editEquipmentClose"
     >
-      <!--【	工作位置管理】 -->
-      <equipmentPosition
+      <!--【	维保】 -->
+      <maintenanceLog
         :row-data="rowData"
         :maintenance-id="maintenanceId"
         @close="editEquipmentClose"
@@ -309,7 +291,7 @@
   // 【维保计划管理】-API
   import repairApi from "@/api/resourceProductMgr/repair"
   // 【工作位置管理】组件
-  import equipmentPosition from "@/views/zuihou/repairManger/maintenanceLog/Index"
+  import maintenanceLog from "@/views/zuihou/repairManger/maintenanceLog/Index"
 
   // 【弹出框】elementui组件
   import elDragDialog from '@/directive/el-drag-dialog'
@@ -321,7 +303,7 @@
   export default {
     name: "Repair",
     directives: {elDragDialog},
-    components: {Pagination, TenantEdit, TenantView,TenantEvent,equipmentPosition},
+    components: {Pagination, TenantEdit, TenantView,TenantEvent,maintenanceLog},
     props: {},
     data() {
       return {
@@ -386,8 +368,9 @@
       },
       editEquipmentClose(){
         this.equipmentVisible = false
+        this.search()
       },
-      editEquipmentSuccess(data){
+      editEquipmentSuccess(){
         this.search()
       },
       setItemText(row) {
@@ -395,14 +378,23 @@
           return row.downTime
         }
       },
+      setItemColor(row) {
+        return () => {
+            if(row.expireFlag == 1){
+              return '#FF0000'
+            }
+        }
+      },
       viewClose() {
         this.tenantViewVisible = false
       },
       editClose() {
         this.dialog.isVisible = false
+        this.fetch()
       },
       eventClose() {
         this.tenantEvent.isVisible = false
+        this.fetch()
       },
       editSuccess() {
         this.search()
@@ -510,6 +502,8 @@
         this.tenantEvent.isVisible = true
       },
       fetch(params = {}) {
+        this.tableKey = !this.tableKey
+        this.selection = []
         this.loading = true
         if (this.queryParams.timeRange) {
           this.queryParams.map.createTime_st = this.queryParams.timeRange[0]

imcs-ui/src/views/zuihou/repairManger/repair/components/Edit.vue

@@ -57,34 +57,24 @@
             v-model="tenant.status"
             label="1"
           >
-            {{ $t("common.show") }}
+            启用
           </el-radio>
           <el-radio
             v-model="tenant.status"
             label="0"
           >
-            {{ $t("common.hide") }}
+            冻结
           </el-radio>
         </template>
       </el-form-item>
-      <!--修改排序-->
-      <el-form-item
-        :label="$t(&quot;resource.table.repair.weight&quot;)+&quot;：&quot;"
-        prop="weight"
-      >
-        <el-input-number
-          v-model="tenant.weight"
-          :min="0"
-          :max="9999999999"
-        />
-      </el-form-item>
+
       <!--备注-->
       <el-form-item
         :label="$t(&quot;resource.table.repair.remark&quot;)"
         prop="company"
       >
         <el-input
-          v-model="tenant.remark"
+          v-model="tenant.remark" type="textarea"
           :placeholder="$t(&quot;common.pleaseEnter&quot;)"
         />
       </el-form-item>