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:
宋伟佳
2021-08-09 19:31:22 +08:00
parent b4c5441f99 6032ab8f66
commit dcd388b44b
5 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+26 -14
View File
@@ -345,21 +345,33 @@ export default {
addList() {
dicTypeData().then(res => {
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
})
standUnqualified(this.queryUnqualidiedData).then(res => {
this.unqualidiedData = res.data.records
this.unqualidiedData.forEach(item => {
this.$set(item,'engineer','')
this.$set(item,'engineerId','')
this.$set(item,'dutyPeopleInfo','')
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
standUnqualified(this.queryUnqualidiedData).then(res => {
this.unqualidiedData = res.data.records
this.unqualidiedData.forEach(item => {
// 责任部门转换
if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
let k = (item.responsibleUnit || "").split(',')
for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
}
item.responsibleUnit = k.join(',')
}
}
}
this.$set(item,'engineer','')
this.$set(item,'engineerId','')
this.$set(item,'dutyPeopleInfo','')
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
})
this.total = res.data.total
})
this.total = res.data.total
})
this.standModel = true;
},
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+7 -7
View File
@@ -371,13 +371,13 @@ export default {
loading: 'loading'
}, res => {
if (res.ok) {
res.data.records.forEach((item)=>{
for(let key in item){
if(item[key] == null){
item[key]='无'
}
}
})
// res.data.records.forEach((item)=>{
// for(let key in item){
// if(item[key] == null){
// item[key]='无'
// }
// }
// })
this.sarProStateListDatas = res.data.records
this.sarProStateTotal = res.data.total
}
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+5 -6
View File
@@ -27,7 +27,7 @@
</p>
<p class="transition-box-p">
<label class="transition-box-label">上传时间：</label>
<span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
<span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">征求意见周期：</label>
@@ -193,7 +193,6 @@
_this: this
}, res => {
this.standinfoList = res.data.records
console.log(this.standinfoList);
this.total = res.data.total
this.spinShow = false
}, e => {
@@ -277,10 +276,10 @@
cid: this.$route.query.item.cid,
content: this.opinionContent.content,
partCode: this.opinionContent.partCode,
userId: this.$store.getters.userInfo.userId,
userName: this.$store.getters.userInfo.account,
deptName: this.$store.getters.userInfo.orgName,
deptId: this.$store.getters.userInfo.orgId
userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.userName || '',
deptName: this.$store.getters.userInfo.orgName || '',
deptId: this.$store.getters.userInfo.orgId || ''
}
if (this.type === 'edit') {
form.id = this.id
src/pages/searchCenter/pages/advancedSearch.vue
+4 -4
View File
@@ -324,8 +324,8 @@
</el-row>
<el-row type="flex" justify="space-around" class="code-row-bg">
<el-col :span="12">
<el-form-item label="代替标准号" prop="nameShow">
<el-input v-model="standForm.nameShow" clearable placeholder="根据代替标准号查找"
<el-form-item label="代替标准号" prop="dtbjh">
<el-input v-model="standForm.dtbjh" clearable placeholder="根据代替标准号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-col>
@@ -938,7 +938,7 @@
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('a',scope.row)">取消收藏</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand('b',scope.row)">分享</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
@@ -962,7 +962,7 @@
<div v-else>
<el-button size="mini" type="primary" v-if="scope.row.collectId" @click="clickCollection(scope.row)">取消收藏</el-button>
<el-button size="mini" type="primary" v-else @click="clickCollection(scope.row)">收藏</el-button>
<el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>
<!-- <el-button sizi="mini" @click="clickShare(scope.row)">分享</el-button>-->
</div>
</template>
</el-table-column>
src/pages/searchCenter/pages/standardSearch.vue
+2 -2
View File
@@ -215,7 +215,7 @@
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
<div style="margin-right: 15px;">发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<div style="margin-right: 15px;">发布日期11: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
<!-- <div>{{$t('m.putTime')}}: {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '&#45;&#45;' }} </div>-->
</div>
</div>
@@ -2531,7 +2531,7 @@
//display: -webkit-box;
//-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
max-height: 60px;
max-height: 78px;
}
.AllTime {
margin-top: 15px;