From b8bd2b2da2b62da9565fd62b74d5b4a403abe15c Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 27 三月 2024 15:11:50 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM
---
src/views/purchaseManage/purchase/index.vue | 158 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 139 insertions(+), 19 deletions(-)
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index 48c106e..93c3fc8 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -53,6 +53,13 @@
<el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
>鏌ョ湅</el-button
>
+ <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 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"
@@ -96,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">
@@ -117,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>
@@ -125,18 +146,21 @@
import {
getPurchaseList,
getPurchaseInfo,
- submitPurchase,
+ newSubmitPurchase,
deletePurchase,
+ getPurchaseQualityInspectionInfo,
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() {
@@ -155,6 +179,17 @@
]
// 鏀惰揣淇℃伅
const recriveColumn = [
+ { label: "鏀惰揣鏃堕棿", prop: "createTime", default: true },
+ { label: "鏀惰揣浜�", prop: "principal" },
+ { label: "浜у搧鍚嶇О", prop: "productName" },
+ { label: "浜у搧缂栫爜", prop: "productId" },
+ { label: "瑙勬牸", prop: "specs" },
+ { label: "鏁伴噺", prop: "amount" },
+ { label: "鍗曚綅", prop: "unit" },
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getreceiveStatusStatus }
+ ]
+ // 鍏ュ簱淇℃伅
+ const inLibraryColumn = [
{ label: "鍏ュ簱鍗曞彿", prop: "operationNumber", default: true },
{ label: "鏀惰揣浠撳簱", prop: "warehouseName" },
{ label: "浜у搧鍚嶇О", prop: "name" },
@@ -162,10 +197,11 @@
{ label: "鏁伴噺", prop: "amount" },
{ label: "鍏ュ簱鏃堕棿", prop: "overTime" },
{ label: "鏀惰揣浜�", prop: "principal" },
- { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getpurchaseStatus }
+ { label: "鐘舵��", prop: "status", isCallMethod: true, getCallMethod: this.getreceiveStatusStatus }
]
return {
purchaseStatusList: getDataByType("purchaseStatus"),
+ receiveStatusList: getDataByType("receiveStatus"),
tableLoading: false,
tableList: {}, // 鍒楄〃
selValueList: [],
@@ -184,6 +220,23 @@
supplierList: []
}
},
+ editAffirmConfig: {
+ visible: false,
+ isDisabled: false,
+ detailEnter: false,
+ infomation: {
+
+ // supplierList: []
+ }
+ },
+ editTestingAllConfig:{
+ visible: false,
+ isDisabled: false,
+ detailEnter: false,
+ infomation: {
+
+ }
+ },
tableColumn: [
{ label: "鍗曟嵁绫诲瀷", prop: "orderType", min: 130 },
{ label: "閲囪喘鍗曞彿", prop: "number", min: 150, isCommonClick: true, default: true },
@@ -197,7 +250,7 @@
showCol: ["閲囪喘鍗曞彿", "閲囪喘鍗曞悕绉�", "鍗曟嵁绫诲瀷", "渚涘簲鍟嗗悕绉�", "閲囪喘鏁伴噺", "鏀惰揣浠撳簱", "缁忓姙浜�", "鍒跺崟浜�"],
tableBottomColumn: [],
showBottomCol: [],
- TabsIndex: "0",
+ TabsIndex: 0,
productTableList: {},
// 浜у搧淇℃伅
productColumn: productColumn,
@@ -215,7 +268,10 @@
],
// 鏀惰揣淇℃伅
recriveColumn: recriveColumn,
- showReceiveCol: ["鍏ュ簱鍗曞彿", "鏀惰揣浠撳簱", "浜у搧鍚嶇О", "浜у搧缂栫爜", "鏁伴噺", "鍏ュ簱鏃堕棿", "鏀惰揣浜�", "鐘舵��"],
+ // 鍏ュ簱淇℃伅
+ inLibraryColumn:inLibraryColumn,
+ showReceiveCol: ["鏀惰揣鏃堕棿", "鏀惰揣浜�", "浜у搧鍚嶇О", "浜у搧缂栫爜", "瑙勬牸", "鏁伴噺", "鍗曚綅", "鐘舵��"],
+ inLibraryCol: ["鍏ュ簱鍗曞彿", "鏀惰揣浠撳簱", "浜у搧鍚嶇О", "浜у搧缂栫爜", "鏁伴噺", "鍏ュ簱鏃堕棿", "鏀惰揣浜�", "鐘舵��"],
loading: false,
selectRow: {}
}
@@ -253,6 +309,17 @@
for (let i in this.purchaseStatusList) {
if (this.purchaseStatusList[i].id == val) {
return this.purchaseStatusList[i].name
+ }
+ }
+ } else {
+ return "--"
+ }
+ },
+ getreceiveStatusStatus(val) {
+ if (val) {
+ for (let i in this.receiveStatusList) {
+ if (this.receiveStatusList[i].id == val) {
+ return this.receiveStatusList[i].name
}
}
} else {
@@ -302,7 +369,8 @@
this.pagerOptions.totalCount = res.data.total
if (res.data.total > 0) {
this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
- this.tableRowClick(this.selectRow)
+ // this.tableRowClick(this.selectRow)
+ this.getProductInventoryInfo(this.selectRow)
}
}
})
@@ -347,7 +415,7 @@
number: "",
contact: "",
phone: "",
- signingDate: "",
+ signingDate: this.getCurrentDate(),
deliveryDate: "",
remark: "",
wholeDiscountType: null,
@@ -357,7 +425,14 @@
realTotalPrice: 0
}
},
-
+ // 鑾峰彇褰撳墠鏃ユ湡
+ getCurrentDate() {
+ let now = new Date()
+ let year = now.getFullYear()
+ let month = now.getMonth() + 1
+ let day = now.getDate()
+ return year + "-" + month + "-" + day
+ },
// 缂栬緫
btnEdit(row) {
this.editConfig.detailEnter = false
@@ -383,9 +458,8 @@
setTimeout(() => {
this.tableLoading = false
}, 3000)
- // this.editRow = row;
- // this.$refs.add.islook = true;
},
+
// 纭鍙戣揣
btnConfirm(row) {
let string = "鏄惁鎻愪氦锛�"
@@ -401,7 +475,10 @@
if (!row.supplierName) {
this.btnEdit(row)
} else {
- submitPurchase({ id: Number(row.id), status: 2 }).then((response) => {
+ newSubmitPurchase({
+ id: Number(row.id),
+ status:4
+ }).then((response) => {
if (response.code === 200) {
this.$message.success("鎻愪氦鎴愬姛")
this.getData()
@@ -424,7 +501,10 @@
type: "warning"
}).then(
() => {
- submitPurchase({ id: Number(row.id), status: 5 }).then((response) => {
+ newSubmitPurchase({
+ id: Number(row.id),
+ status:5
+ }).then((response) => {
if (response.code === 200) {
this.$message.success("宸插彇娑�")
this.getData()
@@ -485,6 +565,17 @@
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) {
this.tableLoading = true
@@ -508,7 +599,7 @@
// top 琛岀偣鍑�
tableRowClick(row) {
this.selectRow = row
- if (row.status == 1 && this.TabsIndex == 0) {
+ if (this.TabsIndex == 0) {
getPurchaseInfo({ id: row.id }).then((res) => {
if (res.code == 200) {
this.productTableList.tableInfomation = res.data.productList
@@ -516,9 +607,18 @@
this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
}
})
- } else if (this.TabsIndex == 1 && row.status == 1) {
+ } else if (this.TabsIndex == 1 ) {
this.productTableList.tableInfomation = []
- } else {
+ getPurchaseQualityInspectionInfo({
+ purchaseNumber: row.number,
+ }).then((res)=>{
+ if (res.code == 200) {
+ this.productTableList.tableInfomation = res.data
+ } else {
+ this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
+ }""
+ })
+ } else if(this.TabsIndex == 2) {
getOperationInfo({ id: row.id }).then((res) => {
if (res.code == 200) {
this.productTableList.tableInfomation = res.data
@@ -526,6 +626,8 @@
this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
}
})
+ }else {
+ this.productTableList.tableInfomation=[]
}
},
// bom 鍒楄〃
@@ -568,16 +670,22 @@
this.showBottomCol = this.showReceiveCol
this.setBottomList()
this.getProductInventoryInfo(this.selectRow)
+ } else if (this.TabsIndex == 2) {
+ console.log("鍏ュ簱")
+ // 鍏ュ簱淇℃伅鍒楄〃
+ 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) {
- console.log(row)
- if (this.TabsIndex == 0 && row.status == 1) {
+ if (this.TabsIndex == 0 ) {
getPurchaseInfo({ id: row.id }).then((res) => {
if (res.code == 200) {
this.productTableList.tableInfomation = res.data.productList
@@ -587,7 +695,17 @@
})
} else if (this.TabsIndex == 1 && row.status == 1) {
this.productTableList.tableInfomation = []
- } else {
+ } else if(this.TabsIndex==1 ){
+ getPurchaseQualityInspectionInfo({
+ purchaseNumber: row.number,
+ }).then((res)=>{
+ if (res.code == 200) {
+ this.productTableList.tableInfomation = res.data
+ } else {
+ this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
+ }""
+ })
+ }else if(this.TabsIndex==2){
getOperationInfo({ id: row.id }).then((res) => {
if (res.code == 200) {
this.productTableList.tableInfomation = res.data
@@ -595,6 +713,8 @@
this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
}
})
+ }else{
+ this.productTableList.tableInfomation =[]
}
}
}
--
Gitblit v1.8.0