2025-07-08

1、技术参数卡的当前节点的筛选有问题 - 优先处理 2、筛选条件优化（优先处理刀具和测试） 3、如果数据有多页，点了查询之后要默认第一页的数据
6 months ago · 99ac56f1f8
6 changed files with 182 additions and 5 deletions
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@ -23,6 +23,19 @@
          <el-option label="已完成" value="已完成"></el-option>
        </el-select>
      </el-form-item>
+      <el-form-item label="节点审批人">
+        <el-input v-model="searchData.createBy2" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="当前节点">
+        <el-select v-model="searchData.nodeId" placeholder="请选择节点" clearable style="width: 120px">
+          <el-option
+            v-for="option in nodeOptions"
+            :key="option.id"
+            :label="option.name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
      <el-form-item :label="' '">
        <el-button v-if="authSearch" @click="getDataList">查询</el-button>
        <download-excel
@ -1326,6 +1339,9 @@
    choosePartNoList, // 根据视图查物料计划
    checkSuperAdmin, // 校验是否为超级管理员
  } from '@/api/changeManagement/changeManagement.js'
+  import {
+    getNodeList
+  } from "@/api/sampleManagement/technicalSpecificationList.js"
  import ChooseList from '@/views/modules/common/Chooselist'
  import {verifyData} from "@/api/chooselist/chooselist.js"
  import changeUploadFile from "../base/upload_file.vue"
@ -1534,7 +1550,9 @@
          menuId: this.$route.meta.menuId,
          buNo: '',
          page: 1,
-          limit: 10
+          limit: 10,
+          nodeId: '',
+          createBy2: ''
        },
        searchData2: {
          site: this.$store.state.user.site,
@ -1714,6 +1732,7 @@
        chooseFileList: [],
        approvalList: [],
        partList: [],
+        nodeOptions: [],
        // ======== 列表表头 ========
        columnList: [
          {
@ -2938,6 +2957,7 @@
        /*第二个表格高度的动态调整*/
        this.secondHeight = window.innerHeight / 2  - 186
      })
+      this.fetchNodeOptions()
    },

    activated () {
@ -2985,6 +3005,21 @@

    methods: {

+      fetchNodeOptions() {
+        getNodeList(this.searchData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.nodeOptions = data.rows.map(item => ({
+              id: item.nodeId,
+              name: item.nodeName
+            }));
+          } else {
+            this.$message.error('获取节点列表失败');
+          }
+        }).catch(error => {
+          this.$message.error('请求失败：' + error);
+        });
+      },
+
      // 校验是否为超级管理员
      checkSuperAdmin () {
        checkSuperAdmin().then(({data}) => {
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@ -38,6 +38,19 @@
          placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
+      <el-form-item label="节点审批人">
+        <el-input v-model="searchData.approvalUsername" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="当前节点">
+        <el-select v-model="searchData.nodeId" placeholder="请选择节点" clearable style="width: 120px">
+          <el-option
+            v-for="option in nodeOptions"
+            :key="option.id"
+            :label="option.name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
    </el-form>
    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
      <el-form-item :label="'PLM物料编码'">
@ -842,6 +855,9 @@ import {
 import {
  customerContactSearch, // 客户联系人列表查询
 } from '@/api/customer/customerContact.js'
+import {
+  getNodeList
+} from "@/api/sampleManagement/technicalSpecificationList.js"
 import Chooselist from '@/views/modules/common/Chooselist'
 import proofingUploadFile from "./proofing_upload_file"
 import DictDataSelect from "../sys/dict-data-select.vue";
@ -1047,6 +1063,8 @@ export default {
        limit: 10,
        menuId: this.$route.meta.menuId,
        buNo: '',
+        nodeId: '',
+        approvalUsername: ''
      },
      // 其它
      dataListLoading: false,
@ -1202,6 +1220,7 @@ export default {
      projectPartList: [],
      addressList: [],
      contactList: [],
+      nodeOptions: [],
      // ======== 列表表头 ========
      columnList: [
        {
@ -2231,6 +2250,7 @@ export default {
      /*第二个表格高度的动态调整*/
      this.secondHeight = window.innerHeight / 2 - 206;
    })
+    this.fetchNodeOptions()
  },

  created() {
@ -2244,6 +2264,21 @@ export default {

  methods: {

+    fetchNodeOptions() {
+      getNodeList(this.searchData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.nodeOptions = data.rows.map(item => ({
+            id: item.nodeId,
+            name: item.nodeName
+          }));
+        } else {
+          this.$message.error('获取节点列表失败');
+        }
+      }).catch(error => {
+        this.$message.error('请求失败：' + error);
+      });
+    },
+
    // 校验是否为超级管理员
    checkSuperAdmin () {
      checkSuperAdmin().then(({data}) => {
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@ -41,6 +41,19 @@
          placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
+      <el-form-item label="节点审批人">
+        <el-input v-model="searchData.approvalUsername" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="当前节点">
+        <el-select v-model="searchData.nodeId" placeholder="请选择节点" clearable style="width: 120px">
+          <el-option
+            v-for="option in nodeOptions"
+            :key="option.id"
+            :label="option.name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
    </el-form>
    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
      <el-form-item label="BU">
@ -772,6 +785,9 @@ import {
  getNodeAuthority, // 获取节点权限
  checkSuperAdmin, // 校验是否为超级管理员
 } from '@/api/changeManagement/changeManagement.js'
+import {
+  getNodeList
+} from "@/api/sampleManagement/technicalSpecificationList.js"
 import Chooselist from '@/views/modules/common/Chooselist'
 import quotationUploadFile from "./quotation_upload_file"
 import DictDataSelect from "../sys/dict-data-select.vue";
@ -990,7 +1006,9 @@ export default {
        page: 1,
        limit: 10,
        menuId: this.$route.meta.menuId,
-        quotationNo: ''
+        quotationNo: '',
+        nodeId: '',
+        approvalUsername: ''
      },
      // 其它
      dataListLoading: false,
@ -1149,6 +1167,7 @@ export default {
      fileContentList: [],
      projectPartList: [],
      contactList: [],
+      nodeOptions: [],
      // ======== 列表表头 ========
      columnList: [
        {
@ -2087,6 +2106,7 @@ export default {
      /*第二个表格高度的动态调整*/
      this.secondHeight = window.innerHeight -this.height;
    })
+    this.fetchNodeOptions()
  },

  created() {
@ -2100,6 +2120,21 @@ export default {

  methods: {

+    fetchNodeOptions() {
+      getNodeList(this.searchData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.nodeOptions = data.rows.map(item => ({
+            id: item.nodeId,
+            name: item.nodeName
+          }));
+        } else {
+          this.$message.error('获取节点列表失败');
+        }
+      }).catch(error => {
+        this.$message.error('请求失败：' + error);
+      });
+    },
+
    // 校验是否为超级管理员
    checkSuperAdmin () {
      checkSuperAdmin().then(({data}) => {
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@ -19,7 +19,7 @@
        <el-input v-model="searchData.cutterNumber" style="width: 120px" clearable></el-input>
      </el-form-item>
      <el-form-item label="节点审批人">
-        <el-input v-model="searchData.sp" style="width: 130px"></el-input>
+        <el-input v-model="searchData.sp" clearable style="width: 130px"></el-input>
      </el-form-item>
      <el-form-item label="当前节点">
        <el-select v-model="searchData.nodeId" placeholder="请选择节点" clearable style="width: 130px">
@ -605,6 +605,7 @@
          sp: '',
          nodeId: '',
          documentSource: '',
+          menuId: this.$route.meta.menuId
        },
        nodeOptions: [],
        pageIndex: 1,
--- a/src/views/modules/test/requestForTest.vue
+++ b/src/views/modules/test/requestForTest.vue
@ -41,6 +41,19 @@
          placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
+      <el-form-item label="节点审批人">
+        <el-input v-model="searchData.approvalUsername" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="当前节点">
+        <el-select v-model="searchData.nodeId" placeholder="请选择节点" clearable style="width: 120px">
+          <el-option
+            v-for="option in nodeOptions"
+            :key="option.id"
+            :label="option.name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
    </el-form>
    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
      <el-form-item label="BU">
@ -53,8 +66,7 @@
        <el-input v-model="searchData.projectName" clearable style="width: 120px"></el-input>
      </el-form-item>
      <el-form-item :label="'优先等级'">
-        <dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false"
-                          dict-type="priority_Level"/>
+        <dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false" dict-type="priority_Level"/>
      </el-form-item>
      <el-form-item :label="'IFS物料编码'">
        <el-input v-model="searchData.finalPartNo" clearable style="width: 120px"></el-input>
@ -951,6 +963,9 @@ import {
 import {
  customerContactSearch, // 客户联系人列表查询
 } from '@/api/customer/customerContact.js'
+import {
+  getNodeList
+} from "@/api/sampleManagement/technicalSpecificationList.js"
 import ChooseList from '@/views/modules/common/Chooselist'
 import TestUploadFile from "./test_upload_file"
 import DictDataSelect from "../sys/dict-data-select.vue";
@ -1144,6 +1159,8 @@ export default {
        menuId: this.$route.meta.menuId,
        testNo: '',
        buNo: '',
+        nodeId: '',
+        approvalUsername: ''
      },
      fileContentLoaded: false,
      // 其它
@ -1307,6 +1324,7 @@ export default {
      addressList: [],
      contactList: [],
      plmTestInformationArr: [],
+      nodeOptions: [],
      // ======== 列表表头 ========
      columnList: [
        {
@ -2302,6 +2320,7 @@ export default {
      /*第二个表格高度的动态调整*/
      this.secondHeight = window.innerHeight / 2  - 186
    })
+    this.fetchNodeOptions()
  },

  created() {
@ -2315,6 +2334,21 @@ export default {

  methods: {

+    fetchNodeOptions() {
+      getNodeList(this.searchData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.nodeOptions = data.rows.map(item => ({
+            id: item.nodeId,
+            name: item.nodeName
+          }));
+        } else {
+          this.$message.error('获取节点列表失败');
+        }
+      }).catch(error => {
+        this.$message.error('请求失败：' + error);
+      });
+    },
+
    // 校验是否为超级管理员
    checkSuperAdmin () {
      checkSuperAdmin().then(({data}) => {
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@ -22,6 +22,19 @@
          placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
+      <el-form-item label="节点审批人">
+        <el-input v-model="searchData.sp" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item label="当前节点">
+        <el-select v-model="searchData.nodeId" placeholder="请选择节点" clearable style="width: 120px">
+          <el-option
+            v-for="option in nodeOptions"
+            :key="option.id"
+            :label="option.name"
+            :value="option.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
      <el-form-item :label="'状态'">
        <el-select v-model="searchData.status" clearable style="width: 80px">
          <el-option label="全部" value=""></el-option>
@ -611,6 +624,9 @@ import {
  getApprovalList, // 查询审批信息
  checkSuperAdmin, // 校验是否为超级管理员
 } from '@/api/changeManagement/changeManagement.js'
+import {
+  getNodeList
+} from "@/api/sampleManagement/technicalSpecificationList.js"
 import ApprovalInformation from "../changeManagement/approvalInformation.vue";
 import OssComponents from "../oss/ossComponents";
 import DictDataSelect from "../sys/dict-data-select.vue"
@ -674,7 +690,11 @@ export default {
        startDate: '',
        endDate: '',
        status: '',
+        nodeId: '',
+        sp: '',
+        menuId: this.$route.meta.menuId,
      },
+      nodeOptions: [],
      toolData: [],
      visibleU: false,
      plmChangeApplyHeaderArr: [],
@ -1446,11 +1466,28 @@ export default {
      this.height = window.innerHeight / 2 - 30
      this.fieldColumn()
    })
+    this.fetchNodeOptions()
  },

  methods: {
    isAuth,

+    fetchNodeOptions() {
+      getNodeList(this.searchData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.nodeOptions = data.rows.map(item => ({
+            id: item.nodeId,
+            name: item.nodeName
+          }));
+        } else {
+          this.$message.error('获取节点列表失败');
+        }
+      }).catch(error => {
+        this.$message.error('请求失败：' + error);
+      });
+    },
+
+
    // 校验是否为超级管理员
    checkSuperAdmin () {
      checkSuperAdmin().then(({data}) => {