Commit a3f0f581 authored by 周远喜's avatar 周远喜

ok

parent a4285b5c
<template> <template>
<div> <div>
<div v-if="theme=='list'" class="flex fd userSelect"> <div v-if="theme == 'list'" class="flex fd userSelect">
<div class="fg1 users"> <div class="fg1 users">
<dl v-for="(g,i) in group" :key="i"> <dl v-for="(g, i) in group" :key="i">
<dt :class="{checked:g.opened}" class="flex fc-b"> <dt :class="{ checked: g.opened }" class="flex fc-b">
<div class="ib fg"> <div class="ib fg">
<Checkbox v-model="g.checked" @on-change="checkAll(g,i)"> <Checkbox v-model="g.checked" @on-change="checkAll(g, i)">
<span class="ml10">{{g.departmentTitle}}</span> <span class="ml10">{{ g.departmentTitle }}</span>
</Checkbox> </Checkbox>
<!-- <span class="ml20">(<span v-text="g.children | vvv"></span>/{{g.children.length}}人)</span></div> --> <!-- <span class="ml20">(<span v-text="g.children | vvv"></span>/{{g.children.length}}人)</span></div> -->
<span class="ml20">({{g.children.length}}人)</span> <span class="ml20">({{ g.children.length }}人)</span>
</div> </div>
<a class="op" @click="toggle(i)"> <a class="op" @click="toggle(i)">
<Icon :type="g.opened?'ios-arrow-up':'ios-arrow-down'" size="24" /> <Icon
:type="g.opened ? 'ios-arrow-up' : 'ios-arrow-down'"
size="24"
/>
</a> </a>
</dt> </dt>
<dd <dd
v-show="g.opened" v-show="g.opened"
v-for="(li,j) in g.children" v-for="(li, j) in g.children"
:key="j" :key="j"
@click="checkItem(i,j,li)" @click="checkItem(i, j, li)"
:class="{checked:li.checked}" :class="{ checked: li.checked }"
>{{li.userName}}</dd> >
{{ li.userName }}
</dd>
</dl> </dl>
</div> </div>
<div class="footer flex"> <div class="footer flex">
...@@ -30,9 +35,9 @@ ...@@ -30,9 +35,9 @@
</div> </div>
<div class="fg"> <div class="fg">
<dl> <dl>
<dd v-for="(li,i) in checkedItems" :key="i"> <dd v-for="(li, i) in checkedItems" :key="i">
<div class="flex"> <div class="flex">
<span class="fg">{{li.userName}}</span> <span class="fg">{{ li.userName }}</span>
<a @click="removeItem(li)"> <a @click="removeItem(li)">
<Icon type="md-close" size="16" /> <Icon type="md-close" size="16" />
</a> </a>
...@@ -54,16 +59,20 @@ ...@@ -54,16 +59,20 @@
filterable filterable
> >
<Option <Option
v-for="item in datas?datas:dic" v-for="item in datas ? datas : dic"
:value="item.value" :value="item.value"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
> >
<div> <div>
{{ item.label }} {{ item.label }}
<span style="color:#c3c3c3" v-if="item.cardNo">({{ item.cardNo }})</span> <span style="color: #c3c3c3" v-if="item.cardNo"
>({{ item.cardNo }})</span
>
<br /> <br />
<span style="color:#c3c3c3" v-if="item.departmentTitle">{{ item.departmentTitle }}</span> <span style="color: #c3c3c3" v-if="item.departmentTitle">{{
item.departmentTitle
}}</span>
</div> </div>
</Option> </Option>
</Select> </Select>
...@@ -135,14 +144,26 @@ export default { ...@@ -135,14 +144,26 @@ export default {
// 加载人员 // 加载人员
getselectuser(id) { getselectuser(id) {
let url = `${systemUrl}/user/getselectuser`; let url = `${systemUrl}/user/getselectuser`;
this.$api var paras={
.post(url, {
// pageIndex: 1, // pageIndex: 1,
departmentId: id, departmentId: id,
type: this.type, type: this.type,
roleTitle: this.roleTitle, roleTitle: this.roleTitle,
// pageSize: 0 // pageSize: 0
}) };
if(this.type=99){//开发组
paras={
conditions:[
{
fieldName: "UserType",
fieldValue: "2",
conditionalType: "Equal",
},
]
};
}
this.$api
.post(url, paras)
.then((r) => { .then((r) => {
this.data = r.result; this.data = r.result;
if (this.theme == "list") { if (this.theme == "list") {
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
ref="userSelected" ref="userSelected"
v-model="bugForm.alloterId" v-model="bugForm.alloterId"
style="width:240px;" style="width:240px;"
:type="99"
/> />
</FormItem> </FormItem>
</Col> </Col>
......
...@@ -34,10 +34,9 @@ ...@@ -34,10 +34,9 @@
<files ref="refFile" :parms="parms" unClosable /> <files ref="refFile" :parms="parms" unClosable />
</FormItem> </FormItem>
</Row> </Row>
<Row></Row> <Card title="Bug处理">
<Row> <Row >
<FormItem label> <FormItem label>
bug处理
<Input v-model="bugForm.remark" placeholder="请输入bug详情" type="textarea" :rows="5" /> <Input v-model="bugForm.remark" placeholder="请输入bug详情" type="textarea" :rows="5" />
</FormItem> </FormItem>
</Row> </Row>
...@@ -52,6 +51,8 @@ ...@@ -52,6 +51,8 @@
<InputNumber :min="1" v-model="bugForm.time"></InputNumber> <InputNumber :min="1" v-model="bugForm.time"></InputNumber>
</Col> </Col>
</Row> </Row>
</Card>
</Form> </Form>
</div> </div>
<div class="rightDiv" :style="{height:divHeight}"> <div class="rightDiv" :style="{height:divHeight}">
......
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
<dictionary <dictionary
code="Test.bug.status" code="Test.bug.status"
v-model="easySearch.status.value" v-model="easySearch.status.value"
style="width:80px;" style="width:400px;"
multiple
></dictionary> ></dictionary>
</FormItem> </FormItem>
<FormItem> <FormItem>
...@@ -97,7 +98,7 @@ export default { ...@@ -97,7 +98,7 @@ export default {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "title,pagePath", value: "" }, keys: { op: "title,pagePath", value: "" },
status: { op: "Equal", value: null }, status: { op: "In", value: [1,5,0] },
creatorUserId: { creatorUserId: {
op: "Equal", op: "Equal",
value: userInfo.userId value: userInfo.userId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment