风险监控优化

src/views/ctyc/info/approvalMain.vue

@@ -2,9 +2,9 @@
   <div class="app-container">
     <el-tabs v-model="activeName" >
       <el-tab-pane :label="num1" name="approval" @click="tabClick"></el-tab-pane>
-      <el-tab-pane :label="num2" name="approved" @click="tabClick"></el-tab-pane>
+      <el-tab-pane :label="num2" name="approved" @click="tabClick" ></el-tab-pane>
     </el-tabs>
-    <component :is="currentPage"></component>
+    <component :is="currentPage" :oid="ocode"></component>
   </div>
 </template>
 
@@ -13,9 +13,17 @@ import { listInfo } from "@/api/ctyc/info";
 import approval from '@/views/ctyc/info/approval';
 import approved from '@/views/ctyc/info/approved';
 export default {
+  mounted() {
+    let code = this.$route.query.code; // 物料ID
+    if(code!= undefined){
+      this.ocode = code;
+      this.activeName = 'approved';
+    }
+  },
   name: "tabs",
   data() {
     return {
+      ocode: '',
       num1: '',
       num2: '',
       queryParams1: {
@@ -31,6 +39,9 @@ export default {
     currentPage(newValue, oldValue) {
         if(oldValue != newValue){
           this.tabClick();
+          if(newValue == 'approval'){
+            this.$router.replace('/business/ctyc/approvalMain');
+          }
         }
       },
     },

src/views/ctyc/info/approved.vue

@@ -435,6 +435,12 @@ import { listInfo, getInfo, delInfo, addInfo, updateInfo, getTycInfo, addAlog, q
 
 export default {
   name: "Info",
+  props: {
+          oid: {
+              type: String, // 指定数据类型
+              default: '' // 指定默认值，如果message绑定的值设置为 undefined 即会使用该值
+          }
+        },
   data() {
     return {
       // 按钮模拟默认点击
@@ -548,6 +554,9 @@ export default {
   },
   created() {
     this.getList();
+    if(this.oid != ''){
+      this.handleOaInfo(this.oid);
+    }
   },
   methods: {
     /** 查询合作企业列表 */
@@ -652,6 +661,20 @@ export default {
         this.infoTitle = "审阅";
       })
     },
+    /** 详情按钮操作 */
+    handleOaInfo(oid) {
+      this.reset();
+      const companyId = oid
+      getTycInfo(companyId).then(response => {
+        this.infoForm = response.data;
+        this.infoOpen = true;
+        this.ef1 = true;
+        this.ef2 = false;
+        this.bp1 = false;
+        this.bp2 = true;
+        this.infoTitle = "审阅";
+      })
+    },
     /** 风险审阅按钮操作 */
     handleAlog() {
       this.reset();

src/views/material/basicFile/columns.js

@@ -384,11 +384,15 @@ export const SearchColumnsExtend = [
     },
   },
   {
-    item: { key: "materialCodes", title: "物料编码" },
-    attr: {
-      clearable: true,
-      is: "el-input",
-      placeholder: '多物料编码使用 , 隔开',
+    item:{
+      key: "name",
+      title: "物料名称",  
+    },
+    attr:{
+      clearable:true,
+      is: "el-popover-select-v2",
+      valueKey: "name",
+      referName: "MATERIAL_PARAM",
     },
   },
   {