提交对应客户代码

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/TaskModal/index.vue

@@ -24,6 +24,7 @@
             <el-option v-for="item in PRIORITY " :key="item.value" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
+        {{ form.taskType }}
         <el-form-item :label="form.taskType">
           <template #label>
             <el-select v-model="form.taskType" class="border resetSelect" style="width: 100px" @change="changeTaskType"
@@ -143,6 +144,7 @@ watch(() => props.saveLoading, (val) => {
     formRef.value?.resetFields();
     form.value = { ...defalutModalForm };
     generateFormRef.value?.reset();
+    taskTypeValueData.value = customeData.value
   }
 })
 watch(() => props.visible, (val) => {

fhKeeper/formulahousekeeper/customerBuler-crm/src/main.ts

@@ -31,7 +31,7 @@ app.config.globalProperties.$echarts = echarts;
 app
   .use(ElementPlus, {
     locale: zhCn,
-    zIndex: 1900,
+    zIndex: 1800,
   })
   .use(createPinia())
   .use(router)

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/contacts/component/relatedBusiness.vue

@@ -22,6 +22,7 @@
                 <el-table-column prop="stageValue" label="商机阶段" width="130" />
                 <el-table-column prop="creatorName" label="创建人" width="130" />
                 <el-table-column prop="createTime" label="创建时间" width="130" />
+                <el-table-column prop="editTime" label="修改时间" width="130" />
             </el-table>
         </div>
 
@@ -53,7 +54,7 @@ import { get, post } from '@/utils/request';
 import { useRouter, useRoute } from "vue-router";
 
 import RelatedProducts from '@/components/relatedProducts/relatedProducts.vue'
-import { formatDateTime } from '@/utils/times';
+import { formatDate, formatDateTime } from '@/utils/times';
 import { GETGENERATEFOEM, UPDATEINSET } from '@/pages/business/api';
 import { GETTABLELIST } from '@/pages/product/api';
 import { judgmentaAmounteEqual } from '@/utils/tools';
@@ -142,7 +143,12 @@ function closeVisible(type: keyof typeof allVisible) {
 watchEffect(() => {
     const { data } = props
     information.value = data
-    relatedTaskstable.value = data.businessOpportunityList
+    relatedTaskstable.value = data.businessOpportunityList.map((item: any) => {
+        return {
+            ...item,
+            expectedTransactionDate: item.expectedTransactionDate ? formatDate(new Date(item.expectedTransactionDate)) : ''
+        }
+    })
 });
 
 async function getSystemField() {

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/order/api.ts

@@ -23,8 +23,8 @@ export const URL_EDITEBATE = `${MOD}/editPayment`
 export const URL_DETELEITEMS = `${MOD}/deletePayment`
 
 export const tableColumns: TableColumn[] = [
-    { prop: 'orderCode', label: '订单编号', event: 'toDetali', width: '150' },
-    { prop: 'orderName', label: '订单名称', width: '150' },
+    { prop: 'orderCode', label: '订单编号', width: '150' },
+    { prop: 'orderName', label: '订单名称', event: 'toDetali', width: '150' },
     { prop: 'customName', label: '客户名称', width: '200' },
     { prop: 'businessOpportunityName', label: '商机名称', width: '200' },
     { prop: 'price', label: '订单金额(￥)', width: '120' },
@@ -35,8 +35,8 @@ export const tableColumns: TableColumn[] = [
     { prop: 'placeTime', label: '下单时间', width: '200' },
     { prop: 'orderStartDate', label: '订单开始时间', width: '200' },
     { prop: 'orderEndDate', label: '订单结束时间', width: '140' },
-    { prop: 'customSignerName', label: '客户签的人', width: '140' },
-    { prop: 'companySignerName', label: '公司签的人', width: '200' },
+    { prop: 'customSignerName', label: '客户签约人', width: '140' },
+    { prop: 'companySignerName', label: '公司签约人', width: '200' },
     { prop: 'inchargerName', label: '负责人', width: '200' },
     { prop: 'creatorName', label: '创建人', width: '200' },
     { prop: 'createTime', label: '创建时间', width: '200' },

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/order/index.vue

@@ -436,7 +436,7 @@ function setFilterItems() {
     { label: '订单名称', key: 'orderName', type: 'input' },
     { label: '客户名称', key: 'customId', type: 'select', options: selectData.Customer },
     { label: '商机名称', key: 'businessName', type: 'input' },
-    { label: '订单类型', key: 'ordertype', type: 'select', options: selectData.OrderType },
+    { label: '订单类型', key: 'orderType', type: 'select', options: selectData.OrderType },
     { label: '回款状态', key: 'receivedStatus', type: 'select', options: selectData.RemittanceStatus },
     { label: '负责人', key: 'inchargerId', type: 'select', options: selectData.Personnel },
     { label: '下单时间', key: '', type: 'date' },

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

@@ -5,12 +5,7 @@
         </div>
         <div class="flex-1 overflow-auto pt-3">
             <el-table :data="relatedTaskstable" border style="width: 100%;height: 300px;">
-                <el-table-column label="序号" width="80">
-                    <template #default="scope">
-                        {{ scope.$index + 1 }}
-                    </template>
-                </el-table-column>
-                <el-table-column v-for="(column, index) in tableColumns" :key="index" :prop="column.prop"
+                <el-table-column v-for="(column, index) in newTableColumns" :key="index" :prop="column.prop"
                     :label="column.label" :width="column.width">
                     <template #default="scope">
                         <template v-if="column.event === 'toDetali'">
@@ -30,6 +25,7 @@ import { tableColumns, MOD, paymentStatus } from '@/pages/order/api'
 import router from '@/router';
 
 const relatedTaskstable = ref([])
+const newTableColumns = ref<any>([])
 
 const props = defineProps<{
     data: any
@@ -59,6 +55,10 @@ watchEffect(() => {
 
 // 生命周期钩子
 onMounted(() => {
+    newTableColumns.value = tableColumns.filter((item: any) => {
+        const excludedProps = ['businessOpportunityName', 'orderStartDate', 'orderEndDate', 'companySignerName', 'inchargerName', 'customSignerName'];
+        return !excludedProps.includes(item.prop);
+    })
     receiveAssignment(props)
 });
 </script>