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:
zhutianqi
2021-07-28 17:25:46 +08:00
parent 9e20156e5b c532794d64
commit 4a9814337b
9 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
-1
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>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+14 -7
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">-->
@@ -849,7 +849,7 @@
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx" accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile" :before-upload="beginImportFile"
:on-success="importFileSuccess" :on-success="importFileSuccess"
:show-file-list="false" :show-file-list="true"
> >
<div style="padding: 20px 0"> <div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i> <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -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(',') : []
@@ -1962,7 +1964,11 @@
return true return true
}, },
// 导入标准数据成功后执行 // 导入标准数据成功后执行
importFileSuccess (response, file) { importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
if (fileList.length > 1) {
fileList.splice(0, 1)
}
if (response.ok) { if (response.ok) {
this.fileMadel = false this.fileMadel = false
if(this.fileType === 'fbgbjbd'){ if(this.fileType === 'fbgbjbd'){
@@ -2190,6 +2196,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
+8 -5
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"
@@ -4316,13 +4319,13 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/deep/ .icon-tree { /deep/.icon-tree {
margin:0 5px 0 10px; margin:0 5px 0 10px;
position:relative; position:relative;
background:url('~@/assets/images/shangqi/img/tree-add.png'); background:url('~@/assets/images/shangqi/img/tree-add.png');
background-size:100% 100%; background-size:100% 100%;
} }
/deep/ .expanded{ /deep/.expanded{
background:url('~@/assets/images/shangqi/img/tree-sub.png'); background:url('~@/assets/images/shangqi/img/tree-sub.png');
background-size:100% 100%; background-size:100% 100%;
} }
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+3
View File
@@ -64,6 +64,9 @@
fixed="left" fixed="left"
width="260px" width="260px"
> >
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.standSort+ ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"