From c07768e5916aefa5679783da0ebf875e608fddff Mon Sep 17 00:00:00 2001
From: zhen <1173776308@qq.com>
Date: Mon, 22 Jul 2024 14:10:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/leger/dynamicledger.vue       | 3 ++-
 src/views/leger/equipmentledger.vue     | 3 ++-
 src/views/leger/toolinventoryrecord.vue | 3 ++-
 src/views/smart/operationticket.vue     | 4 ++--
 src/views/smart/workpermit.vue          | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/leger/dynamicledger.vue b/src/views/leger/dynamicledger.vue
index a72289f..3a37675 100644
--- a/src/views/leger/dynamicledger.vue
+++ b/src/views/leger/dynamicledger.vue
@@ -47,7 +47,8 @@ export default {
         calcHeight: 210,
         align: 'center',
         searchShow: true,
-        searchMenuSpan: 22,
+        searchMenuSpan: 24,
+        searchMenuPosition:'right',
         searchBtnText: '查询',
         emptyBtnText: '重置',
         tip: false,
diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue
index 808f6a2..a59225d 100644
--- a/src/views/leger/equipmentledger.vue
+++ b/src/views/leger/equipmentledger.vue
@@ -89,7 +89,8 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           calcHeight: 210,
           align: 'center',
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 18,
+          searchMenuPosition:'right',
           tip: false,
           border: true,
           index: false,
diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue
index 9a59f85..7bd302e 100644
--- a/src/views/leger/toolinventoryrecord.vue
+++ b/src/views/leger/toolinventoryrecord.vue
@@ -85,7 +85,8 @@
           calcHeight: 210,
           align: 'center',
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
+          searchMenuPosition:'right',
           tip: false,
           border: true,
           index: false,
diff --git a/src/views/smart/operationticket.vue b/src/views/smart/operationticket.vue
index 1586428..059a2d6 100644
--- a/src/views/smart/operationticket.vue
+++ b/src/views/smart/operationticket.vue
@@ -112,7 +112,8 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
           align: 'center',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 22,
+          searchMenuSpan: 24,
+          searchMenuPosition:'right',
           tip: false,
           border: true,
           index: true,
@@ -713,5 +714,4 @@ import {getList, getDetail, add, update, remove, closeticket} from "@/api/smart/
 </script>
 
 <style>
-
 </style>
diff --git a/src/views/smart/workpermit.vue b/src/views/smart/workpermit.vue
index cd9c247..946cbaa 100644
--- a/src/views/smart/workpermit.vue
+++ b/src/views/smart/workpermit.vue
@@ -112,7 +112,8 @@
           align: 'center',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 22,
+          searchMenuSpan: 24,
+          searchMenuPosition:'right',
           searchBtnText: '查询',
           emptyBtnText: '重置',
           tip: false,

From 1517ea3dfaece4d70f0577d43e40f6eaf9952bc8 Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Mon, 22 Jul 2024 14:12:31 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4=20=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/spares/materialclasscode.js         |  64 ------
 src/views/inspection/inspectionobject.vue   |   5 +-
 src/views/inspection/inspectionplan.vue     |   3 +-
 src/views/inspection/inspectionroute.vue    |   3 +-
 src/views/inspection/inspectiontasks.vue    |   1 +
 src/views/spares/manufacturerinfo.vue       |   5 +-
 src/views/spares/material.vue               |   3 +-
 src/views/spares/materialclasscode.vue      | 225 --------------------
 src/views/spares/materialclassification.vue |   5 +-
 src/views/spares/supplierinfo.vue           |   5 +-
 src/views/spares/warehouse.vue              |   5 +-
 11 files changed, 27 insertions(+), 297 deletions(-)
 delete mode 100644 src/api/spares/materialclasscode.js
 delete mode 100644 src/views/spares/materialclasscode.vue

diff --git a/src/api/spares/materialclasscode.js b/src/api/spares/materialclasscode.js
deleted file mode 100644
index f377176..0000000
--- a/src/api/spares/materialclasscode.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import request from '@/router/axios';
-
-export const getList = (current, size, params) => {
-  return request({
-    url: '/api/spares/materialclasscode/list',
-    method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    }
-  })
-}
-
-export const getDetail = (id) => {
-  return request({
-    url: '/api/spares/materialclasscode/detail',
-    method: 'get',
-    params: {
-      id
-    }
-  })
-}
-
-export const remove = (ids) => {
-  return request({
-    url: '/api/spares/materialclasscode/remove',
-    method: 'post',
-    params: {
-      ids,
-    }
-  })
-}
-
-export const add = (row) => {
-  return request({
-    url: '/api/spares/materialclasscode/submit',
-    method: 'post',
-    data: row
-  })
-}
-
-export const update = (row) => {
-  return request({
-    url: '/api/spares/materialclasscode/submit',
-    method: 'post',
-    data: row
-  })
-}
-
-export const materialClassCodeAdd = (row) => {
-  return request({
-    url: '/api/spares/materialclasscode/submit',
-    method: 'post',
-    data: row
-  })
-}
-
-export const getMaterialClassCode = () => {
-  return request({
-    url: '/api/spares/materialclasscode/getMaterialClassCodeList',
-    method: 'get'
-  })
-}
diff --git a/src/views/inspection/inspectionobject.vue b/src/views/inspection/inspectionobject.vue
index 0d4c01e..5db0e84 100644
--- a/src/views/inspection/inspectionobject.vue
+++ b/src/views/inspection/inspectionobject.vue
@@ -103,7 +103,10 @@
           height: 'auto',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 18,
+          searchBtnText: '查询',
+          emptyBtnText: '重置',
+          searchMenuPosition:'right',
           tip: false,
           border: true,
           index: false,
diff --git a/src/views/inspection/inspectionplan.vue b/src/views/inspection/inspectionplan.vue
index 2b4e2de..58cae8f 100644
--- a/src/views/inspection/inspectionplan.vue
+++ b/src/views/inspection/inspectionplan.vue
@@ -103,7 +103,7 @@
           align: 'center',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 24,
           tip: false,
           border: true,
           index: false,
@@ -111,6 +111,7 @@
           selection: true,
           searchBtnText: '查询',
           emptyBtnText: '重置',
+          searchMenuPosition:'right',
           column: [
             {
               label: "计划编号",
diff --git a/src/views/inspection/inspectionroute.vue b/src/views/inspection/inspectionroute.vue
index 27b94e6..eb165d2 100644
--- a/src/views/inspection/inspectionroute.vue
+++ b/src/views/inspection/inspectionroute.vue
@@ -103,7 +103,7 @@
           align: 'center',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 24,
           tip: false,
           border: true,
           index: false,
@@ -111,6 +111,7 @@
           selection: true,
           searchBtnText: '查询',
           emptyBtnText: '重置',
+          searchMenuPosition:'right',
           column: [
             {
               label: "路线编号",
diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue
index bfa6ca4..6eef7af 100644
--- a/src/views/inspection/inspectiontasks.vue
+++ b/src/views/inspection/inspectiontasks.vue
@@ -154,6 +154,7 @@
           selection: true,
           searchBtnText: '查询',
           emptyBtnText: '重置',
+          searchMenuPosition:'right',
           column: [
             {
               label: "任务编号",
diff --git a/src/views/spares/manufacturerinfo.vue b/src/views/spares/manufacturerinfo.vue
index ce232fe..ed04360 100644
--- a/src/views/spares/manufacturerinfo.vue
+++ b/src/views/spares/manufacturerinfo.vue
@@ -56,7 +56,10 @@
           height: 'auto',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
+          searchBtnText: '查询',
+          emptyBtnText: '重置',
+          searchMenuPosition:'right',
           tip: false,
           border: true,
           index: true,
diff --git a/src/views/spares/material.vue b/src/views/spares/material.vue
index 7e2df96..b44be35 100644
--- a/src/views/spares/material.vue
+++ b/src/views/spares/material.vue
@@ -148,9 +148,10 @@
           height: 'auto',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 18,
           searchBtnText: '查询',
           emptyBtnText: '重置',
+          searchMenuPosition:'right',
           tip: false,
           border: true,
           index: false,
diff --git a/src/views/spares/materialclasscode.vue b/src/views/spares/materialclasscode.vue
deleted file mode 100644
index bce5ea6..0000000
--- a/src/views/spares/materialclasscode.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.materialclasscode_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/spares/materialclasscode";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height: 'auto',
-          calcHeight: 210,
-          searchShow: true,
-          searchMenuSpan: 6,
-          tip: false,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          column: [
-            {
-              label: "分类码编号",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入分类码编号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "物资类型",
-              prop: "materialType",
-              rules: [{
-                required: true,
-                message: "请输入物资类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "物资分类码",
-              prop: "materialClassCode",
-              rules: [{
-                required: true,
-                message: "请输入物资分类码",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-          // this.option.column = this.option.column.filter(v => {
-          //     return this.permission['materialclasscode_col_' + v.prop]
-          // })
-        return {
-          addBtn: this.vaildData(this.permission.materialclasscode_add, false),
-          viewBtn: this.vaildData(this.permission.materialclasscode_view, false),
-          delBtn: this.vaildData(this.permission.materialclasscode_delete, false),
-          editBtn: this.vaildData(this.permission.materialclasscode_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          done();
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          done();
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-        }, error => {
-          window.console.log(error);
-          loading();
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>
diff --git a/src/views/spares/materialclassification.vue b/src/views/spares/materialclassification.vue
index 0608703..b1512c0 100644
--- a/src/views/spares/materialclassification.vue
+++ b/src/views/spares/materialclassification.vue
@@ -54,7 +54,10 @@
           height: 'auto',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
+          searchBtnText: '查询',
+          emptyBtnText: '重置',
+          searchMenuPosition:'right',
           tip: false,
           border: true,
           index: true,
diff --git a/src/views/spares/supplierinfo.vue b/src/views/spares/supplierinfo.vue
index 3f54996..8eb2b8c 100644
--- a/src/views/spares/supplierinfo.vue
+++ b/src/views/spares/supplierinfo.vue
@@ -56,7 +56,10 @@
           height: 'auto',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 12,
+          searchBtnText: '查询',
+          emptyBtnText: '重置',
+          searchMenuPosition:'right',
           tip: false,
           border: true,
           index: true,
diff --git a/src/views/spares/warehouse.vue b/src/views/spares/warehouse.vue
index 7e2d6b5..43acd23 100644
--- a/src/views/spares/warehouse.vue
+++ b/src/views/spares/warehouse.vue
@@ -56,7 +56,10 @@
           height: 'auto',
           calcHeight: 210,
           searchShow: true,
-          searchMenuSpan: 6,
+          searchMenuSpan: 24,
+          searchBtnText: '查询',
+          emptyBtnText: '重置',
+          searchMenuPosition:'right',
           refreshBtn: false,
           searchShowBtn: false,
           tip: false,

From 2a5daa00047f316ffd99f9038b09650ef18bf965 Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Mon, 22 Jul 2024 14:19:34 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8F=82=E6=95=B0=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wel/index.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 747e1f4..4a9366c 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -21,7 +21,7 @@
             <div class="overflowList">
               <el-skeleton :rows="3" animated v-show="skeleton"/>
               <div class="el-collapse-item" v-for="(item, index) in homePageData.inspectionTasksAudit" :key="index">
-                <div class="el-collapse-item__header" @click="skip('/inspection/inspectiontasksDetail', item.id)"><span class="el-collapse-span">☆巡检任务：{{item.taskName}}</span></div>
+                <div class="el-collapse-item__header" @click="skip3('/inspection/inspectiontasksDetail', item.id, item.taskNo)"><span class="el-collapse-span">☆巡检任务：{{item.taskName}}</span></div>
               </div>
             </div>
           </div>
@@ -148,6 +148,7 @@
           },
         });
       },
+      // 入库出库路用
       skip2(path, materialNo, mode){
         this.$router.push({
           path: path,
@@ -157,6 +158,17 @@
             mode: mode
           },
         });
+      },
+      // 巡检任务用
+      skip3(path, id, taskNo){
+        this.$router.push({
+          path: path,
+          query: {
+            frameMode:"search",
+            id: id,
+            taskNo: taskNo
+          },
+        });
       }
     }
   };

From 5122fd4eef5cbf14960244820d8e72b1cd4ff68d Mon Sep 17 00:00:00 2001
From: zhen <1173776308@qq.com>
Date: Mon, 22 Jul 2024 14:22:25 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/release/productioninformation.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/release/productioninformation.vue b/src/views/release/productioninformation.vue
index d919a2f..5d84fb4 100644
--- a/src/views/release/productioninformation.vue
+++ b/src/views/release/productioninformation.vue
@@ -383,7 +383,7 @@
       },
       //驳回
       reject(row) {
-        this.$confirm("是否将数据驳回?", "提示", {
+        this.$confirm("是否将数据审核?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -440,7 +440,7 @@
           this.$message.warning("请选择至少一条数据");
           return;
         }
-        this.$confirm("是否将选择数据驳回?", {
+        this.$confirm("是否将选择数据审核?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

From e560c181e002a7d0ca46bd352a3337e193e260a4 Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Mon, 22 Jul 2024 14:30:36 +0800
Subject: [PATCH 5/6] =?UTF-8?q?bug=20=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inspection/inspectiontasks.vue |  6 ++----
 src/views/spares/material.vue            | 12 ++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue
index 6eef7af..4e9626e 100644
--- a/src/views/inspection/inspectiontasks.vue
+++ b/src/views/inspection/inspectiontasks.vue
@@ -506,10 +506,8 @@
               loading();
             });
           } else {
-            this.$message({
-              type: "warning",
-              message: "请输入必要信息!"
-            });
+            console.log('error submit!!');
+            return false;
           }
         });
 
diff --git a/src/views/spares/material.vue b/src/views/spares/material.vue
index b44be35..b5d81ab 100644
--- a/src/views/spares/material.vue
+++ b/src/views/spares/material.vue
@@ -561,10 +561,8 @@
               loading();
             });
           } else {
-            this.$message({
-              type: "warning",
-              message: "请输入必要信息!"
-            });
+            console.log('error submit!!');
+            return false;
           }
         });
       },
@@ -589,10 +587,8 @@
               loading();
             });
           } else {
-            this.$message({
-              type: "warning",
-              message: "请输入必要信息!"
-            });
+            console.log('error submit!!');
+            return false;
           }
         });
       },

From 027726ab3dc5527573d9f6def7ec32cdf3c67bec Mon Sep 17 00:00:00 2001
From: zhen <1173776308@qq.com>
Date: Mon, 22 Jul 2024 15:07:41 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/leger/dynamicledger.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/leger/dynamicledger.vue b/src/views/leger/dynamicledger.vue
index 3a37675..22411e9 100644
--- a/src/views/leger/dynamicledger.vue
+++ b/src/views/leger/dynamicledger.vue
@@ -60,7 +60,7 @@ export default {
         column: [
           {
             label: "场站",
-            prop: "status",
+            prop: "station",
             type: "select",
             search: true,
             hide: true,
@@ -144,7 +144,7 @@ export default {
         query: {
           frameMode:"search",
           id: row.id,
-          station: row.status,
+          station: row.station,
           kksEncoding: row.kksEncoding,
           kksDescription: row.kksDescription
         },