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:
396572590@qq.com
2022-07-19 16:30:57 +08:00
parent 7c4e728152 f8fbe9cf18
commit 1d11594def
7 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/treeSelect/treeSelectStand.vue
+4 -1
View File
@@ -310,5 +310,8 @@ export default {
::v-deep .el-drawer{ ::v-deep .el-drawer{
outline: none!important; outline: none!important;
} }
.common-tree{
height: 100%;
overflow-y: auto;
}
</style> </style>
src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
+4 -4
View File
@@ -42,10 +42,10 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="汇总调研结果" prop="hzfileId" class="add-form-item form-item-disabled"> <el-form-item label="汇总调研结果" prop="hzfileId" class="add-form-item form-item-disabled">
<div v-if="form.hzfileName" @click="updateFile(form.hzfileId)" class="fileClass"> <div v-if="form.hzfileName" @click="updateFile(form.hzfileId)" class="fileClass" style="margin-right: 5px;padding-left: 10px">
{{ form.hzfileName }} {{ form.hzfileName }}
</div> </div>
<div v-else> <div v-else style="margin-right: 5px;padding-left: 10px">
- - - -
</div> </div>
</el-form-item> </el-form-item>
@@ -61,7 +61,7 @@
></el-button> ></el-button>
</div> </div>
</div> </div>
<div v-else> <div v-else style="margin-right: 5px;padding-left: 10px">
- - - -
</div> </div>
</el-form-item> </el-form-item>
@@ -77,7 +77,7 @@
></el-button> ></el-button>
</div> </div>
</div> </div>
<div v-else> <div v-else style="margin-right: 5px;padding-left: 10px">
- - - -
</div> </div>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+3 -3
View File
@@ -59,7 +59,7 @@
style="height: 32px; margin-left: 5px;" style="height: 32px; margin-left: 5px;"
></el-button> ></el-button>
</div> </div>
<div v-else> <div v-else style="margin-right: 5px;padding-left: 10px">
- - - -
</div> </div>
</el-form-item> </el-form-item>
@@ -75,7 +75,7 @@
></el-button> ></el-button>
</div> </div>
</div> </div>
<div v-else> <div v-else style="margin-right: 5px;padding-left: 10px">
- - - -
</div> </div>
</el-form-item> </el-form-item>
@@ -91,7 +91,7 @@
></el-button> ></el-button>
</div> </div>
</div> </div>
<div v-else> <div v-else style="margin-right: 5px;padding-left: 10px">
- - - -
</div> </div>
</el-form-item> </el-form-item>
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+1 -2
View File
@@ -1235,7 +1235,7 @@ export default {
if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') { if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND' || this.sarAccessInfo.dataSource === 'INLAND_STAND') {
formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
formData.issueTime = null // formData.issueTime = null
} /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') { } /*else if(this.sarAccessInfo.dataSource === 'BUSINESS') {
// formData.issueTime = formData.issueTime ? formData.issueTime[0] : null // formData.issueTime = formData.issueTime ? formData.issueTime[0] : null
// formData.issueTime = formData.issueTime ? formData.issueTime[1] : null // formData.issueTime = formData.issueTime ? formData.issueTime[1] : null
@@ -1761,7 +1761,6 @@ export default {
delete this.sarAccessInfo.lawsNumber delete this.sarAccessInfo.lawsNumber
delete this.sarAccessInfo.standCode delete this.sarAccessInfo.standCode
} }
console.log('this.sarAccessInfo===' , this.sarAccessInfo)
StandardsInfoPage(type === 1 ? ({...this.sarAccessInfo, standNumber: this.sarAccessInfo.seniorStandNumber, lawsNumber: this.sarAccessInfo.seniorLawsNumber, standCode: this.sarAccessInfo.seniorStandCode}) : (this.sarAccessInfo)).then(res => { StandardsInfoPage(type === 1 ? ({...this.sarAccessInfo, standNumber: this.sarAccessInfo.seniorStandNumber, lawsNumber: this.sarAccessInfo.seniorLawsNumber, standCode: this.sarAccessInfo.seniorStandCode}) : (this.sarAccessInfo)).then(res => {
// if (type === 1) { // if (type === 1) {
// this.sarAccessInfo.standNumber = '' // this.sarAccessInfo.standNumber = ''
src/pages/regulatoryRepository/dataCenter/index.vue
+24 -23
View File
@@ -238,7 +238,7 @@
:styles="styles" :styles="styles"
:close="cancelModel" :close="cancelModel"
> >
<div style="margin-left: 3%"> <div style="height: 92%;margin-left: 3%">
<el-form <el-form
ref="attributeEO" ref="attributeEO"
:model="attributeEO" :model="attributeEO"
@@ -295,7 +295,8 @@
> >
<el-input <el-input
type="textarea" type="textarea"
:autosize="{ minRows: 1, maxRows: 15}" :autosize="{ minRows: 1, maxRows: 10}"
resize="none"
style="width: 95%" style="width: 95%"
maxlength="4000" maxlength="4000"
show-word-limit show-word-limit
@@ -325,26 +326,26 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="float: right"> </div>
<el-button <div style="height: 4%;text-align: right;">
type="primary" <el-button
class="common-button-primary" type="primary"
size="mini" class="common-button-primary"
icon="el-icon-check" size="mini"
@click="saveInfo" icon="el-icon-check"
:loading="submitLoading" @click="saveInfo"
>提交 :loading="submitLoading"
</el-button >提交
> </el-button
<el-button >
size="mini" <el-button
icon="el-icon-close" size="mini"
class="common-button-default" icon="el-icon-close"
@click="cancelModel" class="common-button-default"
>取消 @click="cancelModel"
</el-button >取消
> </el-button
</div> >
</div> </div>
</el-drawer> </el-drawer>
</div> </div>
@@ -1041,7 +1042,7 @@ export default {
} }
.upload-demo{ .upload-demo{
/deep/.el-upload-list{ /deep/.el-upload-list{
height: 60vh; height: 42vh;
overflow-y: auto; overflow-y: auto;
} }
} }
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+2 -2
View File
@@ -675,10 +675,10 @@
mounted () { mounted () {
this.queryStandAndLaws() this.queryStandAndLaws()
this.tableHeight = $('.regulatory-repository').height() - 159 this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight = $('body').height() - 152 this.sarProStateTableHeight = $('body').height() - 162
window.onresize = () => { window.onresize = () => {
this.tableHeight = $('.regulatory-repository').height() - 159 this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight = $('body').height() - 152 this.sarProStateTableHeight = $('body').height() - 162
} }
} }
} }
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+1 -1
View File
@@ -1233,7 +1233,7 @@ export default {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: "OtherStandardDetails", name: "OtherStandardDetails",
params: { params: {
id: item.standId, id: item.standId ? item.standId : item.id,
pageType: "INLAND_STAND" pageType: "INLAND_STAND"
} }
}); });