From 5d77f3004b88c8e4247d62e7b77a3227c0b1fae2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 三月 2025 09:45:23 +0800
Subject: [PATCH] 原材料原始记录未跳转页面
---
src/views/business/materialOrder/index.vue | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 65 insertions(+), 22 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index d5e4a46..a8837e7 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -8,7 +8,7 @@
@keyup.enter.native="refreshTable">
</el-input>
</el-form-item>
- <el-form-item label="濮旀墭缂栧彿" prop="entrustCode">
+ <el-form-item label="濮旀墭缂栧彿" prop="entrustCode" v-if="tabIndex !== 0">
<el-input v-model="entity.entrustCode" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable">
</el-input>
@@ -59,9 +59,11 @@
<div class="table-tab">
<div>
<ul class="tab">
- <li v-for="(m, i) in tabList" :key="m.value" :class="{ active: m.value === tabIndex }"
- @click="handleTab(m)">
- {{ m.label }}</li>
+ <li :class="{ active: tabIndex === 0 }" @click="handleTab(0)">寰呬笅鍗�</li>
+ <li :class="{ active: tabIndex === 1 }" @click="handleTab(1)">妫�楠屼腑</li>
+ <li :class="{ active: tabIndex === 2 }" @click="handleTab(2)">宸叉楠�</li>
+ <li :class="{ active: tabIndex === 4 }" @click="handleTab(4)">瀛ｅ害妫�楠�</li>
+ <li :class="{ active: tabIndex === 3 }" v-if="checkPermi(['get:Ifs:ByAll'])" @click="handleTab(3)">鍏ㄩ儴</li>
</ul>
</div>
<div>
@@ -193,6 +195,7 @@
concessionRelease,
getIfsByAll,
getIfsByOver,
+ getIfsByQuarter,
getIfsByStateOne,
rawAllExport,
rawOrderRelease,
@@ -202,10 +205,11 @@
updateEntrustCode
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit } from "@/api/business/materialInspection";
+import {mapGetters} from "vuex";
// import Inspection from "../do/b1-inspect-order-plan/Inspection.vue";
export default {
- name: "b1-material-inspection-order",
+ name: "MaterialOrder",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DownFileDialog, FilesLookVisible, DataLookVisible, ShowInfo, PrintDialog },
data() {
@@ -820,6 +824,9 @@
outLoading: false
}
},
+ computed: {
+ ...mapGetters(['nickName'])
+ },
mounted() {
this.refreshTable()
},
@@ -847,7 +854,7 @@
// 寰呬笅鍗曟煡璇�
getPurchaseOrderList() {
this.tableLoading = true
- const params = { ...this.entity, isInspect: 1, state: 0 }
+ const params = { ...this.entity, isInspect: 1, state: 0, ...this.page }
getWarehouseSubmit(params).then(res => {
this.tableLoading = false
if (res.code === 200) {
@@ -861,7 +868,7 @@
// 妫�楠屼腑鏌ヨ
getIfsByStateOneList() {
this.tableLoading1 = true
- const params = { ...this.entity, orderState: 1, state: 1 }
+ const params = { ...this.entity, orderState: 1, state: 1, ...this.page1 }
getIfsByStateOne(params).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
@@ -875,7 +882,14 @@
// 宸叉楠屾煡璇�
getIfsByOverList() {
this.tableLoading2 = true
- const params = { ...this.entity, orderState: 4, state: 2 }
+ if(null != this.entity.date){
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, orderState: 4, state: 2, ...this.page2 }
getIfsByOver(params).then(res => {
this.tableLoading2 = false
if (res.code === 200) {
@@ -889,8 +903,15 @@
// 鏌ヨ瀛ｅ害妫�楠�
getIfsByQuarterList() {
this.tableLoading4 = true
- const params = { ...this.entity }
- getIfsByOver(params).then(res => {
+ if(null != this.entity.date){
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, ...this.page4 }
+ getIfsByQuarter(params).then(res => {
this.tableLoading4 = false
if (res.code === 200) {
this.tableData4 = res.data.records
@@ -903,7 +924,14 @@
// 鍏ㄩ儴
getIfsByAllList() {
this.tableLoading3 = true
- const params = { ...this.entity, isInspect: 1 }
+ if(null != this.entity.date){
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, isInspect: 1, ...this.page3 }
getIfsByAll(params).then(res => {
this.tableLoading3 = false
if (res.code === 200) {
@@ -946,10 +974,7 @@
if (row.userName) {
inspectorList = row.userName.split(',')
}
- let user = JSON.parse(localStorage.getItem('user'))
- if (user) {
- inspectorList.push(user.name)
- }
+ inspectorList.push(this.nickName)
this.inspectorList = inspectorList
this.insInfo = row
this.InspectInfoDialog = true
@@ -996,16 +1021,34 @@
}).catch(() => { })
},
viewInsInfo0() {
- this.state = 3;
- this.typeSource = this.insInfo.typeSource
- this.orderId = this.insInfo.enterOrderId
+ let inspectorList = []
+ inspectorList.push(this.nickName)
this.InspectInfoDialog = false
+ this.$router.push({
+ path: "/inspectionTask/inspection",
+ query: {
+ sonLaboratory: '鍘熸潗鏂�',
+ state: 3,
+ typeSource: this.insInfo.typeSource,
+ orderId: this.insInfo.enterOrderId,
+ inspectorList: inspectorList,
+ },
+ })
},
viewInsInfo1() {
- this.state = 3;
- this.typeSource = this.insInfo.typeSource
- this.orderId = this.insInfo.quarterOrderId
+ let inspectorList = []
+ inspectorList.push(this.nickName)
this.InspectInfoDialog = false
+ this.$router.push({
+ path: "/inspectionTask/inspection",
+ query: {
+ sonLaboratory: '鍘熸潗鏂�',
+ state: 3,
+ typeSource: this.insInfo.typeSource,
+ orderId: this.insInfo.quarterOrderId,
+ inspectorList: inspectorList,
+ },
+ })
},
goback() {
this.state = 0
@@ -1228,7 +1271,7 @@
},
// 鍒囨崲涓嬪崟tab琛ㄦ牸
handleTab(m) {
- this.tabIndex = m.value;
+ this.tabIndex = m;
this.refreshTable()
},
// 琛ㄦ牸閫夋嫨鏂规硶
--
Gitblit v1.9.3