feat

.env.development

@@ -1,4 +1,3 @@
-# 项目本地运行端口号
 VITE_PORT = 8848
 
 # 开发环境读取配置文件路径
@@ -14,19 +13,21 @@ VITE_CORP_ID = "dingc78fa4301e1a424a35c2f4657eb6378f"
 # 企业微信appid
 VITE_APP_ID = "ww6076e6fd4268ee31"
 # 微信开发环境基础重定向url
-REDIRECT_BASE_URL = "http://cxinv.api.caixiao365.com"
+REDIRECT_BASE_URL = "http://webcx.test241.wanyuhengtong.com/"
 # 开发环境后端用户地址
-VITE_PROXY_USER_REAL = "http://rep.report.caixiao365.com"
+# VITE_PROXY_USER_REAL = "http://report.test241.wanyuhengtong.com"
+
+VITE_PROXY_USER_REAL = "http://report.test241.wanyuhengtong.com"
 # 开发环境后端业务地址
-VITE_PROXY_DOMAIN_REAL = "http://rep.report.caixiao365.com"
+VITE_PROXY_DOMAIN_REAL = "http://report.test241.wanyuhengtong.com"
 
-VITE_IS_PROD = true
+# 采销报表地址
+VITE_PURCHASE_REPORT = "http://stocknew.test241.wanyuhengtong.com/"
+VITE_IS_PROD = false
 
 # 跳转结算地址
-VITE_PURCHASE_URL = 'http://pin.caixiao365.com/'
-# 跳转结算地址
-VITE_SET_URL = 'http://fin.caixiao365.com/'
-
-
+VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com/'
+# 跳转工单地址
+VITE_GD_URL='http://bugweb.test241.wanyuhengtong.com/'
 # token密钥
 VITE_SECRET_KEY = 'key123'

.vscode/settings.json

@@ -26,5 +26,8 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
-  "iconify.excludes": ["el"]
+  "iconify.excludes": [
+    "el"
+  ],
+  "vue.codeActions.enabled": false
 }

src/api/system/accountRole/index.ts

@@ -51,3 +51,10 @@ export const httpRoleAll = (data: object): ResponseType => {
 export const httpSetRole = (data: object): ResponseType => {
   return http.request("post", `${yewuApi}setrole`, { data });
 };
+
+
+
+//解除微信绑定
+export const httpWxDel = (data: object): ResponseType => {
+  return http.request("post", `${yewuApi}account/delWx`, { data });
+};

src/views/system/accountRole/config/content.config.ts

@@ -91,7 +91,7 @@ const columns = [
   {
     label: "操作",
     fixed: "right",
-    width: 100,
+    width: 120,
     slot: "operation"
   }
 ];

src/views/system/accountRole/index.vue

@@ -6,8 +6,13 @@ import contentConfig from "./config/content.config";
 import { httpSetRole } from "/@/api/system/account";
 import { useAsync } from "/@/hooks/core/useAsync";
 import searchConfig from "./config/search.config";
-import { ElMessage } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
 import { ModalTypes } from "./types";
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+
+import {
+  httpWxDel
+} from "/@/api/system/accountRole";
 
 const PageName = "accountRole";
 const roleModalRef = ref<InstanceType<typeof RoleModal> | null>(null);
@@ -41,6 +46,15 @@ const events: PageEvents = {
   }
 };
 
+async function delWx(id) { 
+  ElMessageBox.confirm("是否确认解除绑定?").then(async () => { 
+    const result = await httpWxDel({ id })
+    if (result.code === 1) { 
+        instance.value.onSearch()
+    }
+  })
+}
+
 function handleSave(data: any, type: ModalTypes) {
   const { roleid, id } = data;
 
@@ -66,7 +80,12 @@ function handleSave(data: any, type: ModalTypes) {
       :contentConfig="contentConfig"
       :search-config="searchConfig"
       :get-content-ref="ref => (instance = ref)"
-    />
+    ><template #content_action="{is_wx, id }">
+      <el-tooltip content="解除微信绑定">
+         <el-button v-if="Number(is_wx) === 1" type="text" size="mini" :icon="useRenderIcon('close')" @click="delWx(id)"/>
+      </el-tooltip>
+    </template>
+  </PageContainer>
     <RoleModal ref="roleModalRef" @finance-save="handleSave" />
   </PageAuth>
 </template>

src/views/template/publicTemplate/components/template-modal.vue

@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref, shallowRef } from 'vue';
+import { createHttpRequest } from "/@/views/time/_http";
+import { ElForm , ElMessage} from "element-plus"
+
+const emit = defineEmits(['refresh'])
+
+const httpDepart = createHttpRequest("account/depart")
+const httpUser = createHttpRequest("admin/account/list")
+const httpWechatTemplate = createHttpRequest("admin/WeTemplate/getTemplate")
+const httpCreate = createHttpRequest("admin/DepartReport/create")
+const httpUpdate = createHttpRequest("admin/DepartReport/edit")
+
+const pushTypes = [{ value: "1", label: '每天' }]
+
+const modalType = shallowRef("crate")
+
+const initialData = {
+  report_name: "",
+  template_name: "",
+  template_id: "",
+  template_param: "",
+  push_type: "",
+  depart_id: "",
+  push_arr: []
+}
+
+const rules = {
+  report_name: [{ required: true, message: "请输入模板名称", trigger: 'change' }],
+  template_id: [{ required: true, message: "请选择微信模板", trigger: 'change' }],
+  push_type: [{ required: true, message: "请选择推送类型", trigger: 'change' }],
+  push_arr: [{ required: true, message: "请选择推送人", trigger: 'change' }],
+  depart_id: [{ required: true, message: "请选择部门", trigger: 'change' }]
+}
+
+const title = computed(() => {
+  return modalType.value === "create" ? '创建模板' : '修改模板'
+})
+
+const wechatTemplate = ref<Record<string, string>[]>([])
+const departs = ref<Record<string,string>[]>([])
+const users = ref<Record<string,string>[]>([])
+const visible = ref(false);
+const loading = ref(false);
+
+const formRef = ref<InstanceType<typeof ElForm> | null>(null)
+const formData = ref({ ...initialData });
+
+const requestUsers = async () => {
+  const uResult = await httpUser({ size: 10000, depart_id: formData.value.depart_id });
+  if (uResult.code === 1) users.value = uResult.data.list;
+}
+
+function handleTemplateChange(value) {
+  const item = wechatTemplate.value.find(({ template_id }) => template_id === value)
+  formData.value.template_name = item!.title;
+  formData.value.template_param = item!.content;
+  console.log(formData.value)
+}
+
+async function submit() {
+  try {
+    await formRef.value!.validate();
+    const api = modalType.value === "update" ? httpUpdate : httpCreate
+    const result = await api(formData.value);
+    if (result.code === 1) {
+      emit('refresh')
+      visible.value = false
+    } else { 
+      ElMessage.warning(result.message)
+    }
+  } catch (err) {
+    console.log(err)
+  }
+ }
+
+onMounted(async () => {
+  const wtResult = await httpWechatTemplate({});
+  const dResult = await httpDepart({ size: 10000 })
+  const uResult = await httpUser({ size: 10000, depart_id: formData.value.depart_id,is_wx: 1 });
+  if (uResult.code === 1) users.value = uResult.data.list;
+  if (wtResult.code === 1) wechatTemplate.value = wtResult.data;
+  if (dResult.code === 1) departs.value = [
+    {id:0, name:'全部部门'},
+    ...dResult.data
+  ];
+})
+
+
+defineExpose({
+  onDisplay: (data: any, _modalType: string) => {
+    visible.value = true;
+
+    modalType.value = _modalType;
+    if (_modalType === "update") {
+      formData.value = { ...data };
+      formData.value.push_arr = data.pusher.map(({ user_id }) => user_id)
+      delete formData.value.pusher;
+    } else {
+      formData.value = {...initialData}
+    }
+  }
+})
+</script>
+
+<template>
+  <el-dialog v-model="visible" :title="title" center >
+    <el-form label-width="100px" :model="formData" :rules="rules" ref="formRef">
+      <el-form-item label="模板名称:" prop="report_name">
+        <el-input v-model="formData.report_name" placeholder="模板名称" />
+      </el-form-item>
+
+      <el-form-item label="部门:" prop="depart_id">
+        <el-select v-model="formData.depart_id" placeholder="部门" style="width:100%" @change="handleChange">
+          <el-option v-for="depart in departs" :key="depart.id" :value="depart.id" :label="depart.name" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="微信模板:" prop="template_id">
+        <el-select style="width:100%" v-model="formData.template_id" placeholder="微信模板"  @change="handleTemplateChange">
+          <el-option v-for="template in wechatTemplate" :key="template.template_id" :value="template.template_id"
+            :label="template.title" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="推送时间:" v-model="formData.push_type" prop="push_type">
+        <el-select style="width:100%" placeholder="推送类型" v-model="formData.push_type">
+          <el-option v-for="type in pushTypes" :key="type.value" :label="type.label" :value="type.value"  />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="推送人:" v-model="formData.push_arr" prop="push_arr">
+        <el-select style="width:100%" placeholder="推送人" multiple filterable v-model="formData.push_arr">
+          <el-option filterable v-for="user in users" :key="user.id" :label="user.nickname" :value="user.id" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <div style="display:flex;justify-content: flex-end;width:100%">
+          <el-button type="primary" @click="submit" :loading="loading">保存</el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>

src/views/template/publicTemplate/config/content.config.ts

@@ -0,0 +1,85 @@
+/* eslint-disable prettier/prettier */
+import { h } from "vue";
+import { ContentConfig } from "/@/components/PageContent";
+
+import { createHttpRequest } from "/@/views/time/_http";
+import { ElTag } from "element-plus";
+
+
+const httpList = createHttpRequest("admin/DepartReport/list")
+const httpStatus = createHttpRequest("/admin/DepartReport/status")
+const columns = [
+  {
+    label: "ID",
+    prop: "id",
+    width: '60px'
+  },
+  {
+    label: "模板名称",
+    prop: "report_name"
+  },
+  {
+    label: "微信模板名称",
+    prop: "template_name"
+  },
+  {
+    label: "微信模板ID",
+    prop: "template_id"
+  },
+  {
+    label: "推送时间",
+    prop: "",
+    width: '80px',
+    cellRenderer({ row }) {
+      return "每天"
+    }
+  },
+  {
+    label: "推送人",
+    prop: "pusher",
+    cellRenderer({ row }) {
+      return row.pusher.map(({ user_name }) => user_name).join(",")
+    }
+  },
+  {
+    label: "状态",
+    width: '65px',
+    prop: "status",
+    cellRenderer({ row }) {
+      return h(ElTag, {
+        type: String(row.status) === "1" ? "success" : "danger"
+      }, {
+        default: () => String(row.status) === "1" ? "启用" : "禁用"
+      })
+    }
+  },
+  {
+    label: "创建时间",
+    prop: "createtime",
+    width: '140px'
+  },
+  {
+    label: "模板参数",
+    prop: "template_param"
+  },
+  {
+    width: 80,
+    label: "操作",
+    fixed: "right",
+    slot: "operation"
+  }
+];
+
+
+const contentConfig: ContentConfig = {
+  superUserNoAction: false,
+  columns,
+  apis: {
+    httpList,
+    httpStatus,
+    httpAdd: true,
+    httpUpdate: true
+  }
+};
+
+export default contentConfig;

src/views/template/publicTemplate/config/search.config.ts

@@ -0,0 +1,14 @@
+import { FormConfig } from "/@/components/PageSearch";
+import { shareTypes } from "./configs";
+
+const searchFormConfig: FormConfig = {
+  formItems: [
+    {
+      field: "report_name",
+      type: "input",
+      placeholder: "模板名称"
+    }
+  ]
+};
+
+export default searchFormConfig;

src/views/template/publicTemplate/index.vue

@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
+import searchConfig from "./config/search.config"
+import TemplateModal from "./components/template-modal.vue"
+import contentConfig from "./config/content.config";
+
+const instance = ref(null);
+const templateModalRef = ref<InstanceType<typeof TemplateModal> | null>(null)
+
+const PageName = "publicTemplate";
+
+const hooks: PageHooks = {
+  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
+};
+
+const events: PageEvents = {
+  content: {
+    create: () => templateModalRef.value!.onDisplay(undefined, "create"),
+    update: data => templateModalRef.value!.onDisplay(data, "update")
+  }
+};
+</script>
+
+<template>
+  <PageAuth :pageName="PageName">
+    <PageContainer  :get-content-ref="ref => (instance = ref)" :events="events" :hooks="hooks" :content-config="contentConfig" :search-config="searchConfig" />
+    <TemplateModal ref="templateModalRef" @refresh="instance.onSearch()" />
+  </PageAuth>
+</template>

src/views/template/publicTemplate/types.ts

@@ -0,0 +1,5 @@
+export enum ModalTypes {
+  update,
+  preview,
+  create
+}

src/views/template/publish/config/content.config.ts

@@ -0,0 +1,57 @@
+/* eslint-disable prettier/prettier */
+import { ContentConfig } from "/@/components/PageContent";
+
+// import { httpList } from "/@/api/dashboard/accountsReceivable";
+import { addition, unit2TenThousand } from "/@/utils/calc";
+import { createHttpRequest } from "/@/views/time/_http";
+
+
+const httpList = createHttpRequest("admin/DepartReport/log")
+const columns = [
+  {
+    label: "记录ID",
+    prop: "id"
+  },
+  {
+    label: "推送模板名称",
+    prop: "template_name",
+    cellRenderer({ row }) {
+      return row.report.template_name
+    }
+  },
+  {
+    label: "推送状态",
+    prop: "status",
+    cellRenderer({ row }) {
+      return String(row.status) === "1" ? "推送成功" : "推送失败"
+    }
+  },
+  {
+    label: "推送人",
+    prop: "user_name"
+  },
+  {
+    label: "推送时间",
+    prop: "createtime"
+  },
+  {
+    label: "推送内容",
+    prop: "content"
+  },
+  {
+    label: "推送失败原因",
+    prop: "msg"
+  }
+];
+
+
+const contentConfig: ContentConfig = {
+  superUserNoAction: false,
+  noRequiredInit: true,
+  columns,
+  apis: {
+    httpList
+  }
+};
+
+export default contentConfig;

src/views/template/publish/config/search.config.ts

@@ -0,0 +1,14 @@
+import { FormConfig } from "/@/components/PageSearch";
+import { shareTypes } from "./configs";
+
+const searchFormConfig: FormConfig = {
+  formItems: [
+    {
+      field: "report_name",
+      type: "input",
+      placeholder: "模板名称"
+    }
+  ]
+};
+
+export default searchFormConfig;

src/views/template/publish/index.vue

@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import contentConfig from "./config/content.config";
+import searchConfig from "./config/search.config"
+import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
+const PageName = "publish";
+
+const hooks: PageHooks = {
+  pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
+};
+</script>
+
+<template>
+  <PageAuth :pageName="PageName">
+    <PageContainer 
+      :hooks="hooks" 
+      :searchConfig="searchConfig" 
+      :content-config="contentConfig" 
+      />
+  </PageAuth>
+</template>

src/views/time/customerDepartment/components/summary.vue

@@ -1,15 +1,13 @@
 <script setup lang="ts">
-import { ref } from "vue";
 import searchConfig from "./config/search.summary";
 import { columns } from "./config/content.summary";
 import { usePermission } from "/@/hooks/core";
 import { PageSearch } from "/@/components/PageSearch";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
-import apis from "./config/apis";
 import { frontEndExport } from "/@/utils/export";
-import { onMounted } from "vue";
+import { onMounted, shallowRef, ref} from "vue";
+import apis from "./config/apis";
 import dayjs from "dayjs";
-import { shallowRef } from "vue";
 
 // 汇总权限:列表|导出
 const pageName = "customerDepartment";
@@ -20,16 +18,10 @@ const managers = ref<Record<string, string>[]>([]);
 const salers = ref<Record<string, string>[]>([]);
 
 async function handleExportAllReport() {
-  // const u2 = salers.value.map(({ saler, total_percentage }) => ({
-  //   username: saler,
-  //   total_percentage
-  // }));
-    
-  const u2 = managers.value.map(({ manager, total_percentage }) => ({
+  const data = managers.value.map(({ manager, total_percentage }) => ({
     username: manager,
     total_percentage
   }));
-  const data = [...u2];
   
   frontEndExport({
     columns,
@@ -70,7 +62,7 @@ onMounted(() => requestData({ year_month }));
         v-loading="loading"
       >
         <ElButton
-          :icon="useRenderIcon('arrow-up-line') as unknown as string"
+          :icon="(useRenderIcon('arrow-up-line') as unknown as string)"
           v-if="hasPermissionWithCode('9')"
           @click="handleExportAllReport"
           type="primary"