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 
# Conflicts:
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
This commit is contained in:
zyd
2022-10-26 22:46:47 +08:00
parent ab95a315e0 bb7bc9e484
commit 56de43533e
6 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/images/shangqi/home/top-logo.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 156 KiB

After

Width:  |  Height:  |  Size: 144 KiB

src/pages/phone/phoneHome.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="search-top"> <div class="search-top">
<div class="top-title"> <div class="top-title">
</div> </div>
<h3 class="home-title">标 准 法 规 管 理 系 统 S P R S</h3> <h3 class="home-title">标 准 与 政 策 法 规 管 理 系 统 S P R S</h3>
</div> </div>
<div class="search-head"> <div class="search-head">
<van-search <van-search
src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+14 -2
View File
@@ -201,7 +201,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled"> <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.QCRBUSS" :disabled="disabledState" clearable></el-input> <el-input v-model="form.qcrbuss" :disabled="disabledState" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled"> <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple> <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
@@ -404,7 +404,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="复审结果" prop="reviewResults" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled"> <el-form-item label="复审结果" prop="reviewResults" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
<el-select v-model="form.reviewResults" filterable clearable> <el-select v-model="form.reviewResults" @change="reviewChange" filterable clearable>
<el-option <el-option
v-for="item in opinionsReviewResultsOptions" v-for="item in opinionsReviewResultsOptions"
:key="item.value" :key="item.value"
@@ -816,6 +816,11 @@ export default {
this.$preview(attId) this.$preview(attId)
} }
}, },
reviewChange(val){
if(val == '1'){
this.form.QCRBUSS = ''
}
},
downloadFile (data) { downloadFile (data) {
//文件id中出现了','字符,去除掉 //文件id中出现了','字符,去除掉
window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id) window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
@@ -903,6 +908,13 @@ export default {
}, },
deep: true //对象的深度验证 deep: true //对象的深度验证
}, },
// 'form.reviewResults': {
// handler (val) {
// if(val == '1'){
// this.form.QCRBUSS = ''
// }
// }
// },
} }
} }
</script> </script>
src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
+16 -16
View File
@@ -418,14 +418,14 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
></el-datePicker> ></el-datePicker>
</el-form-item> </el-form-item>
<el-form-item v-if="form.reviewResults === '1'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled"> <!-- <el-form-item v-if="form.reviewResults === '1'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">-->
<div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <!-- <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">-->
<span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','lx')" :title="item.name">{{ item.name | ellipsis2 }}</span> <!-- <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','lx')" :title="item.name">{{ item.name | ellipsis2 }}</span>-->
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''"> <!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreviewNew(item,'down','lx')"></el-button> <!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreviewNew(item,'down','lx')"></el-button>-->
</span> <!-- </span>-->
</div> <!-- </div>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled"> <el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.reviewUserName" :disabled="disabledState" v-model="form.reviewUserName" :disabled="disabledState"
@@ -444,14 +444,14 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
></el-datePicker> ></el-datePicker>
</el-form-item> </el-form-item>
<el-form-item v-if="form.reviewResults === '1'" label="复审单" prop="FSDName" class="add-form-item form-item-disabled"> <!-- <el-form-item v-if="form.reviewResults === '1'" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">-->
<div v-if="FSDList.length > 0" v-for="(item,index) in FSDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> <!-- <div v-if="FSDList.length > 0" v-for="(item,index) in FSDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">-->
<span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','fs')" :title="item.name">{{ item.name | ellipsis2 }}</span> <!-- <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','fs')" :title="item.name">{{ item.name | ellipsis2 }}</span>-->
<span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''"> <!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreviewNew(item,'down','fs')"></el-button> <!-- <el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreviewNew(item,'down','fs')"></el-button>-->
</span> <!-- </span>-->
</div> <!-- </div>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item v-if="verifySort() !== '' && verifySort()" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled"> <el-form-item v-if="verifySort() !== '' && verifySort()" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.expirationDate" :disabled="disabledState" <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
:editable="false" :editable="false"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+7 -3
View File
@@ -744,7 +744,7 @@
</div> </div>
</el-upload> </el-upload>
</el-dialog> </el-dialog>
<loading style="z-index: 2099;" :loading="importLoading">导入中...</loading> <loading :loading="importDataLoading">{{导入数据中}}</loading>
</div> </div>
</template> </template>
<script> <script>
@@ -949,6 +949,7 @@ export default {
dataLoading: false, // 数据搜索 table 查询loading dataLoading: false, // 数据搜索 table 查询loading
importLoading: false, //导入loading importLoading: false, //导入loading
exportTestItemNameFlag: false, // 导出模态框 exportTestItemNameFlag: false, // 导出模态框
importDataLoading: false,// 导入数据loading
exportName: '', // 导出名称 exportName: '', // 导出名称
importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口 importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口
// importExcelUrls: '/api/sarLawsDetailedList/sar-laws-detailed-list/importData', // 导入接口 // importExcelUrls: '/api/sarLawsDetailedList/sar-laws-detailed-list/importData', // 导入接口
@@ -1050,6 +1051,8 @@ export default {
importFileStand (res, file, fileList) { importFileStand (res, file, fileList) {
let files = {} let files = {}
if (res.ok) { if (res.ok) {
this.importModalshowflag = false
this.importDataLoading = true
files.attId = res.data.attId files.attId = res.data.attId
files.fileName = res.data.name files.fileName = res.data.name
if (res.data.standNum != null && res.data.standNum !== '') { if (res.data.standNum != null && res.data.standNum !== '') {
@@ -1069,6 +1072,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
if(res.ok){ if(res.ok){
this.importDataLoading = false
if(res.data.length){ if(res.data.length){
res.data.forEach(item => { res.data.forEach(item => {
// 适用认证转换 // 适用认证转换
@@ -1147,7 +1151,7 @@ export default {
this.$message.warning('请勿上传为空的文件') this.$message.warning('请勿上传为空的文件')
} }
}else{ }else{
this.importLoading = false this.importDataLoading = false
const arr = res.data.split('；') const arr = res.data.split('；')
let newDatas = [],h = this.$createElement; let newDatas = [],h = this.$createElement;
for (const i in arr) { for (const i in arr) {
@@ -1164,7 +1168,7 @@ export default {
}); });
} }
}) })
this.importModalshowflag = false
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.importFileAboutStand.clearFiles() this.$refs.importFileAboutStand.clearFiles()
}) })
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+3
View File
@@ -1952,6 +1952,7 @@ export default {
bussionessStandNodes: [], bussionessStandNodes: [],
sarBussionessStandEO: { sarBussionessStandEO: {
TXLBBUSS: '', TXLBBUSS: '',
txlbId:'',
VPPSBMBUSS: '', VPPSBMBUSS: '',
KCVPPSBMBUSS: '', KCVPPSBMBUSS: '',
KCVPPSCNBUSS: '', KCVPPSCNBUSS: '',
@@ -2867,6 +2868,7 @@ export default {
if (checkedData.length > 0) { if (checkedData.length > 0) {
this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",") this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
this.sarBussionessStandEO.menuId = checkedData.map(item => item.menuId).join(",") this.sarBussionessStandEO.menuId = checkedData.map(item => item.menuId).join(",")
this.sarBussionessStandEO.txlbId = checkedData.map(item => item.menuId).join(",")
this.sarBussionessStandEO.treeType = checkedData.map(item => item.treeType).join(",") this.sarBussionessStandEO.treeType = checkedData.map(item => item.treeType).join(",")
this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",") this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
} else { } else {
@@ -2876,6 +2878,7 @@ export default {
} }
this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
this.sarBussionessStandEO.menuId = checkedData.id this.sarBussionessStandEO.menuId = checkedData.id
this.sarBussionessStandEO.txlbId = checkedData.id
this.sarBussionessStandEO.treeType = checkedData.treeType this.sarBussionessStandEO.treeType = checkedData.treeType
this.sarBussionessSearch.TXLBBUSS = checkedData.menuName this.sarBussionessSearch.TXLBBUSS = checkedData.menuName
} }