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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-04-21 09:15:19 +08:00
parent 52adb01730 95f7fbb4f7
commit 22373238c1
10 changed files with 103 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+1 -1
View File
@@ -11,7 +11,7 @@
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="min-height: 30px">
<span @click="dealWith(item)"
style="line-height: 30px; font-size: 13px;display: inline-block;width: 400px;">{{ getPrcNameFilter(item) }}</span>
style="line-height: 30px; font-size: 13px;display: inline-block;width: 100%;">{{ getPrcNameFilter(item) }}</span>
<!-- <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
<!-- <span @click="dealWith(item)"-->
<!-- style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+3 -1
View File
@@ -109,7 +109,7 @@
</el-table>
</div>
<loading :loading="loading">正在获取中……</loading>
<pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
<pagination :total="total" :page="itemsPage " @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
</div>
</div>
<!-- 分享 -->
@@ -1528,6 +1528,8 @@ export default {
confirmButtonClass: 'common-button-primary',
roundButton: false
}).then(() => {
this.itemsPage = 1
this.itemsEo.page = 1
this.loading = true
this.deleteItemsModal = false
this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', {
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+14
View File
@@ -429,6 +429,7 @@
v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求"
maxlength="500"
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
@@ -1181,6 +1182,19 @@
@import '~@/assets/styles/style';
@import '~@/assets/styles/mixins';
.bzjdStep1-1 {
.itemsTextBox {
min-height: 300px;
max-height: 500px;
overflow: auto;
line-height: 20px;
/deep/ td {
border: 1px solid #606266;
text-align: center;
}
}
/deep/.el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+11
View File
@@ -1193,6 +1193,17 @@ export default {
@import '~@/assets/styles/mixins';
.bzjdStep1 {
.itemsTextBox {
min-height: 300px;
max-height: 500px;
overflow: auto;
line-height: 20px;
/deep/ td {
border: 1px solid #606266;
text-align: center;
}
}
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+10
View File
@@ -544,6 +544,16 @@
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzjdStep2 {
.itemsTextBox {
min-height: 300px;
max-height: 500px;
overflow: auto;
line-height: 20px;
/deep/ td {
border: 1px solid #606266;
text-align: center;
}
}
/deep/.el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+12
View File
@@ -306,6 +306,7 @@
v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求"
maxlength="500"
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
@@ -394,6 +395,7 @@
v-model="editForm.technicalRequir"
placeholder="请输入核心技术要求"
maxlength="500"
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
@@ -964,6 +966,16 @@
<style lang="less" scoped>
@import '~@/assets/styles/style';
.bzjdStep3 {
.itemsTextBox {
min-height: 300px;
max-height: 500px;
overflow: auto;
line-height: 20px;
/deep/ td {
border: 1px solid #606266;
text-align: center;
}
}
/deep/.el-drawer__container {
.prc-content-border {
border: none;
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+15 -39
View File
@@ -354,54 +354,30 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText9 = data.commentText9 || ''
this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
arr.push(item)
})
this.json = data
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
let newArr = data.info ? data.info : data.form.data
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []
newArr.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
this.data2 = newArr
}).catch(e => {
});
});
// return new Promise((resolve, reject) => {
// inboundLiaisonDetail({
// taskIds: this.taskIds,
// pId: this.pId
// }).then(res => {
// let data = JSON.parse(res.mesg)
// console.log(data);
// this.form.cid = data.cid
// this.form.endTime = data.endTime
// this.form.cname = data.cname
// this.form.fjList = data.fjList
// this.form.fjListId = data.fjListId
// var arr = []
// data.summaryList.forEach( item => {
// if (item.state != '3') {
// arr.push(item)
// }
// })
// this.json = data
// this.data = arr
// this.oldData = data.oldinfo
// }).catch(e => {
// })
// })
},
}
},
mounted () {
this.getHistoryData()
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+19 -1
View File
@@ -227,6 +227,7 @@
<!-- 选择项目弹窗-->
<el-drawer
title="选择项目"
class="drawer-table"
:visible.sync="projectModel"
size="900px"
custom-class="demo-drawer"
@@ -357,6 +358,7 @@
</el-drawer>
<!-- 添加标准抽屉-->
<el-drawer
class="drawer-table"
title="添加标准"
:wrapperClosable="false"
:visible.sync="standModel"
@@ -439,7 +441,7 @@
<el-table
ref="selections"
tooltip-effect="dark"
style="width: 100%;overflow-y: auto;overflow-x: hidden;"
style="width: 100%;"
border
:loading="lawInfoTableLoading"
:data="lawInfoTable"
@@ -1543,6 +1545,14 @@ export default {
height: calc(~'100% - 65px');
overflow: auto;
}
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
/deep/.demo-drawer-content{
overflow-y: hidden;
}
}
}
</style>
<style lang="less">
@@ -1550,6 +1560,14 @@ export default {
.el-checkbox {
display: block !important;
}
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
/deep/.demo-drawer-content{
overflow-y: hidden;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+9
View File
@@ -216,6 +216,7 @@
</div>
<!-- 添加标准抽屉-->
<el-drawer
class="drawer-table"
title="添加标准"
:wrapperClosable="false"
:visible.sync="standModel"
@@ -1233,6 +1234,14 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
/deep/.demo-drawer-content{
overflow-y: hidden;
}
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+9
View File
@@ -216,6 +216,7 @@
</div>
<!-- 添加标准抽屉-->
<el-drawer
class="drawer-table"
title="添加标准"
:wrapperClosable="false"
:visible.sync="standModel"
@@ -1233,6 +1234,14 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
.drawer-table{
/deep/.el-drawer__body{
overflow-y: hidden;
}
/deep/.demo-drawer-content{
overflow-y: hidden;
}
}
}
</style>