qinhb 1 год назад
Родитель
Сommit
86fa0298ed

+ 1 - 1
src/views/device/maintenance/components/record-page.vue

@@ -34,7 +34,7 @@ const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
 const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate } = Utils; //按钮权限等工具
-const mType = ref("1")
+const mType = ref("-1")
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const props = defineProps({
   maintenance: {

+ 6 - 5
src/views/device/maintenance/index.vue

@@ -33,14 +33,14 @@
                    icon="el-icon-setting"
                    text
                    v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.maintenance_handle]"
-                   v-if="row.state === 0"
+                   v-if="row.type === '1' && row.state === 0"
                    type="primary"
                    :size="size">维护</el-button>
         <el-button disabled
                    icon="el-icon-setting"
                    text
                    v-hasPerm="[ButtonPermKeys.DEVICE.BTNS.maintenance_handle]"
-                   v-if="row.state === 1"
+                   v-if="row.type === '1' && row.state === 1"
                    type="primary"
                    :size="size">维护</el-button>
         <el-button @click="maintenanceList(row)"
@@ -124,7 +124,7 @@
         height="80%"
         @close="dialog2.visible = false"
     >
-      <record-page :maintenance="maintenanceInfo"></record-page>
+      <record-page :maintenance="clickRecord"></record-page>
     </el-dialog>
   </div>
 </template>
@@ -176,6 +176,7 @@ const deviceInfo = (value) => {
   dialog.visible = false
 }
 const maintenanceInfo = ref(null)
+const clickRecord = ref(null)
 const maintenance = (row)=>{
   maintenanceInfo.value = row
   maintenanceInfo.value.maintenanceContent = row.remark
@@ -183,7 +184,7 @@ const maintenance = (row)=>{
   dialog1.visible = true
 }
 const maintenanceList = (row)=>{
-  maintenanceInfo.value = row
+  clickRecord.value = row
   dialog2.visible = true
 }
 const queryUserList = ()=>{
@@ -201,7 +202,7 @@ const maintenanceSubmit =()=>{
           message: data.msg,
           type: "success",
         });
-        maintenanceInfo.value = null
+        //maintenanceInfo.value = null
         dialog1.visible = false
         dataList()
       })