Lijy 10 місяців тому
батько
коміт
513cb64b75

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/business/api.ts

@@ -37,8 +37,8 @@ export const tableColumn: businessTableColumnInterface[] = [
     { prop: "customerName", label: "客户名称", width: "180" },
     { prop: "contactsName", label: "联系人", width: "180", eventName: "showName" },
     { prop: "amountOfMoney", label: "商机金额", width: "180" },
+    { prop: "expectedTransactionDate", label: "预计成交时间", width: "180" },
     { prop: "stageValue", label: "商机阶段", width: "180" },
-    { prop: "expectedTransactionDate", label: "预计成交", width: "180" },
     { prop: "inchargerName", label: "负责人", width: "180" },
     { prop: "creatorName", label: "创建人", width: "180" },
     { prop: "createTime", label: "创建时间", width: "180" }

+ 15 - 2
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/product/component/relatedBusiness.vue

@@ -6,7 +6,7 @@
         <div class="flex-1 overflow-auto pt-3">
             <el-table :data="relatedTaskstable" :show-overflow-tooltip="tableShowOverflowTooltip" border
                 style="width: 100%;height: 100%;">
-                <el-table-column v-for="(item, index) in tableColumn" :prop="item.prop" :label="item.label" :key="index"
+                <el-table-column v-for="(item, index) in newTableColumn" :prop="item.prop" :label="item.label" :key="index"
                     :width="item.width">
                     <template #default="scope">
                         <div class="table-text-textnowrap" v-if="item.eventName"
@@ -23,9 +23,11 @@ import { ref, reactive, onMounted, onUnmounted, defineExpose, inject, watchEffec
 import { tableColumn, MOD } from '@/pages/business/api'
 import { tableShowOverflowTooltip } from '@/utils/globalVariables'
 import router from '@/router';
+import { formatDate } from '@/utils/times';
 
 const relatedTaskstable = ref([])
 const information: any = ref({})
+const newTableColumn: any = ref([])
 
 const props = defineProps<{
     data: any,
@@ -34,7 +36,12 @@ const props = defineProps<{
 
 // 接收参数赋值
 function receiveAssignment(item: any) {
-    relatedTaskstable.value = item.data
+    relatedTaskstable.value = item.data.map((item: any) => {
+        return {
+            ...item,
+            expectedTransactionDate: item.expectedTransactionDate ? formatDate(new Date(item.expectedTransactionDate)) : ''
+        }
+    })
     information.value = item.information
 }
 
@@ -58,6 +65,12 @@ watchEffect(() => {
 // 生命周期钩子
 onMounted(() => {
     receiveAssignment(props)
+    newTableColumn.value = tableColumn.filter((item: any) => {
+        return !['联系人', '负责人'].includes(item.label)
+    })
+    newTableColumn.value.splice(2, 0, {
+        prop: "inchargerName", label: "负责人", width: "180"
+    })
 });
 </script>
 <style scoped lang="scss">

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/product/component/relatedSalesOrder.vue

@@ -56,7 +56,7 @@ watchEffect(() => {
 // 生命周期钩子
 onMounted(() => {
     newTableColumns.value = tableColumns.filter((item: any) => {
-        const excludedProps = ['businessOpportunityName', 'orderStartDate', 'orderEndDate', 'companySignerName', 'inchargerName', 'customSignerName'];
+        const excludedProps = ['businessOpportunityName', 'orderStartDate', 'orderEndDate', 'companySignerName', 'customSignerName'];
         return !excludedProps.includes(item.prop);
     })
     receiveAssignment(props)