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:
liuhuaizhi
2021-07-28 16:00:06 +08:00
parent 8a2e6ced5d 7dd33233d2
commit c73fdaaef7
9 changed files with 137 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+4 -5
View File
@@ -139,7 +139,6 @@
<span <span
v-else-if="child.attrType === 'DATE_PICKER'" v-else-if="child.attrType === 'DATE_PICKER'"
class="modular-content-p-val" class="modular-content-p-val"
:title="child.value || '-'"
> >
{{ child.value ? child.value.substring(0,10) : '-' }} {{ child.value ? child.value.substring(0,10) : '-' }}
</span> </span>
@@ -200,8 +199,8 @@
</template> </template>
<template <template
v-for="(child, childIndex) in item.one" v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0' && (item.label !== '关联信息' && (item.label !== '实施日期' && child.attrField !== 'SSRQGJ' && child.attrField !== 'ZCCSSRQGJ' && child.attrField !== 'XCXSSRQGJ' || (childIndex < 6 || item.showAll)) || item.label === '适用范围')" v-if="child.isShowImp === '0' && item.label === '关联信息'"
> >
<div <div
:key="child.id" :key="child.id"
@@ -294,8 +293,8 @@
</template> </template>
<template <template
v-for="(child, childIndex) in item.child" v-for="(child, childIndex) in item.one"
v-if="child.isShowImp === '0' && item.label !== '实施日期' && item.label !== '适用范围'" v-if="child.isShowImp === '0' && item.label !== '关联信息' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
> >
<div <div
:key="child.id" :key="child.id"
src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+8 -6
View File
@@ -62,7 +62,7 @@
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col> <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
</div> </div>
<el-col :span="4"> <el-col :span="4">
<el-button size="mini" @click="cancelStandard(item.id)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button> <el-button size="mini" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -150,7 +150,7 @@ export default {
}, e => {}) }, e => {})
}, },
// 取消收藏 // 取消收藏
cancelStandard (id) { cancelStandard (item) {
this.$confirm('确定取消收藏此数据?', '提示', { this.$confirm('确定取消收藏此数据?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@@ -158,16 +158,18 @@ export default {
confirmButtonClass: 'common-button-primary', confirmButtonClass: 'common-button-primary',
roundButton: true roundButton: true
}).then(() => { }).then(() => {
var json = {} // var json = {
json.userId = this.$store.getters.userInfo.userId // id: item.collectId
json.id = id // }
this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, { // json.userId = this.$store.getters.userInfo.userId
this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.$message.success('已取消收藏') this.$message.success('已取消收藏')
this.contentOpen = false this.contentOpen = false
this.pageChange(1) this.pageChange(1)
this.selectStandard()
} }
}, e => { }, e => {
}) })
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+8 -5
View File
@@ -512,7 +512,7 @@
:key="key1" :key="key1"
:lazy=true :lazy=true
:multiple=true :multiple=true
:check-Strictly="false" :check-strictly= true
:modalShowFlag="modalShowFlag2" :modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:show-checkBox="showCheckBox" :show-checkBox="showCheckBox"
@@ -528,7 +528,7 @@
:key="key2" :key="key2"
:lazy=true :lazy=true
:multiple=true :multiple=true
:check-Strictly="false" :check-strictly= true
:modalShowFlag="modalShowFlag3" :modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:show-checkBox="showCheckBox" :show-checkBox="showCheckBox"
@@ -544,7 +544,7 @@
:key="key3" :key="key3"
:lazy=true :lazy=true
:multiple=true :multiple=true
:check-Strictly="false" :check-strictly= true
:modalShowFlag="modalShowFlag4" :modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
@@ -678,8 +678,8 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度"> <el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
<el-option label="采标程度1" value="1"></el-option> <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -1400,6 +1400,7 @@
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
cbcdOptions: [], // 采标程度
wssmrOptions: [], // 我司署名人 wssmrOptions: [], // 我司署名人
sycpxOptions: [], // 适用产品线 sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门 zrbmOptions: [], // 责任部门
@@ -1583,6 +1584,7 @@
console.log(bringData) console.log(bringData)
const json = Object.assign(bringData, bringData.attrInfoCaseMap); const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json)) this.form = JSON.parse(JSON.stringify(json))
console.log(json,'AAAAAAA')
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
@@ -2190,6 +2192,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.qcdwOption = res.data.QCDW // 体系类别 this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+3 -2
View File
@@ -452,8 +452,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled> <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option label="采标程度1" value="1"></el-option> <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled"> <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
@@ -819,6 +818,7 @@
standSystemOptions: [], // 标准体系 standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门 gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
@@ -1069,6 +1069,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.key++ this.key++
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+3 -2
View File
@@ -445,8 +445,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled> <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option label="采标程度1" value="1"></el-option> <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -793,6 +792,7 @@ export default {
standSystemOptions: [], // 标准体系 standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门 gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
@@ -1053,6 +1053,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.key++ this.key++
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+3 -2
View File
@@ -663,8 +663,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度"> <el-select v-model="form.cbcd" placeholder="请选择采标程度">
<el-option label="采标程度1" value="1"></el-option> <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled"> <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
@@ -1224,6 +1223,7 @@ export default {
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
gkglbmOptions: [], // 归口管理部门 gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人 wssmrOptions: [], // 我司署名人
@@ -1750,6 +1750,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.treeStatus = true this.treeStatus = true
this.key++ this.key++
}) })
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+3 -2
View File
@@ -463,8 +463,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled> <el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option label="采标程度1" value="1"></el-option> <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -782,6 +781,7 @@
applyArcticOptions: [], // 适用车型 applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型 categoryOptions: [], // 能源类型
gkglbmOptions: [], // 归口管理部门 gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度
applyAuthOptions: [], // 适用认证 applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度 cysdOptions: [], // 我司参与深度
sycpxOptions: [], // 适用产品线 sycpxOptions: [], // 适用产品线
@@ -977,6 +977,7 @@
this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.qcdwOption = res.data.QCDW // 体系类别 this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
}) })
} }
} }
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+6 -3
View File
@@ -995,7 +995,8 @@
<tree-select-new <tree-select-new
width = "500" width = "500"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag2" :modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
@@ -1005,7 +1006,8 @@
<tree-select-new <tree-select-new
width = "500" width = "500"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag3" :modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
@@ -1015,7 +1017,8 @@
<tree-select-new <tree-select-new
width = "500" width = "500"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag4" :modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+6 -3
View File
@@ -1254,7 +1254,8 @@
<tree-select-new <tree-select-new
width = "500" width = "500"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag2" :modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
@@ -1264,7 +1265,8 @@
<tree-select-new <tree-select-new
width = "500" width = "500"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag3" :modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
@@ -1274,7 +1276,8 @@
<tree-select-new <tree-select-new
width = "500" width = "500"
:lazy=true :lazy=true
:multiple=false :multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag4" :modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"