FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
yuezhihang
2022-06-20 17:00:16 +08:00
parent c56159fc16 08d85bd644
commit 01b6085a23
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+3 -1
View File
@@ -24,7 +24,7 @@
</div> </div>
</div> </div>
<div style="float: right; margin-top: 20px"> <div style="float: right; margin-top: 20px">
<el-checkbox v-if="answer.checkedShow" @change="answerChang" :disabled="answer.state && answer.state === 'yes'" v-model="answer.checked">归档</el-checkbox> <el-checkbox v-if="answer.checkedShow && (answer.answerer !== answererNowUserName)" @change="answerChang" :disabled="answer.state && answer.state === 'yes'" v-model="answer.checked">归档</el-checkbox>
</div> </div>
</div> </div>
<!-- <div class="footer-box">--> <!-- <div class="footer-box">-->
@@ -40,6 +40,8 @@ export default {
data(){ data(){
return{ return{
checked: '', checked: '',
answererNowUserId: this.$store.getters.userInfo.userId,
answererNowUserName: this.$store.getters.userInfo.userName,
} }
}, },
methods:{ methods:{
src/pages/personal/pages/my-questions/index.vue
+17 -6
View File
@@ -396,7 +396,7 @@
<loading :loading="dataLoading">正在加载数据</loading> <loading :loading="dataLoading">正在加载数据</loading>
</div> </div>
<div class="info-answer"> <div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item> <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div> </div>
</el-tab-pane> </el-tab-pane>
</template> </template>
@@ -457,7 +457,7 @@
<loading :loading="dataLoading">正在加载数据</loading> <loading :loading="dataLoading">正在加载数据</loading>
</div> </div>
<div class="info-answer"> <div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item> <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div> </div>
</el-tab-pane> </el-tab-pane>
</template> </template>
@@ -520,7 +520,7 @@
<loading :loading="dataLoading">正在加载数据</loading> <loading :loading="dataLoading">正在加载数据</loading>
</div> </div>
<div class="info-answer"> <div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item> <answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div> </div>
</el-tab-pane> </el-tab-pane>
</template> </template>
@@ -872,7 +872,6 @@
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
v-model="handleSelectForm.lawNumber" v-model="handleSelectForm.lawNumber"
@change="lawNumberSearch"
placeholder="根据标准号/标准名称查找" placeholder="根据标准号/标准名称查找"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
@@ -1454,6 +1453,7 @@ export default {
}, },
//选择标准的查询按钮 //选择标准的查询按钮
searchLawBtn(){ searchLawBtn(){
this.lawNumberSearch()
this.lawInfoTableLoading = true this.lawInfoTableLoading = true
if (this.handleSelectForm.dataSource === 'INLAND'){ if (this.handleSelectForm.dataSource === 'INLAND'){
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{
@@ -1842,6 +1842,17 @@ export default {
this.activeName = "myQue" this.activeName = "myQue"
this.activeType = this.standType this.activeType = this.standType
this.searchBtn() this.searchBtn()
this.queSearch()
this.handleSelectForm.lawNumber = ''
this.handleSelectForm.textStatus = ''
this.handleSelectForm.isRelateAccess = ''
this.handleSelectForm.standNumber = ''
this.handleSelectForm.lawsNumber = ''
this.handleSelectForm.standCode = ''
//清空标准名称/政策名称的查询
this.handleSelectForm.lawName = ''
this.handleSelectForm.standName = ''
this.handleSelectForm.numberName = ''
}, e => { }, e => {
}) })
@@ -1860,13 +1871,13 @@ export default {
overflow: auto !important; overflow: auto !important;
} }
#my-questions{ #my-questions{
height: 100%; height: calc(100vh - 75px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: #F5F7FA; background: #F5F7FA;
margin-bottom: 10px; margin-bottom: 10px;
.tab-box{ .tab-box{
height: 100%; height: 93%;
} }
.type-tabs { .type-tabs {
/deep/.el-tabs__header { /deep/.el-tabs__header {
src/pages/regulatoryRepository/standQA/index.vue
+4 -3
View File
@@ -1033,7 +1033,8 @@ export default {
questionClick(){ questionClick(){
sessionStorage.setItem('queId', this.activeQue) sessionStorage.setItem('queId', this.activeQue)
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
id: this.activeQue id: this.activeQue,
state: 'yes'
},{ },{
_this: this _this: this
}, res => { }, res => {
@@ -1258,13 +1259,13 @@ export default {
overflow: auto; overflow: auto;
} }
#my-questions{ #my-questions{
height: 100%; height: calc(100vh - 75px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background: #F5F7FA; background: #F5F7FA;
margin-bottom: 10px; margin-bottom: 10px;
.tab-box{ .tab-box{
height: 100%; height: 93%;
} }
.type-tabs { .type-tabs {
/deep/.el-tabs__header { /deep/.el-tabs__header {