From 29b5ffe318b8ab32865ebebedd865ea2aa3f6c7e Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 06 九月 2023 17:45:31 +0800
Subject: [PATCH] 供应商列表相关bug修复及样式调整
---
src/views/purchaseManage/purchase/index.vue | 171 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 84 insertions(+), 87 deletions(-)
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index 7f4dfa0..9154e05 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -15,7 +15,7 @@
</div>
<template>
<TableCommonView
- class="content-table"
+ class="content-table"
ref="tableListRef"
:table-list="tableList"
@selCommonClick="selCommonClick"
@@ -23,15 +23,15 @@
<template slot="tableButton">
<el-table-column label="鐘舵��" width="120">
<template slot-scope="scope">
- {{ getpurchaseStatus(scope.row.status) }}
+ {{ getpurchaseStatus(scope.row.status) }}
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="120" fixed="right">
<template slot-scope="scope">
- <el-button type="text" size="small" @click="editClick(scope.row)" style="margin-right: 5px"
+ <el-button type="text" size="small" @click="editClick(scope.row)" style="margin-right: 5px"
>缂栬緫</el-button
>
- <el-button @click="submitClick(scope.row)" type="text" size="small">鎻愪氦</el-button>
+ <el-button @click="submitClick(scope.row)" type="text" size="small">鎻愪氦</el-button>
</template>
</el-table-column>
</template>
@@ -41,48 +41,45 @@
</div>
</template>
</div>
-
+
<!-- 鏂板缓/缂栬緫閿�鍞嚎绱� -->
<!-- <AddSalesLeadDialog v-if="editSalesLeadConfig.visible" :edit-rightContent-config="editSalesLeadConfig" /> -->
<!-- 璇︽儏 -->
- <DetailSupplier v-if="commonDetail.visible" :common-detail="commonDetail" />
+ <DetailSupplier v-if="commonDetail.visible" :common-detail="commonDetail" />
<!-- 鏂板缓/缂栬緫 -->
<AddPurchase v-if="editConfig.visible" :edit-common-config="editConfig" />
</div>
</template>
<script>
-
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import {
- getPurchaseList,getPurchaseInfo,submitPurchase,
-} from "@/api/purchaseManage/purchase";
+import { getPurchaseList, getPurchaseInfo, submitPurchase } from "@/api/purchaseManage/purchase"
import DetailSupplier from "@/views/purchaseManage/purchase/DetailSupplier"
import AddPurchase from "@/views/purchaseManage/purchase/components/AddPurchase"
-import { getDataByType } from "@/api/data";
+import { getDataByType } from "@/api/data"
export default {
name: "SupplierManage",
props: {},
- components: { DetailSupplier,AddPurchase },
+ components: { DetailSupplier, AddPurchase },
mixins: [pageMixin],
computed: {},
data() {
return {
- tableLoading:false,
+ tableLoading: false,
tableList: {}, // 鍒楄〃
selValueList: [],
commonDetail: {
visible: false,
infomation: {}
},
- search:'',
- editRow:{},
+ search: "",
+ editRow: {},
editConfig: {
visible: false,
title: "鍒涘缓",
infomation: {}
},
- purchaseStatusList:getDataByType('purchaseStatus'),
+ purchaseStatusList: getDataByType("purchaseStatus")
}
},
created() {
@@ -94,11 +91,11 @@
if (val) {
for (let i in this.purchaseStatusList) {
if (this.purchaseStatusList[i].id == val) {
- return this.purchaseStatusList[i].name;
+ return this.purchaseStatusList[i].name
}
}
} else {
- return "--";
+ return "--"
}
},
setTable() {
@@ -107,13 +104,13 @@
selectIndex: true,
tableColumn: [
{ label: "閲囪喘鍗曞彿", prop: "number", min: 150, isCommonClick: true },
- { label: "閲囪喘鍗曞悕绉�", prop: "name", min: 130, isCommonClick: true},
+ { label: "閲囪喘鍗曞悕绉�", prop: "name", min: 130, isCommonClick: true },
{ label: "鍗曟嵁绫诲瀷", prop: "orderType", min: 130 },
{ label: "渚涘簲鍟嗗悕绉�", prop: "contact", min: 130 },
{ label: "閲囪喘鏁伴噺", prop: "quantity", min: 130 },
{ label: "鏀惰揣浠撳簱", prop: "warehouse", min: 130 },
{ label: "缁忓姙浜�", prop: "handledBy", min: 130 },
- { label: "鍒跺崟浜�", prop: "creator", min: 130 },
+ { label: "鍒跺崟浜�", prop: "creator", min: 130 }
]
}
},
@@ -138,11 +135,11 @@
// 鎼滅储
searchClick(val, content) {
console.log(val, content)
- this.search = content
+ this.search = content
this.getData()
},
resetClick() {
- this.search = ''
+ this.search = ""
this.getData()
},
// 鏂板缓
@@ -152,89 +149,88 @@
this.editConfig.visible = true
this.editConfig.title = "鍒涘缓"
this.editConfig.infomation = {
- productList:[],
- purchaseTypeId:'',
- supplierId:'',
- supplierName:'',
- orderSource:'鎵嬪姩鍒涘缓',
- name:'',
- contact:'',
- phone:'',
- signingDate:'',
- deliveryDate:'',
- remark:'',
- wholeDiscountType:null,
- wholeDiscount:0,
- priceAdjustmentType:null,
- priceAdjustment:0,
- realTotalPrice:0,
- }
+ productList: [],
+ purchaseTypeId: "",
+ supplierId: "",
+ supplierName: "",
+ orderSource: "鎵嬪姩鍒涘缓",
+ name: "",
+ contact: "",
+ phone: "",
+ signingDate: "",
+ deliveryDate: "",
+ remark: "",
+ wholeDiscountType: null,
+ wholeDiscount: 0,
+ priceAdjustmentType: null,
+ priceAdjustment: 0,
+ realTotalPrice: 0
+ }
},
-
+
// 缂栬緫
- editClick(row){
- this.tableLoading=true
- getPurchaseInfo({id:row.ID}).then((res) => {
+ editClick(row) {
+ this.tableLoading = true
+ getPurchaseInfo({ id: row.ID }).then((res) => {
if (res.code == 200) {
- this.tableLoading=false
+ this.tableLoading = false
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = {
- productList:res.data.productList,
- supplierName:res.data.purchase.supplier.name,
- ...res.data.purchase,
- }
- }else{
- this.$message.error(res.msg?res.msg+',':''+'鑾峰彇淇℃伅澶辫触锛�')
+ this.editConfig.infomation = {
+ productList: res.data.productList,
+ supplierName: res.data.purchase.supplier.name,
+ ...res.data.purchase
+ }
+ } else {
+ this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
}
})
- setTimeout(()=>{
- this.tableLoading=false
- },3000)
+ setTimeout(() => {
+ this.tableLoading = false
+ }, 3000)
// this.editRow = row;
// this.$refs.add.islook = true;
-
},
// 纭鍙戣揣
submitClick(row) {
- this.$confirm("鏄惁鎻愪氦?", "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- console.log("dddd")
- submitPurchase({ id: row.ID }).then((response) => {
- if (response.code === 200) {
- this.$message.success("鎻愪氦鎴愬姛")
- this.getData()
- } else {
- this.$message.warning("鎻愪氦澶辫触")
- }
- })
+ this.$confirm("鏄惁鎻愪氦?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ console.log("dddd")
+ submitPurchase({ id: row.ID }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鎻愪氦鎴愬姛")
+ this.getData()
+ } else {
+ this.$message.warning("鎻愪氦澶辫触")
+ }
})
- .catch(() => {})
+ })
+ .catch(() => {})
},
-
+
// 璇︽儏
selCommonClick(row) {
console.log(row)
- this.tableLoading=true
- getPurchaseInfo({id:row.ID}).then((res) => {
+ this.tableLoading = true
+ getPurchaseInfo({ id: row.ID }).then((res) => {
if (res.code == 200) {
- this.tableLoading=false
+ this.tableLoading = false
this.commonDetail.visible = true
- this.commonDetail.infomation = {
- productList:res.data.productList,
+ this.commonDetail.infomation = {
+ productList: res.data.productList,
...res.data.purchase
- }
- }else{
- this.$message.error(res.msg?res.msg+',':''+'鑾峰彇淇℃伅澶辫触锛�')
+ }
+ } else {
+ this.$message.error(res.msg ? res.msg + "," : "" + "鑾峰彇淇℃伅澶辫触锛�")
}
})
- setTimeout(()=>{
- this.tableLoading=false
- },3000)
+ setTimeout(() => {
+ this.tableLoading = false
+ }, 3000)
}
}
}
@@ -243,10 +239,10 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.rightContent {
- width:100%;
- height:calc(100% - 10px);
+ width: 100%;
+ height: calc(100% - 10px);
.content-box {
- height:100%;
+ height: 100%;
.supplier-search {
display: flex;
align-items: center;
@@ -255,11 +251,12 @@
margin-right: 20px;
}
}
- .content-table{
+ .content-table {
// height:calc(100% - 60px - 42px);
}
.btn-pager {
display: flex;
+ // background: #fff;
.page {
margin-left: auto;
}
--
Gitblit v1.8.0