kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2023-01-05 14:47:11 +08:00
parent 544e291eb8 bdabfdfec8
commit ba97649992
2 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/project/pingchang/AppWorkTask/AppWorkTask.vue
View File

@@ -96,7 +96,6 @@
})
},
add() {
console.log(123)
uni.navigateTo({
url: "./create"
})

51
src/project/pingchang/AppWorkTask/create.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="create-sub-task">
<template v-if="!userSelect">
<template>
<div class="card">
<u-row justify="between">
<div class="left">
@@ -54,40 +54,43 @@
<div class="left" style="line-height: 22px;">
<em>*</em>执行人
</div>
<u-row @click="handleSelectUser(0)" style="justify-content: flex-end">
<div v-if="form.userInfoList.length" class="value">
<AiPagePicker type="sysUser" :isShowPhone="true" :selected.sync="form.userInfoList"
action="/app/wxcp/wxuser/list?status=1" nodeKey="id" class="select-user">
<app-nucleic-acid-sampling v-if="form.userInfoList.length" class="value">
已选择<em>{{form.userInfoList.slice(0,2).map(e=>e.name).join("、")}}</em>等
<em>{{form.userInfoList.length}}</em>人
</div>
<div v-else class="placeholder">请选择</div>
</app-nucleic-acid-sampling>
<span v-else class="color-999">请选择</span>
<div class="arrow"></div>
</u-row>
</AiPagePicker>
</u-row>
</div>
<div class="card border" style="padding: 13px 17px;margin-bottom: 0">
<u-row justify="between">
<div class="left" style="line-height: 22px;">督办人</div>
<u-row @click="handleSelectUser(1)" style="justify-content: flex-end">
<div v-if="form.checkUserList.length" class="value">
<AiPagePicker type="sysUser" :isShowPhone="true" :selected.sync="form.checkUserList"
action="/app/wxcp/wxuser/list?status=1" nodeKey="id" class="select-user">
<app-nucleic-acid-sampling v-if="form.checkUserList.length" class="value">
已选择<em>{{form.checkUserList.slice(0,2).map(e=>e.name).join("、")}}</em>等
<em>{{form.checkUserList.length}}</em>人
</div>
<div v-else class="placeholder">请选择</div>
</app-nucleic-acid-sampling>
<span v-else class="color-999">请选择</span>
<div class="arrow"></div>
</u-row>
</AiPagePicker>
</u-row>
</div>
<div class="card" style="padding: 13px 17px">
<u-row justify="between">
<div class="left" style="line-height: 22px;">抄送人</div>
<u-row @click="handleSelectUser(2)" style="justify-content: flex-end">
<div v-if="form.sendUserList.length" class="value">
<AiPagePicker type="sysUser" :isShowPhone="true" :selected.sync="form.sendUserList"
action="/app/wxcp/wxuser/list?status=1" nodeKey="id" class="select-user">
<app-nucleic-acid-sampling v-if="form.sendUserList.length" class="value">
已选择<em>{{form.sendUserList.slice(0,2).map(e=>e.name).join("、")}}</em>等
<em>{{form.sendUserList.length}}</em>人
</div>
<div v-else class="placeholder">请选择</div>
</app-nucleic-acid-sampling>
<span v-else class="color-999">请选择</span>
<div class="arrow"></div>
</u-row>
</AiPagePicker>
</u-row>
</div>
<div class="card" style="padding: 12px 17px;">
@@ -99,9 +102,6 @@
<div class="footer" @click="handleCreate">创建</div>
</template>
<AiSelectEnterprise :visible.sync="userSelect" :value="selectList" v-if="userSelect"
@change="userChange"></AiSelectEnterprise>
<ai-back ref="aiBack" v-if="!userSelect"/>
</div>
</template>
@@ -112,7 +112,6 @@
data() {
return {
index: null,
userSelect: false,
selectList: [],
form: {
parentTaskCode: null,
@@ -166,17 +165,6 @@
}
})
},
handleSelectUser(status) {
this.currentClick = status
if (this.currentClick == 0 && this.form.userInfoList.length) {
this.selectList = this.form.userInfoList
} else if (this.currentClick == 1 && this.form.checkUserList.length) {
this.selectList = this.form.checkUserList
} else if (this.currentClick == 2 && this.form.sendUserList.length) {
this.selectList = this.form.sendUserList
}
this.userSelect = true
},
dateChange(e) {
let date = this.getDate({format: true});
if (new Date(date).getTime() > new Date(e.target.value).getTime()) {
@@ -260,6 +248,7 @@
}
.arrow {
display: inline-block;
width: 16px;
height: 16px;
border-top: 5px solid #CCCCCC;