diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 79f6eacee..1404296b9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -69,7 +69,8 @@
-
+
+
{{ file.oldFileName }}
@@ -87,6 +88,27 @@
/>
+
+
+
+ {{ file.oldFileName }}
+
+
+
+
+
标准分解单
-
- 更多
-
+
+
+
+
+
- -
+ -
@@ -244,9 +266,9 @@
{{
sarStandardsInfoEO.issueTime || '-'
}}
- {{
- standMap[sarStandardsInfoEO.standNature] || '-'
- }}
+
+
+
{{
@@ -2076,7 +2098,9 @@ export default {
console.log('1943',child1)
const list = []
if (child1 && child1.length > 1) {
- list.push(child1[0])
+ for (let i = 0; i < child1.length; i++) {
+ list.push(child1[i])
+ }
return list
}
return child1
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 7291d830e..e996b9f6f 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -319,7 +319,7 @@
@close="showItemInfoModal = false"
class="demo-drawer"
>
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+ 内容简介
+
+
+
+
+
+
+
+
+
+
+
{{item.itemContent}}
+
+
+
+
+
+
+
+
+
@@ -1873,35 +1989,6 @@ export default {
})
}
},
- // 获取关联文件名称
- getFileName (row) {
- this.referanceStandList = []
- if (row.referenceStand != null && row.referenceStand !== '') {
- this.referanceStandList = row.referenceStand.split(',')
- }
- if (row.relevanceFile === null) {
- this.standItemEO.FileNameList = []
- this.showItemInfoModal = true
- return false
- } else {
- this.$http.get('att/attFile/getMultiFileInfos', {
- fileIds: row.relevanceFile
- }, {
- _this: this
- }, res => {
- // let fileNameList = []
- // this.standItemEO.relevanceFileName = ''
- // res.data.map((item) => {
- // fileNameList.push(item.oldFileName)
- // })
- // this.standItemEO.relevanceFileName = fileNameList.join(';')
- this.standItemEO.FileNameList = res.data
- this.showItemInfoModal = true
- }, e => {
- this.showItemInfoModal = true
- })
- }
- },
addSpecialRequest (item, index) {
let specialObj = {
description: '',
@@ -2084,7 +2171,7 @@ export default {
// this.clause(command[0])
// break
case '属性':
- this.attribute(command[0])
+ this.attribute(command[2], command[0])
break
case '编辑':
this.editLawsInfo(command[2], command[0])
@@ -2154,9 +2241,65 @@ export default {
this.showItemRequestDetails()
},
// 点击表格 属性按钮事件
- attribute (row) {
- this.getFileName(row)
- this.showItemInfoEO = JSON.parse(JSON.stringify(row))
+ attribute (index, row) {
+ this.isSubmit = false
+ this.standItemEO.id = row.id
+ this.showItemInfoModal = true
+ this.saveEditItemIndex = index
+ this.standItemEO = JSON.parse(JSON.stringify(row))
+ if (this.standItemEO.applyArctic && !(this.standItemEO.applyArctic instanceof Array)) {
+ let a = this.standItemEO.applyArctic.split(',')
+ this.standItemEO.applyArctic = a // 适用车型
+ }
+ if (this.standItemEO.newcarPutTime != null && this.standItemEO.newcarPutTime !== '') {
+ this.standItemEO.newcarPutTime = this.standItemEO.newcarPutTime.replace(new RegExp(/-/gm), '/')
+ this.standItemEO.newcarPutTime = new Date(this.standItemEO.newcarPutTime)
+ }
+ if (this.standItemEO.productPutTime != null && this.standItemEO.productPutTime !== '') {
+ this.standItemEO.productPutTime = this.standItemEO.productPutTime.replace(new RegExp(/-/gm), '/')
+ this.standItemEO.productPutTime = new Date(this.standItemEO.productPutTime)
+ }
+ if (this.standItemEO.paramsList == null || this.standItemEO.paramsList.length < 1) {
+ let specialObj = {
+ description: '',
+ figure: ''
+ }
+ this.standItemEO.paramsList.push(specialObj)
+ }
+ this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
+ this.saveItemId = row.id
+ this.showUpdateItemInfo()
+ // this.getFileName(row)
+ // this.showItemInfoEO = JSON.parse(JSON.stringify(row))
+ },
+ // 获取关联文件名称
+ getFileName (row) {
+ this.referanceStandList = []
+ if (row.referenceStand != null && row.referenceStand !== '') {
+ this.referanceStandList = row.referenceStand.split(',')
+ }
+ if (row.relevanceFile === null) {
+ this.standItemEO.FileNameList = []
+ this.showItemInfoModal = true
+ return false
+ } else {
+ this.$http.get('att/attFile/getMultiFileInfos', {
+ fileIds: row.relevanceFile
+ }, {
+ _this: this
+ }, res => {
+ // let fileNameList = []
+ // this.standItemEO.relevanceFileName = ''
+ // res.data.map((item) => {
+ // fileNameList.push(item.oldFileName)
+ // })
+ // this.standItemEO.relevanceFileName = fileNameList.join(';')
+ this.standItemEO.FileNameList = res.data
+ this.showItemInfoModal = true
+ }, e => {
+ this.showItemInfoModal = true
+ })
+ }
},
getDicTypeName(opt, type) {
const _type = type ? type.split(',') : []
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 734a2b504..23c6ac1e2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -103,18 +103,21 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index 63914643d..4ef4b219b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -143,17 +143,20 @@
prop="itemsNum"
label="条款号"
width="70"
+ fixed
align="center">
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 57a19019e..a47607970 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -107,12 +107,14 @@
@@ -120,6 +122,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 227a57450..8a29886b1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -82,6 +82,7 @@
@@ -89,12 +90,14 @@
prop="itemsName"
width="170"
label="条款名称"
+ fixed
show-overflow-tooltip
align="center">
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index f3b763caf..472b63a8a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -84,17 +84,20 @@
prop="itemsNum"
label="条款号"
width="70"
+ fixed
align="center">
@@ -127,23 +130,6 @@
show-overflow-tooltip
align="center">
-
-
- {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
-
-
-
-
+
+
+ {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
+
+
+
+
查看比对
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
- {{ scope.row.standSortShow }} {{
- scope.row.standNumber
- }}-{{ scope.row.standYear }}
- {{
- scope.row.standSortShow }}
- {{ scope.row.standNumber }}
-
-
-
-
- {{ scope.row.standName || scope.row.standEnName}}
-
-
-
-
- {{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}
-
-
-
-
-
-
-
-
- {{ textStatusMap[scope.row.textStatus] }}
-
-
-
+
+
+
+
+ {{ scope.row.standSortShow }} {{
+ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
+ {{
+ scope.row.standSortShow }}
+ {{ scope.row.standNumber }}
+
+
+
+
+ {{ scope.row.standName || scope.row.standEnName}}
+
+
+
+
+ {{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+
+
+
+
+ {{ textStatusMap[scope.row.textStatus] }}
+
+
+
+
@@ -429,7 +429,8 @@ export default {
name: item.oldFileName,
uid: item.uid,
status: item.status,
- id: item.id
+ id: item.id,
+ fileSuffix: item.fileSuffix
});
});
});
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index a4475fb17..28587330f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -126,6 +126,7 @@
是
否
+
@@ -1836,9 +1837,11 @@ export default {
/** val === '1' (国外) val === '0'( 国内 )*/
// 国内英文名称不必填 国外必填 ,标准性质国内不体现
if (val === '1') {
+ this.rules.standName[0].required = false
this.rules.standEnName[0].required = true;
this.rules.standNature[0].required = false
} else {
+ this.rules.standName[0].required = true
this.rules.standNature[0].required = true
this.rules.standEnName[0].required = false;
}
@@ -3120,6 +3123,9 @@ export default {
@import '~@/assets/styles/style';
.bzrkStep1 {
+ /deep/ .el-button--mini.is-circle {
+ padding: 2px;
+ }
/deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner {
width: 70%;
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 8101bf075..78340e107 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -26,7 +26,7 @@
-
+
国内标准入库
海外标准入库
@@ -1692,6 +1692,23 @@ export default {
},
},
methods: {
+ // 标准来源改变事件
+ standInChange(val) {
+ this.verifySarStandard = false
+
+ /** val === '1' (国外) val === '0'( 国内 )*/
+ // 国内英文名称不必填 国外必填 ,标准性质国内不体现
+ if (val === '1') {
+ this.rules.standName[0].required = false
+ this.rules.standNature[0].required = false
+ this.rules.standEnName[0].required = true;
+ } else {
+ this.rules.standName[0].required = true
+ this.rules.standNature[0].required = true
+ this.rules.standEnName[0].required = false;
+ }
+ this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
+ },
getBusStandFileByAttId(attId) {
return new Promise((resolve, reject) => {
getBusStandFileByAttId({
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
index b69e1ff75..0e6f8e884 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -155,6 +155,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
+ :page-size="pageSize"
+ @size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
@@ -297,30 +299,6 @@ export default {
});
window.open(routeUrl.href, "_blank");
},
- //查询项目下的标准
- getStandData() {
- this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
- standType: this.standardSearch.standType,
- standNumber: this.standardSearch.standNumber,
- page: this.pageNo,
- pageSize: this.pageSizeNo
- }, {
- _this: this
- }, res => {
- this.standardData = res.data.list;
- this.standardData.forEach(item => {
- if(item.attrInfoMap === null){
- this.$set(item, "ZCCSSRQ", '');
- this.$set(item, "XCXSSRQ", '');
- }else{
- this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
- this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
- }
- })
- this.totalNo = res.data.count;
- }, e => {
- });
- },
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -398,6 +376,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
+ handleSizeChange(size) {
+ this.pageSize = size;
+ },
//驳回事件
beforeBack() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 89d261398..d53a543b5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -200,6 +200,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
+ :page-size="pageSize"
+ @size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
@@ -551,6 +553,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
+ handleSizeChange(size) {
+ this.pageSize = size;
+ },
},
computed: {
listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 4df5c1836..984ad8d2b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -200,6 +200,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
+ :page-size="pageSize"
+ @size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
@@ -526,6 +528,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
+ handleSizeChange(size) {
+ this.pageSize = size;
+ },
},
computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 775f91db2..fba54c8cb 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -200,6 +200,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
+ :page-size="pageSize"
+ @size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
@@ -551,6 +553,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
+ handleSizeChange(size) {
+ this.pageSize = size;
+ },
},
computed: {
listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 8438138d2..33a90a927 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -226,6 +226,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
+ :page-size="pageSize"
+ @size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
@@ -753,6 +755,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
+ handleSizeChange(size) {
+ this.pageSize = size;
+ },
//保存事件
handleSave() {
this.saveLoading = true;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 70d0b79c0..2e7651a5d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -158,6 +158,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
+ :page-size="pageSize"
+ @size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
@@ -367,30 +369,6 @@ export default {
});
window.open(routeUrl.href, "_blank");
},
- //查询项目下的标准
- getStandData() {
- this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
- standType: this.standardSearch.standType,
- standNumber: this.standardSearch.standNumber,
- page: this.pageNo,
- pageSize: this.pageSizeNo
- }, {
- _this: this
- }, res => {
- this.standardData = res.data.list;
- this.standardData.forEach(item => {
- if (item.attrInfoMap === null) {
- this.$set(item, "ZCCSSRQ", "");
- this.$set(item, "XCXSSRQ", "");
- } else {
- this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
- this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
- }
- });
- this.totalNo = res.data.count;
- }, e => {
- });
- },
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -509,6 +487,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
+ handleSizeChange(size) {
+ this.pageSize = size;
+ },
},
computed: {
listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index e2f7bb78a..8efce2454 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -198,6 +198,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
+ :page-size="pageSize"
+ @size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
@@ -549,6 +551,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
+ handleSizeChange(size) {
+ this.pageSize = size;
+ },
},
computed: {
listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index ccb983998..9fac7b4aa 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -200,6 +200,8 @@
background
:page-sizes="[20, 40, 60]"
:total="total"
+ :page-size="pageSize"
+ @size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
@@ -551,6 +553,9 @@ export default {
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
+ handleSizeChange(size) {
+ this.pageSize = size;
+ },
},
computed: {
listNoDataText() {