Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev

shibei_master
jiangyy 4 years ago
parent
commit
fdd51465c4
  1. 12
      src/assets/scss/buttonstyle.scss
  2. 3
      src/views/main-content.vue
  3. 45
      src/views/modules/base/community/communityTable.vue
  4. 11
      src/views/modules/secretaryLog/difficulty/difficultyForm.vue
  5. 9
      src/views/modules/secretaryLog/humanisticCare/careForm.vue
  6. 7
      src/views/modules/secretaryLog/workLog/form.vue
  7. 4
      src/views/modules/secretaryLog/workLog/index.vue
  8. 2
      src/views/tips.vue

12
src/assets/scss/buttonstyle.scss

@ -81,7 +81,11 @@
background-color: #3e8ef7 !important;
border-color: #3e8ef7 !important;
}
.diy-button--qrcode {
color: #fff !important;
background-color: #4ec591 !important;
border-color: #4ec591 !important;
}
//table按钮样式
//查看
@ -101,3 +105,9 @@
color: #d51010 !important;
text-decoration: underline !important;
}
//
.div-table-button--qr {
color: #4ec591 !important;
text-decoration: underline !important;
}

3
src/views/main-content.vue

@ -134,6 +134,9 @@ export default {
this.loopTips()
},
destroyed() {
this.$store.dispatch('clearInter')
},
computed: {
msgList() {
return this.$store.state.tipsList

45
src/views/modules/base/community/communityTable.vue

@ -33,6 +33,10 @@
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button>
<!-- <el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="resetSearch">重置</el-button> -->
</div>
<div class="div_btn">
<el-button style=""
@ -99,6 +103,10 @@
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>
<el-button v-if="agencyObj.level == 'community'" style="margin-left:10px"
class="diy-button--qrcode"
size="small"
@click="handleDownQr(agencyObj, 'community')">社区二维码</el-button>
</div>
@ -119,6 +127,11 @@
<el-table-column prop="neighborHoodName"
label="小区名称"
min-width="100">
<!-- <template slot-scope="scope">
<a class="name-a" @click="handleDetail(scope.row)">
{{ scope.row.neighborHoodName }}
</a>
</template> -->
</el-table-column>
<el-table-column prop="agencyName"
label="所属组织"
@ -156,7 +169,12 @@
style="color:#feb349;text-decoration: underline;"
size="small"
@click="handleToNextLevel(scope.row)">进入</el-button> -->
<el-button type="text"
<!-- <el-button type="text"
class="div-table-button--qr"
size="small"
@click="handleDownQr(scope.row, 'neighborHood')">二维码</el-button> -->
<el-button
type="text"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
@ -223,6 +241,7 @@ import CommunityForm from './communityForm'
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
import axios from 'axios'
let loading //
export default {
@ -528,7 +547,29 @@ export default {
this.$message.error(msg)
}
},
async handleDownQr(row, type) {
// const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
const url = '/gov/org/agency/create-qrcode'
const _id = type == 'community' ? row.id : row.neighborHoodId
const params = {
id: _id,
type
}
await axios({
method: 'POST',
url: window.SITE_CONFIG['apiURL'] + url,
data: params,
responseType: 'blob'
}).then(res => {
console.log('res----1r', res)
if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName)
this.download(res.data, fileName) //blob
} else this.$message.error('下载失败')
// this.download(res.data, '1.png')
})
},
//
async handleExport () {
let title = this.agencyObj.label

11
src/views/modules/secretaryLog/difficulty/difficultyForm.vue

@ -17,7 +17,8 @@
type="textarea"
maxlength="100"
show-word-limit
:rows="3"
:rows="4"
clearable
placeholder="请输入内容"
v-model="formData.content"></el-input>
</el-form-item>
@ -30,7 +31,8 @@
type="textarea"
maxlength="100"
show-word-limit
:rows="3"
:rows="4"
clearable
placeholder="请输入解决方式"
v-model="formData.resolveWay"></el-input>
</el-form-item>
@ -44,6 +46,7 @@
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
clearable
placeholder="选择时间">
</el-date-picker>
</el-form-item>
@ -56,6 +59,7 @@
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
clearable
:picker-options="pickerOptions"
@change="handleTime"
placeholder="选择时间">
@ -70,7 +74,8 @@
type="textarea"
maxlength="100"
show-word-limit
:rows="3"
:rows="4"
clearable
placeholder="请输入备注"
v-model="formData.remark"></el-input>
</el-form-item>

9
src/views/modules/secretaryLog/humanisticCare/careForm.vue

@ -15,6 +15,7 @@
style="display: block">
<el-input class="item_width_2"
placeholder="请输入关怀类型"
clearable
v-model="formData.concernType">
</el-input>
</el-form-item>
@ -25,6 +26,7 @@
style="display: block">
<el-input class="item_width_2"
placeholder="请输入关怀人员"
clearable
v-model="formData.resiName">
</el-input>
</el-form-item>
@ -35,6 +37,7 @@
style="display: block">
<el-input class="item_width_2"
placeholder="请输入电话"
clearable
v-model="formData.phone">
</el-input>
</el-form-item>
@ -44,6 +47,7 @@
style="display: block">
<el-input class="item_width_1"
placeholder="请输入地址"
clearable
v-model="formData.address">
</el-input>
</el-form-item>
@ -56,7 +60,8 @@
type="textarea"
maxlength="100"
show-word-limit
:rows="3"
:rows="4"
clearable
placeholder="请输入关怀事项"
v-model="formData.content"></el-input>
</el-form-item>
@ -70,6 +75,7 @@
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
clearable
placeholder="选择时间">
</el-date-picker>
</el-form-item>
@ -82,6 +88,7 @@
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
clearable
:picker-options="pickerOptions"
@change="handleTime"
placeholder="选择时间">

7
src/views/modules/secretaryLog/workLog/form.vue

@ -16,7 +16,8 @@
type="textarea"
maxlength="100"
show-word-limit
:rows="3"
:rows="4"
clearable
:disabled="disabled"
placeholder="请输入内容"
v-model="formData.content"></el-input>
@ -30,7 +31,8 @@
type="textarea"
maxlength="100"
show-word-limit
:rows="3"
:rows="4"
clearable
:disabled="disabled"
placeholder="请输入工作事项"
v-model="formData.workType"></el-input>
@ -44,6 +46,7 @@
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm"
type="datetime"
clearable
:disabled="disabled"
:picker-options="pickerOptions"
@change="handleTime"

4
src/views/modules/secretaryLog/workLog/index.vue

@ -150,7 +150,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="70%"
width="50%"
top="5vh"
class="dialog-h"
@closed="diaClose">
@ -309,7 +309,7 @@ export default {
},
async deleteDifficulty (row) {
const url = "/gov/project/memoDifficulty/delete"
const url = "/gov/project/memoWorkDiary/delete"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoDifficulty/delete"
let ids = [row.id]
let params = {

2
src/views/tips.vue

@ -70,7 +70,7 @@ export default {
}
.tips-wr-desc {
width: 100%;
height: 33px;
height: 32px;
margin-top: 10px;
padding-left: 20px;
display: -webkit-box;

Loading…
Cancel
Save