Browse Source

表格状态的显示

luckysheet-xiaowang-Intelligen
是小王呀\24601 10 months ago
parent
commit
1bfc50508b
  1. 1
      src/views/modules/base/smartExcel/cpts/excel-info.vue
  2. 6
      src/views/modules/base/smartExcel/cpts/excel-summary.vue
  3. 14
      src/views/modules/base/smartExcel/cpts/excel-view.vue
  4. 9
      src/views/modules/base/smartExcel/cpts/filling-info.vue

1
src/views/modules/base/smartExcel/cpts/excel-info.vue

@ -182,6 +182,7 @@ export default {
...mapGetters(['clientHeight', 'resolution']), ...mapGetters(['clientHeight', 'resolution']),
}, },
props: { props: {
taskId: { taskId: {
type: String, type: String,
default: "" default: ""

6
src/views/modules/base/smartExcel/cpts/excel-summary.vue

@ -82,14 +82,16 @@ export default {
this.$emit('close') this.$emit('close')
}, },
handleClickShowView(val){ handleClickShowView(val){
const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId } = val; const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId,taskStateName} = val;
this.$store.state.sidebarFold = true; this.$store.state.sidebarFold = true;
this.showView = true; this.showView = true;
this.sheetTotal = false this.sheetTotal = false
this.workbookId = val.taskId; this.workbookId = val.taskId;
this.userId = val.userId; this.userId = val.userId;
this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction}; this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction};
this.mergeObj = {subWorkBookId,workBookId } this.mergeObj = {subWorkBookId,workBookId,taskStateName }
this.taskStateName=val.taskStateName
}, },
handleClickShowViewAll(val){ handleClickShowViewAll(val){
this.$store.state.sidebarFold = true; this.$store.state.sidebarFold = true;

14
src/views/modules/base/smartExcel/cpts/excel-view.vue

@ -25,9 +25,9 @@
</div> </div>
<div> <div>
<!-- --> <!-- -->
<el-button type="danger" v-if="pageType === 'add' && !sheetTotal" @click="handleClickCurrencyEvent('rejected')"> 驳回重提</el-button> <el-button type="danger" v-if="pageType === 'add' && !sheetTotal&&mergeObj.taskStateName=='已提交'" @click="handleClickCurrencyEvent('rejected')"> 驳回重提</el-button>
<el-button type="primary" v-if="pageType === 'add'&& !sheetTotal" @click="handleClickCurrencyEvent('archived')"> 审核存档</el-button> <el-button type="primary" v-if="pageType === 'add'&& !sheetTotal&&mergeObj.taskStateName=='已提交'" @click="handleClickCurrencyEvent('archived')"> 审核存档</el-button>
<el-button type="primary" v-if="pageType === 'filling'" @click="handleClickCurrencyEvent('submit')"> 保存</el-button> <el-button type="primary" v-if="pageType === 'filling'&& taskStateName=='处理中'" @click="handleClickCurrencyEvent('submit')"> 保存</el-button>
</div> </div>
</div> </div>
<div id="luckysheet"></div> <div id="luckysheet"></div>
@ -84,7 +84,11 @@ export default {
userId:{ userId:{
type:String, type:String,
default:'' default:''
} },
taskStateName: {
type: String,
default: ""
},
}, },
computed: { computed: {
tableHeight() { tableHeight() {
@ -97,6 +101,8 @@ export default {
}, },
watch: {}, watch: {},
async mounted() { async mounted() {
console.log(this.mergeObj,"dskjlfsdklf");
if (this.sheetTotal) { if (this.sheetTotal) {
this.currentId = this.workbookId; this.currentId = this.workbookId;
this.loadWorkBook() this.loadWorkBook()

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

@ -65,7 +65,7 @@
<span>点击以下表格开始提报任务</span> <span>点击以下表格开始提报任务</span>
</div> </div>
<div class="flex-wrap flex"> <div class="flex-wrap flex">
<div class="item flex flex-y flex-center-deputy" @click="handleClickShowView(formData.subWorkBookId)" <div class="item flex flex-y flex-center-deputy" @click="handleClickShowView(formData.subWorkBookId,formData.taskStateName)"
:key="index"> :key="index">
<img :src="require(`@/assets/images/index/Excel.png`)" alt=""> <img :src="require(`@/assets/images/index/Excel.png`)" alt="">
<div class="agencyName">{{formData.taskTitle}}</div> <div class="agencyName">{{formData.taskTitle}}</div>
@ -90,7 +90,7 @@
</div> </div>
</div> </div>
<div v-if="showView"> <div v-if="showView">
<excel-view @close="close" :workbookId="workbookId" :pageType="'filling'" :sheetTotal="true" :infoObj="infoObj"></excel-view> <excel-view @close="close" :workbookId="workbookId" :taskStateName="taskStateName" :pageType="'filling'" :sheetTotal="true" :infoObj="infoObj"></excel-view>
</div> </div>
<el-dialog title="转派其他接收人" :visible.sync="showPersonel" width="50%" :close-on-click-modal="false"> <el-dialog title="转派其他接收人" :visible.sync="showPersonel" width="50%" :close-on-click-modal="false">
<acceptingPersonel :showType="showType" :taskId="formData.id" <acceptingPersonel :showType="showType" :taskId="formData.id"
@ -107,6 +107,7 @@ import acceptingPersonel from "./acceptingPersonel.vue";
export default { export default {
data() { data() {
return { return {
taskStateName:"",
workbookId:"", workbookId:"",
showView:false, showView:false,
showType:"", showType:"",
@ -161,10 +162,12 @@ export default {
handelClickBack() { handelClickBack() {
this.$emit('handleShowPage') this.$emit('handleShowPage')
}, },
handleClickShowView(val){ handleClickShowView(val,valname){
console.log(val,valname);
this.$store.state.sidebarFold = true; this.$store.state.sidebarFold = true;
this.showView = true; this.showView = true;
this.workbookId = val this.workbookId = val
this.taskStateName=valname
}, },
}, },
components: {acceptingPersonel,excelView}, components: {acceptingPersonel,excelView},

Loading…
Cancel
Save