Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/utils/dict.ts

src/api/crm/contract/index.ts

@@ -127,7 +127,7 @@ export const changeContract = async (data: TransferReqVO) => {
 
 // 合同变更列表
 export const changeContractList = async (data: TransferReqVO) => {
-  return await request.put({ url: '/crm/contract-change-record/page', data })
+  return await request.get({ url: '/crm/contract-change-record/page', data })
 }
 
 

src/utils/dict.ts

@@ -238,9 +238,12 @@ export enum DICT_TYPE {
   MATCHING_PRODUCT_TYPES="matching_product_types",  //对接产品类型
 
   // ========== ERP - 企业资源计划模块  ==========
+
+  // ========== TTS - 项目模块  ==========
   TTS_PROJECT_LEVEL="tts_project_level", //项目级别
   TTS_PROJECT_TYPE="tts_project_type", //项目类型
   TTS_TASK_LEVEL = 'tts_task_level',   //对接模式
+  TTS_APPLY_STATUS = 'tts_apply_status',
 
 
   // ========== ERP - 企业资源计划模块  ==========

src/views/crm/business/detail/index.vue

@@ -16,28 +16,28 @@
     </el-button>
   </BusinessDetailsHeader>
   <el-col>
-    <el-tabs>
+    <!-- <el-tabs> -->
-      <el-tab-pane label="跟进记录">
+      <!-- <el-tab-pane label="跟进记录">
         <FollowUpList :biz-id="businessId" :biz-type="BizTypeEnum.CRM_BUSINESS" />
-      </el-tab-pane>
+      </el-tab-pane> -->
-      <el-tab-pane label="详细资料">
+      <!-- <el-tab-pane label="详细资料"> -->
         <BusinessDetailsInfo :business="business" />
-      </el-tab-pane>
+      <!-- </el-tab-pane> -->
-      <el-tab-pane label="联系人" lazy>
+      <!-- <el-tab-pane label="联系人" lazy>
         <ContactList
           :biz-id="business.id!"
           :biz-type="BizTypeEnum.CRM_BUSINESS"
           :business-id="business.id"
           :customer-id="business.customerId"
         />
-      </el-tab-pane>
+      </el-tab-pane> -->
       <!-- <el-tab-pane label="产品">
         <BusinessProductList :business="business" />
       </el-tab-pane> -->
       <!-- <el-tab-pane label="合同" lazy>
         <ContractList :biz-id="business.id!" :biz-type="BizTypeEnum.CRM_BUSINESS" />
       </el-tab-pane> -->
-      <el-tab-pane label="操作日志">
+      <!-- <el-tab-pane label="操作日志">
         <OperateLogV2 :log-list="logList" />
       </el-tab-pane>
       <el-tab-pane label="团队成员">
@@ -48,8 +48,8 @@
           :show-action="true"
           @quit-team="close"
         />
-      </el-tab-pane>
+      </el-tab-pane> -->
-    </el-tabs>
+    <!-- </el-tabs> -->
   </el-col>
 
   <!-- 表单弹窗：添加/修改 -->

src/views/crm/contact/detail/index.vue

@@ -3,9 +3,9 @@
     <el-button v-if="permissionListRef?.validateWrite" @click="openForm('update', contact.id)">
       编辑
     </el-button>
-    <el-button v-if="permissionListRef?.validateOwnerUser" type="primary" @click="transfer">
+    <!-- <el-button v-if="permissionListRef?.validateOwnerUser" type="primary" @click="transfer">
       转移
-    </el-button>
+    </el-button> -->
   </ContactDetailsHeader>
   <el-col>
     <el-tabs>

src/views/crm/contract/detail/index.vue

@@ -1,14 +1,14 @@
 <!-- 合同详情页面组件-->
 <template>
-  <ContentWrap class="mt-10px">
+  <!-- <ContentWrap class="mt-10px">
-    <el-col>
+    <el-col> -->
-      <el-tabs>
+      <!-- <el-tabs> -->
-        <el-tab-pane label="跟进记录">
+        <!-- <el-tab-pane label="跟进记录">
           <FollowUpList :biz-id="contract.id" :type="1" :biz-type="BizTypeEnum.CRM_CONTRACT" />
-        </el-tab-pane>
+        </el-tab-pane> -->
-        <el-tab-pane label="合同信息">
+        <!-- <el-tab-pane label="合同信息"> -->
           <ContractDetailsInfo :contract="contract" :id="props.id" />
-        </el-tab-pane>
+        <!-- </el-tab-pane> -->
         <!-- <el-tab-pane label="产品">
           <ContractProductList :contract="contract" />
         </el-tab-pane> -->
@@ -26,7 +26,7 @@
             :customer-id="contract.customerId"
           />
         </el-tab-pane> -->
-        <el-tab-pane label="团队成员">
+        <!-- <el-tab-pane label="团队成员">
           <PermissionList
             ref="permissionListRef"
             :type="1"
@@ -38,10 +38,10 @@
         </el-tab-pane>
         <el-tab-pane label="操作日志">
           <OperateLogV2 :log-list="logList" />
-        </el-tab-pane>
+        </el-tab-pane> -->
-      </el-tabs>
+      <!-- </el-tabs> -->
-    </el-col>
+    <!-- </el-col>
-  </ContentWrap>
+  </ContentWrap> -->
 
 </template>
 <script lang="ts" setup>

src/views/task/online/index.vue

@@ -32,11 +32,10 @@
       <el-form-item label="申请上线日期" prop="onlineDate">
         <el-date-picker
           v-model="queryParams.onlineDate"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
         />
       </el-form-item>
@@ -95,7 +94,7 @@
       </el-table-column>
       <el-table-column label="审批状态" align="center" prop="auditStatus" width="110">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CRM_AUDIT_STATUS" :value="scope.row.auditStatus" />
+          <dict-tag :type="DICT_TYPE.TTS_APPLY_STATUS" :value="scope.row.auditStatus" />
         </template>
       </el-table-column>
       <!-- <el-table-column label="上线注意事项" align="center" prop="precautions" />
@@ -296,4 +295,7 @@ onMounted(async() => {
   getList()
 
 })
+onActivated(()=>{
+  getList()
+})
 </script>