Ver código fonte

设备维护及点检更改

qinhb 11 meses atrás
pai
commit
a16295410d

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

@@ -34,113 +34,116 @@ 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 crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const props = defineProps({
-  maintenanceId: {
-    type: Number,
+  maintenance: {
+    type: Object,
     default: () => {
-      return 0;
+      return {};
     }
   }
 })
 
 watch?.(
-    () => props.maintenanceId,
+    () => props.maintenance,
     (newVal) => {
-      search.value.maintenanceId = newVal
+      search.value.maintenanceId = newVal.id
+      mType.value = newVal.type
+      handleOption()
       dataList()
     }
 );
-
-// 设置表格列或者其他自定义的option
-option.value = Object.assign(option.value, {
-  delBtn: false,
-  selection: false,
-  search: false,
-  editBtn: false,
-  addBtn: false,
-  viewBtn: false,
-  menu: false,
-  column: [
-    {
-      label: "设备编号",
-      prop: "deviceNo",
-      width: '120',
-      rules: [
-        {
-          required: true,
-          message: "设备编号不能为空",
-          trigger: "trigger",
-        },
-      ],
-    },
-    {
-      label: "设备名称",
-      prop: "deviceName",
-      width: '120',
-      rules: [
-        {
-          required: true,
-          message: "设备名称不能为空",
-          trigger: "trigger",
+const handleOption =()=>{
+  // 设置表格列或者其他自定义的option
+  option.value = Object.assign(option.value, {
+    delBtn: false,
+    selection: false,
+    search: false,
+    editBtn: false,
+    addBtn: false,
+    viewBtn: false,
+    menu: false,
+    column: [
+      {
+        label: "设备编号",
+        prop: "deviceNo",
+        width: '120',
+        rules: [
+          {
+            required: true,
+            message: "设备编号不能为空",
+            trigger: "trigger",
+          },
+        ],
+      },
+      {
+        label: "设备名称",
+        prop: "deviceName",
+        width: '120',
+        rules: [
+          {
+            required: true,
+            message: "设备名称不能为空",
+            trigger: "trigger",
+          },
+        ],
+      },
+      /*{
+        label: "设备类型",
+        prop: "deviceType",
+        type: "select",
+        width: '100',
+        dicUrl:
+            dictDataUtil.request_url +
+            dictDataUtil.TYPE_CODE.device_type,
+        props: {
+          label: "dictLabel",
+          value: "dictValue",
         },
-      ],
-    },
-    {
-      label: "设备类型",
-      prop: "deviceType",
-      type: "select",
-      width: '100',
-      dicUrl:
-        dictDataUtil.request_url +
-        dictDataUtil.TYPE_CODE.device_type,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
+      },*/
+      /* {
+         label: "设备位置",
+         width: '150',
+         prop: "devicePosition",
+       },*/
+      /*{
+        label: "维护类型",
+        prop: "type",
+        type: "select",
+        editDisplay: false,
+        dicData: [{label: '点检',value:'0'},{label: '保养',value:'1'}]
+      },*/
+      {
+        label: mType.value === "1" ? "维护内容" : "点检内容",
+        prop: "maintenanceContent",
+        minRows: 2, //最小行/最小值
+        maxlength: 512, //最大输入长度
+        overHidden: true
       },
-    },
-   /* {
-      label: "设备位置",
-      width: '150',
-      prop: "devicePosition",
-    },*/
-    {
-      label: "维护类型",
-      prop: "type",
-      type: "select",
-      editDisplay: false,
-      dicData: [{label: '点检',value:'0'},{label: '保养',value:'1'}]
-    },
-    {
-      label: "维护内容",
-      prop: "maintenanceContent",
-      minRows: 2, //最小行/最小值
-      maxlength: 512, //最大输入长度
-      overHidden: true
-    },
-    {
-      label: "维护人",
-      prop: "maintenanceUser",
-    },
-    {
-      label: "维护结果",
-      prop: "result",
-      search: true,
-      type: "select",
-      editDisplay: false,
-      dicData: [{label: '正常',value:"0"},{label: '报故',value:"1"}]
-    },
-    {
-      label: "维护时间",
-      width: '180',
-      prop: "maintenanceTime",
-    },
-  ],
-});
-
+      {
+        label: mType.value === "1" ? "维护人员" : "点检人员",
+        prop: "maintenanceUser",
+      },
+      {
+        label: mType.value === "1" ? "维护结果" : "点检结果",
+        prop: "result",
+        search: true,
+        type: "select",
+        editDisplay: false,
+        dicData: mType.value === "1" ? [{label: '正常',value:"0"},{label: '报故',value:"1"}] : [{label: '合格',value:"0"},{label: '不合格',value:"1"}]
+      },
+      {
+        label: mType.value === "1" ? "维护时间" : "点检时间",
+        width: '180',
+        prop: "maintenanceTime",
+      },
+    ],
+  })
+}
 onMounted?.(() => {
-  search.value.maintenanceId = props.maintenanceId
+  search.value.maintenanceId = props.maintenance.id
+  handleOption()
   dataList();
 });
 </script>

+ 1 - 1
src/views/device/maintenance/index.vue

@@ -124,7 +124,7 @@
         height="80%"
         @close="dialog2.visible = false"
     >
-      <record-page :maintenanceId="maintenanceInfo.id"></record-page>
+      <record-page :maintenance="maintenanceInfo"></record-page>
     </el-dialog>
   </div>
 </template>