From 9d3f1aa7571cd532c0c27bf8376ebf4b2178a252 Mon Sep 17 00:00:00 2001 From: charles <981744753@qq.com> Date: 星期三, 24 七月 2024 17:45:45 +0800 Subject: [PATCH] fix:解决srm之前改了域名,处理各种异常状态,跳转也会出现异常等问题。 --- src/views/purchaseManage/quality/index.vue | 278 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 186 insertions(+), 92 deletions(-) diff --git a/src/views/purchaseManage/quality/index.vue b/src/views/purchaseManage/quality/index.vue index 9a987ef..8b2521d 100644 --- a/src/views/purchaseManage/quality/index.vue +++ b/src/views/purchaseManage/quality/index.vue @@ -1,35 +1,46 @@ <template> - <div class="rightContent"> - <div class="content-box"> - <div class="supplier-search"> - <SearchCommonView - ref="searchCommonView" - :inputSelect="false" - placeholder="鍙緭鍏ヤ緵搴斿晢,鐗╂枡,閲囪喘鍗曠瓑鎼滅储" - @searchClick="searchClick" - @resetClick="resetClick" + <div class="quality"> + <div class="filter"> + <div class="filter-card"> + <CommonSearch + :show-add="false" + :show-download="false" + :amount-view="false" + :show-action-btn="false" + :placeholder="'璇疯緭鍏ヤ緵搴斿晢/鐗╂枡/閲囪喘鍗曠瓑'" + @searchClick="onFilterSearch" /> </div> - <template> - <TableCommonView - class="content-table" - ref="tableListRef" - :table-list="tableList" - @selCommonClick="selCommonClick" - @getSelectArray="getSelectArray" - > - <template slot="tableButton"> - <el-table-column label="鎿嶄綔" width="120" fixed="right"> - <template slot-scope="scope"> - <el-button @click="qualityClick(scope.row)" type="text" size="small">鍘昏川妫�</el-button> - </template> - </el-table-column> - </template> - </TableCommonView> + </div> + + <div class="body"> + <div class="body-card"> + <div class="list-view"> + <TableCommonView + class="content-table" + ref="tableListRef" + :table-list="tableList" + @selCommonClick="selCommonClick" + @selTableCol="selTableCol" + > + <template slot="tableButton"> + <el-table-column align="center" label="鐘舵��" width="120"> + <template slot-scope="scope"> + {{ getQualityStatus(scope.row.member_name) }} + </template> + </el-table-column> + <el-table-column align="center" label="鎿嶄綔" width="120" fixed="right"> + <template slot-scope="scope"> + <el-button @click="qualityClick(scope.row)" type="text" size="small">鍘昏川妫�</el-button> + </template> + </el-table-column> + </template> + </TableCommonView> + </div> <div class="btn-pager"> <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" /> </div> - </template> + </div> </div> <!-- 鏂板缓/缂栬緫閿�鍞嚎绱� --> @@ -41,9 +52,11 @@ <script> import pageMixin from "@/components/makepager/pager/mixin/pageMixin" -import { getSalesLeadsList, getDeleteSalesLeads } from "@/api/client/salesLead" +import { + qualityInspectList,getPurchaseInfo,submitPurchase, +} from "@/api/purchaseManage/purchase"; import DetailSupplier from "@/views/purchaseManage/quality/DetailSupplier" - +import { getDataByType } from "@/api/data"; export default { name: "SupplierManage", props: {}, @@ -58,7 +71,20 @@ visible: false, infomation: {} }, - search_map: {} + search: {}, + qualityStatusList:getDataByType('qualityStatus'), + tableColumn: [ + { label: "璐ㄦ鍗曠紪鍙�", prop: "number", min: 190, isCommonClick: true,default:true }, + { label: "閲囪喘鍗曠紪鍙�", prop: "name", min: 130, isCommonClick: true }, + { label: "鍗曟嵁绫诲瀷", prop: "contact_name", min: 130 }, + { label: "渚涘簲鍟嗗悕绉�", prop: "contact_phone", min: 130 }, + { label: "鍒拌揣浠撳簱", prop: "sales_resources", min: 130 }, + { label: "璐ㄦ鏁伴噺", prop: "province", min: 130 }, + { label: "妫�楠屽憳", prop: "city", min: 130 }, + // { label: "鐘舵��", prop: "member_name", min: 110 }, + { label: "璐ㄦ鏃堕棿", prop: "member_name", min: 150 }, + ], + showCol: ['璐ㄦ鍗曠紪鍙�', '閲囪喘鍗曠紪鍙�', '鍗曟嵁绫诲瀷', '渚涘簲鍟嗗悕绉�', '鍒拌揣浠撳簱', '璐ㄦ鏁伴噺', '妫�楠屽憳', '璐ㄦ鏃堕棿'] } }, created() { @@ -66,42 +92,51 @@ this.getData() }, methods: { + getQualityStatus(val) { + if (val) { + for (let i in this.qualityStatusList) { + if (this.qualityStatusList[i].id == val) { + return this.qualityStatusList[i].name; + } + } + } else { + return "--"; + } + }, + setColumnVisible(showCol){ + return this.tableColumn.map(ele=>{ + return { + ...ele, + isShowColumn:showCol.includes(ele.label) + } + }) + }, setTable() { this.tableList = { tableInfomation: [], selectIndex: true, - tableColumn: [ - { label: "璐ㄦ鍗曠紪鍙�", prop: "number", min: 190, isCommonClick: true }, - { label: "閲囪喘鍗曠紪鍙�", prop: "name", min: 130, isCommonClick: true}, - { label: "鍗曟嵁绫诲瀷", prop: "contact_name", min: 130 }, - { label: "渚涘簲鍟嗗悕绉�", prop: "contact_phone", min: 130 }, - { label: "鍒拌揣浠撳簱", prop: "sales_resources", min: 130 }, - { label: "璐ㄦ鏁伴噺", prop: "province", min: 130 }, - { label: "妫�楠屽憳", prop: "city", min: 130 }, - { label: "鐘舵��", prop: "member_name", min: 110 }, - { label: "璐ㄦ鏃堕棿", prop: "member_name", min: 150 }, - ] + showcol: this.showCol, + allcol: [], + tableColumn:this.setColumnVisible(this.showCol) } + this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label); + }, + selTableCol(val) { + this.showcol = val; + this.tableList.tableColumn = this.setColumnVisible(val); }, // 璇锋眰鏁版嵁 async getData() { - await getSalesLeadsList({ - search_map: this.search_map, + + await qualityInspectList({ + keyword: this.search, page: this.pagerOptions.currPage, pageSize: this.pagerOptions.pageSize }) .then((res) => { - const list = res.data.list.map((item) => { - return { - ...item, - province: item.Province.name, - city: item.City.name, - sales_resources: item.sales_sources.name, - member_name: item.member.username - } - }) + const list = res.data.data.list this.tableList.tableInfomation = list || [] - this.pagerOptions.totalCount = res.data.count + this.pagerOptions.totalCount = res.data.data.total }) .catch((err) => { console.log(err) @@ -110,13 +145,16 @@ // 鎼滅储 searchClick(val, content) { console.log(val, content) - this.search_map = { - [val.value]: content - } + this.search = content this.getData() }, resetClick() { - this.search_map = {} + this.search = '' + this.getData() + }, + onFilterSearch(searchText){ + this.search = searchText ?? '' + this.pagerOptions.currPage = 1 this.getData() }, @@ -129,7 +167,7 @@ }) .then(() => { console.log("dddd") - getDeleteSalesLeads({ ids: this.selValueList }).then((response) => { + submitPurchase({ ids: this.selValueList }).then((response) => { if (response.code === 200) { this.$message.success("纭鍙戣揣鎴愬姛") this.getData() @@ -140,18 +178,21 @@ }) .catch(() => {}) }, - getSelectArray(val) { - this.selValueList = [] - const list = val.map((item) => { - return item.id - }) - this.selValueList = list - }, + // 璇︽儏 selCommonClick(row) { console.log(row) - this.commonDetail.visible = true - this.commonDetail.infomation = { ...row } + getPurchaseInfo({id:row.ID}).then((res) => { + if (res.code == 200) { + this.commonDetail.visible = true + this.commonDetail.infomation = { + productList:res.data.productList, + ...res.data.purchase + } + }else{ + this.$message.error(res.msg?res.msg+',':''+'鑾峰彇淇℃伅澶辫触锛�') + } + }) } } } @@ -159,11 +200,82 @@ <!-- Add "scoped" attribute to limit CSS to this component only --> <style lang="scss" scoped> -.rightContent { - width:100%; - height:calc(100% - 10px); - .content-box { - height:100%; +//.rightContent { +// width:100%; +// height:calc(100% - 10px); +// .content-box { +// height:100%; +// .supplier-search { +// display: flex; +// align-items: center; +// .add-view { +// margin-left: auto; +// margin-right: 20px; +// } +// } +// .content-table{ +// // height:calc(100% - 60px - 42px); +// } +// .btn-pager { +// display: flex; +// .page { +// margin-left: auto; +// } +// } +// } +// .bottom { +// .product-search { +// display: flex; +// align-items: center; +// .search { +// margin-left: auto; +// } +// .add-view { +// margin-left: 20px; +// margin-right: 20px; +// } +// } +// .btn-pager { +// display: flex; +// .page { +// margin-left: auto; +// } +// } +// } +//} + + +.quality{ + height: 100%; + overflow: hidden; + .filter{ + height: 80px; + display: flex; + align-items: center; + padding: 12px 20px 0 20px; + &-card{ + height: 80px; + display: flex; + align-items: center; + box-sizing: border-box; + padding: 10px 20px; + flex: 1; + border-radius: 12px; + background-color: #fff; + } + } + .body{ + box-sizing: border-box; + padding: 10px 20px; + border-radius: 12px; + height: calc(100% - 92px); + .body-card { + background-color: #fff; + border-radius: 12px; + height: 100%; + overflow: hidden; + } + .supplier-search { display: flex; align-items: center; @@ -172,27 +284,9 @@ margin-right: 20px; } } - .content-table{ - // height:calc(100% - 60px - 42px); - } - .btn-pager { - display: flex; - .page { - margin-left: auto; - } - } - } - .bottom { - .product-search { - display: flex; - align-items: center; - .search { - margin-left: auto; - } - .add-view { - margin-left: 20px; - margin-right: 20px; - } + .list-view { + height: calc(100% - 60px); + overflow: hidden; } .btn-pager { display: flex; -- Gitblit v1.8.0