Pārlūkot izejas kodu

update:把芋艿替换成非繁人

RuHu.Xu 11 mēneši atpakaļ
vecāks
revīzija
b1478dc0a6
31 mainītis faili ar 40 papildinājumiem un 40 dzēšanām
  1. 1 1
      .eslintrc.js
  2. 1 1
      src/api/crm/message/index.ts
  3. 2 2
      src/components/Form/src/Form.vue
  4. 5 5
      src/components/Search/src/Search.vue
  5. 2 2
      src/components/Table/src/Table.vue
  6. 3 3
      src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
  7. 1 1
      src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
  8. 1 1
      src/hooks/web/useCrudSchemas.ts
  9. 1 1
      src/hooks/web/useTable.ts
  10. 1 1
      src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue
  11. 1 1
      src/views/bpm/taskAssignRule/index.vue
  12. 1 1
      src/views/crm/business/BusinessForm.vue
  13. 1 1
      src/views/crm/clue/ClueForm.vue
  14. 1 1
      src/views/crm/contact/ContactForm.vue
  15. 1 1
      src/views/crm/contact/OwerSelect.vue
  16. 1 1
      src/views/crm/contact/components/ContactList.vue
  17. 1 1
      src/views/crm/contract/index.vue
  18. 2 2
      src/views/crm/customer/limitConfig/CustomerLimitConfigForm.vue
  19. 1 1
      src/views/crm/message/tables/TodayCustomer.vue
  20. 1 1
      src/views/crm/permission/components/PermissionForm.vue
  21. 1 1
      src/views/crm/permission/components/TransferForm.vue
  22. 1 1
      src/views/crm/product/ProductForm.vue
  23. 1 1
      src/views/crm/receivable/plan/components/ReceivablePlanList.vue
  24. 1 1
      src/views/mall/home/components/OperationDataCard.vue
  25. 1 1
      src/views/mall/promotion/bargain/activity/index.vue
  26. 1 1
      src/views/mall/promotion/combination/activity/index.vue
  27. 1 1
      src/views/member/user/components/balance-list.vue
  28. 1 1
      src/views/member/user/detail/UserExperienceRecordList.vue
  29. 1 1
      src/views/member/user/detail/index.vue
  30. 1 1
      src/views/mp/components/wx-voice-play/main.vue
  31. 1 1
      src/views/mp/menu/index.vue

+ 1 - 1
.eslintrc.js

@@ -72,6 +72,6 @@ module.exports = defineConfig({
 		],
 		'vue/multi-word-component-names': 'off',
 		'vue/no-v-html': 'off',
-		'prettier/prettier': 'off' // 芋艿:默认关闭 prettier 的 ESLint 校验,因为我们使用的是 IDE 的 Prettier 插件
+		'prettier/prettier': 'off' // 非繁人:默认关闭 prettier 的 ESLint 校验,因为我们使用的是 IDE 的 Prettier 插件
 	}
 })

+ 1 - 1
src/api/crm/message/index.ts

@@ -34,7 +34,7 @@ export interface CustomerVO {
 }
 
 // 查询客户列表
-// TODO @芋艿:看看是不是后续融合到 getCustomerPage 里;
+// TODO @非繁人:看看是不是后续融合到 getCustomerPage 里;
 export const getTodayCustomerPage = async (params) => {
   return await request.get({ url: `/crm/message/todayCustomer`, params })
 }

+ 2 - 2
src/components/Form/src/Form.vue

@@ -36,7 +36,7 @@ export default defineComponent({
       default: () => []
     },
     // 是否需要栅格布局
-    // update by 芋艿:将 true 改成 false,因为项目更常用这种方式
+    // update by 非繁人:将 true 改成 false,因为项目更常用这种方式
     isCol: propTypes.bool.def(false),
     // 表单数据对象
     model: {
@@ -49,7 +49,7 @@ export default defineComponent({
     isCustom: propTypes.bool.def(false),
     // 表单label宽度
     labelWidth: propTypes.oneOfType([String, Number]).def('auto'),
-    // 是否 loading 数据中 add by 芋艿
+    // 是否 loading 数据中 add by 非繁人
     vLoading: propTypes.bool.def(false)
   },
   emits: ['register'],

+ 5 - 5
src/components/Search/src/Search.vue

@@ -100,7 +100,7 @@ const setVisible = () => {
 </script>
 
 <template>
-  <!-- update by 芋艿:class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离,避免空隙过大 -->
+  <!-- update by 非繁人:class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离,避免空隙过大 -->
   <Form
     :inline="inline"
     :is-col="isCol"
@@ -113,12 +113,12 @@ const setVisible = () => {
   >
     <template #action>
       <div v-if="layout === 'inline'">
-        <!-- update by 芋艿:去除搜索的 type="primary",颜色变淡一点 -->
+        <!-- update by 非繁人:去除搜索的 type="primary",颜色变淡一点 -->
         <ElButton v-if="showSearch" @click="search">
           <Icon class="mr-5px" icon="ep:search" />
           {{ t('common.query') }}
         </ElButton>
-        <!-- update by 芋艿:将 icon="ep:refresh-right" 修改成 icon="ep:refresh",和 ruoyi-vue 搜索保持一致  -->
+        <!-- update by 非繁人:将 icon="ep:refresh-right" 修改成 icon="ep:refresh",和 ruoyi-vue 搜索保持一致  -->
         <ElButton v-if="showReset" @click="reset">
           <Icon class="mr-5px" icon="ep:refresh" />
           {{ t('common.reset') }}
@@ -127,7 +127,7 @@ const setVisible = () => {
           {{ t(visible ? 'common.shrink' : 'common.expand') }}
           <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
         </ElButton>
-        <!-- add by 芋艿:补充在搜索后的按钮 -->
+        <!-- add by 非繁人:补充在搜索后的按钮 -->
         <slot name="actionMore"></slot>
       </div>
     </template>
@@ -150,7 +150,7 @@ const setVisible = () => {
         {{ t(visible ? 'common.shrink' : 'common.expand') }}
         <Icon :icon="visible ? 'ep:arrow-up' : 'ep:arrow-down'" />
       </ElButton>
-      <!-- add by 芋艿:补充在搜索后的按钮 -->
+      <!-- add by 非繁人:补充在搜索后的按钮 -->
       <slot name="actionMore"></slot>
     </div>
   </template>

+ 2 - 2
src/components/Table/src/Table.vue

@@ -105,7 +105,7 @@ export default defineComponent({
     })
 
     const pagination = computed(() => {
-      // update by 芋艿:保持和 Pagination 组件的逻辑一致
+      // update by 非繁人:保持和 Pagination 组件的逻辑一致
       return Object.assign(
         {
           small: false,
@@ -285,7 +285,7 @@ export default defineComponent({
           }}
         </ElTable>
         {unref(getProps).pagination ? (
-          // update by 芋艿:保持和 Pagination 组件一致
+          // update by 非繁人:保持和 Pagination 组件一致
           <ElPagination
             v-model:pageSize={pageSizeRef.value}
             v-model:currentPage={currentPageRef.value}

+ 3 - 3
src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

@@ -88,7 +88,7 @@ const createNewDiagram = async (xml) => {
 }
 
 /* 高亮流程图 */
-// TODO 芋艿:如果多个 endActivity 的话,目前的逻辑可能有一定的问题。https://www.jdon.com/workflow/multi-events.html
+// TODO 非繁人:如果多个 endActivity 的话,目前的逻辑可能有一定的问题。https://www.jdon.com/workflow/multi-events.html
 const highlightDiagram = async () => {
   const activityList = activityLists.value
   if (activityList.length === 0) {
@@ -139,11 +139,11 @@ const highlightDiagram = async () => {
         if (targetActivity) {
           canvas.addMarker(nn.id, targetActivity.endTime ? 'highlight' : 'highlight-todo')
         } else if (nn.targetRef.$type === 'bpmn:ExclusiveGateway') {
-          // TODO 芋艿:这个流程,暂时没走到过
+          // TODO 非繁人:这个流程,暂时没走到过
           canvas.addMarker(nn.id, activity.endTime ? 'highlight' : 'highlight-todo')
           canvas.addMarker(nn.targetRef.id, activity.endTime ? 'highlight' : 'highlight-todo')
         } else if (nn.targetRef.$type === 'bpmn:EndEvent') {
-          // TODO 芋艿:这个流程,暂时没走到过
+          // TODO 非繁人:这个流程,暂时没走到过
           if (!todoActivity && endActivity.key === n.id) {
             canvas.addMarker(nn.id, 'highlight')
             canvas.addMarker(nn.targetRef.id, 'highlight')

+ 1 - 1
src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue

@@ -106,7 +106,7 @@ const handleNameUpdate = (value) => {
   }, 100)
 }
 // const handleDescriptionUpdate=(value)=> {
-// TODO 芋艿:documentation 暂时无法修改,后续在看看
+// TODO 非繁人:documentation 暂时无法修改,后续在看看
 // this.elementBaseInfo['documentation'] = value;
 // this.updateBaseInfo('documentation');
 // }

+ 1 - 1
src/hooks/web/useCrudSchemas.ts

@@ -162,7 +162,7 @@ const filterTableSchema = (crudSchema: CrudSchema[]): TableColumn[] => {
   const tableColumns = treeMap<CrudSchema>(crudSchema, {
     conversion: (schema: CrudSchema) => {
       if (schema?.isTable !== false && schema?.table?.show !== false) {
-        // add by 芋艿:增加对 dict 字典数据的支持
+        // add by 非繁人:增加对 dict 字典数据的支持
         if (!schema.formatter && schema.dictType) {
           schema.formatter = (_: Recordable, __: TableColumn, cellValue: any) => {
             return h(DictTag, {

+ 1 - 1
src/hooks/web/useTable.ts

@@ -217,7 +217,7 @@ export const useTable = <T = any>(config?: UseTableConfig<T>) => {
     elTableRef,
     tableObject,
     methods,
-    // add by 芋艿:返回 tableMethods 属性,和 tableObject 更统一
+    // add by 非繁人:返回 tableMethods 属性,和 tableObject 更统一
     tableMethods: methods
   }
 }

+ 1 - 1
src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue

@@ -33,7 +33,7 @@ const bpmnControlForm = ref({
   prefix: 'flowable'
 })
 const activityList = ref([]) // 任务列表
-// const bpmnXML = computed(() => { // TODO 芋艿:不晓得为啊哈不能这么搞
+// const bpmnXML = computed(() => { // TODO 非繁人:不晓得为啊哈不能这么搞
 //   if (!props.processInstance || !props.processInstance.processDefinition) {
 //     return
 //   }

+ 1 - 1
src/views/bpm/taskAssignRule/index.vue

@@ -70,7 +70,7 @@ const getList = async () => {
 }
 
 /** 翻译规则范围 */
-// TODO 芋艿:各种 ts 报错
+// TODO 非繁人:各种 ts 报错
 const getAssignRuleOptionName = (type, option) => {
   if (type === 10) {
     for (const roleOption of roleOptions.value) {

+ 1 - 1
src/views/crm/business/BusinessForm.vue

@@ -10,7 +10,7 @@
       <el-form-item label="商机名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入商机名称" />
       </el-form-item>
-      <!-- TODO 芋艿:客户列表的组件 -->
+      <!-- TODO 非繁人:客户列表的组件 -->
       <el-form-item label="客户名称" prop="customerName">
         <el-popover
           placement="bottom"

+ 1 - 1
src/views/crm/clue/ClueForm.vue

@@ -10,7 +10,7 @@
       <el-form-item label="线索名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入线索名称" />
       </el-form-item>
-      <!-- TODO 芋艿:后续客户的选择 -->
+      <!-- TODO 非繁人:后续客户的选择 -->
       <el-form-item label="客户" prop="customerId">
         <el-select v-model="formData.customerId" clearable placeholder="请选择客户">
           <el-option

+ 1 - 1
src/views/crm/contact/ContactForm.vue

@@ -230,7 +230,7 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const ownerUserList = ref<any[]>([])
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
-// TODO 芋艿:统一的客户选择面板
+// TODO 非繁人:统一的客户选择面板
 const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
 const allContactList = ref<ContactApi.ContactVO[]>([]) // 所有联系人列表
 

+ 1 - 1
src/views/crm/contact/OwerSelect.vue

@@ -18,7 +18,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-// TODO 芋艿:统一选择框。
+// TODO 非繁人:统一选择框。
 import * as UserApi from '@/api/system/user'
 import { parseBigInt } from 'jsencrypt/lib/lib/jsbn/jsbn'
 const dialogVisible = ref(false) // 弹窗的是否展示

+ 1 - 1
src/views/crm/contact/components/ContactList.vue

@@ -25,7 +25,7 @@
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />
         </template>
       </el-table-column>
-      <!-- TODO 芋艿:【操作:设为首要联系人】 -->
+      <!-- TODO 非繁人:【操作:设为首要联系人】 -->
     </el-table>
     <!-- 分页 -->
     <Pagination

+ 1 - 1
src/views/crm/contract/index.vue

@@ -46,7 +46,7 @@
   </ContentWrap>
 
   <!-- 列表 -->
-  <!-- TODO 芋艿:各种字段要调整 -->
+  <!-- TODO 非繁人:各种字段要调整 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="合同编号" align="center" prop="id" />

+ 2 - 2
src/views/crm/customer/limitConfig/CustomerLimitConfigForm.vue

@@ -83,7 +83,7 @@ const formRules = reactive({
   maxCount: [{ required: true, message: '数量上限不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-// TODO @芋艿:看看怎么搞个部门选择组件
+// TODO @非繁人:看看怎么搞个部门选择组件
 const deptTree = ref() // 部门树形结构
 const userTree = ref() // 用户树形结构
 
@@ -180,7 +180,7 @@ const getUserTree = async () => {
   handleUserData(userTree.value, deptUserMap)
 }
 
-// TODO @芋艿:看看怎么搞个用户选择的组件
+// TODO @非繁人:看看怎么搞个用户选择的组件
 /**
  * 处理用户树
  *

+ 1 - 1
src/views/crm/message/tables/TodayCustomer.vue

@@ -150,7 +150,7 @@ const CONTACT_STATUS = [
 ]
 
 const SCENE_TYPES = [
-  // TODO 芋艿:貌似可以搞成全局枚举
+  // TODO 非繁人:貌似可以搞成全局枚举
   { label: '我负责的', value: 1 },
   { label: '我跟进的', value: 2 },
   { label: '我参与的', value: 3 },

+ 1 - 1
src/views/crm/permission/components/PermissionForm.vue

@@ -117,7 +117,7 @@ const resetForm = (bizType: number, bizId: number) => {
 }
 onMounted(async () => {
   // 获得用户列表
-  // TODO 芋艿:用户列表的选择组件
+  // TODO 非繁人:用户列表的选择组件
   userOptions.value = await UserApi.getSimpleUserList()
 })
 </script>

+ 1 - 1
src/views/crm/permission/components/TransferForm.vue

@@ -117,7 +117,7 @@ const resetForm = () => {
 }
 onMounted(async () => {
   // 获得用户列表
-  // TODO 芋艿:用户列表的选择组件
+  // TODO 非繁人:用户列表的选择组件
   userOptions.value = await UserApi.getSimpleUserList()
 })
 </script>

+ 1 - 1
src/views/crm/product/ProductForm.vue

@@ -212,6 +212,6 @@ onMounted(async () => {
   const data = await ProductCategoryApi.getProductCategoryList({})
   productCategoryList.value = handleTree(data, 'id', 'parentId')
   // 系统用户列表
-  userList.value = await getSimpleUserList() // TODO 芋艿:替换成用户组件
+  userList.value = await getSimpleUserList() // TODO 非繁人:替换成用户组件
 })
 </script>

+ 1 - 1
src/views/crm/receivable/plan/components/ReceivablePlanList.vue

@@ -39,7 +39,7 @@
       </el-table-column>
       <el-table-column label="提前几日提醒" align="center" prop="remindDays" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <!-- TODO 芋艿:新建回款、编辑、删除 -->
+      <!-- TODO 非繁人:新建回款、编辑、删除 -->
     </el-table>
     <!-- 分页 -->
     <Pagination

+ 1 - 1
src/views/mall/home/components/OperationDataCard.vue

@@ -61,7 +61,7 @@ const getOrderData = async () => {
 
 /** 查询商品数据 */
 const getProductData = async () => {
-  // TODO: @芋艿:这个接口的返回值,是不是用命名字段更好些?
+  // TODO: @非繁人:这个接口的返回值,是不是用命名字段更好些?
   const productCount = await ProductSpuApi.getTabsCount()
   data.productForSale.value = productCount['0']
   data.productInWarehouse.value = productCount['1']

+ 1 - 1
src/views/mall/promotion/bargain/activity/index.vue

@@ -197,7 +197,7 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-// TODO 芋艿:这里要改下
+// TODO 非繁人:这里要改下
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
   try {

+ 1 - 1
src/views/mall/promotion/combination/activity/index.vue

@@ -195,7 +195,7 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-// TODO 芋艿:这里要改下
+// TODO 非繁人:这里要改下
 /** 关闭按钮操作 */
 const handleClose = async (id: number) => {
   try {

+ 1 - 1
src/views/member/user/components/balance-list.vue

@@ -6,7 +6,7 @@ export default defineComponent({
 })
 </script>
 
-<!-- TODO @芋艿:未来实现,等周建的 -->
+<!-- TODO @非繁人:未来实现,等周建的 -->
 <template>
   <div>余额列表</div>
 </template>

+ 1 - 1
src/views/member/user/detail/UserExperienceRecordList.vue

@@ -81,7 +81,7 @@
       <el-table-column label="描述" align="center" prop="description" />
       <el-table-column label="业务编号" align="center" prop="bizId" width="150px" />
       <el-table-column label="业务类型" align="center" prop="bizType" width="150px">
-        <!--   TODO 芋艿:此处应创建对应的字典 -->
+        <!--   TODO 非繁人:此处应创建对应的字典 -->
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MEMBER_EXPERIENCE_BIZ_TYPE" :value="scope.row.bizType" />
         </template>

+ 1 - 1
src/views/member/user/detail/index.vue

@@ -24,7 +24,7 @@
         </el-card>
       </el-col>
       <!-- 下边:账户明细 -->
-      <!-- TODO 芋艿:【订单管理】【售后管理】【收藏记录】-->
+      <!-- TODO 非繁人:【订单管理】【售后管理】【收藏记录】-->
       <el-card header="账户明细" style="width: 100%; margin-top: 20px" shadow="never">
         <template #header>
           <CardTitle title="账户明细" />

+ 1 - 1
src/views/mp/components/wx-voice-play/main.vue

@@ -84,7 +84,7 @@ const amrStop = () => {
   playing.value = false
   amr.value.stop()
 }
-// TODO 芋艿:下面样式有点问题
+// TODO 非繁人:下面样式有点问题
 </script>
 <style lang="scss" scoped>
 .wx-voice-div {

+ 1 - 1
src/views/mp/menu/index.vue

@@ -265,7 +265,7 @@ const menuListToBackend = () => {
 }
 
 // 将前端的 menu,转换成后端接收的 menu
-// TODO: @芋艿,需要根据后台API删除不需要的字段
+// TODO: @非繁人,需要根据后台API删除不需要的字段
 const menuToBackend = (menu: any) => {
   let result = {
     ...menu,