提交

src/views/business/production/fileUpload/index.vue

@@ -17,6 +17,12 @@
           <el-input v-model="queryParams.leaderName" placeholder="请输入客户负责人" style="width: 150px" clearable
             @keyup.enter="handleQuery" />
         </el-form-item>
+        <!-- <el-form-item v-if="tenant.versionId == '4'" label="来源：" prop="tenantId">
+          <el-select v-model="queryParams.tenantId" clearable>
+                  <el-option v-for="item in tenantList" :key="item.fromTenantId" :label="item.contactCompany"
+                    :value="item.fromTenantId" />
+                </el-select>
+        </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery" size="small">搜索</el-button>
         <!-- <el-button type="primary" icon="Upload" @click="uploadHandle" size="small" v-hasPermi="['business:upload:add']">上传</el-button>
@@ -41,6 +47,11 @@
       <el-table-column label="客户名称" prop="name" min-width="110" align="left" />
       <el-table-column label="税号" min-width="200" align="center" prop="socialCreditCode" />
       <el-table-column label="纳税类型" align="center" min-width="120" prop="taxType" />
+      <el-table-column v-if="tenant.versionId == '4'" label="来源" align="center" min-width="110" prop="tenantId">
+        <template #default="scope">
+          {{ getTenantName(scope.row) }}
+        </template>
+      </el-table-column>
       <el-table-column label="客服" align="center" min-width="110" prop="adviserName" />
       <el-table-column label="负责人" align="center" min-width="110" prop="leaderName" />
       <el-table-column label="操作" width="130" align="center" class-name="small-padding fixed-width">
@@ -60,15 +71,15 @@
 </template>
 
 <script setup name="ResouceUpload">
-  import { listLableNoPage } from "@/api/business/lable"
   import { listFile, delFile } from "@/api/business/fileUpload";
-  import { uploadFile, downloadFile } from "@/api/tool/file";
+  import { downloadFile } from "@/api/tool/file";
   import useUserStore from "@/store/modules/user";
-  import { ref } from "vue";
+  import { ref, computed } from "vue";
   import formDialog from "./form.vue";
   import viewDialog from "./view.vue";
   import {
     listEntrustOrder,
+    listTenant
   } from "@/api/business/entrust/entrustOrder";
   import {
     listProductionCompany,
@@ -124,6 +135,16 @@
     files: [],
   };
 
+  const getTenantName = computed(() => {
+    return row => {
+      const tenant = tenantList.value.find(t => t.fromTenantId == row.tenantId)
+      if(tenant) {
+        return tenant.contactCompany
+      }
+      return ''
+    }
+  })
+
   /** 查询对象 */
   const queryParams = ref({
     pageNum: 1,
@@ -157,16 +178,28 @@
     }
     listEntrustOrder({
     pageNum: 1,
-    pageSize: 20,
-    orderByColumn: "create_time", status: 1}).then(res => {
+    pageSize: 999,
+    status: 1}).then(res => {
       tenantList.value = res.rows
     })
   }
 
+  // function getTenantList() {
+  //   if(tenant.versionId != '4') {
+  //     return
+  //   }
+  //   listTenant({
+  //   pageNum: 1,
+  //   pageSize: 999,
+  //   status: 1}).then(res => {
+  //     tenantList.value = res.rows
+  //   })
+  // }
+
   onActivated(() => {
     // 你的逻辑
     // getList();
-    getEntrustOrderList()
+    // getEntrustOrderList()
   });
   /** 查询company列表 */
   // function getList() {
@@ -323,6 +356,6 @@
       });
   }
   getList();
-  // getOption();
-  // getEntrustOrderList()
+  // getTenantList()
+  getEntrustOrderList()
 </script>