diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 5f38e84b8..10c9a1e9c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2346,6 +2346,7 @@
this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+ this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.setMap(this.standStateOptions)
})
this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 6ef3f73c2..0bce9bc75 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -382,15 +382,13 @@ export default {
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
- this.fileListData.fileText = fileList
- this.fileTextList = fileList
-/* this.newDataList.forEach((item, index) => {
- if (file.name === item.name || file.id === item.id) {
- this.newDataList.splice(index, 1)
- console.log(this.dataList)
-
+ this.fileData = fileList
+ this.fileTextList.forEach((item, index) => {
+ if (item.name === file.name || item.id === file.id ) {
+ console.log()
+ this.fileTextList.splice(index,1)
}
- })*/
+ })
},
handleONRemove() {},
/************ ********* *****************/
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index 865a6a96e..b952313b3 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -360,8 +360,8 @@ export default {
this.backLoading = true
if (this.commentText) {
var json = {
- responUserInfo: {
- info: this.dataList
+ responUserList: {
+ standardInfoList: this.dataList
},
actionFlag: 1,
commentText: this.commentText
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index 9a29bb58f..a379be0c5 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -386,8 +386,7 @@ export default {
form.current = this.sarProStateTotalPage;
form.size = this.sarProStatePageSize;
this.$http.get("sarStandardComplianceAssessResult/product", form, {
- _this: this,
- loading: "loading"
+ _this: this
}, res => {
if (res.ok) {
// res.data.records.forEach((item)=>{
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index d3bdaaeb9..2acf17183 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -13,7 +13,7 @@
-
-
+
-
-
+
@@ -104,7 +104,7 @@
-
+
-
+
-
+
@@ -186,14 +186,14 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -899,8 +899,8 @@
v-if="selectIndex !== 'items'"
width="130">
-
- {{ $dateFormat(new Date(scope.row.issue_time), "yyyy-MM-dd") }}
+
+ {{ $dateFormat(new Date(scope.row.issueTime), "yyyy-MM-dd") }}
@@ -910,8 +910,8 @@
:label="$t('m.putTime')"
width="130">
-
- {{ $dateFormat(new Date(scope.row.put_time), "yyyy-MM-dd") }}
+
+ {{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
@@ -919,7 +919,7 @@
+ :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '企业标准状态')">
{{ scope.row.standstateshow }}
@@ -937,7 +937,16 @@
查看
- 取消收藏
+
+ 收藏
+
+
+ 取消收藏
+
@@ -948,8 +957,16 @@
查看
- 收藏
-
+
+ 收藏
+
+
+ 取消收藏
+
@@ -960,7 +977,16 @@
查看
- 取消收藏
+
+ 收藏
+
+
+ 取消收藏
+
收藏
@@ -1306,9 +1332,7 @@ export default {
const inlandList = data['INLAND_STAND'] || []
const foreignList = data['FOREIGN_STAND'] || []
const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB');
- console.log(foreignFilterList)
this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList);
- console.log(this.formFieldListStandData,'-----------------------------------1')
}
}, e => {})
},
@@ -1720,6 +1744,13 @@ export default {
this.total = res.data.count;
this.resultData = res.data.list;
this.resultData.map((item) => {
+ if (item.collectId != null && item.collectId !== '') {
+ item.collectBtn = false
+ item.cancelCollectBtn = true
+ } else {
+ item.collectBtn = true
+ item.cancelCollectBtn = false
+ }
if (item.applyArcticShow) {
item.applyArcticShow.toString();
item.applyArcticShow = item.applyArcticShow.slice(0, item.applyArcticShow.length - 1);
@@ -1936,13 +1967,13 @@ export default {
}
let pagetype = "";
if (item.type === "stand") {
- if (item.stand_type === "INLAND") {
+ if (item.standType === "INLAND") {
pagetype = "INLAND_STAND";
} else {
pagetype = "FOREIGN_STAND";
}
} else if (item.type === "laws") {
- if (item.laws_type === "INLAND") {
+ if (item.lawsType === "INLAND") {
pagetype = "INLAND_LAWS";
} else {
pagetype = "FOREIGN_LAWS";
@@ -1959,6 +1990,7 @@ export default {
}
}
personCollect.collectType = pagetype;
+ personCollect.userId = this.$store.getters.userInfo.userId
this.$http.postData("person/personCollect", personCollect, {
_this: this
}, res => {
@@ -1970,21 +2002,20 @@ export default {
},
// 取消收藏
cancelCollectStandard(item) {
- // this.judgeBussRole(item)
- // if (this.bussRoleFlag === false) {
- // this.$message.error('当前角色无权限操作此数据')
- // } else {
- // }
- this.$http.put("person/personCollect/updateByUserId", {
- id: item.collectId
- }, {
- _this: this
- }, res => {
- item.collectBtn = !item.collectBtn;
- item.cancelCollectBtn = !item.cancelCollectBtn;
- item.collectId = "";
- }, e => {
- });
+ item.isSubmit = true
+ this.$http.put('person/personCollect/updateByUserId', {
+ id: item.collectId
+ }, {
+ _this: this
+ }, res => {
+ item.isSubmit = false
+ item.collectBtn = !item.collectBtn
+ item.cancelCollectBtn = !item.cancelCollectBtn
+ item.collectId = ''
+ this.$message.success(res.message)
+ }, e => {
+ item.isSubmit = false
+ })
},
// 取消
treeCancel() {
@@ -2278,6 +2309,26 @@ export default {
}
},
watch: {
+ "standForm.zccssrq"(newVal) {
+ if (newVal == null) {
+ this.standForm.zccssrq = "";
+ }
+ },
+ "standForm.xcxssrq"(newVal) {
+ if (newVal == null) {
+ this.standForm.xcxssrq = "";
+ }
+ },
+ "standForm.ssrq"(newVal) {
+ if (newVal == null) {
+ this.standForm.ssrq = "";
+ }
+ },
+ "standForm.issueTime"(newVal) {
+ if (newVal == null) {
+ this.standForm.issueTime = "";
+ }
+ },
// 资源大类监听, 改变后过滤条件
selectIndex(val) {
let type = "";
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 15040c34f..b179d70d1 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -11,7 +11,7 @@
@@ -156,8 +156,17 @@
查看
- 取消收藏
-
+
+ 收藏
+
+
+ 取消收藏
+
+
@@ -170,8 +179,17 @@
查看
- 收藏
-
+
+ 收藏
+
+
+ 取消收藏
+
+
@@ -1003,7 +1021,6 @@
})
}
this.searchOriginOptions = this.searchOptions
- console.log(this.searchOriginOptions)
this.saveAllSortOptions = res.data.STANDCLASSIFY
this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW
this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组
@@ -1241,6 +1258,15 @@
if (res.ok) {
this.total = res.data.count
this.resultData = res.data.list
+ this.resultData.map((item) => {
+ if (item.collectId != null && item.collectId !== '') {
+ item.collectBtn = false
+ item.cancelCollectBtn = true
+ } else {
+ item.collectBtn = true
+ item.cancelCollectBtn = false
+ }
+ });
this.selectGroupdata(res.data)
} else {
this.total = 0
@@ -1877,7 +1903,6 @@
let pagetype = ''
pagetype = item.typeShow
if (item.typeShow === 'INLAND_STAND') {
- console.log('guonei权限')
routername = 'OtherStandardDetails'
// if (this.$hasPermission('CFEZ3VP7EA95CTRBH3JB')) {
// routername = 'OtherStandardDetails'
@@ -2051,6 +2076,7 @@
}
}
personCollect.collectType = pagetype
+ personCollect.userId = this.$store.getters.userInfo.userId
this.$http.postData('person/personCollect', personCollect, {
_this: this
}, res => {
@@ -2120,7 +2146,6 @@
type: 'warning'
})
} else {
- console.log(this.selectNowObjResult);
let pagetype = ''
if (this.selectNowObjResult.type === 'stand') {
if (this.selectNowObjResult.standType === 'INLAND') {
@@ -2241,7 +2266,6 @@
if (item.type === 'stand') {
// if (this.$hasPermission('HK36LHK9444NPN8X634W')){
routername = 'OtherStandardDetails'
- console.log('guoneiQUANXIAN')
if (item.standType === 'INLAND') {
pagetype = 'INLAND_STAND'
} else {