diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index e25ae23e..08976d48 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -422,6 +422,185 @@
@current-change="handleCurrentChange12"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1009,6 +1188,10 @@ export default {
total12: 0,
pageCurrent12: 1,
pageSize12: 100,
+ tableData13: [], // 外购件列表
+ total13: 0,
+ pageCurrent13: 1,
+ pageSize13: 100,
remarkFilters: [],
supplierFilters: [],
tableData2: [], // 询价单列表
@@ -1587,6 +1770,41 @@ export default {
this.pageCurrent12 = val
this.searchTable12()
},
+ searchTable13() { // 查询基本件列表
+ let check1, check2, check3, check4, check5, check6, check7
+ this.partNum ? check1 = 1 : check1 = 0
+ this.partName ? check2 = 1 : check2 = 0
+ this.partSpec ? check3 = 1 : check3 = 0
+ this.projectValue ? check4 = 1 : check4 = 0
+ this.machineValue ? check5 = 1 : check5 = 0
+ this.groupValue ? check6 = 1 : check6 = 0
+ this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
+ searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
+ this.tableData12 = response.data.rows
+ this.total12 = response.data.total
+ const remark = []
+ const supplier = []
+ this.remarkFilters = []
+ this.supplierFilters = []
+ response.data.rows.map(v => {
+ if (!remark.includes(v.备注)) {
+ remark.push(v.备注)
+ supplier.push(v.供货商)
+ this.remarkFilters.push({ text: v.备注, value: v.备注 })
+ this.supplierFilters.push({ text: v.供货商, value: v.供货商 })
+ }
+ })
+ })
+ },
+ handleSizeChange13(val) { // 基本件列表分页
+ this.pageSize13 = val
+ this.pageCurrent13 = 1
+ this.searchTable13()
+ },
+ handleCurrentChange13(val) { // 基本件列表分页
+ this.pageCurrent13 = val
+ this.searchTable13()
+ },
searchTable2() { // 查询询价单列表
this.supplierName ? this.check3 = 1 : this.check3 = 0
this.inquirySheetNum ? this.check4 = 1 : this.check4 = 0
@@ -1856,6 +2074,16 @@ export default {
this.基本件流水号[i] = val[i].基本件流水号
}
},
+ handleSelectionChange3(val) { // 基本件多选
+ this.groupPartBasicNum = []
+ this.allNum = []
+ this.基本件流水号 = []
+ for (let i = 0; i < val.length; i++) {
+ this.groupPartBasicNum[i] = val[i].组件零件基本件流水号
+ this.allNum[i] = val[i].零件数量
+ this.基本件流水号[i] = val[i].基本件流水号
+ }
+ },
addInquirySheet() { // 追加物料
const numGroup1 = [] // 空数组，放该询价单中已有的组件零件流水号
const numGroup2 = [] // 空数组，放该询价单中已有的组件零件基本件流水号
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 76b2257f..65360cff 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -19,7 +19,7 @@
-
+
项目名称:
@@ -787,6 +787,19 @@ export default {
'id'
])
},
+ watch: {
+ // 如果路由有变化，会再次执行该方法
+ '$route': {
+ handler(route) {
+ const _this = this
+ if (route.name === 'PurchaseTaskAllocate') {
+ setTimeout(() => {
+ _this.Jump()
+ }, 1200)
+ }
+ }
+ }
+ },
created() {
this.searchTable0() // 查表1
this.fetchData() // 初始化数据
@@ -794,10 +807,18 @@ export default {
this.timer2 = setInterval(this.searchUnallocatePartNumber, 20 * 60 * 1000) // 20 分钟一刷新
this.getDefaultTime()
},
+ mounted() {
+ setTimeout(() => {
+ this.Jump()
+ }, 500)
+ },
beforeDestroy() {
clearInterval(this.timer2)
},
methods: {
+ Jump() {
+ window.location.hash = '#PurchasingCenter/PurchaseTaskAllocate'
+ },
getDefaultTime() {
const end = new Date()
const start = new Date()