From b6f905bf79dbf325961e962773a2f2ada59e7d65 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 5 Jun 2023 22:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BC=BA=E5=A4=B1=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purApply/purOrderSelectProduct.vue        |  2 +-
 src/views/purchase/purOrder/purOrder.vue      | 29 ++++++-------
 src/views/purchase/purOrder/purOrderAudit.vue |  1 +
 .../purchase/purOrder/purOrderSearch.vue      | 41 ++++++++++---------
 4 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index 7921a9a1..ad18422f 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="分类编码:" class="query-form-item">
-              <el-input v-model="listQuery.mainId" style="width: 90%" placeholder="请输入三方物资分类"
+              <el-input v-model="listQuery.flbm" style="width: 90%" placeholder="请输入分类编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index f402c3a6..24f24d6b 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -26,7 +26,7 @@
 
           <el-col :span="8">
             <el-form-item label="采购仓库">
-              <el-select v-model="filterQuery.invCode" style="width: 90%"  clearable placeholder="请选择所属仓库">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
                 <el-option
                   v-for="item in invList"
                   :key="item.name"
@@ -84,6 +84,7 @@
         <el-table-column label="采购单号" prop="billNo"></el-table-column>
         <el-table-column label="采购部门" prop="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
           <template slot-scope="scope">
             {{ emergencyMap[scope.row.emergency] }}
@@ -176,12 +177,12 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        emergency:'',
-        deptCode:'',
-        invCode:''
+        emergency: '',
+        deptCode: '',
+        invCode: ''
       },
       formName: null,
-      invCodebe:null,
+      invCodebe: null,
       formMap: {
         add: "新增采购订单",
         update: "编辑采购订单",
@@ -192,7 +193,7 @@ export default {
         3: "已审核",
         4: "已拒绝"
       },
-      emergencyMap:{
+      emergencyMap: {
         1: "正常",
         2: "较急",
         3: "特急",
@@ -286,7 +287,7 @@ export default {
             this.newSpDistributionVisible = false
           }
         });
-      }else{
+      } else {
         this.newSpDistributionVisible = false
       }
 
@@ -312,7 +313,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
-            this.detailList=[]
+            this.detailList = []
           } else {
             this.$message.error(response.message);
           }
@@ -404,8 +405,8 @@ export default {
       this.detailList = [];
     },
     getInvList() {
-      var query={
-        parentId:this.filterQuery.deptCode
+      var query = {
+        parentId: this.filterQuery.deptCode
       }
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
@@ -414,12 +415,12 @@ export default {
     getDeptList() {
       getDeptListByUser().then((res) => {
         this.deptList = res.data || [];
-        if(this.deptList.length>0){
-          this.filterQuery.deptCode=this.deptList[0].code
-          this.invCodebe=this.filterQuery.deptCode
+        if (this.deptList.length > 0) {
+          this.filterQuery.deptCode = this.deptList[0].code
+          this.invCodebe = this.filterQuery.deptCode
         }
         this.getList();
-        this. getInvList();
+        this.getInvList();
       });
     },
 
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 5f1b8579..c212e8b2 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -83,6 +83,7 @@
         <el-table-column label="采购单号" prop="billNo"></el-table-column>
         <el-table-column label="采购部门" prop="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
           <template slot-scope="scope">
             {{ emergencyMap[scope.row.emergency] }}
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 4e98a2d1..7a1d9f30 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -10,7 +10,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="采购部门">
-              <el-select v-model="filterQuery.deptCode"  @change="getInvList" placeholder="请选择采购部门" style="width: 90%">
+              <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择采购部门" style="width: 90%">
                 <el-option
                   v-for="item in deptList"
                   :key="item.code"
@@ -99,6 +99,7 @@
         <el-table-column label="采购单号" prop="billNo"></el-table-column>
         <el-table-column label="采购部门" prop="deptName"></el-table-column>
         <el-table-column label="采购仓库" prop="invName"></el-table-column>
+        <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="紧急程度" prop="emergency">
           <template slot-scope="scope">
             {{ emergencyMap[scope.row.emergency] }}
@@ -193,11 +194,11 @@ export default {
         corpName: null,
         type: 1,
         editStatus: 1,
-        emergency:'',
-        deptCode:'',
+        emergency: '',
+        deptCode: '',
       },
-      Menustatus:null,
-      filePath:"",
+      Menustatus: null,
+      filePath: "",
       formName: null,
       formMap: {
         add: "新增采购计划",
@@ -221,7 +222,7 @@ export default {
       editType: 1,
       total: 0,
       thirdSys: [],
-      invCodebe:null,
+      invCodebe: null,
       thirdSysDetail: null,
       busTypes: [],
       originTypes: [],
@@ -328,7 +329,7 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    help(){
+    help() {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       window.open(this.certFileUrl + this.filePath);
     },
@@ -354,7 +355,7 @@ export default {
           if (response.code == 20000) {
             this.list = response.data.list || [];
             this.total = response.data.total || 0;
-            this.detailList=[]
+            this.detailList = []
           } else {
             this.$message.error(response.message);
           }
@@ -410,12 +411,12 @@ export default {
       this.getList();
     },
 
-    selectAuthMenu(){
-      let params={menuName:this.$route.meta.title}
-      selectAuthMenu(params).then((res) =>{
-        if(res.code === 20000){
-          this.Menustatus=res.data.status;
-          this.filePath=res.data.filePath;
+    selectAuthMenu() {
+      let params = {menuName: this.$route.meta.title}
+      selectAuthMenu(params).then((res) => {
+        if (res.code === 20000) {
+          this.Menustatus = res.data.status;
+          this.filePath = res.data.filePath;
         }
       })
     },
@@ -427,8 +428,8 @@ export default {
     },
 
     getInvList() {
-      var query={
-        parentId:this.filterQuery.deptCode
+      var query = {
+        parentId: this.filterQuery.deptCode
       }
       filterSubAll(query).then((res) => {
         this.invList = res.data || [];
@@ -437,12 +438,12 @@ export default {
     getDeptList() {
       getDeptListByUser().then((res) => {
         this.deptList = res.data || [];
-        if(this.deptList.length>0){
-          this.filterQuery.deptCode=this.deptList[0].code
-          this.invCodebe=this.filterQuery.deptCode
+        if (this.deptList.length > 0) {
+          this.filterQuery.deptCode = this.deptList[0].code
+          this.invCodebe = this.filterQuery.deptCode
         }
         this.getList();
-        this. getInvList();
+        this.getInvList();
       });
     },