elink-star
/
esua-epdc-admin
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/release/epdc' into release/epdc

epdc-admin-dangqun
wanggongfeng 3 years ago
parent
02493f8287 67abf36fb9
commit
27886d5f6f
7 changed files with 257 additions and 257 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/modules/events/appeal-development-list.vue
  2. 6
      src/views/modules/events/appeal-enforce-list.vue
  3. 4
      src/views/modules/events/appeal-peo-list.vue
  4. 30
      src/views/modules/events/item-close-list.vue
  5. 30
      src/views/modules/events/item-end-list.vue
  6. 6
      src/views/modules/events/item-examine-list.vue
  7. 28
      src/views/modules/events/itemfusingdelay-list.vue

6
src/views/modules/events/appeal-development-list.vue
View File

@ -140,7 +140,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人姓名"
header-align="center" header-align="center"
min-width="200" min-width="200"
align="center" align="center"
@ -209,7 +209,7 @@ export default {
nickName: '', nickName: '',
mobile: '', mobile: '',
appealType: 1, appealType: 1,
evaluationScore:'' evaluationScore: ''
}, },
addOrUpdateVisible: false, addOrUpdateVisible: false,
@ -241,7 +241,7 @@ export default {
}, },
methods: { methods: {
getPeoList(){ getPeoList () {
console.log(this.dataList) console.log(this.dataList)
}, },
dealAction (id) { dealAction (id) {

6
src/views/modules/events/appeal-enforce-list.vue
View File

@ -140,7 +140,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人姓名"
header-align="center" header-align="center"
min-width="200" min-width="200"
align="center" align="center"
@ -209,7 +209,7 @@ export default {
nickName: '', nickName: '',
mobile: '', mobile: '',
appealType: 2, appealType: 2,
evaluationScore:'' evaluationScore: ''
}, },
addOrUpdateVisible: false, addOrUpdateVisible: false,
@ -241,7 +241,7 @@ export default {
}, },
methods: { methods: {
getPeoList(){ getPeoList () {
console.log(this.dataList) console.log(this.dataList)
}, },
dealAction (id) { dealAction (id) {

4
src/views/modules/events/appeal-peo-list.vue
View File

@ -140,7 +140,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人姓名"
header-align="center" header-align="center"
min-width="200" min-width="200"
align="center" align="center"
@ -209,7 +209,7 @@ export default {
nickName: '', nickName: '',
mobile: '', mobile: '',
appealType: 0, appealType: 0,
evaluationScore:'' evaluationScore: ''
}, },
addOrUpdateVisible: false, addOrUpdateVisible: false,

30
src/views/modules/events/item-close-list.vue
View File

@ -35,10 +35,10 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="提交人" prop="itemCode" label-width="100px"> <el-form-item label="联系人姓名" prop="itemCode" label-width="100px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入联系人姓名"
clearable clearable
@keyup.native="btKeyUpNickName" @keyup.native="btKeyUpNickName"
style="width:250px;" style="width:250px;"
@ -128,7 +128,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人姓名"
header-align="center" header-align="center"
min-width="200" min-width="200"
align="center" align="center"
@ -213,13 +213,13 @@
</template> </template>
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import Detail from './item-detail' import Detail from './item-detail'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
name: 'ItemCloseList', name: 'ItemCloseList',
data() { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/events/item/page', getDataListURL: '/events/item/page',
@ -244,7 +244,7 @@
detailVisible: false, detailVisible: false,
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: (time) => { disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime; let beginDateVal = this.dataForm.endTime
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
@ -252,12 +252,12 @@
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: (time) => { disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime; let EndDateVal = this.dataForm.startTime
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
}, }
} }
}, },
components: { components: {
@ -291,14 +291,14 @@
} }
}, },
methods: { methods: {
detailAction(id) { detailAction (id) {
this.$parent.selectComponent = 'ItemCloseDetailView' this.$parent.selectComponent = 'ItemCloseDetailView'
this.$router.push({path: '/events-item-close', query: {id: id}}) this.$router.push({ path: '/events-item-close', query: { id: id } })
}, },
getOptions() { getOptions () {
this.$http this.$http
.get(`/sys/user/deptOptions/getByLoginUser`) .get(`/sys/user/deptOptions/getByLoginUser`)
.then(({data: res}) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -324,5 +324,5 @@
this.dataForm.mobile = e.target.value this.dataForm.mobile = e.target.value
} }
} }
} }
</script> </script>

30
src/views/modules/events/item-end-list.vue
View File

@ -35,10 +35,10 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="提交人" prop="itemCode" label-width="100px"> <el-form-item label="联系人姓名" prop="itemCode" label-width="100px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入联系人姓名"
clearable clearable
@keyup.native="btKeyUpNickName" @keyup.native="btKeyUpNickName"
style="width:250px;" style="width:250px;"
@ -126,7 +126,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人姓名"
header-align="center" header-align="center"
width="200" width="200"
align="center" align="center"
@ -218,13 +218,13 @@
</template> </template>
<script> <script>
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import Detail from './item-detail' import Detail from './item-detail'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
name: 'ItemEndList', name: 'ItemEndList',
data() { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/events/item/page', getDataListURL: '/events/item/page',
@ -249,7 +249,7 @@
options: [], options: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: (time) => { disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime; let beginDateVal = this.dataForm.endTime
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
@ -257,12 +257,12 @@
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: (time) => { disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime; let EndDateVal = this.dataForm.startTime
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
}, }
} }
}, },
components: { components: {
@ -296,14 +296,14 @@
} }
}, },
methods: { methods: {
detailAction1(id) { detailAction1 (id) {
this.$parent.selectComponent = 'ItemCloseDetailView' this.$parent.selectComponent = 'ItemCloseDetailView'
this.$router.push({path: '/events-item-end', query: {id: id}}) this.$router.push({ path: '/events-item-end', query: { id: id } })
}, },
getOptions() { getOptions () {
this.$http this.$http
.get(`/sys/user/deptOptions/getByLoginUser`) .get(`/sys/user/deptOptions/getByLoginUser`)
.then(({data: res}) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
@ -329,5 +329,5 @@
this.dataForm.mobile = e.target.value this.dataForm.mobile = e.target.value
} }
} }
} }
</script> </script>

6
src/views/modules/events/item-examine-list.vue
View File

@ -15,10 +15,10 @@
style="width:200px;" style="width:200px;"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人" prop="userName" label-width="100px"> <el-form-item label="联系人姓名" prop="userName" label-width="100px">
<el-input <el-input
v-model="dataForm.userName" v-model="dataForm.userName"
placeholder="请输入提交人" placeholder="请输入联系人姓名"
clearable clearable
@keyup.native="btKeyUpNickName" @keyup.native="btKeyUpNickName"
style="width:250px;" style="width:250px;"
@ -79,7 +79,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人姓名"
header-align="center" header-align="center"
min-width="200" min-width="200"
align="center" align="center"

28
src/views/modules/events/itemfusingdelay-list.vue
View File

@ -31,10 +31,10 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="提交人" prop="itemCode" label-width="100px"> <el-form-item label="联系人姓名" prop="itemCode" label-width="100px">
<el-input <el-input
v-model="dataForm.nickName" v-model="dataForm.nickName"
placeholder="请输入提交人" placeholder="请输入联系人姓名"
clearable clearable
@keyup.native="btKeyUpNickName" @keyup.native="btKeyUpNickName"
style="width:250px;" style="width:250px;"
@ -134,7 +134,7 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="nickName" prop="nickName"
label="提交人" label="联系人姓名"
header-align="center" header-align="center"
min-width="200" min-width="200"
align="center" align="center"
@ -264,16 +264,16 @@ export default {
itemContent: '', itemContent: '',
nickName: '', nickName: '',
mobile: '', mobile: '',
stateName:'', stateName: '',
handleStateName:'', handleStateName: '',
handleReason:'' handleReason: ''
}, },
handleVisible:false, handleVisible: false,
ids: [], ids: [],
options: [], options: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: (time) => { disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime; let beginDateVal = this.dataForm.endTime
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
@ -281,12 +281,12 @@ export default {
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: (time) => { disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime; let EndDateVal = this.dataForm.startTime
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
}, }
} }
}, },
components: { components: {
@ -322,14 +322,14 @@ export default {
} }
}, },
methods: { methods: {
dealAction(id) { dealAction (id) {
this.$parent.selectComponent = 'ItemfusingdelayDetailView' this.$parent.selectComponent = 'ItemfusingdelayDetailView'
this.$router.push({path: '/events-itemfusingdelay', query: {id: id}}) this.$router.push({ path: '/events-itemfusingdelay', query: { id: id } })
}, },
getOptions() { getOptions () {
this.$http this.$http
.get(`/sys/user/deptOptions/getByLoginUser`) .get(`/sys/user/deptOptions/getByLoginUser`)
.then(({data: res}) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

Write Preview
Loading…
Cancel
Save