- - -
+
+ {{ item.name }}
+
+
+
+
+
+
+
@@ -410,6 +426,10 @@ export default {
type: Boolean,
default: false
},
+ fileShow: {
+ type: Boolean,
+ default: false
+ },
},
filters: {
ellipsis (value) {
@@ -464,6 +484,24 @@ export default {
...mapGetters(['userInfo'])
},
methods: {
+ // 文件预览及下载
+ handleFilePreview(file,type) {
+ let attId = ""
+ if(file && file.id){
+ attId = file.id
+ }else {
+ attId = file.response.data.id
+ }
+ if (type === 'down') {
+ if (attId) {
+ window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+ } else {
+ this.$message.warning('文件不存在,下载失败')
+ }
+ } else {
+ this.$preview(attId)
+ }
+ },
downloadFile (data) {
//文件id中出现了','字符,去除掉
window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index e9c47b61b..a65fd2c8d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -1492,7 +1492,7 @@
{ required: false, message: '请选择企标发布日期', trigger: 'change' }
],
putTime: [
- { required: false, message: '请选择企标实施日期', trigger: 'change' }
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [
{ required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
index f16b90d2a..6492bb7ab 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
@@ -962,6 +962,9 @@
issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
+ putTime: [
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
+ ],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
index 3ab0c4714..431bf1126 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
@@ -961,6 +961,9 @@
issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
+ putTime: [
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
+ ],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 13ca1f384..3915e44b1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -18,18 +18,27 @@
label-width="210px"
>
-
+ :fileMadelSub = "fileMadel"
+ :fbgDown = "false"
+ @formCancel="formCancel"
+ @formSelectLawsCancel = "formSelectLawsCancel"
+ @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+ @formChoiceQCDW = "formChoiceQCDW"
+ @formChoiceZRR1 = "formChoiceZRR1"
+ @formChoiceZRR2 = "formChoiceZRR2"
+ @formChoiceZRR3 = "formChoiceZRR3"
+ @formChoiceZRR4 = "formChoiceZRR4"
+ />
@@ -357,6 +366,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
>
+
@@ -561,7 +576,7 @@
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index c35fd6eac..e3386c8e9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -952,6 +952,9 @@
issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change' }
],
+ putTime: [
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
+ ],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 2fd189adf..7b5ce1fd6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -1019,7 +1019,7 @@
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
putTime: [
- { required: false, message: '请选择企标实施日期', trigger: 'change' }
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1975,11 +1975,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
- if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
- this.$message.error('文件限制只可上传一个')
- return false
- }
+ // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+ // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+ // this.$message.error('文件限制只可上传一个')
+ // return false
+ // }
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
@@ -2533,7 +2533,6 @@
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
- console.log(this.LSBBBUSSFileList)
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.formKey++
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
index bab22e13a..570cb2108 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
@@ -957,6 +957,9 @@
issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
+ putTime: [
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
+ ],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 4bbee0e44..bfc3831b0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -7,8 +7,8 @@
-
+
-->
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -185,7 +185,128 @@
:disabledState = "disabledState"
:verifySarStandard = "verifySarStandard">
-
+
+
+ 模块信息
+
+
+
+
+
+
+
+ 创建条款
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+ 维护
+ 删除
+
+
+
+
+
+
+
+
+
+
@@ -264,7 +385,7 @@
-
+
item.response === undefined && item.raw === undefined);
- if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
- this.$message.error('文件限制只可上传一个')
- return false
- }
+ // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+ // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+ // this.$message.error('文件限制只可上传一个')
+ // return false
+ // }
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
index b6f30ab4c..8a1ee1e07 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -1089,6 +1089,9 @@
issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
+ putTime: [
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
+ ],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
index 8fdd3e678..11f460fc1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -883,6 +883,9 @@
issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
+ putTime: [
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
+ ],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index 10c0623b9..46b4062d4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -1091,6 +1091,9 @@
issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
+ putTime: [
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
+ ],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 1fdafaf7c..3a1756c5a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -921,6 +921,8 @@
xdUserName: this.$store.getters.userInfo.userName,
pxUserId: this.$store.getters.userInfo.userId,
pxUserName: this.$store.getters.userInfo.userName,
+ fbUserId: '',
+ fbUserName: '',
qcUserId: '', // 多实例
qcUserName:'', // 多实例
bzhUserId:'',
@@ -1017,7 +1019,7 @@
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
putTime: [
- { required: false, message: '请选择企标实施日期', trigger: 'change' }
+ { required: true, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1973,11 +1975,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
- this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
- if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
- this.$message.error('文件限制只可上传一个')
- return false
- }
+ // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+ // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+ // this.$message.error('文件限制只可上传一个')
+ // return false
+ // }
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
@@ -2531,7 +2533,6 @@
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
- console.log(this.LSBBBUSSFileList)
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.formKey++
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 882d3509e..c11ae9fa3 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -352,7 +352,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '重新企标汇总修订'){
+ }else if (row.taskInfo === '重新企标编写汇总修订'){
this.$router.push({
name: 'bussLibraryC3',
query: {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index af8403ca5..8e22d49a5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -13,18 +13,18 @@
@@ -32,28 +32,28 @@
点击上传
@@ -69,48 +69,50 @@
数据搜索
-
+
-
+
-
+
+ v-if="sarAccessInfo.dataSource === 'FOREIGN_STAND' || sarAccessInfo.dataSource === 'INLAND_STAND'"
+ v-model="sarAccessInfo.standNumber"
+ placeholder="请输入标准号"/>
+
+
+ type="primary"
+ class="common-button-primary"
+ size="small"
+ @click="searchLawsStands">
查询
清空
+ class="common-button-default"
+ size="small"
+ @click="clearSearchLaws">清空
-
-
- 高级查询
-
-
高级查询
@@ -119,117 +121,103 @@
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
添加
+ class="common-button-default"
+ size="mini" @click="addSarAccess">添加
{{ $t('m.showAddDataList') }}
{{ $t('m.hideAddDataList') }}
+ show-overflow-tooltip
+ fixed="left"
+ align="center"
+ width="150px"
+ :label="standLabelNum">
- {{ scope.row.standNumber}}
- {{ scope.row.lawsNumber}}
- {{scope.row.standCode}}
-
-
-
- {{ scope.row.standName|| scope.row.standEnName || scope.row.lawsName}}
+ {{
+ scope.row.standNumber
+ }}
+ {{
+ scope.row.lawsNumber
+ }}
+ {{
+ scope.row.standCode
+ }}
+ prop="standName"
+ align="center"
+ show-overflow-tooltip
+ :label="standLabelName"
+ >
+
+ {{
+ scope.row.standName || scope.row.standEnName || scope.row.lawsName
+ }}
+
+
+
{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
+ prop="xcxssrq"
+ align="center"
+ width="150"
+ label="新车型实施日期">
+ show-overflow-tooltip
+ prop="zccssrq"
+ align="center"
+ width="150"
+ label="在产车实施日期">
+ show-overflow-tooltip
+ prop="textStatus"
+ width="100px"
+ align="center"
+ label="文本状态">
- {{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}
+ {{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow }}
@@ -243,139 +231,138 @@
清单条目
导出
删除
+ type="selection"
+ width="55"
+ align="center">
+ show-overflow-tooltip
+ width="180px"
+ fixed="left"
+ align="center"
+ :label="standLabelNum">
- {{ scope.row.standNumber }}
+ {{ scope.row.standNumber }}
{{ scope.row.standName || scope.row.lawsName }}
+ prop="standEnName"
+ align="center"
+ width="180px"
+ label="英文名称">
{{ scope.row.standEnName }}
+ prop="typeApplicable"
+ align="center"
+ width="180px"
+ label="适用车型">
+ prop="nylx"
+ align="center"
+ width="180px"
+ label="能源类型">
+ prop="ssrq"
+ align="center"
+ width="210px"
+ label="标准实施日期">
+ show-overflow-tooltip
+ prop="zccssrqgj"
+ width="210px"
+ align="center"
+ label="在产车实施日期">
+ prop="xcxssrqgj"
+ align="center"
+ width="210px"
+ label="新车型实施日期">
+ show-overflow-tooltip
+ prop="zrbm"
+ width="210px"
+ align="center"
+ label="责任部门">
+ show-overflow-tooltip
+ prop="sycpx"
+ width="180px"
+ align="center"
+ label="适用产品线">
上移
下移
编辑
@@ -405,13 +392,13 @@
@@ -421,11 +408,11 @@
@@ -445,11 +432,11 @@
+ clearable
+ v-model.trim="editRowData.ssrq"
+ type="dates"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期">
@@ -479,24 +466,237 @@
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.label }}
+
+
+
+
+
+ {{ opt.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 日期选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+