-
-
- 标准征求意见流程
- 责任人会签
-
-
-
-
-
-
- 基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 征求意见列表
-
-
- 导出汇总单
- 导出征求意见搞
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ stateText(scope.row.state) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
-
-
-
+
+
+
+ 标准征求意见流程
+ 责任人会签
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 征求意见列表
+
+
+ 导出汇总单
+
+ 导出征求意见搞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ stateText(scope.row.state) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 61b4a50d7..dfadeae1d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -355,19 +355,34 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- this.form.cid = data.cid
- this.form.endTime = data.endTime
- this.form.cname = data.cname
- var arr = []
- data.summaryList.forEach( item => {
- if (item.state != '3') {
- arr.push(item)
- }
- })
- this.json = data
- this.data = arr
+ if (data.oldinfo === undefined) {
+ this.form.cid = data.cid;
+ this.form.endTime = data.endTime;
+ this.form.cname = data.cname;
+ var arr = [];
+ data.summaryList.forEach(item => {
+ if (item.state != "3") {
+ arr.push(item);
+ }
+ });
+ this.json = data;
+ this.data = arr;
+ this.oldData = data.oldinfo;
+ } else {
+ this.form.cid = data.oldinfo.cid;
+ this.form.endTime = data.oldinfo.endTime;
+ this.form.cname = data.oldinfo.cname;
+ var arr = [];
+ data.oldinfo.data.forEach(item => {
+ if (item.state != "3") {
+ arr.push(item);
+ }
+ });
+ this.json = data;
+ this.data = arr;
+ this.oldData = data.oldinfo;
+ }
- this.oldData = data.oldinfo
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 1144cfc97..8cc1a33ff 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -355,18 +355,33 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- this.form.cid = data.cid
- this.form.endTime = data.endTime
- this.form.cname = data.cname
- var arr = []
- data.summaryList.forEach( item => {
- if (item.state != '3') {
- arr.push(item)
- }
- })
- this.json = data
- this.data = arr
- this.oldData = data.oldinfo
+ if (data.oldinfo === undefined) {
+ this.form.cid = data.cid;
+ this.form.endTime = data.endTime;
+ this.form.cname = data.cname;
+ var arr = [];
+ data.summaryList.forEach(item => {
+ if (item.state != "3") {
+ arr.push(item);
+ }
+ });
+ this.json = data;
+ this.data = arr;
+ this.oldData = data.oldinfo;
+ } else {
+ this.form.cid = data.oldinfo.cid;
+ this.form.endTime = data.oldinfo.endTime;
+ this.form.cname = data.oldinfo.cname;
+ var arr = [];
+ data.oldinfo.data.forEach(item => {
+ if (item.state != "3") {
+ arr.push(item);
+ }
+ });
+ this.json = data;
+ this.data = arr;
+ this.oldData = data.oldinfo;
+ }
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 72dfadb99..4703b35e0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -1,440 +1,470 @@
-
-
-
- 标准征求意见流程
- 工程研究总院院长批准
-
-
-
-
-
-
- 基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 征求意见列表
-
-
- 导出汇总单
- 导出征求意见搞
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ stateText(scope.row.state) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
-
-
-
+
+
+
+ 标准征求意见流程
+ 工程研究总院院长批准
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 征求意见列表
+
+
+ 导出汇总单
+
+ 导出征求意见搞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ stateText(scope.row.state) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index f5de1e3ca..8401257ba 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -42,6 +42,12 @@
填写信息
+
+
+
+
+
+
+
+
+
+
+
+
@@ -331,6 +348,73 @@
@submit="handleSubmit"
>
+
+
+
+ 在研产品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 在产产品
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -349,6 +433,27 @@ export default {
},
data() {
return {
+ batchEditForm: {
+ // 在研产品
+ // 合规
+ complianceReasons :'',
+ // 不合规
+ noCompliance :'',
+ // 应对措施
+ countermeasures :'',
+ // 完成时间
+ completionTime :'',
+
+ // 在产产品
+ // 合规
+ zcComplianceReasons :'',
+ // 不合规
+ zcNoCompliance:'',
+ // 应对措施
+ zcCountermeasures:'',
+ // 完成时间
+ zcCompletionTime:''
+ },
hasChildren: true,
active: "1",
loading: false,
@@ -398,6 +503,83 @@ export default {
};
},
methods: {
+ //批量编辑确定按钮事件
+ saveBatchEditForm() {
+
+ // console.log(this.selectList)
+ for( let a = 0; a < this.dataList.length; a++) {
+ for ( let b = 0; b < this.selectList.length; b++) {
+ if (this.dataList[a].id === this.selectList[b]) {
+ //合规
+ this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
+ //不合规
+ this.dataList[a].noCompliance = this.batchEditForm.noCompliance
+ //应对措施
+ this.dataList[a].countermeasures = this.batchEditForm.countermeasures
+ //完成时间
+ this.dataList[a].completionTime = this.batchEditForm.completionTime
+ //合规
+ this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
+ //不合规
+ this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
+ //应对措施
+ this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
+ //完成时间
+ this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
+ }else {
+ for (let i=0;i
0) {
+ //合规
+ this.batchEditForm.complianceReasons = ''
+ //不合规
+ this.batchEditForm.noCompliance = ''
+ //应对措施
+ this.batchEditForm.countermeasures = ''
+ //完成时间
+ this.batchEditForm.completionTime = ''
+ //合规
+ this.batchEditForm.zcComplianceReasons = ''
+ //不合规
+ this.batchEditForm.zcNoCompliance = ''
+ //应对措施
+ this.batchEditForm.zcCountermeasures = ''
+ //完成时间
+ this.batchEditForm.zcCompletionTime = ''
+ this.modalshowflag = true
+ } else {
+ this.$message.warning('请选择要编辑的数据')
+ }
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -525,7 +707,11 @@ export default {
},
//标准表格选择框改变
selectStandChange(data) {
- this.selectList = data;
+ this.selectList = [];
+ for (let i = 0; i < data.length; i++) {
+ this.selectList.push(data[i].id);
+ }
+
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
@@ -605,6 +791,25 @@ export default {
height: calc(~'100% - 103px');
overflow: auto;
+ .tableTitle {
+ margin-bottom: 10px;
+ height: 30px;
+ line-height: 30px;
+ position: relative;
+ font-size: 13px;
+ font-weight: bold;
+
+ .tableButton {
+ position: absolute;
+ right: 0;
+ top: 0;
+ }
+
+ .accessStandardsAndRegulations {
+ height: 100%;
+ }
+ }
+
.accessStandardsAndRegulations {
height: 100%;
}
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index e2a4a8fdc..06bb099c8 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1686,7 +1686,7 @@ export default {
orgTableValName: '',
twoOptions: [],
threeOptions: [],
- sarType: 'STAND',
+ sarType: 'INLAND_STAND',
productModal: false, // 模态框是否打开
modalType: '',
productTitle: '', // 模态框标题
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 928a2148f..3438cea85 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -341,6 +341,20 @@
label="文本状态"
width="110"
>
+
+
+
+ {{scope.row.standStatusShow}}
+
+
+ {{scope.row.standStatusShow}}
+
+
+ {{scope.row.standStatusShow}}
+
+
+
+
@@ -1237,6 +1251,7 @@ export default {
children: 'children',
label: 'menuName'
},
+
advancedSearch:[],
nodeKey: 'id',
nodeKeyCode: 'code',
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 9a4e7820a..3ee6d83d5 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -4105,7 +4105,7 @@ export default {
queryDisplayLocation () {
return new Promise((resolve, reject) => {
this.$http.get('lawssBase/utArea/getAreaList', {
- sarType: 'INLAND_STAND'
+ sarType: 'FOREIGN_STAND'
}, {
_this: this
}, res => {
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index 23a60ebce..fccb551d2 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -976,8 +976,8 @@
:label="$t('m.putTime')"
width="130">
-
- {{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
+
+ {{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
@@ -987,7 +987,8 @@
width="180"
:label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
-
+
{{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
@@ -2492,6 +2493,14 @@ export default {
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
+/deep/ .yellowClass{
+ color: #E6A23C !important;
+}
+
+/deep/ .redClass{
+ color: #F56C6C !important;
+}
+
#advancedSearch {
background: #fff;
@borderColor: #BFBFBF;
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 1edd98e0c..219773ddf 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -109,6 +109,17 @@
+
+
+
+ {{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
+
+
+
+
{{ getLawsState(scope.row.statecode) }}
- {{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
+
+ {{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
+ /deep/ .yellowClass{
+ color: #E6A23C;
+ }
+
+ /deep/ .redClass{
+ color: #F56C6C;
+ }
/deep/ p{
display: inline;
}
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 1155aea99..d3cd25a02 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,10 +4,10 @@
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
-// const devIp = '192.168.1.159'
+const devIp = '10.96.10.171'
+const devInterfacePORT = '9999'
+// const devIp = '10.5.103.101'
// const devInterfacePORT = '9999'
-const devIp = '62.234.136.153'
-const devInterfacePORT = '8038'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -31,7 +31,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8038'
+const prodInterfacePORT = '8033'
// 判断环境