提交相关代码

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

@@ -143,7 +143,7 @@ function closeVisible(type: keyof typeof allVisible) {
 watchEffect(() => {
     const { data } = props
     information.value = data
-    relatedTaskstable.value = data.businessOpportunityList.map((item: any) => {
+    relatedTaskstable.value = (data.businessOpportunityList || []).map((item: any) => {
         return {
             ...item,
             expectedTransactionDate: item.expectedTransactionDate ? formatDate(new Date(item.expectedTransactionDate)) : ''

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

@@ -15,9 +15,9 @@
                 </el-table-column>
                 <el-table-column prop="name" label="联系人姓名">
                     <template #default="scope">
-                        <el-button link type="primary" size="large">{{
+                        <el-button link type="primary" size="large" @click="toPath(scope.row)">{{
                             scope.row.name
-                        }}</el-button>
+                            }}</el-button>
                     </template>
                 </el-table-column>
                 <el-table-column prop="phone" label="电话号码" width="130" />
@@ -56,6 +56,7 @@ import { GETGENERATEFOEM, URL_ADD } from '@/pages/contacts/api';
 import { get, post } from '@/utils/request';
 import { setTemplateDataDisable } from '@/utils/tools';
 import { GenerateForm } from '@zmjs/form-design';
+import router from '@/router';
 import { ref, reactive, onMounted, onUnmounted, defineExpose, inject, watchEffect } from 'vue'
 
 const emits = defineEmits(['refreshData']);
@@ -104,6 +105,13 @@ function editContacts(data: any) {
     }, 1000);
 }
 
+function toPath(row: any) {
+    router.push({
+        path: `/contacts/detail`,
+        query: { id: row.id }
+    })
+}
+
 const allLoading = reactive({
     contactsTemplateRefLoading: false,
     editContactsSaveLoading: false

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

@@ -30,7 +30,7 @@ export const tableColumns: TableColumn[] = [
     { prop: 'price', label: '订单金额(￥)', width: '120' },
     { prop: 'receivedPayment', label: '已回款(￥)', width: '100' },
     { prop: 'unReceivedPayment', label: '未回款(￥)', width: '100' },
-    { prop: 'statusValue', label: '回款状态', width: '100' },
+    { prop: 'receivedStatus', label: '回款状态', width: '100' },
     { prop: 'typeName', label: '订单类型', width: '200' },
     { prop: 'placeTime', label: '下单时间', width: '200' },
     { prop: 'orderStartDate', label: '订单开始时间', width: '200' },

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

@@ -96,7 +96,7 @@ function saveOrder() {
         ...items,
         orderEndDate: items.orderEndDate ? items.orderEndDate : '',
         orderStartDate: items.orderStartDate ? items.orderStartDate : '',
-        placeTime: items.placeTime ? formatDate(items.placeTime) : '',
+        placeTime: items.placeTime ? formatDate(new Date(items.placeTime)) : '',
         orderProductDetailString: produt
     }
     if((formVal.price || 0) < (formVal.receivedPayment || 0)) {
@@ -104,7 +104,7 @@ function saveOrder() {
       return
     }
     allLoading.editSaveLading = true
-    console.log(formVal, '<==== 将要传的值')
+    console.log(formVal, '<==== 将要传的值', items)
     post(URL_OEDERUPDATE, formVal).then(() => {
         globalPopup?.showSuccess('操作成功')
         allLoading.editSaveLading = false
@@ -160,8 +160,8 @@ async function getSystemField() {
     setInfoValue(info.value)
 }
 
-function setInfoValue(item: any) {
-    const templateKey = getTemplateKey(orderTemplate.value.list)
+async function setInfoValue(item: any) {
+    const templateKey = await getTemplateKey(orderTemplate.value.list)
     let formVal: templateKey = { id: item.id }
     for (let i = 0; i < templateKey.length; i++) {
         const key = templateKey[i]
@@ -174,6 +174,7 @@ watchEffect(() => {
     const { data, information } = props
     relatedTaskstable.value = data || []
     info.value = information || {}
+    setInfoValue(info.value)
 });
 
 // 生命周期钩子

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

@@ -56,6 +56,9 @@
                   }}</el-button> -->
                   <div class="table-text-textnowrap" @click.prevent="toDetali(scope.row)">{{ scope.row[column.prop] }}</div>
                 </template>
+                <template v-if="column.prop === 'receivedStatus'">
+                  <div>{{ selectData.RemittanceStatus[scope.row.receivedStatus].name }}</div>
+                </template>
               </template>
             </el-table-column>
             <el-table-column :label="'操作'" :width="'200px'" fixed="right" v-permission="['orderEdit']">