Browse Source

提交相关代码

Lijy 10 months ago
parent
commit
5dbcda4bae

+ 4 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/business/component/attachment.vue

@@ -62,6 +62,7 @@ const attachmenttable = ref([])
 const information = ref<any>({})
 const information = ref<any>({})
 const renameDialogVisible = ref(false)
 const renameDialogVisible = ref(false)
 const renameVal = ref('')
 const renameVal = ref('')
+const transitionVal = ref<any>({})
 const uploadRef = ref<any>()
 const uploadRef = ref<any>()
 
 
 // 下载文件
 // 下载文件
@@ -86,7 +87,8 @@ function saveEditClue() {
         globalPopup?.showWarning('请输入文件名称')
         globalPopup?.showWarning('请输入文件名称')
         return
         return
     }
     }
-    const bussinessId = information.value.id
+    // const bussinessId = information.value.id
+    const bussinessId = transitionVal.value.id
     post(REFIENAMEFILE, { name: renameVal.value, id: bussinessId }).then((res) => {
     post(REFIENAMEFILE, { name: renameVal.value, id: bussinessId }).then((res) => {
         renameDialogVisible.value = false
         renameDialogVisible.value = false
         globalPopup?.showSuccess(res.msg || '')
         globalPopup?.showSuccess(res.msg || '')
@@ -97,6 +99,7 @@ function saveEditClue() {
 // 显示弹窗
 // 显示弹窗
 function showVisible(item: any) {
 function showVisible(item: any) {
     renameVal.value = JSON.parse(JSON.stringify(item.name))
     renameVal.value = JSON.parse(JSON.stringify(item.name))
+    transitionVal.value = JSON.parse(JSON.stringify(item))
     renameDialogVisible.value = true
     renameDialogVisible.value = true
 }
 }
 
 

+ 4 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/customer/component/attachment.vue

@@ -61,6 +61,7 @@ const attachmenttable = ref([])
 const information = ref<any>({})
 const information = ref<any>({})
 const uploadRef = <any>ref()
 const uploadRef = <any>ref()
 const renameDialogVisible = ref(false)
 const renameDialogVisible = ref(false)
+const transitionVal = ref<any>({})
 const renameVal = ref('')
 const renameVal = ref('')
 
 
 // 下载文件
 // 下载文件
@@ -85,7 +86,8 @@ function saveEditClue() {
         globalPopup?.showWarning('请输入文件名称')
         globalPopup?.showWarning('请输入文件名称')
         return
         return
     }
     }
-    const id = information.value.id
+    // const id = information.value.id
+    const id = transitionVal.value.id
     post(URL_REFFILENAME, { name: renameVal.value, id: id }).then((res) => {
     post(URL_REFFILENAME, { name: renameVal.value, id: id }).then((res) => {
         renameDialogVisible.value = false
         renameDialogVisible.value = false
         globalPopup?.showSuccess(res.msg || '')
         globalPopup?.showSuccess(res.msg || '')
@@ -114,6 +116,7 @@ async function httpUploadFile(param: UploadRequestOptions) {
 // 显示弹窗
 // 显示弹窗
 function showVisible(item: any) {
 function showVisible(item: any) {
     renameVal.value = JSON.parse(JSON.stringify(item.name))
     renameVal.value = JSON.parse(JSON.stringify(item.name))
+    transitionVal.value = JSON.parse(JSON.stringify(item))
     renameDialogVisible.value = true
     renameDialogVisible.value = true
 }
 }
 
 

+ 10 - 2
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/customer/component/relatedBusiness.vue

@@ -8,9 +8,9 @@
         </div>
         </div>
         <div class="flex-1 overflow-auto pt-3">
         <div class="flex-1 overflow-auto pt-3">
             <el-table :data="relatedTaskstable" border style="width: 100%;height: 300px;">
             <el-table :data="relatedTaskstable" border style="width: 100%;height: 300px;">
-                <el-table-column prop="taskName" label="name">
+                <el-table-column prop="taskName" label="商机名称">
                     <template #default="scope">
                     <template #default="scope">
-                        <el-button link type="primary" size="large">{{
+                        <el-button link type="primary" size="large" @click="toDetail(scope.row)">{{
                             scope.row.name
                             scope.row.name
                             }}</el-button>
                             }}</el-button>
                     </template>
                     </template>
@@ -55,6 +55,7 @@ import { GETTABLELIST } from '@/pages/product/api';
 import { GETGENERATEFOEM, UPDATEINSET } from '@/pages/business/api';
 import { GETGENERATEFOEM, UPDATEINSET } from '@/pages/business/api';
 import { judgmentaAmounteEqual, setTemplateDataDisable } from '@/utils/tools';
 import { judgmentaAmounteEqual, setTemplateDataDisable } from '@/utils/tools';
 import { formatDateTime } from '@/utils/times';
 import { formatDateTime } from '@/utils/times';
+import router from '@/router';
 
 
 const emits = defineEmits(['refreshData']);
 const emits = defineEmits(['refreshData']);
 const globalPopup = inject<GlobalPopup>('globalPopup')
 const globalPopup = inject<GlobalPopup>('globalPopup')
@@ -83,6 +84,13 @@ const allLoading = reactive({
     businessSaveLading: false
     businessSaveLading: false
 })
 })
 
 
+function toDetail(row: any) {
+    router.push({
+        path: `/business/detail`,
+        query: { id: row.id }
+    })
+}
+
 function editBusiness(visibles: boolean) {
 function editBusiness(visibles: boolean) {
     businessTemplateRef.value?.getData().then((res: any) => {
     businessTemplateRef.value?.getData().then((res: any) => {
         let productTableListData = relatedProductsRef?.value?.returnData()
         let productTableListData = relatedProductsRef?.value?.returnData()

+ 8 - 3
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/customer/component/relatedOrders.vue

@@ -11,7 +11,7 @@
                 <el-table-column prop="orderCode" label="订单编号" width="130" />
                 <el-table-column prop="orderCode" label="订单编号" width="130" />
                 <el-table-column prop="orderName" label="订单名称" min-width="200">
                 <el-table-column prop="orderName" label="订单名称" min-width="200">
                     <template #default="scope">
                     <template #default="scope">
-                        <el-button link type="primary" size="large">{{
+                        <el-button link type="primary" size="large" @click="toPath(scope.row)">{{
                             scope.row.orderName
                             scope.row.orderName
                             }}</el-button>
                             }}</el-button>
                     </template>
                     </template>
@@ -55,7 +55,7 @@ import { ref, reactive, onMounted, onUnmounted, defineExpose, inject, watchEffec
 import { setTemplateDataDisable } from '@/utils/tools';
 import { setTemplateDataDisable } from '@/utils/tools';
 import { GenerateForm } from '@zmjs/form-design';
 import { GenerateForm } from '@zmjs/form-design';
 import { get, post } from '@/utils/request';
 import { get, post } from '@/utils/request';
-
+import router from '@/router';
 import RelatedProducts from '@/components/relatedProducts/relatedProducts.vue'
 import RelatedProducts from '@/components/relatedProducts/relatedProducts.vue'
 import { GETGENERATEFOEM, GETTABLELIST, URL_OEDERUPDATE } from '@/pages/order/api';
 import { GETGENERATEFOEM, GETTABLELIST, URL_OEDERUPDATE } from '@/pages/order/api';
 import { formatDate } from '@/utils/times';
 import { formatDate } from '@/utils/times';
@@ -86,7 +86,12 @@ const allLoading = reactive({
     orderTemplateLoadinng: false,
     orderTemplateLoadinng: false,
 })
 })
 
 
-
+function toPath(row: any) {
+    router.push({
+        path: `/order/detail`,
+        query: { id: row.id }
+    })
+}
 
 
 function saveOrder(flag: boolean) {
 function saveOrder(flag: boolean) {
     orderTemplateRef.value?.getData().then((res: any) => {
     orderTemplateRef.value?.getData().then((res: any) => {

+ 4 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/thread/detail/components/attachment.vue

@@ -54,6 +54,7 @@ import { DETELEFILE, DOWNFILE, REFIENAME, UPLOADFILE } from '../../constant';
 const globalPopup = inject<GlobalPopup>('globalPopup')
 const globalPopup = inject<GlobalPopup>('globalPopup')
 const emits = defineEmits(['refreshData']);
 const emits = defineEmits(['refreshData']);
 const attachmenttable = ref([])
 const attachmenttable = ref([])
+const transitionVal = ref<any>({})
 const information: any = ref({})
 const information: any = ref({})
 const renameDialogVisible = ref(false)
 const renameDialogVisible = ref(false)
 const renameVal = ref('')
 const renameVal = ref('')
@@ -84,7 +85,8 @@ function saveEditClue() {
         globalPopup?.showWarning('请输入文件名称')
         globalPopup?.showWarning('请输入文件名称')
         return
         return
     }
     }
-    const clueId = information.value.id
+    // const clueId = information.value.id
+    const clueId = transitionVal.value.id
     post(REFIENAME, { name: renameVal.value, id: clueId }).then((res) => {
     post(REFIENAME, { name: renameVal.value, id: clueId }).then((res) => {
         if (res.code == 'ok') {
         if (res.code == 'ok') {
             renameDialogVisible.value = false
             renameDialogVisible.value = false
@@ -97,6 +99,7 @@ function saveEditClue() {
 // 显示弹窗
 // 显示弹窗
 function showVisible(item: any) {
 function showVisible(item: any) {
     renameVal.value = JSON.parse(JSON.stringify(item.name))
     renameVal.value = JSON.parse(JSON.stringify(item.name))
+    transitionVal.value = JSON.parse(JSON.stringify(item))
     renameDialogVisible.value = true
     renameDialogVisible.value = true
 }
 }