提交相关代码

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

@@ -100,10 +100,10 @@ function editProduct() {
 function editProductShow() {
     const productList = information.value.businessItemProducts || []
     const list = productList.map((item: any) => {
-        const { id, productName, productId, productCode, unit, unitName, typeName, type, price, inventory, orderProductDetail, num, discount, sealPrice, totalPrice, quantity } = item
+        const { id, productName, productId, productCode, unit, unitName, productType, type, price, inventory, sellingPrice, orderProductDetail, num, discount, sealPrice, totalPrice, quantity } = item
         return {
-            id, productId: productId, productName, productCode, unit, unitName, typeName, type, price, inventory,
-            num, discount, sealPrice, totalPrice, quantity
+            id, productId: productId, productName, productCode, unitName: unit, typeName: productType, type, price, inventory,
+            num, discount, sealPrice, totalPrice, quantity, sellingPrice
         }
     })
     productTableListValue.value = list

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

@@ -240,6 +240,7 @@ function claimCustomer() {
 function editCustomer() {
   const {
     id,
+    contactsName,
     companyPhone,
     customName,
     inchargerId,
@@ -249,7 +250,8 @@ function editCustomer() {
     customerLevelId,
     email,
     telPhone,
-    customDesc
+    customDesc,
+    address
   } = information.value;
   const formVal = {
     id,
@@ -257,12 +259,14 @@ function editCustomer() {
     inchargerId,
     customerIndustryId,
     customerLevelId,
+    contactsName,
     email,
     customSourceId,
     createTime: formatDate(new Date(createTime)),
     telPhone,
     companyPhone,
-    customDesc
+    customDesc,
+    address
   };
   generateFormValue.value = formVal;
   allLoading.generateFormDataLoading = true;

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

@@ -165,7 +165,7 @@ import TaskModal from '@/components/TaskModal/index.vue';
 import ImportModal from './ImportModal.vue';
 import ExportModal from './ExportModal.vue';
 import { post, uploadFile } from '@/utils/request';
-import { getFromValue, confirmAction, downloadFile } from '@/utils/tools';
+import { getFromValue, confirmAction, downloadFile, createTaskFromType } from '@/utils/tools';
 import { tableShowOverflowTooltip } from '@/utils/globalVariables'
 import { pushMap } from './type';
 const router = useRouter()
@@ -174,6 +174,7 @@ const globalPopup = inject<GlobalPopup>('globalPopup')
 const pagePermission = ref<any[]>();
 const taskModalVisible = ref(false);
 const taskForm = ref<any>();
+const taskModalVisibleKey = ref<number>(1)
 const isEdit = ref(false);
 const len = computed(() => {
   return tableRef.value?.getSelectionRows().length
@@ -278,7 +279,8 @@ function currentChange(currentPage: number): void {
 
 function createTasks() {
   taskModalVisible.value = true;
-  taskForm.value = null;
+  // taskForm.value = null;
+  taskForm.value = createTaskFromType(0);
   isEdit.value = false;
 }
 function deleteTasks() {