提交相关代码

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

@@ -52,9 +52,11 @@
             @click="editNewBusiness(false)">新建商机</el-button>
           <el-button type="primary" @click="showVisible('batchTransferVisible')"
             :disabled="batchTableData.length <= 0">批量转移</el-button>
-          <el-button type="primary" v-permission="['businessDelete']" @click="batchDeteleItem()" :disabled="batchTableData.length <= 0">批量删除</el-button>
+          <el-button type="primary" v-permission="['businessDelete']" @click="batchDeteleItem()"
+            :disabled="batchTableData.length <= 0">批量删除</el-button>
           <el-button type="primary" @click="showVisible('stageSetVisible')">阶段设置</el-button>
-          <el-button type="primary" v-permission="['businessRecycle']" @click="showVisible('deteleBusinessVisible')">回收站</el-button>
+          <el-button type="primary" v-permission="['businessRecycle']"
+            @click="showVisible('deteleBusinessVisible')">回收站</el-button>
           <el-button v-permission="['businessImport']" type="primary"
             @click="showVisible('importVisible')">导入</el-button>
           <el-button v-permission="['businessExport']" type="primary" @click="exportBusinessTableList()"
@@ -68,11 +70,13 @@
             <el-table-column v-for="(item, index) in tableColumn" :prop="item.prop" :label="item.label" :key="index"
               :width="item.width">
               <template #default="scope">
-                <div class="table-text-textnowrap" v-if="item.eventName" @click="dealWithTableColumn(scope.row, item.eventName)">{{ scope.row[item.prop] }}</div>
+                <div class="table-text-textnowrap" v-if="item.eventName"
+                  @click="dealWithTableColumn(scope.row, item.eventName)">{{ scope.row[item.prop] }}</div>
                 <template v-else>{{ scope.row[item.prop] }}</template>
               </template>
             </el-table-column>
-            <el-table-column label="操作" fixed="right" width="200" v-permission="['businessAddAnEdit', 'tasksAdd', 'businessDelete']">
+            <el-table-column label="操作" fixed="right" width="200"
+              v-permission="['businessAddAnEdit', 'tasksAdd', 'businessDelete']">
               <template #default="scope">
                 <el-button link type="primary" size="large" @click="editNewBusiness(scope.row)"
                   v-permission="['businessAddAnEdit']">编辑</el-button>
@@ -99,7 +103,8 @@
           <h4 :id="titleId">{{ allText.newBusinessisibleText }}</h4>
           <div>
             <el-button type="primary" :loading="allLoading.newBusinessSaveLading"
-              :disabled="allLoading.businessSaveLading" @click="editBusiness(true)" v-if="!businessTemplateValue.id">保存并新建</el-button>
+              :disabled="allLoading.businessSaveLading" @click="editBusiness(true)"
+              v-if="!businessTemplateValue.id">保存并新建</el-button>
             <el-button type="primary" @click="editBusiness(false)" :loading="allLoading.businessSaveLading"
               :disabled="allLoading.newBusinessSaveLading">保存</el-button>
             <el-button @click="closeVisible('newBusinessisible')">取消</el-button>
@@ -271,13 +276,15 @@ function editBusiness(visibles: boolean) {
       businessItemProductList: productTableListData ? JSON.stringify(productTableListData) : []
     }
     allLoading.businessSaveLading = true
-    post(UPDATEINSET, { ...businessTemplateValue.value, ...newForm }).then((_res) => {
-      allVisible.newBusinessisible = visibles
-      globalPopup?.showSuccess('保存成功')
-      getBusinessTableList()
-    }).finally(() => {
-      allLoading.businessSaveLading = false
-    })
+    setTimeout(() => {
+      post(UPDATEINSET, { ...businessTemplateValue.value, ...newForm }).then((_res) => {
+        allVisible.newBusinessisible = visibles
+        globalPopup?.showSuccess('保存成功')
+        getBusinessTableList()
+      }).finally(() => {
+        allLoading.businessSaveLading = false
+      })
+    }, 1500)
   }).catch((_err: any) => {
     console.log(_err)
     globalPopup?.showError('请填写完整')

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

@@ -13,7 +13,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="公司号码">
-              <el-input v-model="customerCriteriaForm.telPhone" clearable placeholder="请输入"></el-input>
+              <el-input v-model="customerCriteriaForm.companyPhone" clearable placeholder="请输入"></el-input>
             </el-form-item>
             <el-form-item label="邮箱">
               <el-input v-model="customerCriteriaForm.email" clearable placeholder="请输入"></el-input>
@@ -208,7 +208,7 @@ interface personnelInterface {
 interface customerCriteriaFormType { // 线索筛选条件类型
   customName: string,
   customSourceId: string | number,
-  telPhone: string,
+  companyPhone: string,
   email: string,
   customerIndustryId: string | number,
   customerLevelId: string | number,
@@ -226,7 +226,7 @@ const globalPopup = inject<GlobalPopup>('globalPopup')
 const customerCriteriaForm = reactive<customerCriteriaFormType>({ // 筛选条件form
   customName: '',
   customSourceId: '',
-  telPhone: '',
+  companyPhone: '',
   email: '',
   customerIndustryId: '',
   customerLevelId: '',

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

@@ -5,9 +5,9 @@
         </div>
         <div class="flex-1 overflow-auto pt-5">
             <el-table :data="operationRecordtable" border style="width: 100%;height: 278px;">
-                <el-table-column prop="operateDate" label="操作时间" width="150" />
-                <el-table-column prop="operateName" label="操作人" width="120" />
-                <el-table-column prop="msg" label="操作内容" />
+                <el-table-column prop="auditTime" label="操作时间" width="150" />
+                <el-table-column prop="auditorName" label="操作人" width="120" />
+                <el-table-column prop="auditorContent" label="操作内容" />
             </el-table>
         </div>
     </div>
@@ -22,7 +22,7 @@ const operationRecordtable = ref([])
 
 watchEffect(() => {
     const { data } = props
-    operationRecordtable.value = data.contactsLogList || []
+    operationRecordtable.value = data || []
 });
 // 生命周期钩子
 onMounted(() => {