2024-10-16

src/views/modules/project/projectInfo/com_project_info_quotation.vue

@@ -221,7 +221,7 @@ export default {
       if (this.$router.resolve(`/quotation-sellForQuotation`).resolved.name === '404'){
         this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
       }else {
-        this.$router.push({name:`quotation-sellForQuotation`,params:{quotationNo:row.quotationNo,versionCode:row.versionCode},})
+        this.$router.push({name:`quotation-sellForQuotation`,params:{quotationNo:row.quotationNo+"-"+row.versionCode},})
       }
     }
   }

src/views/modules/project/projectInfo/projectInfo.vue

@@ -1618,6 +1618,7 @@
         let inData={
           site: this.currentRow.site,
           projectId: this.currentRow.projectId,
+          userName:this.$store.state.user.name,
           page: 1,
           limit: 1000
         }
@@ -1627,7 +1628,7 @@
         let inData={
           site: this.currentRow.site,
           projectId: this.currentRow.projectId,
-          username:this.$store.state.user.name,
+          createBy:this.$store.state.user.name,
           no: 1,
           size: 1000
         }
@@ -1637,7 +1638,7 @@
         let inData={
           site: this.currentRow.site,
           projectId: this.currentRow.projectId,
-          username:this.$store.state.user.name,
+          createBy:this.$store.state.user.name,
           page: 1,
           limit: 1000
         }
@@ -1647,7 +1648,7 @@
         let inData={
           site: this.currentRow.site,
           projectId: this.currentRow.projectId,
-          // username:this.$store.state.user.name,
+          createBy:this.$store.state.user.name,
           page: 1,
           limit: 1000
         }
@@ -1657,7 +1658,7 @@
         let inData={
           site: this.currentRow.site,
           projectId: this.currentRow.projectId,
-          username:this.$store.state.user.name,
+          createBy:this.$store.state.user.name,
           page: 1,
           limit: 1000
         }

src/views/modules/proofing/requestForProofing.vue

@@ -2304,52 +2304,55 @@ export default {
     })
   },
   created() {
-
+    this.handleRouteQuery();
   },
   activated() {
-    if (this.$route.params.type === 'tokenLogin'){
-      let params = {
-        site: this.$route.params.site,
-        proofingNo: this.$route.params.docNo,
-        limit: this.pageSize,
-        createBy: this.$store.state.user.name,
-        page : 1,
-      }
-      this.dataListLoading = true
-      proofingInformationSearch(params).then(({data}) => {
-        if (data && data.code === 0) {
-          this.dataList = data.page.list
-          this.totalPage = data.page.totalCount
-          this.$refs.selectDiv.setLengthAll(this.dataList.length)
-          // 判断是否全部存在数据
-          if (this.totalPage > 0) {
-            //设置选中行
-            this.$refs.proofingTable.setCurrentRow(this.dataList[0])
-            //加载当前的页签的table
-            this.refreshCurrentTabTable()
-            this.proofingClickRow(this.dataList[0])
-            this.updateModal(this.dataList[0])
-          } else {
-            //设置选中行
-            this.$refs.proofingTable.setCurrentRow({})
-            // 加载当前的页签的table
-            this.refreshCurrentTabTable()
-            this.testClickRow({})
-          }
-        }
-        this.dataListLoading = false
-      })
-    }else if (this.$route.params.proofingNo){
-      this.searchData.proofingNo = this.$route.params.proofingNo
-      this.getDataList();
-      setTimeout(()=>{
-        this.searchData.proofingNo = ''
-      },200)
-    }else {
-      this.getDataList();
-    }
+    this.handleRouteQuery();
   },
   methods: {
+    handleRouteQuery(){
+      if (this.$route.params.type === 'tokenLogin'){
+        let params = {
+          site: this.$route.params.site,
+          proofingNo: this.$route.params.docNo,
+          limit: this.pageSize,
+          createBy: this.$store.state.user.name,
+          page : 1,
+        }
+        this.dataListLoading = true
+        proofingInformationSearch(params).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+            this.$refs.selectDiv.setLengthAll(this.dataList.length)
+            // 判断是否全部存在数据
+            if (this.totalPage > 0) {
+              //设置选中行
+              this.$refs.proofingTable.setCurrentRow(this.dataList[0])
+              //加载当前的页签的table
+              this.refreshCurrentTabTable()
+              this.proofingClickRow(this.dataList[0])
+              this.updateModal(this.dataList[0])
+            } else {
+              //设置选中行
+              this.$refs.proofingTable.setCurrentRow({})
+              // 加载当前的页签的table
+              this.refreshCurrentTabTable()
+              this.testClickRow({})
+            }
+          }
+          this.dataListLoading = false
+        })
+      }else if (this.$route.params.proofingNo){
+        this.searchData.proofingNo = this.$route.params.proofingNo
+        this.getDataList();
+        setTimeout(()=>{
+          this.searchData.proofingNo = ''
+        },200)
+      }else {
+        this.getDataList();
+      }
+    },
     // ======== 分页相关方法 ========
     /**
      * 每页数

src/views/modules/quotation/requestForQuote.vue

@@ -2111,40 +2111,43 @@ export default {
     })
   },
   created() {
-    this.getDataList()
+    this.handleRouteQuery()
   },
   activated () {
-    if (this.$route.params.type === 'tokenLogin') {
-      if (this.$route.params.docNo) {
-        this.searchData.quotationBatchNo = this.$route.params.docNo
-      }
-      this.searchData.limit = this.pageSize
-      this.searchData.page = this.pageIndex
-      let params = {
-        ...this.searchData,
-        createBy: this.$store.state.user.name
-      }
-      quotationInformationSearch(params).then(({data}) => {
-        if (data.code === 0) {
-          this.dataList = data.page.list
-          this.pageIndex = data.page.currPage
-          this.pageSize = data.page.pageSize
-          this.totalPage = data.page.totalCount
-          this.$refs.selectDiv.setLengthAll(this.dataList.length)
-          //判断是否全部存在数据
-          if (this.dataList.length > 0) {
-            //设置选中行
-            // this.$refs.quotationTable.setCurrentRow(this.dataList[0])
-            // this.refreshCurrentTabTable() //加载当前的页签的table
-            this.quotationClickRow(this.dataList[0])
-            this.updateModal(this.dataList[0])
-          }else {
-            this.quotationCurrentRow = {}
-          }
+    this.handleRouteQuery()
+  },
+  methods: {
+    handleRouteQuery(){
+      if (this.$route.params.type === 'tokenLogin') {
+        if (this.$route.params.docNo) {
+          this.searchData.quotationBatchNo = this.$route.params.docNo
         }
-      })
-    }else {
-      if (this.$route.params.quotationNo) {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        let params = {
+          ...this.searchData,
+          createBy: this.$store.state.user.name
+        }
+        quotationInformationSearch(params).then(({data}) => {
+          if (data.code === 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+            this.$refs.selectDiv.setLengthAll(this.dataList.length)
+            //判断是否全部存在数据
+            if (this.dataList.length > 0) {
+              //设置选中行
+              // this.$refs.quotationTable.setCurrentRow(this.dataList[0])
+              // this.refreshCurrentTabTable() //加载当前的页签的table
+              this.quotationClickRow(this.dataList[0])
+              this.updateModal(this.dataList[0])
+            }else {
+              this.quotationCurrentRow = {}
+            }
+          }
+        })
+      }else if (this.$route.params.quotationNo) {
         this.searchData.quotationNo = this.$route.params.quotationNo
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
@@ -2172,10 +2175,10 @@ export default {
             }
           }
         })
+      }else {
+        this.getDataList()
       }
-    }
-  },
-  methods: {
+    },
     // ======== 分页相关方法 ========
     /**
      * 每页数

src/views/modules/quotation/toBeQuoted.vue

@@ -142,7 +142,7 @@
                    @size-change="sizeChangeHandle"
                    @current-change="currentChangeHandle"
                    :current-page="pageIndex"
-                   :page-sizes="[50, 100, 200, 500]"
+                   :page-sizes="[20,50, 100, 200, 500]"
                    :page-size="pageSize"
                    :total="totalPage"
                    layout="total, sizes, prev, pager, next, jumper">
@@ -181,7 +181,7 @@ export default {
         trackerName: '',
         testPartNo: '',
         partName: '',
-        quotationStatus: '已完成',
+        quotationStatus: '审批中',
         quotationResultStatus: '',
         startDate: '',
         endDate: '',
@@ -194,7 +194,7 @@ export default {
       },
       // 分页
       pageIndex: 1,//当前页码
-      pageSize:50,//每页条数
+      pageSize:20,//每页条数
       totalPage:0,//总条数
       // 表格数据
       dataList:[],//表格数据

src/views/modules/sys/dict-data.vue

@@ -330,7 +330,7 @@ export default {
       <el-table-column header-align="center" align="center" label="操作" width="160">
         <template slot-scope="{row,$index}">
           <el-button type="text" :disabled="row.isSystem === 'Y'" @click="openDictTypeDialog(1,row)" icon="el-icon-edit">修改</el-button>
-          <el-button type="text" :disabled="row.isSystem === 'Y'" v-if="false" @click="delDictData(row)" icon="el-icon-delete">删除</el-button>
+          <el-button type="text" :disabled="row.isSystem === 'Y'" @click="delDictData(row)" icon="el-icon-delete">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/modules/test/requestForTest.vue

@@ -2179,54 +2179,57 @@
       })
     },
     created () {
-      this.getDataList()
+      this.handleRouteQuery()
     },
     activated () {
-      if (this.$route.params.type === 'tokenLogin') {
-        if (this.$route.params.docNo) {
-          this.searchData.testNo = this.$route.params.docNo
-        }
-        this.searchData.limit = this.pageSize
-        this.searchData.page = this.pageIndex
-        let params = {
-          ...this.searchData,
-          createBy:this.$store.state.user.name,
-        }
-        testInformationSearch(params).then(({data}) => {
-          if (data.code === 0) {
-            this.dataList = data.page.list
-            this.pageIndex = data.page.currPage
-            this.pageSize = data.page.pageSize
-            this.totalPage = data.page.totalCount
-            this.$refs.selectDiv.setLengthAll( this.dataList.length)
-            // 判断是否全部存在数据
-            if (this.totalPage > 0) {
-              //设置选中行
-              this.$refs.testTable.setCurrentRow(this.dataList[0])
-              // 加载当前的页签的table
-              this.refreshCurrentTabTable()
-              this.testClickRow(this.dataList[0])
-              this.updateModal(this.dataList[0])
-            } else {
-              //设置选中行
-              this.$refs.testTable.setCurrentRow({})
-              // 加载当前的页签的table
-              this.refreshCurrentTabTable()
-              this.testClickRow({})
-            }
+      this.handleRouteQuery()
+    },
+    methods: {
+      handleRouteQuery(){
+        if (this.$route.params.type === 'tokenLogin') {
+          if (this.$route.params.docNo) {
+            this.searchData.testNo = this.$route.params.docNo
           }
-        })
-      }else {
-        if (this.$route.params.testNo){
+          this.searchData.limit = this.pageSize
+          this.searchData.page = this.pageIndex
+          let params = {
+            ...this.searchData,
+            createBy:this.$store.state.user.name,
+          }
+          testInformationSearch(params).then(({data}) => {
+            if (data.code === 0) {
+              this.dataList = data.page.list
+              this.pageIndex = data.page.currPage
+              this.pageSize = data.page.pageSize
+              this.totalPage = data.page.totalCount
+              this.$refs.selectDiv.setLengthAll( this.dataList.length)
+              // 判断是否全部存在数据
+              if (this.totalPage > 0) {
+                //设置选中行
+                this.$refs.testTable.setCurrentRow(this.dataList[0])
+                // 加载当前的页签的table
+                this.refreshCurrentTabTable()
+                this.testClickRow(this.dataList[0])
+                this.updateModal(this.dataList[0])
+              } else {
+                //设置选中行
+                this.$refs.testTable.setCurrentRow({})
+                // 加载当前的页签的table
+                this.refreshCurrentTabTable()
+                this.testClickRow({})
+              }
+            }
+          })
+        }else if(this.$route.params.testNo){
           this.searchData.testNo = this.$route.params.testNo
           this.getDataList()
           setTimeout(()=>{
             this.searchData.testNo = ''
           },200)
+        }else{
+          this.getDataList();
         }
-      }
-    },
-    methods: {
+      },
       searchTestPropertiesItem(){
         let params={
           site:this.$store.state.user.site,