+
{
const csrSupplierList = ref([])
const selMonth = ref('')
const getCsrSupplierList = (index?: any) => {
- const month = index || index === 0 ? query.value.year + '-' + months[index] : ''
+ const _m = +months[index]
+ const month =
+ index || index === 0
+ ? (_m < 4 ? +query.value.year + 1 : query.value.year) + '-' + months[index]
+ : ''
csrSupplierList.value = []
selMonth.value = ''
const req = { pageNum: 1, pageSize: 10, ...query.value, month }
+ req.year = _m < 4 ? +req.year + 1 : req.year
req.supplierName
? fetchCsrSupplierList(req).then((res: any) => {
csrSupplierList.value = (res.rows || []).filter((item: any) => item.submitunCount > 0)
})
- : fetchCsrSupplierTopList(req).then((res: any) => {
+ : fetchCsrSupplierTopList({ ...req }).then((res: any) => {
csrSupplierList.value = (res.rows || []).filter((item: any) => item.submitunCount > 0)
})
- selMonth.value = month ? +months[index] + '月' : ''
+ selMonth.value = month ? months[index] : ''
}
const getCsrSupplierTaskInfo = () => {
@@ -326,7 +331,9 @@ getCsrSupplierTaskInfo()
-
未提交供应商明细({{ query.year }}年{{ selMonth }})
+
+ 未提交供应商明细({{ +selMonth < 4 ? +query.year + 1 : query.year }}年{{ selMonth }}月)
+
更新时间：{{ updateTime }}
diff --git a/src/views/home/csr/modifyCSR2.vue b/src/views/home/csr/modifyCSR2.vue
index 22d9348..5628fb5 100755
--- a/src/views/home/csr/modifyCSR2.vue
+++ b/src/views/home/csr/modifyCSR2.vue
@@ -1,281 +1,280 @@
-
+
-
-
-
-
- 返回
-
-
-
- 新增
-
+
+
+
+
+ 返回
+
+
+ 新增
- {{ userData ? '已设置' : '查看范围设置' }}
+ {{ userData ? '已设置' : '查看范围设置' }}
-
-
-
-
-
-
-
![]()
-
+
+
+
+
+
+
![]()
+
-
-
-
-
-
- 编辑
+
+
+ {{ i.originalFileName }}
+
+
+
+
+
+ 编辑
-
- 删除
-
-
-
-
+
-
-
-
-
-
-
- {{ i.originalFileName }}
-
-
-
-
-
- 编辑
+
+
+
+
+ {{ i.originalFileName }}
+
+
+
+
+
+ 编辑
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
- 选择文件
-
-
-
-
-
- 确认
-
-
-
+
+
+ 选择文件
+
+
+
+
+ 确认
+
+
+
@@ -394,26 +450,72 @@ const handleCurrentChange=(e)=>{
外部调研报告
-
+
-
+
-
+
-
+
-
+
选择文件
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
确认
@@ -430,4 +532,4 @@ const handleCurrentChange=(e)=>{
right: 30px;
top: -92px;
}
-
\ No newline at end of file
+
diff --git a/src/views/home/intelligence/components/InfosEdit.vue b/src/views/home/intelligence/components/InfosEdit.vue
index 73ac361..9774fa2 100755
--- a/src/views/home/intelligence/components/InfosEdit.vue
+++ b/src/views/home/intelligence/components/InfosEdit.vue
@@ -21,6 +21,7 @@ import {
import { saveArticle, trendsDetail } from '@/api/daikin/base'
import Editor from '../components/TinyECE.vue'
import { useUserStore } from '@/stores/modules/user'
+import { pickerOptions } from '@/utils/date'
import { useRoute } from 'vue-router'
const { day, week } = useDate()
const { push } = useRouter()
@@ -172,7 +173,7 @@ async function save() {
})
}
- const { title, tag, source, cate, type } = formValue.value
+ const { title, tag, source, cate, type, isTop, isPublish, publishTime } = formValue.value
console.log(cate)
const { msg, code } = await saveArticle({
title,
@@ -183,7 +184,10 @@ async function save() {
type,
content,
bannerImg,
- userIdList
+ userIdList,
+ isTop,
+ isPublish,
+ publishTime
})
if (code === 200) {
message.success('新增成功')
@@ -370,6 +374,37 @@ const handleClose = (tag: any) => {
{{ i.nickName }}
+
+
+
+
+
+
+
+
+
+
文本内容预览
diff --git a/src/views/home/intelligence/process/ProcessInfo.vue b/src/views/home/intelligence/process/ProcessInfo.vue
index 071f044..ab2712a 100755
--- a/src/views/home/intelligence/process/ProcessInfo.vue
+++ b/src/views/home/intelligence/process/ProcessInfo.vue
@@ -6,6 +6,7 @@ import HomeHeadSearch from '@/views/home/components/HomeHeadSearch.vue'
import UserPage from './UserPages.vue'
import { useDate } from '@/views/home/hooks/useDate'
import { getArticleDetail, review } from '@/api/daikin/base'
+import { pickerOptions } from '@/utils/date'
import {
NModal,
NCard,
@@ -59,6 +60,8 @@ let formValue: any = ref({
source: '',
content: '',
isTop: 'N',
+ isPublish: 0,
+ publishTime: '',
bannerImg: ''
})
@@ -422,6 +425,37 @@ const showModalRefs = ref(false)
{{ i.nickName }}
+
+
+
+
+
+
+
+
diff --git a/src/views/home/market/modify.vue b/src/views/home/market/modify.vue
index c5bd507..c9a64e7 100755
--- a/src/views/home/market/modify.vue
+++ b/src/views/home/market/modify.vue
@@ -5,8 +5,9 @@ import HomeHead from '@/views/home/components/HomeHead.vue'
import { useMessage, NModal } from 'naive-ui'
import { useUserStore } from '@/stores/modules/user'
import UserList from '@/views/home/intelligence/process/UserPages.vue'
+import { pickerOptions } from '@/utils/date'
-import { getList, marketPreDelete,marketPreADD } from '@/api/daikin/base'
+import { getList, marketPreDelete, marketPreADD } from '@/api/daikin/base'
const message = useMessage()
const store = useUserStore()
@@ -15,7 +16,6 @@ const header = { 'token': store.user.token }
const dataA = ref([])
const editA = ref()
-
const shomkA = ref(false)
async function setDataFiles(arr, _row) {
@@ -23,136 +23,155 @@ async function setDataFiles(arr, _row) {
arr.value = _row.map((i: { filePathList: { name: any; originalFileName: any }[] }) => {
if (i.filePathList && i.filePathList.length > 0) {
i.filePathList.forEach((file: { name: any; originalFileName: any }) => {
- file.name = file.originalFileName;
- });
+ file.name = file.originalFileName
+ })
}
return i
})
}
}
-const type =ref(2)
+const type = ref(2)
async function getDataA() {
- const {data} = await getList({type:2})
- dataA.value = data
- // setDataFiles(dataArr);
+ const { data } = await getList({ type: 2 })
+ dataA.value = data
+ // setDataFiles(dataArr);
}
-
onMounted(async () => {
- getDataA();
+ getDataA()
})
function computedName(title) {
- let index = title.indexOf(".");
+ let index = title.indexOf('.')
if (index > -1) {
- return title.slice(0, index - 1);
+ return title.slice(0, index - 1)
}
- return title;
+ return title
}
-async function onSubmitA(row: { id: any; fileList?: any; title?: any }) {
+async function onSubmitA(row: {
+ id: any
+ fileList?: any
+ title?: any
+ isTop?: any
+ isPublish?: any
+ publishTime?: any
+}) {
console.log(row, 555)
- const { id, title } = row
+ const { id, title, isTop, isPublish, publishTime } = row
// let moduleId = 1;
- let sendData= {}
- if(!row.id){
- sendData = { title,type:type.value,userIdList:userData.value };
- if (row.fileList && row.fileList.length > 0) {
- row.fileList.map(item => {
-
- if(item.response) {
- sendData.filePath = item.response.url;
- // obj.title = title || computedName(item.response.originalFilename);
- }
- else {
- sendData.filePath = item.url;
- // obj.title = title || computedName(item.originalFilename);
- }
-
- })
+ let sendData = {}
+ if (!row.id) {
+ sendData = {
+ title,
+ type: type.value,
+ userIdList: userData.value,
+ isTop,
+ isPublish,
+ publishTime
+ }
+ if (row.fileList && row.fileList.length > 0) {
+ row.fileList.map((item) => {
+ if (item.response) {
+ sendData.filePath = item.response.url
+ // obj.title = title || computedName(item.response.originalFilename);
+ } else {
+ sendData.filePath = item.url
+ // obj.title = title || computedName(item.originalFilename);
+ }
+ })
+ }
+ } else {
+ sendData = {
+ id,
+ title,
+ type: type.value,
+ userIdList: userData.value,
+ isTop,
+ isPublish,
+ publishTime
+ }
+ }
+ console.log(sendData)
+ const { code, msg } = await marketPreADD(sendData)
+ if (code === 200) {
+ message.success('修改成功！')
+ } else {
+ message.error(msg)
}
-}
-else{
- sendData = {id, title,type:type.value,userIdList:userData.value };
-}
-console.log(sendData)
-const {code,msg} = await marketPreADD(sendData)
- if (code === 200) { message.success("修改成功！") }
- else { message.error(msg) }
shomkA.value = false
- getDataA();
+ getDataA()
}
-
-
const handleEditA = (type: string, row: any) => {
console.log(row)
editA.value = {
title: '',
- fileList: [],
+ fileList: []
}
- setUserList.value =[]
+ setUserList.value = []
shomkA.value = true
if (!row) return
editA.value = row
- editA.value.fileList = [{
- name: row.title,
- originalFilename: row.title,
- url: row.filePath,
- }]
- setUserList.value =row.userIdList
+ editA.value.fileList = [
+ {
+ name: row.title,
+ originalFilename: row.title,
+ url: row.filePath
+ }
+ ]
+ setUserList.value = row.userIdList
}
-
async function handleDeleteA(index: number, row: any) {
const { id } = row
if (!id) return
- const { code, msg } = await marketPreDelete({ id,type:type.value })
- if (code === 200) { message.success("删除成功！") }
- else { message.error(msg) }
- getDataA();
+ const { code, msg } = await marketPreDelete({ id, type: type.value })
+ if (code === 200) {
+ message.success('删除成功！')
+ } else {
+ message.error(msg)
+ }
+ getDataA()
}
-
-const activeName = ref("first")
+const activeName = ref('first')
const userList = ref()
const showModal = ref(false)
const flg = ref()
-const setUserList =ref()
+const setUserList = ref()
async function getUser(row) {
console.log(row)
showModal.value = !showModal.value
flg.value = row
- if(row.id&&row.userIdList){
+ if (row.id && row.userIdList) {
setUserList.value = row.userIdList
}
// const {data: userArr} = await getBPCUser({moduleId})
// setUserList.value = userArr
-
}
- // 获取子组件传过来的值
- const userData = ref()
- const handleChild = (data: any) => {
- console.log(data, 444);
- const { showModal: show, multipleSelection } = data
- showModal.value = unref(show)
- let userIdList: any[] =[]
- multipleSelection.value.forEach((i: { userId: any })=>{
- userIdList.push(i.userId)
- })
- if(flg.value.id){
- flg.value.userIdList = userIdList
- marketPreADD(flg.value)
- getDataA();
- console.log(flg.value)
- }
- userData.value = userIdList
+// 获取子组件传过来的值
+const userData = ref()
+const handleChild = (data: any) => {
+ console.log(data, 444)
+ const { showModal: show, multipleSelection } = data
+ showModal.value = unref(show)
+ let userIdList: any[] = []
+ multipleSelection.value.forEach((i: { userId: any }) => {
+ userIdList.push(i.userId)
+ })
+ if (flg.value.id) {
+ flg.value.userIdList = userIdList
+ marketPreADD(flg.value)
+ getDataA()
+ console.log(flg.value)
}
- const CloseThiss = (data: boolean)=>{
- showModal.value = data
- }
-
+ userData.value = userIdList
+}
+const CloseThiss = (data: boolean) => {
+ showModal.value = data
+}
@@ -165,16 +184,25 @@ async function getUser(row) {
汇率内容管理
-
-
- 汇率内容新增
-
-
-
-
-
+
+
-
-
-
- {{it.nickName}}
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
+
+
+
+
+ {{ it.nickName }}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
@@ -212,30 +242,71 @@ async function getUser(row) {
New
-->
-
+
-
+
- 设置
+ 设置
-
+
-
+
选择文件
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
确认
-
+
@@ -255,4 +326,4 @@ async function getUser(row) {
justify-content: center;
margin: 0 auto;
}
-
\ No newline at end of file
+
diff --git a/src/views/home/market/modifys.vue b/src/views/home/market/modifys.vue
index f595943..e0c3f33 100755
--- a/src/views/home/market/modifys.vue
+++ b/src/views/home/market/modifys.vue
@@ -5,8 +5,8 @@ import HomeHead from '@/views/home/components/HomeHead.vue'
import { useMessage, NModal } from 'naive-ui'
import { useUserStore } from '@/stores/modules/user'
import UserList from '@/views/home/intelligence/process/UserPages.vue'
-
-import { getList, marketPreDelete,marketPreADD } from '@/api/daikin/base'
+import { pickerOptions } from '@/utils/date'
+import { getList, marketPreDelete, marketPreADD } from '@/api/daikin/base'
const message = useMessage()
const store = useUserStore()
@@ -15,7 +15,6 @@ const header = { 'token': store.user.token }
const dataA = ref([])
const editA = ref()
-
const shomkA = ref(false)
async function setDataFiles(arr, _row) {
@@ -23,135 +22,154 @@ async function setDataFiles(arr, _row) {
arr.value = _row.map((i: { filePathList: { name: any; originalFileName: any }[] }) => {
if (i.filePathList && i.filePathList.length > 0) {
i.filePathList.forEach((file: { name: any; originalFileName: any }) => {
- file.name = file.originalFileName;
- });
+ file.name = file.originalFileName
+ })
}
return i
})
}
}
-const type =ref(1)
+const type = ref(1)
async function getDataA() {
- const {data} = await getList({type:1})
- dataA.value = data
- // setDataFiles(dataArr);
+ const { data } = await getList({ type: 1 })
+ dataA.value = data
+ // setDataFiles(dataArr);
}
-
onMounted(async () => {
- getDataA();
+ getDataA()
})
function computedName(title) {
- let index = title.indexOf(".");
+ let index = title.indexOf('.')
if (index > -1) {
- return title.slice(0, index - 1);
+ return title.slice(0, index - 1)
}
- return title;
+ return title
}
-async function onSubmitA(row: { id: any; fileList?: any; title?: any }) {
+async function onSubmitA(row: {
+ id: any
+ fileList?: any
+ title?: any
+ isTop?: any
+ isPublish?: any
+ publishTime?: any
+}) {
console.log(row, 555)
- const { id, title } = row
+ const { id, title, isTop, isPublish, publishTime } = row
// let moduleId = 1;
- let sendData= {}
- if(!row.id){
- sendData = { title,type:type.value,userIdList:userData.value };
- if (row.fileList && row.fileList.length > 0) {
- row.fileList.map(item => {
-
- if(item.response) {
- sendData.filePath = item.response.url;
- // obj.title = title || computedName(item.response.originalFilename);
- }
- else {
- sendData.filePath = item.url;
- // obj.title = title || computedName(item.originalFilename);
- }
-
- })
+ let sendData = {}
+ if (!row.id) {
+ sendData = {
+ title,
+ type: type.value,
+ userIdList: userData.value,
+ isTop,
+ isPublish,
+ publishTime
+ }
+ if (row.fileList && row.fileList.length > 0) {
+ row.fileList.map((item) => {
+ if (item.response) {
+ sendData.filePath = item.response.url
+ // obj.title = title || computedName(item.response.originalFilename);
+ } else {
+ sendData.filePath = item.url
+ // obj.title = title || computedName(item.originalFilename);
+ }
+ })
+ }
+ } else {
+ sendData = {
+ id,
+ title,
+ type: type.value,
+ userIdList: userData.value,
+ isTop,
+ isPublish,
+ publishTime
+ }
+ }
+ console.log(sendData)
+ const { code, msg } = await marketPreADD(sendData)
+ if (code === 200) {
+ message.success('修改成功！')
+ } else {
+ message.error(msg)
}
-}
-else{
- sendData = {id, title,type:type.value,userIdList:userData.value };
-}
-console.log(sendData)
-const {code,msg} = await marketPreADD(sendData)
- if (code === 200) { message.success("修改成功！") }
- else { message.error(msg) }
shomkA.value = false
- getDataA();
+ getDataA()
}
-
-
const handleEditA = (type: string, row: any) => {
console.log(row)
editA.value = {
title: '',
- fileList: [],
+ fileList: []
}
- setUserList.value =[]
+ setUserList.value = []
shomkA.value = true
if (!row) return
editA.value = row
- editA.value.fileList = [{
- name: row.title,
- originalFilename: row.title,
- url: row.filePath,
- }]
- setUserList.value =row.userIdList
+ editA.value.fileList = [
+ {
+ name: row.title,
+ originalFilename: row.title,
+ url: row.filePath
+ }
+ ]
+ setUserList.value = row.userIdList
}
-
async function handleDeleteA(index: number, row: any) {
const { id } = row
if (!id) return
- const { code, msg } = await marketPreDelete({ id,type:type.value })
- if (code === 200) { message.success("删除成功！") }
- else { message.error(msg) }
- getDataA();
+ const { code, msg } = await marketPreDelete({ id, type: type.value })
+ if (code === 200) {
+ message.success('删除成功！')
+ } else {
+ message.error(msg)
+ }
+ getDataA()
}
-
-const activeName = ref("first")
+const activeName = ref('first')
const userList = ref()
const showModal = ref(false)
const flg = ref()
-const setUserList =ref()
+const setUserList = ref()
async function getUser(row) {
console.log(row)
showModal.value = !showModal.value
flg.value = row
- if(row.id&&row.userIdList){
+ if (row.id && row.userIdList) {
setUserList.value = row.userIdList
}
// const {data: userArr} = await getBPCUser({moduleId})
// setUserList.value = userArr
-
}
- // 获取子组件传过来的值
- const userData = ref()
- const handleChild = (data: any) => {
- console.log(data, 444);
- const { showModal: show, multipleSelection } = data
- showModal.value = unref(show)
- let userIdList: any[] =[]
- multipleSelection.value.forEach((i: { userId: any })=>{
- userIdList.push(i.userId)
- })
- if(flg.value.id){
- flg.value.userIdList = userIdList
- console.log(flg.value)
- marketPreADD(flg.value)
- }
- userData.value = userIdList
+// 获取子组件传过来的值
+const userData = ref()
+const handleChild = (data: any) => {
+ console.log(data, 444)
+ const { showModal: show, multipleSelection } = data
+ showModal.value = unref(show)
+ let userIdList: any[] = []
+ multipleSelection.value.forEach((i: { userId: any }) => {
+ userIdList.push(i.userId)
+ })
+ if (flg.value.id) {
+ flg.value.userIdList = userIdList
+ console.log(flg.value)
+ marketPreADD(flg.value)
}
- const CloseThiss = (data: boolean)=>{
- showModal.value = data
- }
-
+ userData.value = userIdList
+}
+const CloseThiss = (data: boolean) => {
+ showModal.value = data
+}
@@ -164,16 +182,25 @@ async function getUser(row) {
市况内容管理
-
-
- 市况内容新增
-
-
-
-
-
+
+
-
-
-
- {{it.nickName}}
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
+
+
+
+ {{ it.nickName }}
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
@@ -211,30 +240,71 @@ async function getUser(row) {
New
-->
-
+
-
+
- 设置
+ 设置
-
+
-
+
选择文件
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
确认
-
+
@@ -254,4 +324,4 @@ async function getUser(row) {
justify-content: center;
margin: 0 auto;
}
-
\ No newline at end of file
+
diff --git a/src/views/home/quality/modify.vue b/src/views/home/quality/modify.vue
index 1954836..9b89134 100755
--- a/src/views/home/quality/modify.vue
+++ b/src/views/home/quality/modify.vue
@@ -22,6 +22,7 @@ import {
badartGetUser,
badartAddUser
} from '@/api/daikin/base'
+import { pickerOptions } from '@/utils/date'
import UserList from '@/views/home/intelligence/process/UserPages.vue'
const message = useMessage()
const store = useUserStore()
@@ -123,9 +124,13 @@ async function onSubmitA(row: {
proportion?: any
partSum?: any
badSum?: any
+ monthDate?: any
+ isTop?: any
+ isPublish?: any
+ publishTime?: any
}) {
console.log(row)
- const { id, indexId, title, partSum, badSum, monthDate } = row
+ const { id, indexId, title, partSum, badSum, monthDate, isTop, isPublish, publishTime } = row
let filePathArr = []
if (row.fileList && row.fileList.length > 0) {
@@ -146,7 +151,10 @@ async function onSubmitA(row: {
badSum,
filePath,
cate,
- monthDate: time
+ monthDate: time,
+ isTop,
+ isPublish,
+ publishTime
})
if (code === 200) {
message.success('修改成功！')
@@ -157,8 +165,16 @@ async function onSubmitA(row: {
gettopList()
}
-async function onSubmitB(row: { filePathList?: any; id?: any; cate?: any; title?: any }) {
- const { id, cate, title } = row
+async function onSubmitB(row: {
+ filePathList?: any
+ id?: any
+ cate?: any
+ title?: any
+ isTop?: any
+ isPublish?: any
+ publishTime?: any
+}) {
+ const { id, cate, title, isTop, isPublish, publishTime } = row
let filePathArr = []
if (row.fileList && row.fileList.length > 0) {
@@ -169,7 +185,15 @@ async function onSubmitB(row: { filePathList?: any; id?: any; cate?: any; title?
}
let filePath = filePathArr.join(',')
- const { code, msg } = await badartAdd({ id, cate, title, filePath })
+ const { code, msg } = await badartAdd({
+ id,
+ cate,
+ title,
+ filePath,
+ isTop,
+ isPublish,
+ publishTime
+ })
if (code === 200) {
message.success('修改成功！')
} else {
@@ -180,9 +204,17 @@ async function onSubmitB(row: { filePathList?: any; id?: any; cate?: any; title?
getbadartList()
}
-async function onSubmitC(row: { filePathList?: any; id?: any; source?: any; title?: any }) {
+async function onSubmitC(row: {
+ filePathList?: any
+ id?: any
+ source?: any
+ title?: any
+ isTop?: any
+ isPublish?: any
+ publishTime?: any
+}) {
console.log(row)
- const { id, source, title } = row
+ const { id, source, title, isTop, isPublish, publishTime } = row
let filePathArr = []
if (row.fileList && row.fileList.length > 0) {
@@ -193,16 +225,31 @@ async function onSubmitC(row: { filePathList?: any; id?: any; source?: any; titl
}
let filePath = filePathArr.join(',')
- const { code, msg } = await highAdd({ id, source, title, filePath })
+ const { code, msg } = await highAdd({
+ id,
+ source,
+ title,
+ filePath,
+ isTop,
+ isPublish,
+ publishTime
+ })
if (code === 200) {
message.success('修改成功！')
} else message.error(msg)
shomkC.value = false
gethighList()
}
-async function onSubmitD(row: { filePathList?: any; id?: any; title?: any }) {
+async function onSubmitD(row: {
+ filePathList?: any
+ id?: any
+ title?: any
+ isTop?: any
+ isPublish?: any
+ publishTime?: any
+}) {
console.log(row)
- const { id, title } = row
+ const { id, title, isTop, isPublish, publishTime } = row
let filePathArr = []
if (row.fileList && row.fileList.length > 0) {
@@ -213,7 +260,7 @@ async function onSubmitD(row: { filePathList?: any; id?: any; title?: any }) {
}
let filePath = filePathArr.join(',')
- const { code, msg } = await actAdd({ id, title, filePath })
+ const { code, msg } = await actAdd({ id, title, filePath, isTop, isPublish, publishTime })
if (code === 200) {
message.success('修改成功！')
} else {
@@ -681,6 +728,40 @@ const CloseThiss = (data: any) => {
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
个人日程