提交相关代码

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/business/component/products.vue

@@ -15,7 +15,7 @@
                 </el-table-column>
                 <el-table-column prop="productName" label="产品名称">
                     <template #default="scope">
-                        <el-button link type="primary" size="large">{{
+                        <el-button link type="primary" size="large" @click="toDetali(scope.row)">{{
                             scope.row.productName
                         }}</el-button>
                     </template>
@@ -54,7 +54,7 @@
 import { ref, reactive, onMounted, onUnmounted, defineExpose, inject, watchEffect } from 'vue'
 import { GETTABLELIST } from '@/pages/product/api';
 import { post } from '@/utils/request';
-
+import router from '@/router';
 import RelatedProducts from '@/components/relatedProducts/relatedProducts.vue'
 import { UPDATEINSET } from '../api';
 import { all } from 'axios';
@@ -77,6 +77,13 @@ const allLoading = reactive({
     editProductLoading: false
 })
 
+function toDetali(row: any) {
+  router.push({
+    path: `/product/detail`,
+    query: { id: row.productId }
+  })
+}
+
 function editProduct() {
     let productTableListData = relatedProductsRef?.value?.returnData()
     const { id, name, customerId, contactsId, amountOfMoney, expectedTransactionDate, stageId, inchargerId, remark } = information.value

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/customer/component/relatedContacts.vue

@@ -23,7 +23,12 @@
                 <el-table-column prop="phone" label="电话号码" width="130" />
                 <el-table-column prop="email" label="邮箱" width="130" />
                 <el-table-column prop="position" label="职务" width="130" />
-                <el-table-column prop="sexValue" label="性别" width="130" />
+                <el-table-column prop="sex" label="性别" width="130">
+                    <template #default="scope">
+                        <template v-if="scope.row.sex == 1">男</template>
+                        <template v-if="scope.row.sex == 0">女</template>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="ownerName" label="负责人" width="130" />
                 <el-table-column prop="creatorName" label="创建人" width="130" />
                 <el-table-column prop="createTime" label="创建时间" width="130" />

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

@@ -25,8 +25,8 @@
 
             <div class="w-full h-auto flex justify-between mt-2">
                 <div class="bg-white shadow-md rounded-md" style="width: 65%;">
-                    <Detailcompinents :data="relatedTasks" :information="information" :formTaskType="2" :filed="'orderId'"
-                        :disabled-list="['taskType', 'orderId']" @refreshData="refreshData" />
+                    <Detailcompinents :data="relatedTasks" :information="information" :formTaskType="2"
+                        :filed="'orderId'" :disabled-list="['taskType', 'orderId']" @refreshData="refreshData" />
                 </div>
                 <div class="bg-white ml-2 shadow-md rounded-md flex-1">
                     <OperationRecord :data="operationRecord" />
@@ -140,33 +140,40 @@ function getRelatedProducts() {
 
 type allTypeStr = 'getDetail' | 'getFileList' | 'getRelatedTasks' | 'getOperationRecord' | 'getRelatedProducts' | 'getPaymentCollectionList' | ''
 
-async function getAll(event: allTypeStr) {
+async function getAll(_event: allTypeStr) {
     try {
         pageLoading.value = true
-        if (!event) {
-            await Promise.all([
-                getDetail(),
-                getFileList(),
-                getRelatedTasks(),
-                getOperationRecord(),
-                getRelatedProducts(),
-                getPaymentCollectionList()
-            ])
-        } else if (event == 'getDetail') {
-            await getDetail()
-        } else if (event == 'getFileList') {
-            await getFileList()
-        } else if (event == 'getRelatedTasks') {
-            await getRelatedTasks()
-        } else if (event == 'getOperationRecord') {
-            await getOperationRecord()
-        } else if (event == 'getRelatedProducts') {
-            await getRelatedProducts()
-        } else if (event == 'getPaymentCollectionList') {
-            await getDetail()
-            await getPaymentCollectionList()
-        }
-
+        // if (!event) {
+        //     await Promise.all([
+        //         getDetail(),
+        //         getFileList(),
+        //         getRelatedTasks(),
+        //         getOperationRecord(),
+        //         getRelatedProducts(),
+        //         getPaymentCollectionList()
+        //     ])
+        // } else if (event == 'getDetail') {
+        //     await getDetail()
+        // } else if (event == 'getFileList') {
+        //     await getFileList()
+        // } else if (event == 'getRelatedTasks') {
+        //     await getRelatedTasks()
+        // } else if (event == 'getOperationRecord') {
+        //     await getOperationRecord()
+        // } else if (event == 'getRelatedProducts') {
+        //     await getRelatedProducts()
+        // } else if (event == 'getPaymentCollectionList') {
+        //     await getDetail()
+        //     await getPaymentCollectionList()
+        // }
+        await Promise.all([
+            getDetail(),
+            getFileList(),
+            getRelatedTasks(),
+            getOperationRecord(),
+            getRelatedProducts(),
+            getPaymentCollectionList()
+        ])
         pageLoading.value = false
     } catch {
         pageLoading.value = false

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/product/detail/index.vue

@@ -19,7 +19,7 @@
           <Information :data="information" @getInformationData="getInformationData" />
         </div>
         <div class="bg-white ml-2 shadow-md rounded-md flex-1">
-          <Attachment :data="attachment" :information="information" @getFileList="getFileList" />
+          <Attachment :data="attachment" :information="information" @getFileList="getDetail" />
         </div>
       </div>
 
@@ -85,9 +85,10 @@ function getFileList(val: any = false) {
   })
 }
 
-async function getDetail(flag: boolean) {
+async function getDetail(_flag: boolean) {
   try {
-    const id = flag ? addressParameters.value : value.value
+    // const id = flag ? addressParameters.value : value.value
+    const id = addressParameters.value
     pageLoading.value = true
 
     await Promise.all([