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

Merge remote-tracking branch 'origin/feature/subCheck' into feature/subCheck

master
wanggongfeng 5 years ago
parent
a9a94f1feb 42d71bca95
commit
b2b4caa380
2 changed files with 131 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 223
      src/views/modules/kpi/kpisubpositiondetail.vue
  2. 4
      src/views/modules/kpi/subpositioncheckinfo.vue

223
src/views/modules/kpi/kpisubpositiondetail.vue
View File

@ -6,60 +6,60 @@
{{index+1}}、 {{item.label}}:
</div>
<div v-for="(item1, index1) in item.childDiction">
<div style="margin: 20px">
{{index1+1}}) {{item1.label}}
</div>
<el-form label-width="370px" :model="item1" :rules="dataRule" ref="dataForm" >
<el-form-item label="描述:" label-width="90px" style="font-weight:bold;">
<el-input
type="textarea"
:rows="6"
placeholder="描述，最多输入500字以内"
v-model="item1.describe"
maxlength="500"
style="max-width:562px">
</el-input>
</el-form-item>
<el-form-item label="添加图片" v-loading="loading" prop="images" label-width="90px">
<el-upload
:action="uploadUrl"
:class="{hide:hideUpload}"
list-type="picture-card"
:file-list="item1.images"
:limit=6
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove"
:on-success="handleAvatarSuccess"
:on-error="handelError"
:before-upload="beforeAvatarUpload"
style="width:480px">
<i class="el-icon-plus"></i>
</el-upload>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<div><font color="gray">1~6张图</font></div>
</el-form-item>
<el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
<el-upload
ref="upload"
class="upload-demo"
:action="uploadFileUrl"
:before-remove="beforeFileRemove"
:file-list="item1.files"
:before-upload="beforeAvatarFileUpload"
:on-remove="handleFileRemove"
:on-success="handleAvatarFileSuccess"
:on-error="handelError"
:on-preview="handleFileCardPreview"
style="width:480px">
<el-button size="small" >点击上传</el-button>
<div slot="tip" class="el-upload__tip">支持扩展名.rar.zip.doc.docx、PDF、Excel...文件</div>
</el-upload>
</el-form-item>
</el-form>
<div style="margin: 20px">
{{index1+1}}) {{item1.label}}
</div>
<el-form label-width="370px" :model="item1" :disabled="pageDisabled" :rules="dataRule" ref="dataForm" >
<el-form-item label="描述:" label-width="90px" style="font-weight:bold;">
<el-input
type="textarea"
:rows="6"
placeholder="描述，最多输入500字以内"
v-model="item1.describe"
maxlength="500"
style="max-width:562px">
</el-input>
</el-form-item>
<el-form-item label="添加图片" v-loading="loading" prop="images" label-width="90px">
<el-upload
:action="uploadUrl"
:class="{hide:hideUpload}"
list-type="picture-card"
:file-list="item1.images"
:limit=6
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove"
:on-success="handleAvatarSuccess"
:on-error="handelError"
:before-upload="beforeAvatarUpload"
style="width:480px">
<i class="el-icon-plus"></i>
</el-upload>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<div><font color="gray">1~6张图</font></div>
</el-form-item>
<el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
<el-upload
ref="upload"
class="upload-demo"
:action="uploadFileUrl"
:before-remove="beforeFileRemove"
:file-list="item1.files"
:before-upload="beforeAvatarFileUpload"
:on-remove="handleFileRemove"
:on-success="handleAvatarFileSuccess"
:on-error="handelError"
:on-preview="handleFileCardPreview"
style="width:480px">
<el-button size="small" >点击上传</el-button>
<div slot="tip" class="el-upload__tip">支持扩展名.rar.zip.doc.docx、PDF、Excel...文件</div>
</el-upload>
</el-form-item>
</el-form>
</div>
<el-form v-if="index == 1" label-width="370px" :model="item" :rules="dataRule" ref="dataForm" >
<el-form v-if="item.childDiction.length == 0" label-width="370px" :disabled="pageDisabled" :model="item" :rules="dataRule" ref="dataForm" >
<el-form-item label="描述:" prop="content" label-width="90px" style="font-weight:bold;">
<el-input
type="textarea"
@ -108,13 +108,15 @@
</el-upload>
</el-form-item>
</el-form>
</div>
<el-form>
<el-form-item label="关联网格:" prop="content" label-width="90px" style="font-weight:bold;">
<el-form-item label="关联网格:" prop="content" label-width="90px" style="font-weight:bold">
<el-select
v-model="dataForm.grids"
multiple
style="width: 300px"
collapse-tags
placeholder="请选择">
<el-option
@ -129,11 +131,15 @@
<el-form>
<el-form-item style="margin-left:35px;">
<el-button type="primary" @click="backToUserRelationList">{{"返回"}}</el-button>
<el-button type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button v-if="this.state === '0'" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button v-if="state === '2'" type="primary" @click="">初审</el-button>
<el-button v-if="state === '3'" type="primary" @click="">验收</el-button>
</el-form-item>
</el-form>
</div>
<!-- 初审弹框 -->
<trial v-if="trialVisible" ref="subpositioncheckinfoTrial" @refreshDataList="backToUserRelationList"></trial>
</el-card>
</template>
@ -141,6 +147,7 @@
import Cookies from "js-cookie";
import debounce from "lodash/debounce";
import MapSelect from "@/views/modules/workRecord/map-select";
import trial from "./subpositioncheckinfo-trial"
export default {
name: "kpisubpositiondetail",
@ -155,6 +162,7 @@ export default {
},
options :[],
isAble:false,
pageDisabled:false,
gridIds:[],
//页面加载控制
pageloading:true,
@ -171,6 +179,9 @@ export default {
hideUpload: false,
fileloading: false,
checkDiction:[],
state:'0',
//出身弹框列表
trialVisible:false,
}
},
@ -187,18 +198,42 @@ export default {
this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
this.uploadFileUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}`
this.getOptions();
this.getCheckInfo();
this.init();
},
mounted () {
if (this.$route.query.disabled === '0') {
if (this.$route.query.status === '1') {
//查看
this.pageDisabled = true;
} else {
}
},
methods: {
init () {
this.dataForm.id = this.$route.query.id
this.state = this.$route.query.state === undefined? '0':this.$route.query.state;
if (this.state === '1'){
this.isAble = true;
this.pageDisabled = true;
}
// this.$route.query.id
// '980b98f007278c1452867b7c208f3f75'
this.$nextTick(() => {
if (this.dataForm.id) {
this.$http.get(`/kpi/subdetail/getInfogrid/${this.dataForm.id}`).then(({ data: res }) => {
this.pageloading = false
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm.grids = res.data
}).catch(() => {})
this.getInfoById()
}else {
this.getCheckInfo();
}
})
},
beforeAvatarUpload (file) {
if (this.dataForm.length === 6) {
@ -302,9 +337,9 @@ export default {
},
// 返回按钮点击事件
backToUserRelationList () {
this.$emit('refreshDataList')
this.$parent.selectComponent = 'Weekrecordinfo'
this.$router.push({ path: '/workRecord-weekrecordinforoute' })
this.$emit('subpositioncheckinfo')
this.$parent.selectComponent = 'Subpositioncheckinfo'
this.$router.push({ path: '/kpi-subpositioncheckinforoute' })
},
getOptions () {
this.$http
@ -327,51 +362,44 @@ export default {
this.checkDiction = res.data
}).catch(() => {})
// this.checkDiction=[
// {
// id:'01f23eecdda4f20ef58fd2cb344ab3bf',
// label:'建站达标',
// childDiction:[
// {
// id:'009ff607df016a3fc1e15a08651c8977',
// label:'网格要有布局合理、功能综合，（可共用、共建，原则上不能超过3个网格共用一处）党群服务站'
// },
// {
// id:'2ff0833824d341e6bd26717c49e0ff33',
// label:'网格划分边界清析、不交叉、不重叠，实现多网合一'
// }
// ]
// },
// {
// id:'ae35fb5792b9ecaa316b1c238fbffd2b',
// label:'人员配备',
// childDiction:[
//
// ]
// }
// ]
},
getInfoById(){
this.$http.get(`/kpi/subdetail/getSubDetailInfoByInfoId/${this.dataForm.id}`).then(({ data: res }) => {
this.pageloading = false
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.checkDiction = res.data
}).catch(() => {})
},
//初审
trial(){
this.trialVisible = true
},
// 表单提交
dataFormSubmitHandle: debounce(function () {
//封装考核内容提报详情表数据
let subChild =[];
for (let i of this.checkDiction){
let laber = i.label;
let bigId = i.id;
let childSub = i.childDiction;
if (childSub.length>0) {
for (let j of childSub) {
//描述
console.log(j)
let childDesribe = j.describe;
//图片
let childUrl = j.images === undefined ? [] :j.images.url;
let childUrl = j.images.url === undefined? [] :j.images.url;
//缩略图
let thumbnail = j.images === undefined ? [] :j.images.thumbnail;
let thumbnail = j.images.thumbnail === undefined ? [] :j.images.thumbnail;
//文件
let childFile =j.files === undefined ? [] : j.files;
let childFile =j.files.name === undefined ? [] : j.files;
let littleId = j.id;
let m = {
id:j.infoId,
@ -386,8 +414,8 @@ export default {
}
}else {
let childDesribe = i.describe;
let childUrl = i.images === undefined ?[]:i.images.url;
let thumbnail = i.images === undefined ? [] :j.images.thumbnail;
let childUrl = i.images.url === undefined ?[]:i.images.url;
let thumbnail = i.images.thumbnail === undefined ? [] :j.images.thumbnail;
let childFile = i.files === undefined ?[]:i.files;
let ai = {
id:i.infoId,
@ -403,18 +431,25 @@ export default {
}
this.dataForm.subDetail =subChild
debugger
let pateDate={
infoId : this.dataForm.id,
gridIds:this.dataForm.grids,
infoDetail:subChild
}
console.log(pateDate)
console.log(pateDate);
this.$http[!this.dataForm.id ? 'post' : 'put'](`kpi/subdetail/addDetail`,pateDate).then(({ data: res }) => {
this.pageloading = false
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.backToUserRelationList();
}).catch(() => {})
}, 1000, { 'leading': true, 'trailing': false })
},
components: {
MapSelect
MapSelect,
trial
}
}
</script>

4
src/views/modules/kpi/subpositioncheckinfo.vue
View File

@ -70,8 +70,8 @@
<template slot-scope="scope">
<el-button type="text" size="small" @click="addHandle(scope.row.id,scope.row.status)">{{ '查看' }}</el-button>
<el-button v-if="scope.row.delShow" type="text" size="small" @click="openHandle(scope.row.id)">{{ '修改' }}</el-button>
<el-button v-if="$hasPermission('sub:check:tiral')" type="text" size="small" @click="firstTrial(scope.row.id)">{{ '初审' }}</el-button>
<el-button v-if="$hasPermission('sub:check:acceptance')" type="text" size="small" @click="acceptance(scope.row.id)">{{ '验收' }}</el-button>
<el-button v-if="$hasPermission('sub:check:tiral') && scope.row.status==='1'" type="text" size="small" @click="firstTrial(scope.row.id)">{{ '初审' }}</el-button>
<el-button v-if="$hasPermission('sub:check:acceptance') && scope.row.status==='2'" type="text" size="small" @click="acceptance(scope.row.id)">{{ '验收' }}</el-button>
<el-button v-if="scope.row.delShow" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ '删除' }}</el-button>
<!-- <el-button v-if="$hasPermission('kpi:subpositioncheckinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
<!-- <el-button v-if="$hasPermission('kpi:subpositioncheckinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->

Write Preview
Loading…
Cancel
Save