From 2637821cb7466330f5c612be809531cb65790219 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 04 七月 2025 20:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/base/modules/EamMaintenanceStandardDetailList.vue |  226 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 109 insertions(+), 117 deletions(-)

diff --git a/src/views/eam/base/modules/EamMaintenanceStandardDetailList.vue b/src/views/eam/base/modules/EamMaintenanceStandardDetailList.vue
index 51fcea1..ea3c9f1 100644
--- a/src/views/eam/base/modules/EamMaintenanceStandardDetailList.vue
+++ b/src/views/eam/base/modules/EamMaintenanceStandardDetailList.vue
@@ -21,131 +21,123 @@
 </template>
 
 <script>
-import '@/assets/less/TableExpand.less'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { getAction } from '@api/manage'
+  import '@/assets/less/TableExpand.less'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@api/manage'
 
-export default {
-  name: 'EamMaintenanceStandardDetailList',
-  mixins: [JeecgListMixin],
-  props: {
-    standardId: {
-      type: String,
-      required: true,
-      default: '-1'
-    }
-  },
-  data() {
-    return {
-      description: '淇濆吇鏍囧噯鏄庣粏绠$悊椤甸潰',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '搴忓彿',
-          align: 'center',
-          dataIndex: 'itemCode',
-          width: 60,
-        },
-        {
-          title: '閮ㄤ綅',
-          align: 'center',
-          dataIndex: 'itemPart',
-          width: 200,
-          ellipsis: true,
-        },
-        {
-          title: '淇濆吇椤�',
-          align: 'center',
-          dataIndex: 'itemName',
-          ellipsis: true,
-        },
-        {
-          title: '淇濆吇瑕佹眰',
-          align: 'center',
-          dataIndex: 'itemDemandAlias',
-          ellipsis: true,
-        },
-        {
-          title: '妫�鏌ユ爣鍑嗘垨瑕佹眰',
-          align: 'center',
-          dataIndex: 'itemDemand',
-          ellipsis: true,
-        },
-        {
-          title: '妫�鏌ユ柟娉�',
-          align: 'center',
-          dataIndex: 'checkMethod',
-          ellipsis: true,
-        }
-      ],
-      url: {
-        list: '/eam/eamMaintenanceStandardDetail/list'
+  export default {
+    name: 'EamMaintenanceStandardDetailList',
+    mixins: [JeecgListMixin],
+    props: {
+      standardId: {
+        type: String,
+        required: true,
+        default: '-1'
       }
-    }
-  },
-  watch: {
-    standardId: {
-      immediate: true,
-      handler(val) {
-        if(val) {
-          this.loadData(1)
-        }else {
-          this.clearList();
+    },
+    data() {
+      return {
+        description: '淇濆吇鏍囧噯鏄庣粏绠$悊椤甸潰',
+        // 琛ㄥご
+        columns: [
+          {
+            title: '搴忓彿',
+            align: 'center',
+            dataIndex: 'itemCode',
+            width: 60
+          },
+          {
+            title: '閮ㄤ綅',
+            align: 'center',
+            dataIndex: 'itemPart',
+            ellipsis: true
+          },
+          {
+            title: '淇濆吇椤瑰垎绫�',
+            align: 'center',
+            dataIndex: 'itemCategory_dictText',
+            ellipsis: true
+          },
+          {
+            title: '淇濆吇椤圭洰',
+            align: 'center',
+            dataIndex: 'itemName',
+            ellipsis: true
+          },
+          {
+            title: '淇濆吇瑙勮寖鎴栬姹�',
+            align: 'center',
+            dataIndex: 'itemDemand',
+            ellipsis: true
+          }
+        ],
+        url: {
+          list: '/eam/eamMaintenanceStandardDetail/list'
         }
       }
-    }
-  },
-  created() {
-  },
-  computed: {
-  },
-  methods: {
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error('璇疯缃畊rl.list灞炴��!')
-        return
+    },
+    watch: {
+      standardId: {
+        immediate: true,
+        handler(val) {
+          if (val) {
+            this.loadData(1)
+          } else {
+            this.clearList()
+          }
+        }
       }
-      if(this.standardId && this.standardId === '-1'){
-        this.clearList();
-        return;
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
+    },
+    created() {
+    },
+    computed: {},
+    methods: {
+      loadData(arg) {
+        if (!this.url.list) {
+          this.$message.error('璇疯缃畊rl.list灞炴��!')
+          return
+        }
+        if (this.standardId && this.standardId === '-1') {
+          this.clearList()
+          return
+        }
+        //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+        if (arg === 1) {
+          this.ipagination.current = 1
+        }
+        let params = this.getQueryParams()//鏌ヨ鏉′欢
+        if (!params) {
+          return false
+        }
+        this.dataSource = []
+        params.standardId = this.standardId
+        this.loading = true
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            // console.log(res)
+            //update-begin---author:zhangyafei    Date:20201118  for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+            this.dataSource = res.result.records || res.result
+            if (res.result.total) {
+              this.ipagination.total = res.result.total
+            } else {
+              this.ipagination.total = 0
+            }
+            //update-end---author:zhangyafei    Date:20201118  for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+          } else {
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      clearList() {
+        this.dataSource = []
+        this.selectedRowKeys = []
         this.ipagination.current = 1
       }
-      let params = this.getQueryParams()//鏌ヨ鏉′欢
-      if (!params) {
-        return false
-      }
-      this.dataSource = []
-      params.standardId = this.standardId
-      this.loading = true
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          // console.log(res)
-          //update-begin---author:zhangyafei    Date:20201118  for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
-          this.dataSource = res.result.records || res.result
-          if (res.result.total) {
-            this.ipagination.total = res.result.total
-          } else {
-            this.ipagination.total = 0
-          }
-          //update-end---author:zhangyafei    Date:20201118  for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
-        } else {
-          this.$message.warning(res.message)
-        }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    clearList() {
-      this.dataSource = []
-      this.selectedRowKeys = []
-      this.ipagination.current = 1
-    },
+    }
   }
-}
 </script>
 <style scoped>
-@import '~@assets/less/common.less';
+  @import '~@assets/less/common.less';
 </style>
\ No newline at end of file

--
Gitblit v1.9.3