elink-star
/
epmet-work-pc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'luckysheet' of http://120.46.222.128:10021/elink-star/epmet-work-pc into luckysheet_xiaowang

luckysheet-xiaowang-Intelligen
是小王呀\24601 10 months ago
parent
249c0ab963 deab877750
commit
879a6152d6
4 changed files with 70 additions and 77 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. 29
      src/views/modules/base/smartExcel/cpts/excel-summary.vue
  2. 4
      src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
  3. 105
      src/views/modules/base/smartExcel/cpts/excel-view.vue
  4. 9
      src/views/modules/base/smartExcel/cpts/filling-info.vue

29
src/views/modules/base/smartExcel/cpts/excel-summary.vue
View File

@ -6,21 +6,21 @@
<h3 class="title">汇总文件</h3>
<el-button type="text" icon="el-icon-back" @click="handleClickBack">返回</el-button>
</div>
<div class="item flex flex-y flex-center-deputy " @click="handleClickShowView(list[0].workBookId,true)">
<div class="item flex flex-y flex-center-deputy " @click="handleClickShowViewAll(list[0].workBookId)">
<img :src="require(`@/assets/images/index/Excel.png`)" alt="">
<div class="agencyName">周期更新表</div>
</div>
<h3 class="title">提报的文件</h3>
<div class="flex-wrap flex">
<div class="item flex flex-y flex-center-deputy" v-for="(item, index) in list" @click="handleClickShowView(summaryDetal.taskId)" :key="index">
<div class="item flex flex-y flex-center-deputy" v-for="(item, index) in list" @click="handleClickShowView(item)" :key="index">
<img :src="require(`@/assets/images/index/Excel.png`)" alt="">
<div class="agencyName">{{ item.taskTitle }}周期更新表</div>
<div>（{{ getStateDescription(item.state) }}）</div>
<div>（{{ getStateDescription(item.taskState) }}）</div>
</div>
</div>
</div>
<div v-if="showView">
<excel-view @close="close" :workbookId="workbookId" :pageType="'add'" :sheetTotal="sheetTotal"></excel-view>
<excel-view @close="close" :workbookId="workbookId" :infoObj="infoObj" :pageType="'add'" :sheetTotal="sheetTotal" :mergeObj="mergeObj"></excel-view>
</div>
</div>
</template>
@ -35,14 +35,15 @@ export default {
list: [
],
workbookId:'',
sheetTotal:false
sheetTotal:false,
infoObj:{},
mergeObj:null//用于传递subworkbookId与workbookId
};
},
created() {
},
async mounted(){
console.log(this.summaryDetal,"dsalkjdlfks");
this.getTableList()
},
methods: {
@ -79,12 +80,22 @@ export default {
handleClickBack() {
this.$emit('close')
},
handleClickShowView(val,total){
handleClickShowView(val){
const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId } = val;
this.$store.state.sidebarFold = true;
this.showView = true;
this.sheetTotal = total || false
this.workbookId = val
this.sheetTotal = false
this.workbookId = val.taskId;
this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction};
this.mergeObj = {subWorkBookId,workBookId }
},
handleClickShowViewAll(val){
this.$store.state.sidebarFold = true;
this.showView = true;
this.sheetTotal = true
this.workbookId = val
}
},
components: { excelView },
computed: {

4
src/views/modules/base/smartExcel/cpts/excel-template-confirmation.vue
View File

@ -70,8 +70,8 @@ export default {
}
},
mounted() {
console.log(this.fileUrl, 'fileUrl===');
this.urlToFile('http://localhost:9001/epmet-work-pc/test1.xlsx',this.fileName)
console.log(this.fileUrl, 'fileUrl===');//测试用'http://localhost:9001/epmet-work-pc/test1.xlsx'
this.urlToFile(this.fileUrl,this.fileName)
},
props: {

105
src/views/modules/base/smartExcel/cpts/excel-view.vue
View File

@ -24,9 +24,10 @@
<el-button type="success" @click="onClickUplond()" v-if="pageType !== 'add'"> 智能填表</el-button>
</div>
<div>
<el-button type="danger" v-if="pageType === 'add'"> 驳回重提</el-button>
<el-button type="primary" v-if="pageType === 'add'"> 审核存档</el-button>
<el-button type="primary" v-if="pageType === 'filling'"> 保存</el-button>
<!-- -->
<el-button type="danger" v-if="pageType === 'add'" @click="handleClickCurrencyEvent('rejected')"> 驳回重提</el-button>
<el-button type="primary" v-if="pageType === 'add'" @click="handleClickCurrencyEvent('archived')"> 审核存档</el-button>
<el-button type="primary" v-if="pageType === 'filling'" @click="handleClickCurrencyEvent('submit')"> 保存</el-button>
</div>
</div>
<div id="luckysheet"></div>
@ -51,26 +52,7 @@ export default {
data() {
return {
showUploadData: false,
menuList: [
// {
// name: '2024年11月第三周（已提交）',
// workbookId:'1876569275607785473'
// },
// {
// name: '2024年11月第三周（已提交）',
// workbookId:'1876571135966158850'
// },
// {
// name: '2024年11月第三周（已提交）',
// workbookId:'1879063358107648002'
// },
// {
// name: '2024年11月第三周（已提交）'
// },
// {
// name: '2024年11月第三周（已提交）'
// }
],
menuList: [],
menuActive: 0,
socket: null,
currentTable: null,
@ -89,6 +71,14 @@ export default {
sheetTotal: {
type: Boolean,
default: false
},
infoObj:{
type:Object,
default:()=>{}
},
mergeObj:{
type:Object,
default:()=>{}
}
},
computed: {
@ -203,46 +193,6 @@ export default {
},
updataSheet(list) {
let arr = [
// {
// 1: '张三1',
// 2: '证件类型1',
// 3: '1234',
// 4: '456',
// 5: '国籍',
// 6: '性别',
// 7: '出生日期',
// 8: '所属社区',
// 9: '所属网格',
// 10: '所属小区',
// 11: '楼栋名称',
// 12: '单元号',
// 13: '门牌号',
// 14: '人房关系',
// 15: '人户状况',
// 16: '与户主关系',
// 17: '民族'
// },
// {
// 1: '张三12',
// 2: '证件类型12',
// 3: '12342',
// 4: '4562',
// 5: '国籍2',
// 6: '性别2',
// 7: '出生日期2',
// 8: '所属社区2',
// 9: '所属网格2',
// 10: '所属小区2',
// 11: '楼栋名称2',
// 12: '单元号2',
// 13: '门牌号2',
// 14: '人房关系2',
// 15: '人户状况2',
// 16: '与户主关系2',
// 17: '民族'
// }
]
list.forEach((item, index) => {
luckysheet.insertRow(this.currentTable[0].data.length, 1)
for (let k in item) {
@ -250,6 +200,35 @@ export default {
}
})
},
// 驳回重提，审核存档，保存统一用这一个事件来处理
async handleClickCurrencyEvent(val){
const url = '/actual/base/communityOneTablePeriodPublish/update'
let parm = {
...this.infoObj
}
parm.taskState = val;
if(val === 'archived'){
this.workbookMerge()
}
const {data,code,msg} = await requestPost(url,parm)
if(code === 0){
this.$message.success('操作成功')
}else{
console.log(msg);
}
},
async workbookMerge(){
const url = '/actual/base/luckySheet/workbook/merge'
let parm = {
sourceWorkbookId:this.mergeObj.subWorkBookId,
targetWorkbookId:this.mergeObj.workBookId
}
const {data,code,msg} = await requestPost(url,parm)
if(code === 0){
console.log('合并成功');
}
},
},
components: {
excelUploadData

9
src/views/modules/base/smartExcel/cpts/filling-info.vue
View File

@ -65,7 +65,7 @@
<span>（点击以下表格开始提报任务）</span>
</div>
<div class="flex-wrap flex">
<div class="item flex flex-y flex-center-deputy" @click="handleClickShowView(formData.workBookId)"
<div class="item flex flex-y flex-center-deputy" @click="handleClickShowView(formData.subWorkBookId)"
:key="index">
<img :src="require(`@/assets/images/index/Excel.png`)" alt="">
<div class="agencyName">{{formData.taskTitle}}</div>
@ -90,7 +90,7 @@
</div>
</div>
<div v-if="showView">
<excel-view @close="close" :workbookId="workbookId" :pageType="'filling'" :sheetTotal="true"></excel-view>
<excel-view @close="close" :workbookId="workbookId" :pageType="'filling'" :sheetTotal="true" :infoObj="infoObj"></excel-view>
</div>
<el-dialog title="转派其他接收人" :visible.sync="showPersonel" width="50%" :close-on-click-modal="false">
<acceptingPersonel :showType="showType" :taskId="formData.id"
@ -115,6 +115,7 @@ export default {
],
formData:{
},
infoObj:{}
};
},
created() { },
@ -139,7 +140,9 @@ export default {
id: this.taskId,
};
requestGet('/actual/base/communityOneTablePeriodPublish/getDetail', parms).then(res => {
this.formData=res.data
this.formData=res.data;
const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction } = this.formData;
this.infoObj = {id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction}
});
},
close() {

Write Preview
Loading…
Cancel
Save