-
{{ listForm.modelName }}
+
+
@@ -236,6 +249,7 @@ export default {
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
bringData: [],
+ fileList:[],
fileIds: "",
commentText: "", //填写会签意见
page: 1,
@@ -267,7 +281,8 @@ export default {
user3: "",
user4: "",
user5: "",
- standMap: new Map()
+ standMap: new Map(),
+ textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
@@ -312,15 +327,14 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
+ console.log(this.listForm.fileName);
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
- this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
- this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId;
- this.fileIds = item.fileId
+ this.fileIds = item.fileId;
this.getFileInfo();
});
},
@@ -331,11 +345,15 @@ export default {
}, {
_this: this
}, res => {
- console.log(res);
this.$nextTick(() => {
res.data.map(item => {
- this.listForm.modelName = item.oldFileName
- this.listForm.model = item.id
+ // 赋值要回显的上传文件内容
+ this.fileList.push({
+ name: item.oldFileName,
+ uid: item.uid,
+ status: item.status,
+ id: item.id
+ });
});
});
}, e => {
@@ -369,8 +387,8 @@ export default {
},
//提交事件
handleSubmit() {
- if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
- this.$message.warning('请填写会签意见')
+ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+ this.$message.warning("请填写会签意见");
}
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
@@ -412,7 +430,24 @@ export default {
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.searchData();
+ },
+ // 将文本状态的id与name对应
+ setMap(data) {
+ data.forEach(item => {
+ this.$set(this.textStatusMap, item.value, item.label);
+ });
+ },
+// 点击查看
+handlePreview(item) {
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
}
+ });
+ window.open(routeUrl.href, "_blank");
+},
},
computed: {
listNoDataText() {
@@ -421,9 +456,17 @@ export default {
},
watch: {},
mounted() {
+//从数据库中查询下拉框数据
+ this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+ _this: this
+ }, res => {
+ this.countryOptions = res.data.COUNTRY;
+ this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+ this.setMap(this.standStateOptions);
+ });
this.processTable();
this.getData();
- }
+ },
};
@@ -437,12 +480,15 @@ export default {
padding: 0 20px 0;
}
}
+
.fileClass {
cursor: pointer;
}
- .fileClass:hover{
+
+ .fileClass:hover {
color: #0c91e5;
}
+
p {
& > a {
cursor: pointer;
@@ -459,6 +505,7 @@ export default {
vertical-align: sub;
cursor: pointer;
}
+
.icon-download {
background-image: url("~assets/images/shangqi/img/download.png");
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index df96a7531..936c44f14 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -100,12 +100,14 @@
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standSortShow }} {{ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
+ {{ scope.row.standSortShow }}
+ {{ scope.row.standNumber }}
+
+ {{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}
+
+
+ {{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}
+
+
+ {{ textStatusMap[scope.row.textStatus] }}
+
@@ -315,6 +391,26 @@ export default {
standList: [], //新添加的标准
// 当前流程类型(1待办/2已办)
processType: 1,
+ searching: false,
+ standardTypeOptions: [
+ {
+ value: "INLAND",
+ label: "国内标准法规",
+ item: "INLAND"
+ },
+ {
+ value: "FOREIGN",
+ label: "海外标准法规",
+ item: "FOREIGN"
+ }
+ ],
+ //查询添加标准相关数据
+ standardSearch: {
+ standType: "",
+ standNumber: "",
+ pageNo: 1,
+ pageSizeNo: this.$store.getters.userInfo.configContent
+ },
loading: false,
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
@@ -363,7 +459,8 @@ export default {
user3: "",
user4: "",
user5: "",
- standMap: new Map()
+ standMap: new Map(),
+ textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
@@ -383,6 +480,9 @@ export default {
handleTabs(name) {
this.active = name;
},
+ typeChange(type) {
+ this.standardSearch.standType = type;
+ },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -394,15 +494,38 @@ export default {
});
window.open(routeUrl.href, "_blank");
},
- //点击添加事件
- addList() {
- this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+ clearStandSearch() {
+ this.standardSearch = {
+ standType: "",
+ standNumber: ""
+ };
+ this.getStandData();
+ },
+ 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.totalNo = res.data.pageCount
+ 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 => {
});
+ },
+ //点击添加事件
+ addList() {
this.standModel = true;
},
//添加标准select的改变
@@ -565,6 +688,12 @@ export default {
this.addList()
},
+ // 将文本状态的id与name对应
+ setMap(data) {
+ data.forEach(item => {
+ this.$set(this.textStatusMap, item.value, item.label);
+ });
+ },
},
computed: {
listNoDataText () {
@@ -572,8 +701,17 @@ export default {
}
},
mounted() {
- this.getData()
- this.processTable()
+ //从数据库中查询下拉框数据
+ this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+ _this: this
+ }, res => {
+ this.countryOptions = res.data.COUNTRY;
+ this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+ this.setMap(this.standStateOptions);
+ });
+ this.getData();
+ this.processTable();
+ this.getStandData();
},
};
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 0bb01ebaf..af40db76d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -74,12 +74,16 @@
fontWeight: 'bold', height: '48px'}">
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standSortShow }} {{
+ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
+ {{
+ scope.row.standSortShow }}
+ {{ scope.row.standNumber }}
+
+ {{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}
+
+
+ {{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}
+
+
+ {{ textStatusMap[scope.row.textStatus] }}
+
@@ -272,7 +285,8 @@
user3: "",
user4: "",
user5: "",
- standMap: new Map()
+ standMap: new Map(),
+ textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
@@ -296,6 +310,17 @@
choiceShow() {
this.ListModel = true;
},
+ // 点击查看
+ handlePreview(item) {
+ let routeUrl = this.$router.resolve({
+ name: "OtherStandardDetails",
+ params: {
+ id: item.id,
+ pageType: "INLAND_STAND"
+ }
+ });
+ window.open(routeUrl.href, "_blank");
+ },
//保存事件
handleSave() {
@@ -415,7 +440,13 @@
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.searchData();
- }
+ },
+ // 将文本状态的id与name对应
+ setMap(data) {
+ data.forEach(item => {
+ this.$set(this.textStatusMap, item.value, item.label);
+ });
+ },
},
computed: {
listNoDataText() {
@@ -423,6 +454,14 @@
}
},
mounted() {
+ //从数据库中查询下拉框数据
+ this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+ _this: this
+ }, res => {
+ this.countryOptions = res.data.COUNTRY;
+ this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+ this.setMap(this.standStateOptions);
+ });
this.getData()
this.processTable()
},
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index e4412898b..e31e72934 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
-const devIp = '192.168.1.145'
+const devIp = '10.96.170.156'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'