From 50538b42c86e69ba7d0de5fde2ad3d68779d9f77 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 22 三月 2024 18:58:59 +0800
Subject: [PATCH] 采购订单添加到货确认与去质检
---
src/views/purchaseManage/purchase/index.vue | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index 2283fa2..f052302 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -53,12 +53,13 @@
<el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
>鏌ョ湅</el-button
>
- <!-- <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
+ <el-button
+ v-if="scope.row.status === 6||scope.row.status === 7" type="text" size="small" @click="confirmation(scope.row)" style="margin-right: 5px"
>鍒拌揣纭</el-button
>
- <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
+ <el-button v-if="scope.row.status === 7||scope.row.status === 8" type="text" size="small" @click="TestingAllClick(scope.row)" style="margin-right: 5px"
>鍘昏川妫�</el-button
- > -->
+ >
<el-button
v-if="scope.row.status === 1"
type="text"
@@ -102,6 +103,16 @@
>
鏀惰揣淇℃伅
</div>
+ <div
+ class="tab-pane"
+ @click="getTab(2)"
+ :style="{
+ background: TabsIndex == 2 ? '#2a78fb' : '#F1F3F8',
+ color: TabsIndex == 2 ? '#fff' : '#666'
+ }"
+ >
+ 鍏ュ簱淇℃伅
+ </div>
</div>
<div class="list-view">
<TableCommonView :loading="loading" :table-list="productTableList" @selTableCol="selBottomTableCol">
@@ -123,6 +134,10 @@
<DetailSupplier v-if="commonDetail.visible" :common-detail="commonDetail" />
<!-- 鏂板缓/缂栬緫 -->
<AddPurchase ref="addDialog" v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <!-- 鍒拌揣閫氱煡 -->
+ <ArrivalConfirmation v-if="editAffirmConfig.visible" :edit-common-config="editAffirmConfig" />
+ <!-- 鎵归噺璐ㄦ -->
+ <TestingAll v-if="editTestingAllConfig.visible" :edit-common-config="editTestingAllConfig" />
</div>
</template>
@@ -131,18 +146,20 @@
import {
getPurchaseList,
getPurchaseInfo,
- submitPurchase,
+ newSubmitPurchase,
deletePurchase,
getOperationInfo
} from "@/api/purchaseManage/purchase"
import DetailSupplier from "@/views/purchaseManage/purchase/DetailSupplier"
import AddPurchase from "@/views/purchaseManage/purchase/components/AddPurchase"
+import ArrivalConfirmation from"@/views/purchaseManage/purchase/components/ArrivalConfirmation"
+import TestingAll from"@/views/purchaseManage/purchase/components/TestingAll"
import { getSupplierList } from "@/api/supplierManage/supplier"
import { getDataByType } from "@/api/data"
export default {
name: "SupplierManage",
props: {},
- components: { DetailSupplier, AddPurchase },
+ components: { DetailSupplier, AddPurchase,ArrivalConfirmation,TestingAll },
mixins: [pageMixin],
computed: {},
data() {
@@ -161,6 +178,17 @@
]
// 鏀惰揣淇℃伅
const recriveColumn = [
+ { label: "鏀惰揣鏃堕棿", prop: "operationNumber", default: true },
+ { label: "鏀惰揣浜�", prop: "principal" },
+ { label: "浜у搧鍚嶇О", prop: "name" },
+ { label: "浜у搧缂栫爜", prop: "number" },
+ { label: "瑙勬牸", prop: "warehouseName" },
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "鍗曚綅", prop: "overTime" },
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getreceiveStatusStatus }
+ ]
+ // 鍏ュ簱淇℃伅
+ const inLibraryColumn = [
{ label: "鍏ュ簱鍗曞彿", prop: "operationNumber", default: true },
{ label: "鏀惰揣浠撳簱", prop: "warehouseName" },
{ label: "浜у搧鍚嶇О", prop: "name" },
@@ -189,6 +217,23 @@
detailEnter: false,
infomation: {
supplierList: []
+ }
+ },
+ editAffirmConfig: {
+ visible: false,
+ isDisabled: false,
+ detailEnter: false,
+ infomation: {
+
+ // supplierList: []
+ }
+ },
+ editTestingAllConfig:{
+ visible: false,
+ isDisabled: false,
+ detailEnter: false,
+ infomation: {
+
}
},
tableColumn: [
@@ -222,7 +267,10 @@
],
// 鏀惰揣淇℃伅
recriveColumn: recriveColumn,
- showReceiveCol: ["鍏ュ簱鍗曞彿", "鏀惰揣浠撳簱", "浜у搧鍚嶇О", "浜у搧缂栫爜", "鏁伴噺", "鍏ュ簱鏃堕棿", "鏀惰揣浜�", "鐘舵��"],
+ // 鍏ュ簱淇℃伅
+ inLibraryColumn:inLibraryColumn,
+ showReceiveCol: ["鏀惰揣鏃堕棿", "鏀惰揣浜�", "浜у搧鍚嶇О", "浜у搧缂栫爜", "瑙勬牸", "鏁伴噺", "鍗曚綅", "鐘舵��"],
+ inLibraryCol: ["鍏ュ簱鍗曞彿", "鏀惰揣浠撳簱", "浜у搧鍚嶇О", "浜у搧缂栫爜", "鏁伴噺", "鍏ュ簱鏃堕棿", "鏀惰揣浜�", "鐘舵��"],
loading: false,
selectRow: {}
}
@@ -425,7 +473,7 @@
if (!row.supplierName) {
this.btnEdit(row)
} else {
- submitPurchase({ id: Number(row.id), status: 2 }).then((response) => {
+ newSubmitPurchase(row.id).then((response) => {
if (response.code === 200) {
this.$message.success("鎻愪氦鎴愬姛")
this.getData()
@@ -448,7 +496,7 @@
type: "warning"
}).then(
() => {
- submitPurchase({ id: Number(row.id), status: 5 }).then((response) => {
+ newSubmitPurchase(Number(row.id)).then((response) => {
if (response.code === 200) {
this.$message.success("宸插彇娑�")
this.getData()
@@ -508,6 +556,17 @@
setTimeout(() => {
this.tableLoading = false
}, 3000)
+ },
+ // 鍒拌揣纭
+ confirmation(row){
+ console.log(row,"row")
+ this.editAffirmConfig.infomation=row
+ this.editAffirmConfig.visible=true
+ },
+ // 鍘昏川妫�
+ TestingAllClick(row){
+ this.editTestingAllConfig.infomation=row
+ this.editTestingAllConfig.visible=true
},
// 璇︽儏
selCommonClick(row) {
@@ -592,11 +651,17 @@
this.showBottomCol = this.showReceiveCol
this.setBottomList()
this.getProductInventoryInfo(this.selectRow)
+ } else if (this.TabsIndex == 2) {
+ // 鍏ュ簱淇℃伅鍒楄〃
+ this.tableBottomColumn = this.inLibraryColumn
+ this.showBottomCol = this.inLibraryCol
+ this.setBottomList()
+ this.getProductInventoryInfo(this.selectRow)
}
},
// 鐘舵��
getStatus(val) {
- return val === 1 ? "寰呯‘璁�" : val === 2 ? "寰呭嚭搴�" : val === 3 ? "鍑哄簱瀹屾垚" : val === 4 ? "宸插叧闂�" : "--"
+ return val === 1 ? "寰呯‘璁�" : val === 2 ? "寰呭叆搴�" : val === 3 ? "宸插叆搴�" : val === 4 ? "宸插畬鎴�" : val === 5 ? "宸插彇娑�" :val === 6 ? "寰呮敹璐�" :val === 7 ? "閮ㄥ垎鏀惰揣" :val === 8 ? "寰呰川妫�" : "--"
},
// 鑾峰彇浜у搧/鏀惰揣淇℃伅
async getProductInventoryInfo(row) {
--
Gitblit v1.8.0