From 3e4694c076c9921e3592ed944412486a970c576c Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Wed, 12 Jan 2022 11:03:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB=EF=BC=9B?=
=?UTF-8?q?=20=E6=B5=B7=E5=A4=96=E5=BA=93=E6=B7=BB=E5=8A=A0=E6=A0=87?=
=?UTF-8?q?=E5=87=86=E4=BD=93=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../details/otherStandardDetails/index.vue | 10 +-
src/pages/localTool/standardWarning.vue | 28 +-
.../pages/creatProcess/bzrk/step1.vue | 3 +-
.../pages/creatProcess/bzrk/step2.vue | 2 +-
.../pages/creatProcess/bzrk/step3.vue | 2 +-
.../pages/creatProcess/bzrk/step4.vue | 2 +-
.../foreignStandardsAndRegulations/index.vue | 901 +++++++++---------
7 files changed, 493 insertions(+), 455 deletions(-)
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 213874f4e..d143eafea 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -269,10 +269,16 @@
-
+ }}
+
-->
+
-
+
清空
- 高级查询
+ 高级查询
@@ -143,11 +143,11 @@
v-btn-permission="'8871ed1be74cf65851659514880bb50a'">
导出
批量删除
-
+ :loading="delLoading"
+ size="mini"
+ @click="deleteStand(2)"
+ v-btn-permission="'b299fa5edb3f3f35badb2adb6bda9f2e'">
批量删除
+
配置标准
@@ -182,9 +182,9 @@
fontWeight: 'bold', height: '48px'}"
@selection-change="standSelectChange"
@sort-change="sortChange">
-
+
@@ -227,10 +227,10 @@
{{
@@ -335,43 +335,43 @@
-
- 收藏
-
- 取消收藏
-
- 编辑
-
- 删除
-
-
+
+ 收藏
+
+ 取消收藏
+
+ 编辑
+
+ 删除
+
+
-
@@ -395,66 +395,66 @@
提交
-
+
+ v-model="sarStandardsSearch.standYear"
+ placeholder="根据标准年份查找">
+ v-model="sarStandardsSearch.issueTime"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="yyyy-MM-dd"
+ placeholder="根据标准发布日期查找">
@@ -519,11 +519,11 @@
+ v-model="sarStandardsSearch.standSort"
+ :placeholder="$t('m.standardCategoryTips')"
+ @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+ :options="standSortOptions"
+ clearable/>
@@ -568,25 +568,25 @@
+ v-model="advanceSearchMapping.SSRQ"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="yyyy-MM-dd"
+ placeholder="根据实施日期查找">
+ v-model="advanceSearchMapping.ZCCSSRQ"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ value-format="yyyy-MM-dd"
+ placeholder="根据在产车实施日期查找">
@@ -594,13 +594,13 @@
+ value-format="yyyy-MM-dd"
+ v-model="advanceSearchMapping.XCXSSRQ"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ placeholder="根据新车型实施日期查找">
@@ -617,37 +617,37 @@
-
+
-
+
责任工程师
-
+
-
+
-
+
责任部门
+ :config="zrbmOptions"
+ clearable
+ v-model="advanceSearchMapping['ZRBM']"
+ :disabled="formdisableflag" placeholder="查询责任部门"
+ @click.native="choiceZRBM('ZRBMId', '查询责任部门', advanceSearchMapping['ZRBM'])">
-
+
-
+
-
+
@@ -919,17 +919,17 @@
clearable>
-
-
-
+
+
+ >
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
文本状态
@@ -997,17 +997,15 @@
-
+
+ 标准体系
+
+
@@ -1137,7 +1135,7 @@
:disabled="formdisableflag"
>
-
+
责任工程师
-
+
@@ -1436,7 +1434,7 @@
-
+
清空
@@ -1700,10 +1698,10 @@
>
导入中...
+
+
@@ -1909,7 +1917,7 @@ export default {
validFlag: '0',
standSort: '',
standNumber: '',
- standName:'',
+ standName: '',
menuId: '',
sarStandardsSearch: ''
},
@@ -1922,21 +1930,21 @@ export default {
standSystemOptions: [], // 标准体系下拉框
sycpxOptions: {
attrName: '适用产品线',
- options:[]
+ options: []
}, // 适用产品线下拉框
zrbmOptions: {
attrName: '责任部门',
- options:[]
+ options: []
}, // 责任部门下拉框
zrgcsOptions: {
attrName: '责任工程师',
- options:[]
+ options: []
}, // 责任工程师下拉框
txlbOptions: [], // 体系类别下拉框
standSortConfigOptions: [], // 标准类别下拉框
applyArcticOptions: {
attrName: '适用车型',
- options:[]
+ options: []
}, // 适用车型下拉框
standStateOptions: [], // 标准状态下拉框
standNatureOptions: [], // 标准性质下拉框
@@ -1944,7 +1952,7 @@ export default {
emergyKindOptions: [], // 能源种类下拉框
applyAuthOptions: {
attrName: '适用认证',
- options:[]
+ options: []
}, // 适用认证下拉框
categoryOptions: [], // 所属类别下拉框
categoryConfigOptions: [], // 所属类别下拉框
@@ -1954,11 +1962,11 @@ export default {
cysdOptions: [], //我司参与深度下拉框
nylxOptions: {
attrName: '能源类型',
- options:[]
+ options: []
},//能源类型下拉框
syrzOptions: {
attrName: '适用认证',
- options:[]
+ options: []
},//适用认证下拉框
gkglbmOptions: [],//归口管理部门下拉框
// 树形结构
@@ -2453,7 +2461,7 @@ export default {
orgData: [],
delLoading: false,
standState: '',
- filterText: ''
+ filterText: '',
}
},
props: {},
@@ -2478,30 +2486,30 @@ export default {
methods: {
// 限制导出框输入的字符
btKeyUp(e) {
- e.target.value = e.target.value.replace(/[`~!@#$%^&*()\+=<>?"{}|,\/;'\\[\]·~!@#¥%……&*()——\+={}|《》?:“”【】、;‘’,。、. <>]/g,"");
+ e.target.value = e.target.value.replace(/[`~!@#$%^&*()\+=<>?"{}|,\/;'\\[\]·~!@#¥%……&*()——\+={}|《》?:“”【】、;‘’,。、. <>]/g, "");
},
// 左右拖动事件
- dragControllerLR: function() {
+ dragControllerLR: function () {
var resize = document.getElementById("resize");
var left = document.getElementById("left");
var right = document.getElementById("right");
var box = document.getElementById("foreignStandardsAndRegulations");
- resize.onmousedown = function(e){
+ resize.onmousedown = function (e) {
var startX = e.clientX;
resize.left = resize.offsetLeft;
- document.onmousemove = function(e){
+ document.onmousemove = function (e) {
var endX = e.clientX;
var moveLen = resize.left + (endX - startX);
var maxT = box.clientWidth - resize.offsetWidth;
- if(moveLen<150) moveLen = 150;
- if(moveLen>maxT-150) moveLen = maxT-150;
+ if (moveLen < 150) moveLen = 150;
+ if (moveLen > maxT - 150) moveLen = maxT - 150;
resize.style.left = moveLen;
left.style.width = moveLen + "px";
right.style.width = (box.clientWidth - moveLen - 5) + "px";
}
- document.onmouseup = function(evt){
+ document.onmouseup = function (evt) {
document.onmousemove = null;
document.onmouseup = null;
resize.releaseCapture && resize.releaseCapture();
@@ -2510,15 +2518,15 @@ export default {
return false;
}
},
- isPermission (value) {
+ isPermission(value) {
let hasCount = 0
- let set =new Set( value.split(","))
+ let set = new Set(value.split(","))
let menuList = store.getters.getMenuList
if (menuList === '') {
return hasCount
} else {
menuList.map((menu) => {
- if ( set.has(menu.id)|| value === undefined || value === '') {
+ if (set.has(menu.id) || value === undefined || value === '') {
hasCount++
}
})
@@ -2586,7 +2594,7 @@ export default {
this.modalShowFlag3 = false
},
popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
- if (checkedData && checkedData.length != 0) {
+ if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
@@ -2606,17 +2614,17 @@ export default {
this.$set(this.textStatusMap, item.value, item.label)
})
},
- choiceZRRS (type, title, id) {
+ choiceZRRS(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
- checkedRole2 (data) {
+ checkedRole2(data) {
let idList = ''
let nameList = ''
- data.forEach( item => {
+ data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
@@ -2624,11 +2632,11 @@ export default {
idList += item.id
nameList += item.name
})
- if (this.drawerTitle === '选择我司署名人'){
+ if (this.drawerTitle === '选择我司署名人') {
this.sarStandardsInfoEO['WSSMR'] = nameList
- }else if (this.drawerTitle === '选择责任工程师'){
+ } else if (this.drawerTitle === '选择责任工程师') {
this.sarStandardsInfoEO['ZRGCS'] = nameList
- }else if (this.drawerTitle === '查询责任工程师'){
+ } else if (this.drawerTitle === '查询责任工程师') {
this.advanceSearchMapping['ZRGCS'] = nameList
}
@@ -2649,8 +2657,18 @@ export default {
},
popoverHide(checkedIds, checkedData) {
if (checkedData) {
- this.sarStandardsInfoEO.standSystem = checkedData.id
+ if (checkedData.length > 0) {
+ this.sarStandardsInfoEO.standSystem = checkedData.map(item => item.menuName).join(",")
+ } else {
+ this.sarStandardsInfoEO.standSystem = checkedData.menuName
+ }
}
+ this.modalShowFlag1 = false
+ this.$forceUpdate()
+ },
+
+ popoverHideCancel() {
+ this.modalShowFlag1 = false
},
closeModal() {
this.productModal = false
@@ -2854,8 +2872,8 @@ export default {
selectStandardPro(row, state) {
// this.sarStandardsInfoEO.country=JSON.parse(item.country );
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: row.id}, {
- _this: this
- }, res => {
+ _this: this
+ }, res => {
const item = res.data || {}
this.addOrUPdateFlag = 2
this.modalshowtitle = '编辑海外标准'
@@ -3060,33 +3078,33 @@ export default {
this.sarStandardsSearch.standSort = ''
this.sarStandardsSearch.standNumber = ''
this.sarStandardsSearch.page = 1
- this.advanceSearchMapping.txlbOption= '' //标准体系
- this.advanceSearchMapping.GXHBQ= '' //标签
- this.advanceSearchMapping.CYSD= '' //我司参与深度
- this.advanceSearchMapping.GKDW= '' //归口管理部门
- this.advanceSearchMapping.SSRQ= ''//实施日期
- this.advanceSearchMapping.XCXSSRQ= ''//新车型实施日期
- this.advanceSearchMapping.ZCCSSRQ= ''//在产车实施日期
- this.advanceSearchMapping.QCDW= ''//起草单位
- this.advanceSearchMapping.NYLX= ''//能源类型
- this.advanceSearchMapping.SYRZ= ''//适用认证
- this.advanceSearchMapping.ZRGCS= ''//责任工程师
- this.advanceSearchMapping.CBBH= ''//采标编号
- this.advanceSearchMapping.CBCD= ''//采标程度
- this.advanceSearchMapping.YYBJ= ''//引用标准
- this.advanceSearchMapping.BYYBJ= ''//被引用标准
- this.advanceSearchMapping.TXLB= ''//体系类别
- this.advanceSearchMapping.CYCVPPSBM= '',
- this.advanceSearchMapping.CYCVPPSCN= ''
- this.advanceSearchMapping.KCCVPPSBM= ''
- this.advanceSearchMapping.KCCVPPSCN= ''
- this.advanceSearchMapping.DYBXH= ''
- this.advanceSearchMapping.DYMC= ''
- this.advanceSearchMapping.CYSD= ''
- this.advanceSearchMapping.CLLX= ''
- this.advanceSearchMapping.SYCPX= ''
- this.advanceSearchMapping.ZRBM= ''
- this.advanceSearchMapping.WSSMR= ''
+ this.advanceSearchMapping.txlbOption = '' //标准体系
+ this.advanceSearchMapping.GXHBQ = '' //标签
+ this.advanceSearchMapping.CYSD = '' //我司参与深度
+ this.advanceSearchMapping.GKDW = '' //归口管理部门
+ this.advanceSearchMapping.SSRQ = ''//实施日期
+ this.advanceSearchMapping.XCXSSRQ = ''//新车型实施日期
+ this.advanceSearchMapping.ZCCSSRQ = ''//在产车实施日期
+ this.advanceSearchMapping.QCDW = ''//起草单位
+ this.advanceSearchMapping.NYLX = ''//能源类型
+ this.advanceSearchMapping.SYRZ = ''//适用认证
+ this.advanceSearchMapping.ZRGCS = ''//责任工程师
+ this.advanceSearchMapping.CBBH = ''//采标编号
+ this.advanceSearchMapping.CBCD = ''//采标程度
+ this.advanceSearchMapping.YYBJ = ''//引用标准
+ this.advanceSearchMapping.BYYBJ = ''//被引用标准
+ this.advanceSearchMapping.TXLB = ''//体系类别
+ this.advanceSearchMapping.CYCVPPSBM = '',
+ this.advanceSearchMapping.CYCVPPSCN = ''
+ this.advanceSearchMapping.KCCVPPSBM = ''
+ this.advanceSearchMapping.KCCVPPSCN = ''
+ this.advanceSearchMapping.DYBXH = ''
+ this.advanceSearchMapping.DYMC = ''
+ this.advanceSearchMapping.CYSD = ''
+ this.advanceSearchMapping.CLLX = ''
+ this.advanceSearchMapping.SYCPX = ''
+ this.advanceSearchMapping.ZRBM = ''
+ this.advanceSearchMapping.WSSMR = ''
this.isAdvancedSearch = false
} else if (flag === 2) {
// 标准条目搜索
@@ -3799,21 +3817,21 @@ export default {
const advanceSearchVOList = [];
for (let key in this.advanceSearchMapping) {
const value = this.advanceSearchMapping[key];
- if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
+ if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'regexp',
value: value.join(',')
});
- }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
+ } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'between',
value: value.join(',')
});
- }else if (value !== null && value !== ''){
+ } else if (value !== null && value !== '') {
advanceSearchVOList.push({
connect: "and",
field: key || '',
@@ -3825,8 +3843,8 @@ export default {
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
this.SarExportSearchEo = formData
- formData.startIssueTime = formData.issueTime?formData.issueTime[0]:null
- formData.endIssueTime = formData.issueTime?formData.issueTime[1]:null
+ formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
+ formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null
formData.issueTime = null
this.SarExportSearchEo = formData
@@ -4378,16 +4396,16 @@ export default {
this.configStandFlag = false
this.selectConfigStand = []
},
- OCRAdd (type) {
+ OCRAdd(type) {
let text = ''
this.OCRType = type
if (type === '0') {
text = 'OCR识别'
this.OCRTitle = '选择OCR识别文件'
- } else if(type === '1') {
+ } else if (type === '1') {
text = '拆分'
this.OCRTitle = '选择拆分文件'
- }else if(type === '2') {
+ } else if (type === '2') {
text = '编辑'
this.OCRTitle = '选择编辑文件'
}
@@ -4401,7 +4419,7 @@ export default {
this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
type: type,
standId: this.selectedList[0]
- },{
+ }, {
_this: this
}, res => {
this.OCRLoading = false
@@ -4414,7 +4432,7 @@ export default {
}
}
})
- } else if (this.ocrList.length === 1 && type === '2'){
+ } else if (this.ocrList.length === 1 && type === '2') {
this.selectStandardPro(this.ocrList[0], 'edit')
}
},
@@ -5038,21 +5056,26 @@ export default {
let nameList = ''
data.forEach(item => {
// if (item.hasChild === '0' && item.children === null) {
- if (nameList.length > 0) {
- nameList += ','
- idList += ','
- }
- idList += item.id
- nameList += item.name
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id
+ nameList += item.name
// }
})
- if (this.drawerTitle === '责任部门'){
+ if (this.drawerTitle === '责任部门') {
this.sarStandardsInfoEO.ZRBMId = idList;
this.sarStandardsInfoEO['ZRBM'] = nameList;
- }else if (this.drawerTitle === '查询责任部门'){
+ } else if (this.drawerTitle === '查询责任部门') {
this.advanceSearchMapping['ZRBM'] = nameList
}
},
+
+ choiceZRR1(type, title, id) {
+ this.drawerTitle = title
+ this.modalShowFlag1 = true
+ },
},
computed: {
// 是否拥有拖拽权限
@@ -5151,37 +5174,41 @@ export default {