pdkj
/
store-manage-app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

main
ihzero 2024-05-02 13:11:06 +08:00
parent 400b721315
commit 9bc454d59b
11 changed files with 77 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/pages/audits/data.data.js
View File

@ -12,14 +12,9 @@ export default {
return statusFun(value, 'statusExpense2', 'name') return statusFun(value, 'statusExpense2', 'name')
} }
}, },
{
title: '未通过理由',
dataIndex: 'workflow_check.check_remarks', { title: '申请人', dataIndex: 'check.employee.name'},
labelPosition: 'top',
isShow: (item) => {
return item?.workflow_check?.check_status == 4
},
},
{ {
title: '所属门店', title: '所属门店',
dataIndex: 'check.subject.store.title', dataIndex: 'check.subject.store.title',
@ -45,8 +40,16 @@ export default {
dataIndex: 'check.subject.photos', dataIndex: 'check.subject.photos',
type: 'album', type: 'album',
}, },
{
title: '未通过理由',
dataIndex: 'workflow_check.check_remarks',
labelPosition: 'top',
isShow: (item) => {
return item?.workflow_check?.check_status == 4
},
},
], ],
params: { include: 'check.subject.task,check.subject.storeMaster,check.subject.store' } params: { include: 'check.subject.task,check.subject.storeMaster,check.subject.store,check.employee' }
}, },
//报销 //报销
reimbursements: { reimbursements: {
@ -61,14 +64,7 @@ export default {
return statusFun(value, 'statusExpense2', 'name') return statusFun(value, 'statusExpense2', 'name')
} }
}, },
{
title: '未通过原因',
dataIndex: 'remarks',
labelPosition: 'top',
isShow: (item) => {
return item?.check_status == 4
},
},
{ {
title: "申请人", title: "申请人",
dataIndex: "check.subject.employee.name" dataIndex: "check.subject.employee.name"
@ -103,6 +99,14 @@ export default {
dataIndex: 'check.subject.photos', dataIndex: 'check.subject.photos',
type: 'album', type: 'album',
}, },
{
title: '未通过原因',
dataIndex: 'remarks',
labelPosition: 'top',
isShow: (item) => {
return item?.check_status == 4
},
},
] ]
}, },
@ -113,7 +117,7 @@ export default {
}, },
data: [ data: [
{ title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')}, { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
{ title: '晋升职位', dataIndex: 'check.subject.job.name'}, { title: '晋升职位', dataIndex: 'check.subject.job.name'},
{ title: '推荐人', dataIndex: 'check.subject.invitor.name'}, { title: '推荐人', dataIndex: 'check.subject.invitor.name'},
{ title: '申请人', dataIndex: 'check.subject.employee.name'}, { title: '申请人', dataIndex: 'check.subject.employee.name'},
@ -125,7 +129,8 @@ export default {
{ title: '本公司工作年限', dataIndex: 'check.subject.employee_data.work_years_in_company'}, { title: '本公司工作年限', dataIndex: 'check.subject.employee_data.work_years_in_company'},
{ title: '员工自评', dataIndex: 'check.subject.employee_data.comment_self', labelPosition: 'top'}, { title: '员工自评', dataIndex: 'check.subject.employee_data.comment_self', labelPosition: 'top'},
{ title: '未来计划', dataIndex: 'check.subject.employee_data.plans', labelPosition: 'top'}, { title: '未来计划', dataIndex: 'check.subject.employee_data.plans', labelPosition: 'top'},
{ title: '推荐理由', dataIndex: 'check.subject.employee_data.reason', labelPosition: 'top'} { title: '推荐理由', dataIndex: 'check.subject.employee_data.reason', labelPosition: 'top'},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
] ]
}, },
//补卡申请 //补卡申请
@ -135,15 +140,17 @@ export default {
}, },
data: [ data: [
{ title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')}, { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
{ title: '申请人', dataIndex: 'check.subject.employee.name'}, { title: '申请人', dataIndex: 'check.subject.employee.name'},
{ title: '所属门店', dataIndex: 'check.subject.store.title'}, { title: '所属门店', dataIndex: 'check.subject.store.title'},
{ title: '电话号码', dataIndex: 'check.subject.employee.phone'}, { title: '电话号码', dataIndex: 'check.subject.employee.phone'},
{ title: '申请时间', dataIndex: 'check.subject.created_format'}, { title: '申请时间', dataIndex: 'check.subject.created_format'},
{ title: '补卡时间', dataIndex: 'check.subject.date_format'}, { title: '补卡时间', dataIndex: 'check.subject.date_format'},
{ title: '补卡类别', dataIndex: 'check.subject.sign_time_text'},
{ title: '补卡原因', dataIndex: 'check.subject.reason', labelPosition: 'top'}, { title: '补卡原因', dataIndex: 'check.subject.reason', labelPosition: 'top'},
{ title: '是否外勤', dataIndex: 'check.subject.sign_type', format: (e) => e == 1 ? '否' : '是'}, { title: '是否外勤', dataIndex: 'check.subject.sign_type', format: (e) => e == 1 ? '否' : '是'},
{ title: '外勤事由', dataIndex: 'check.subject.outside_remarks', labelPosition: 'top', isShow: (item) => item?.sign_type == 2} { title: '外勤事由', dataIndex: 'check.subject.outside_remarks', labelPosition: 'top', isShow: (item) => item?.check?.subject?.sign_type == 2},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
] ]
}, },
//请假申请 //请假申请
@ -153,15 +160,17 @@ export default {
}, },
data: [ data: [
{ title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')}, { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
{ title: '申请人', dataIndex: 'check.subject.employee.name'}, { title: '申请人', dataIndex: 'check.subject.employee.name'},
{ title: '申请时间', dataIndex: 'check.subject.created_format'}, { title: '申请时间', dataIndex: 'check.subject.created_format'},
{ title: '所属门店', dataIndex: 'check.subject.store.title'}, { title: '所属门店', dataIndex: 'check.subject.store.title'},
{ title: '电话号码', dataIndex: 'check.subject.employee.phone'}, { title: '电话号码', dataIndex: 'check.subject.employee.phone'},
{ title: '请假类型', dataIndex: 'check.subject.type.name'}, { title: '请假类型', dataIndex: 'check.subject.type.name'},
{ title: '开始时间', dataIndex: 'check.subject.start_format'}, { title: '请假开始时间', dataIndex: 'check.subject.start_format'},
{ title: '请假结束时间', dataIndex: 'check.subject.end_format'}, { title: '请假结束时间', dataIndex: 'check.subject.end_format'},
{ title: '请假原因', dataIndex: 'check.subject.reason', labelPosition: 'top'}] { title: '请假原因', dataIndex: 'check.subject.reason', labelPosition: 'top'},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
]
}, },
offical_business: { offical_business: {
params: { params: {
@ -172,6 +181,8 @@ export default {
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 },
{ title: '申请人', dataIndex: 'check.subject.employee.name' }, { title: '申请人', dataIndex: 'check.subject.employee.name' },
{ title: '所属门店', dataIndex: 'check.subject.store.title' }, { title: '所属门店', dataIndex: 'check.subject.store.title' },
{ title: '电话号码', dataIndex: 'check.subject.employee.phone' },
{ title: '申请时间', dataIndex: 'check.subject.created_format' },
{ title: '目的地', dataIndex: 'check.subject.address' }, { title: '目的地', dataIndex: 'check.subject.address' },
{ title: '开始时间', dataIndex: 'check.subject.start_format' }, { title: '开始时间', dataIndex: 'check.subject.start_format' },
{ title: '结束时间', dataIndex: 'check.subject.end_format' }, { title: '结束时间', dataIndex: 'check.subject.end_format' },
@ -184,25 +195,33 @@ export default {
}, },
data: [ data: [
{ title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')}, { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 },
{ title: '申请人', dataIndex: 'check.subject.employee.name' }, { title: '申请人', dataIndex: 'check.subject.employee.name' },
{ title: '所属门店', dataIndex: 'check.subject.store.title' }, { title: '所属门店', dataIndex: 'check.subject.store.title' },
{ title: '日期', dataIndex: 'check.subject.date_format' }, { title: '电话号码', dataIndex: 'check.subject.employee.phone' },
{ title: '申请时间', dataIndex: 'check.subject.created_format' },
{ title: '加班日期', dataIndex: 'check.subject.date_format' },
{ title: '开始时间', dataIndex: 'check.subject.start_format' }, { title: '开始时间', dataIndex: 'check.subject.start_format' },
{ title: '结束时间', dataIndex: 'check.subject.end_format' }, { title: '结束时间', dataIndex: 'check.subject.end_format' },
{ title: '加班时长（时）', dataIndex: 'check.subject.hours' },
{ title: '加班事由', dataIndex: 'check.subject.reason', labelPosition: 'top' }, { title: '加班事由', dataIndex: 'check.subject.reason', labelPosition: 'top' },
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 },
] ]
}, },
agreements: { agreements: {
params: { params: {
include: 'check.subject.employee' include: 'check.subject.employee,check.subject.employee.store'
}, },
data: [ data: [
{ title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')}, { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 },
{ title: '申请人', dataIndex: 'check.subject.employee.name' }, { title: '上传人', dataIndex: 'check.subject.employee.name' },
{ title: '所属门店', dataIndex: 'check.subject.employee.store.title' },
{ title: '电话号码', dataIndex: 'check.subject.employee.phone' },
{ title: '上传时间', dataIndex: 'check.subject.created_format' },
{ title: '合同名称', dataIndex: 'check.subject.name' }, { title: '合同名称', dataIndex: 'check.subject.name' },
{ title: '合同照片', dataIndex: 'check.subject.images', type: 'album' }, { title: '合同照片', dataIndex: 'check.subject.images', type: 'album' },
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 },
] ]
} }
} }

3
src/pages/business/detail.vue
View File

@ -35,10 +35,11 @@ const columns = [
{ title: '所属门店', dataIndex: 'store.title' }, { title: '所属门店', dataIndex: 'store.title' },
{ title: '电话号码', dataIndex: 'employee.phone' }, { title: '电话号码', dataIndex: 'employee.phone' },
{ title: '目的地', dataIndex: 'address' }, { title: '目的地', dataIndex: 'address' },
{ title: '申请时间', dataIndex: 'created_format' },
{ title: '开始时间', dataIndex: 'start_format' }, { title: '开始时间', dataIndex: 'start_format' },
{ title: '结束时间', dataIndex: 'end_format' }, { title: '结束时间', dataIndex: 'end_format' },
{ title: '出差原因', dataIndex: 'reason', labelPosition: 'top' }, { title: '出差原因', dataIndex: 'reason', labelPosition: 'top' },
{ title: '申请时间', dataIndex: 'created_format' },
] ]
const pickerRef = ref(null) const pickerRef = ref(null)

5
src/pages/contract/detail.vue
View File

@ -33,9 +33,10 @@ const id = ref(0)
const columns = [ const columns = [
{ title: '审核状态', dataIndex: 'workflow_check.check_status_text' }, { title: '审核状态', dataIndex: 'workflow_check.check_status_text' },
{ title: '拒绝原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 }, { title: '拒绝原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 },
{ title: '申请人', dataIndex: 'employee.name' }, { title: '上传人', dataIndex: 'employee.name' },
{ title: '所属门店', dataIndex: 'store.title' },
{ title: '电话号码', dataIndex: 'employee.phone' }, { title: '电话号码', dataIndex: 'employee.phone' },
{ title: '创建时间', dataIndex: 'created_format' }, { title: '上传时间', dataIndex: 'created_format' },
{ title: '合同名称', dataIndex: 'name' }, { title: '合同名称', dataIndex: 'name' },
{ title: '合同内容', dataIndex: 'images', type: 'album' }, { title: '合同内容', dataIndex: 'images', type: 'album' },
] ]

6
src/pages/contract/list.vue
View File

@ -33,7 +33,7 @@
:status-color="statusFun(item.workflow_check.check_status,'statusExpense','color')" :status-color="statusFun(item.workflow_check.check_status,'statusExpense','color')"
:images="item.images" :images="item.images"
:body="[ :body="[
{ label: '创建时间', value: item.created_format } // { label: '创建时间', value: item.created_format }
]" ]"
@click.stop="applyDetail(item)" @click.stop="applyDetail(item)"
/> />
@ -58,8 +58,8 @@
:status-color="statusFun(item.check_status,'statusExpense','color')" :status-color="statusFun(item.check_status,'statusExpense','color')"
:images="item.check.subject.images" :images="item.check.subject.images"
:body="[ :body="[
{ label: '创建人', value: item.check.subject.employee.name }, // { label: '创建人', value: item.check.subject.employee.name },
{ label: '创建时间', value: item.check.subject.created_format } // { label: '创建时间', value: item.check.subject.created_format }
]" ]"
@click.stop="checkDetail(item)" @click.stop="checkDetail(item)"
/> />

10
src/pages/make-card/create.vue
View File

@ -22,9 +22,9 @@
</uv-input> </uv-input>
</uv-form-item> </uv-form-item>
<uv-line color="#f5f5f5"></uv-line> <uv-line color="#f5f5f5"></uv-line>
<uv-form-item required label="补卡类型" prop="sign_time"> <uv-form-item required label="补卡类别" prop="sign_time">
<uv-input <uv-input
placeholder="请选择补卡类型" placeholder="请选择补卡类别"
@click="openPicker" @click="openPicker"
readonly readonly
inputAlign="right" inputAlign="right"
@ -43,7 +43,7 @@
<uv-textarea <uv-textarea
v-model="form.reason" v-model="form.reason"
count count
placeholder="请输入" placeholder="请输入补卡理由"
:border="`none`" :border="`none`"
:maxlength="200" :maxlength="200"
:customStyle="{ padding: '0' }" :customStyle="{ padding: '0' }"
@ -65,7 +65,7 @@
<uv-textarea <uv-textarea
v-model="form.outside_remarks" v-model="form.outside_remarks"
count count
placeholder="请输入" placeholder="请输入外勤事由"
:border="`none`" :border="`none`"
:customStyle="{ padding: '0' }" :customStyle="{ padding: '0' }"
:maxlength="200" :maxlength="200"
@ -134,7 +134,7 @@ const confirmPicker = (e) => {
} }
const rules = reactive({ const rules = reactive({
date: [{ required: true, message: '请选择补卡时间' }], date: [{ required: true, message: '请选择补卡时间' }],
sign_time: [{ required: true, message: '请选择补卡类型' }], sign_time: [{ required: true, message: '请选择补卡类别' }],
reason: [{ required: true, message: '请输入补卡理由' }], reason: [{ required: true, message: '请输入补卡理由' }],
outside_remarks: [{ required: true, message: '请输入外勤事由' }], outside_remarks: [{ required: true, message: '请输入外勤事由' }],
}) })

4
src/pages/make-card/detail.vue
View File

@ -54,6 +54,10 @@ const detailColumns = [
title: "补卡时间", title: "补卡时间",
dataIndex: "date_format" dataIndex: "date_format"
}, },
{
title: "补卡类别",
dataIndex: "sign_time_text"
},
{ {
title: "补卡原因", title: "补卡原因",
dataIndex: "reason" dataIndex: "reason"

2
src/pages/overtime/create.vue
View File

@ -39,7 +39,7 @@
</uv-form-item> </uv-form-item>
<uv-form-item required label="加班时长" prop="duration"> <uv-form-item required label="加班时长" prop="duration">
<uv-input <uv-input
placeholder="请输入加班时长" placeholder="请输入加班时长(时)"
type="number" type="number"
inputAlign="right" inputAlign="right"
border="`none`" border="`none`"

6
src/pages/overtime/detail.vue
View File

@ -50,13 +50,15 @@ const columns = [
isShow: (data) => data?.workflow_check?.check_status == 4, isShow: (data) => data?.workflow_check?.check_status == 4,
}, },
{ title: '申请人', dataIndex: 'employee.name' }, { title: '申请人', dataIndex: 'employee.name' },
{ title: '申请时间', dataIndex: 'created_format' },
{ title: '所属门店', dataIndex: 'store.title' }, { title: '所属门店', dataIndex: 'store.title' },
{ title: '电话号码', dataIndex: 'employee.phone' }, { title: '电话号码', dataIndex: 'employee.phone' },
{ title: '申请时间', dataIndex: 'created_format' },
{ title: '加班日期', dataIndex: 'date_format' }, { title: '加班日期', dataIndex: 'date_format' },
{ title: '开始时间', dataIndex: 'start_format' }, { title: '开始时间', dataIndex: 'start_format' },
{ title: '结束时间', dataIndex: 'end_format' }, { title: '结束时间', dataIndex: 'end_format' },
{ title: '请假原因', dataIndex: 'reason', labelPosition: 'top' }, { title: '加班时长(时)', dataIndex: 'hours' },
{ title: '请假事由', dataIndex: 'reason', labelPosition: 'top' },
] ]
const open = () => { const open = () => {

6
src/pages/task/index.vue
View File

@ -29,8 +29,7 @@
:status-text="item.taskable.status_text" :status-text="item.taskable.status_text"
:status-color="statusFun(item.taskable.status, 'statusExpense' ,'color')" :status-color="statusFun(item.taskable.status, 'statusExpense' ,'color')"
:body="[ :body="[
{label: '任务时间: ', value: item.start_format + '-' + item.end_format}, {label: '任务时间: ', value: item.start_format + '-' + item.end_format}
{label: '提交时间: ', value: item.created_format},
]" ]"
@click.stop="applyClick(item)" @click.stop="applyClick(item)"
/> />
@ -54,8 +53,7 @@
:status-text="statusFun(item.check_status, 'statusExpense2' ,'name')" :status-text="statusFun(item.check_status, 'statusExpense2' ,'name')"
:status-color="statusFun(item.check_status, 'statusExpense' ,'color')" :status-color="statusFun(item.check_status, 'statusExpense' ,'color')"
:body="[ :body="[
{label: '任务时间: ', value: item.check.subject.task.start_format + '-' + item.check.subject.task.end_format}, {label: '任务时间: ', value: item.check.subject.task.start_format + '-' + item.check.subject.task.end_format}
{label: '提交时间: ', value: item.check.subject.task.created_format},
]" ]"
@click.stop="checkClick(item)" @click.stop="checkClick(item)"
/> />

5
src/pages/upgrade/call-check-version.js
View File

@ -17,6 +17,7 @@ export default function () {
wgtVersion: widgetInfo.version wgtVersion: widgetInfo.version
}; };
http.get('/latest-app-versions').then(resData => { http.get('/latest-app-versions').then(resData => {
console.log(resData);
// _id : string // _id : string
// appid : string // appid : string
@ -51,7 +52,7 @@ export default function () {
title: info.title, title: info.title,
contents: info.description, contents: info.description,
url: info.update_strategy === 'wgt' ? info.wgt_url : info.apk_url, url: info.update_strategy === 'wgt' ? info.wgt_url : info.apk_url,
platform: systemInfo.platform, platform: [systemInfo.platform],
version: info.version, version: info.version,
uni_platform: systemInfo.platform, uni_platform: systemInfo.platform,
stable_publish: true, stable_publish: true,
@ -62,7 +63,7 @@ export default function () {
} }
} }
console.log(resInfo);
resolve(resInfo); resolve(resInfo);
}).catch(err => { }).catch(err => {
reject(err); reject(err);

6
src/pages/upgrade/index.vue
View File

@ -68,8 +68,8 @@
import { createNotificationProgress, cancelNotificationProgress, finishNotificationProgress } from '@/uni_modules/uts-progressNotification' import { createNotificationProgress, cancelNotificationProgress, finishNotificationProgress } from '@/uni_modules/uts-progressNotification'
// #endif // #endif
const localFilePathKey = 'UNI_ADMIN_UPGRADE_CENTER_LOCAL_FILE_PATH' const localFilePathKey = 'UNI_ADMIN_UPGRADE_CENTER_LOCAL_FILE_PATH'
const platform_iOS = 'iOS'; const platform_iOS = 'ios';
const platform_Android = 'Android'; const platform_Android = 'android';
let downloadTask = null; let downloadTask = null;
let openSchemePromise let openSchemePromise
@ -178,7 +178,6 @@
} }
Object.assign(this, localPackageInfo) Object.assign(this, localPackageInfo)
console.log(localPackageInfo);
this.checkLocalStoragePackage() this.checkLocalStoragePackage()
}, },
onBackPress() { onBackPress() {
@ -328,7 +327,6 @@
this.downLoadPercent = res.progress; this.downLoadPercent = res.progress;
this.downloadedSize = (res.totalBytesWritten / Math.pow(1024, 2)).toFixed(2); this.downloadedSize = (res.totalBytesWritten / Math.pow(1024, 2)).toFixed(2);
this.packageFileSize = (res.totalBytesExpectedToWrite / Math.pow(1024, 2)).toFixed(2); this.packageFileSize = (res.totalBytesExpectedToWrite / Math.pow(1024, 2)).toFixed(2);
if (this.needNotificationProgress && !this.downloadSuccess) { if (this.needNotificationProgress && !this.downloadSuccess) {
createNotificationProgress({ createNotificationProgress({
title: "升级中心正在下载安装包……", title: "升级中心正在下载安装包……",