Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
This commit is contained in:
宋伟佳
@@ -345,21 +345,33 @@ export default {
|
|||||||
addList() {
|
addList() {
|
||||||
dicTypeData().then(res => {
|
dicTypeData().then(res => {
|
||||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||||
})
|
standUnqualified(this.queryUnqualidiedData).then(res => {
|
||||||
standUnqualified(this.queryUnqualidiedData).then(res => {
|
this.unqualidiedData = res.data.records
|
||||||
this.unqualidiedData = res.data.records
|
this.unqualidiedData.forEach(item => {
|
||||||
this.unqualidiedData.forEach(item => {
|
// 责任部门转换
|
||||||
this.$set(item,'engineer','')
|
if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
|
||||||
this.$set(item,'engineerId','')
|
let k = (item.responsibleUnit || "").split(',')
|
||||||
this.$set(item,'dutyPeopleInfo','')
|
for (let i in this.zrbmOptions) {
|
||||||
this.$set(item,'dutyPeople','')
|
for (let m = 0; m< k.length; m++) {
|
||||||
this.$set(item,'dutyPeopleInfoId','')
|
if (this.zrbmOptions[i].value === k[m]) {
|
||||||
this.$set(item,'dutyPeopleId','')
|
k[m] = this.zrbmOptions[i].label
|
||||||
this.$set(item,'fileText',[])
|
}
|
||||||
this.$set(item,'fileTextId',[])
|
item.responsibleUnit = k.join(',')
|
||||||
this.$set(item,'fileTextPath',[])
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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;
|
this.standModel = true;
|
||||||
},
|
},
|
||||||
|
|||||||
+7
-7
@@ -371,13 +371,13 @@ export default {
|
|||||||
loading: 'loading'
|
loading: 'loading'
|
||||||
}, res => {
|
}, res => {
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
res.data.records.forEach((item)=>{
|
// res.data.records.forEach((item)=>{
|
||||||
for(let key in item){
|
// for(let key in item){
|
||||||
if(item[key] == null){
|
// if(item[key] == null){
|
||||||
item[key]='无'
|
// item[key]='无'
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
})
|
// })
|
||||||
this.sarProStateListDatas = res.data.records
|
this.sarProStateListDatas = res.data.records
|
||||||
this.sarProStateTotal = res.data.total
|
this.sarProStateTotal = res.data.total
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
</p>
|
</p>
|
||||||
<p class="transition-box-p">
|
<p class="transition-box-p">
|
||||||
<label class="transition-box-label">上传时间：</label>
|
<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>
|
||||||
<p class="transition-box-p">
|
<p class="transition-box-p">
|
||||||
<label class="transition-box-label">征求意见周期：</label>
|
<label class="transition-box-label">征求意见周期：</label>
|
||||||
@@ -193,7 +193,6 @@
|
|||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
this.standinfoList = res.data.records
|
this.standinfoList = res.data.records
|
||||||
console.log(this.standinfoList);
|
|
||||||
this.total = res.data.total
|
this.total = res.data.total
|
||||||
this.spinShow = false
|
this.spinShow = false
|
||||||
}, e => {
|
}, e => {
|
||||||
@@ -277,10 +276,10 @@
|
|||||||
cid: this.$route.query.item.cid,
|
cid: this.$route.query.item.cid,
|
||||||
content: this.opinionContent.content,
|
content: this.opinionContent.content,
|
||||||
partCode: this.opinionContent.partCode,
|
partCode: this.opinionContent.partCode,
|
||||||
userId: this.$store.getters.userInfo.userId,
|
userId: this.$store.getters.userInfo.userId || '',
|
||||||
userName: this.$store.getters.userInfo.account,
|
userName: this.$store.getters.userInfo.userName || '',
|
||||||
deptName: this.$store.getters.userInfo.orgName,
|
deptName: this.$store.getters.userInfo.orgName || '',
|
||||||
deptId: this.$store.getters.userInfo.orgId
|
deptId: this.$store.getters.userInfo.orgId || ''
|
||||||
}
|
}
|
||||||
if (this.type === 'edit') {
|
if (this.type === 'edit') {
|
||||||
form.id = this.id
|
form.id = this.id
|
||||||
|
|||||||
@@ -324,8 +324,8 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row type="flex" justify="space-around" class="code-row-bg">
|
<el-row type="flex" justify="space-around" class="code-row-bg">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="代替标准号" prop="nameShow">
|
<el-form-item label="代替标准号" prop="dtbjh">
|
||||||
<el-input v-model="standForm.nameShow" clearable placeholder="根据代替标准号查找"
|
<el-input v-model="standForm.dtbjh" clearable placeholder="根据代替标准号查找"
|
||||||
@keyup.enter.native="btnSearch"></el-input>
|
@keyup.enter.native="btnSearch"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -938,7 +938,7 @@
|
|||||||
<el-dropdown-menu slot="dropdown">
|
<el-dropdown-menu slot="dropdown">
|
||||||
<el-dropdown-item :command="beforeHandleCommand('l',scope.row)">查看</el-dropdown-item>
|
<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('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-menu>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
|
|
||||||
@@ -962,7 +962,7 @@
|
|||||||
<div v-else>
|
<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-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 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>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|||||||
@@ -215,7 +215,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="AllBoxContent" v-html="item.textContent"></div>
|
<div class="AllBoxContent" v-html="item.textContent"></div>
|
||||||
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
|
<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') : '--' }} </div>-->
|
<!-- <div>{{$t('m.putTime')}}: {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '--' }} </div>-->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -2531,7 +2531,7 @@
|
|||||||
//display: -webkit-box;
|
//display: -webkit-box;
|
||||||
//-webkit-line-clamp: 3;
|
//-webkit-line-clamp: 3;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
max-height: 60px;
|
max-height: 78px;
|
||||||
}
|
}
|
||||||
.AllTime {
|
.AllTime {
|
||||||
margin-top: 15px;
|
margin-top: 15px;
|
||||||
|
|||||||
Reference in New Issue
Block a user