+
-
-
+
+
+
-
-
-
-
-
-
-
-
- {{ 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 ? "已完成" : "未完成" }}
-
-
-
+
+
+
+
+
+ {{ 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 ? "已完成" : "未完成" }}
+
+
+
流程列表加载中
-
-
+
-
+
标准法规部领导审批
-
- {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
- {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}
-
-
+
+
{
inboundLiaisonDetail({
@@ -532,11 +548,11 @@ export default {
this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
- if (item.pepdtos[i].xCXSSRQ === null) {
- item.pepdtos[i].xCXSSRQ = "";
+ if (item.pepdtos[i].xcxssrq === null) {
+ item.pepdtos[i].xcxssrq = "";
}
- if (item.pepdtos[i].zCCSSRQ === null) {
- item.pepdtos[i].zCCSSRQ = "";
+ if (item.pepdtos[i].zccssrq === null) {
+ item.pepdtos[i].zccssrq = "";
}
this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -558,9 +574,10 @@ export default {
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
id: item.pepdtos[0].id,
- xCXSSRQ: item.pepdtos[i].XCXSSRQ,
- zCCSSRQ: item.pepdtos[i].ZCCSSRQ
+ xcxssrq: item.pepdtos[i].XCXSSRQ,
+ zccssrq: item.pepdtos[i].ZCCSSRQ
});
+ this.total = this.listForm.breakdownList.length
}
}
} else {
@@ -585,7 +602,7 @@ export default {
this.listForm.breakdownList[this.lsIndex].implementer = nameList;
} else if (this.type === 2) {
this.listForm.breakdownList.forEach(item => {
- this.selectList.forEach(items => {
+ this.selectStandList.forEach(items => {
if (item === items) {
item.implementerId = idList;
item.implementer = nameList;
@@ -600,6 +617,7 @@ export default {
this.modalshowflag = false;
},
choiceZRRS(row, type, index) {
+ this.selectStandList = this.selectList
this.type = type;
if (type === 1) {
this.drawerTitle = "选择责任人";
@@ -659,14 +677,13 @@ export default {
},
//提交事件
handleSubmit() {
+ let standList = []
this.listForm.breakdownList.forEach(item => {
- if (item.implementer === null || item.implementer === "" || item.implementer === undefined) {
- this.sarFlag = false;
- } else {
- this.sarFlag = true;
+ if (item.implementer) {
+ standList.push(item)
}
});
- if (this.sarFlag === true) {
+ this.listForm.breakdownList = standList
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -690,9 +707,6 @@ export default {
this.isSubmit = false;
}, e => {
});
- } else {
- this.$message.warning("请选择落实人");
- }
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -705,6 +719,7 @@ export default {
},
//标准表格选择框改变
selectStandChange(data) {
+ console.log(data);
this.selectList = data;
},
selectThree() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 0df3cde58..994a8e6a4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -203,18 +203,12 @@
width="200"
align="center"
label="新车型实施日期">
-
- {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}
-
-
- {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}
-
-
- {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}
-
-
- {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -600,47 +598,48 @@ export default {
})
if(!fileFlag){
this.$message.warning('请选择分解单来源')
+ }else{
+ if (this.listForm.dataList.length < 1) {
+ this.$message.warning("请选择带标准的项目");
+ } else {
+ this.listForm.commentText = this.commentText;
+ var json = Object.assign(this.listForm, this.roleForm);
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.userName;
+ json.standId = this.listForm.standId;
+ this.$refs["listForm"].validate((valid) => {
+ if (valid) {
+ this.$refs["roleForm"].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true;
+ this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: res.data,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ });
+ }
+ });
+ } else {
+ return this.$message.warning("请完善人员信息");
+ }
+ });
+ } else {
+ return this.$message.warning("请完善基础信息");
+ }
+ });
}
- if (this.listForm.dataList.length < 1) {
- this.$message.warning("请选择带标准的项目");
- } else {
- this.listForm.commentText = this.commentText;
- var json = Object.assign(this.listForm, this.roleForm);
- json.prcCreateUser = this.$store.getters.userInfo.userId;
- json.prcCreateUserName = this.$store.getters.userInfo.userName;
- json.standId = this.listForm.standId;
- this.$refs["listForm"].validate((valid) => {
- if (valid) {
- this.$refs["roleForm"].validate((valid) => {
- if (valid) {
- this.isSubmit = true;
- this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: res.data,
- userId: this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
- }
- });
- } else {
- return this.$message.warning("请完善人员信息");
- }
- });
- } else {
- return this.$message.warning("请完善基础信息");
- }
- });
}
},
choiceZRR(type, title, id) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
index f48224c89..cdac9c9ef 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -93,22 +93,22 @@
label="条款名称">
+
+
-
- {{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}
-
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
index 34c8987e3..39946e082 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
@@ -86,7 +86,6 @@
prop="ssrq"
width="190px"
align="center"
- sortable
label="标准实施日期">
{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
@@ -104,7 +103,6 @@
@@ -169,7 +167,6 @@
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 969de41de..ccdd41aac 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -126,7 +126,6 @@
prop="ssrq"
width="190px"
align="center"
- sortable
label="标准实施日期">
@@ -617,47 +615,48 @@ export default {
})
if(!fileFlag){
this.$message.warning('请选择分解单来源')
+ }else{
+ if (this.listForm.dataList.length < 1) {
+ this.$message.warning("请选择带标准的项目");
+ } else {
+ this.listForm.commentText = this.commentText;
+ var json = Object.assign(this.listForm, this.roleForm);
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.userName;
+ json.standId = this.listForm.standId;
+ this.$refs["listForm"].validate((valid) => {
+ if (valid) {
+ this.$refs["roleForm"].validate((valid) => {
+ if (valid) {
+ this.isSubmit = true;
+ this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: res.data,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ this.isSubmit = false;
+ });
+ }
+ });
+ } else {
+ return this.$message.warning("请完善人员信息");
+ }
+ });
+ } else {
+ return this.$message.warning("请完善基础信息");
+ }
+ });
}
- if (this.listForm.dataList.length < 1) {
- this.$message.warning("请选择带标准的项目");
- } else {
- this.listForm.commentText = this.commentText;
- var json = Object.assign(this.listForm, this.roleForm);
- json.prcCreateUser = this.$store.getters.userInfo.userId;
- json.prcCreateUserName = this.$store.getters.userInfo.userName;
- json.standId = this.listForm.standId;
- this.$refs["listForm"].validate((valid) => {
- if (valid) {
- this.$refs["roleForm"].validate((valid) => {
- if (valid) {
- this.isSubmit = true;
- this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: res.data,
- userId: this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- this.isSubmit = false;
- });
- }
- });
- } else {
- return this.$message.warning("请完善人员信息");
- }
- });
- } else {
- return this.$message.warning("请完善基础信息");
- }
- });
}
},
// 点击查看
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 4bc687e09..4ea1a6af7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -45,7 +45,6 @@
+
+
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
@@ -477,9 +476,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
- if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
- this.dataList.push(item)
- }
+ this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
+ this.$set(items, "zccssrq", item.zccssrq);
+ this.$set(items, "xcxssrq", item.xcxssrq);
+ this.$set(items, "ssrq", item.ssrq);
}
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index ff5c3e3f0..7665ee262 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -45,7 +45,6 @@
+
+
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
@@ -456,7 +455,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
- console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -476,9 +474,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
- if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
- this.dataList.push(item)
- }
+ this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -486,6 +482,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
+ this.$set(items, "zccssrq", item.zccssrq);
+ this.$set(items, "xcxssrq", item.xcxssrq);
+ this.$set(items, "ssrq", item.ssrq);
}
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 87f80fe44..1d20a7bb1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -45,7 +45,6 @@
+
+
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
@@ -477,9 +476,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
- if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
- this.dataList.push(item)
- }
+ this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
+ this.$set(items, "zccssrq", item.zccssrq);
+ this.$set(items, "xcxssrq", item.xcxssrq);
+ this.$set(items, "ssrq", item.ssrq);
}
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
index d3ac9ac8d..296b39017 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
@@ -86,30 +86,19 @@
prop="ssrq"
width="190px"
align="center"
- sortable
label="标准实施日期">
-
- {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
index 4e770b15a..17d28a408 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
@@ -98,11 +98,19 @@
-
- {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
-
+
+
+
+
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index 102cc4e2e..9101f2de9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -96,11 +96,19 @@
-
- {{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}
-
+
+
+
+
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
@@ -448,7 +455,6 @@ export default {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
- console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 90222f38a..38d19e256 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -52,7 +52,6 @@
+
+
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{
- if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+ if(item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
@@ -814,6 +700,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
+ this.$set(items, "zccssrq", item.zccssrq);
+ this.$set(items, "xcxssrq", item.xcxssrq);
+ this.$set(items, "ssrq", item.ssrq);
}
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 8f1018e18..a3cb98cd0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -45,7 +45,6 @@
+
+
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
{
- if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
- this.dataList.push(item)
- }
+ this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -446,6 +443,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
+ this.$set(items, "zccssrq", item.zccssrq);
+ this.$set(items, "xcxssrq", item.xcxssrq);
+ this.$set(items, "ssrq", item.ssrq);
}
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index ecd61f622..1d4626568 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -45,7 +45,6 @@
+
+
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
@@ -475,9 +474,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
- if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
- this.dataList.push(item)
- }
+ this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -485,6 +482,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
+ this.$set(items, "zccssrq", item.zccssrq);
+ this.$set(items, "xcxssrq", item.xcxssrq);
+ this.$set(items, "ssrq", item.ssrq);
}
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 96e427c4b..720ee308c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -45,7 +45,6 @@
+
+
-
- {{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}
-
-
- {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}
-
@@ -477,9 +476,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
- if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
- this.dataList.push(item)
- }
+ this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
+ this.$set(items, "zccssrq", item.zccssrq);
+ this.$set(items, "xcxssrq", item.xcxssrq);
+ this.$set(items, "ssrq", item.ssrq);
}
})
})
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 39bb29fce..79b6974d5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -368,7 +368,7 @@
align="center"
label="适用产品线">
-
-
+ -->
@@ -494,7 +495,7 @@
@@ -502,7 +503,7 @@
@@ -513,7 +514,7 @@
-
+
@@ -593,11 +721,34 @@ export default {
loading: false,
nonList: [], //未符合项表格数据
replaceLoading: false,
+ standList: [],
+ productLines: [], //产品线数据
//项目数据
ProjectDatas: [],
+ dialogTableVisible: false,
itemsData: [],
selectItems: [],
dataList: [],
+ //查询添加标准相关数据
+ standardSearch: {
+ standType: "",
+ standNumber: "",
+ pageNo: 1,
+ pageSizeNo: this.$store.getters.userInfo.configContent
+ },
+ standardData: [], //存放标准数据
+ standardTypeOptions: [
+ {
+ value: "INLAND",
+ label: "国内标准法规",
+ item: "INLAND"
+ },
+ {
+ value: "FOREIGN",
+ label: "海外标准法规",
+ item: "FOREIGN"
+ }
+ ],
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
@@ -685,9 +836,6 @@ export default {
//数据查看
historySee: false,
historySeeForm: {},
- // 新增编辑框的disabled
- serialNumber: true,
-
// 提交按钮loading
submiting: false,
// 选择人（单选）
@@ -749,6 +897,47 @@ export default {
this.myLoading.loadData = false;
});
},
+ typeChange(type) {
+ console.log(type);
+ this.standardSearch.standType = type;
+ },
+ //取消添加
+ cancelStand(){
+ this.dialogTableVisible = false
+ },
+ //确认添加标准
+ okStand(){
+ if(this.standList > 1){
+ this.$message.warning('您只能选择一条标准进行添加')
+ }else if(this.standList < 1){
+ this.$message.warning('请至少选择一条数据进行添加')
+ }else{
+ this.addForm.standId = this.standList[0].id
+ this.addForm.standName = this.standList[0].standName
+ this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear
+ this.dialogTableVisible = false
+ }
+ },
+ //添加标准select的改变
+ selectStand(data) {
+ this.standList = data;
+ },
+ showStand(){
+ this.dialogTableVisible = true
+ },
+ //标准查询按钮
+ getStandDataBtn(){
+ this.page =1;
+ this.getStandDatas();
+ },
+ //清空查询按钮
+ clearStandSearch(){
+ this.standardSearch = {
+ standType: "",
+ standNumber: ""
+ };
+ this.getStandDatas();
+ },
// 点击历史记录按钮事件
historyClick() {
this.$router.push({
@@ -873,25 +1062,24 @@ export default {
}
},
- //获取项目数据
- getProjectData() {
- this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
- page: this.page,
- pageSize: this.pageSize,
- ...this.projectSearch
- }, {
- _this: this
- }, res => {
- if (res.data === null) {
- this.ProjectDatas = "";
- this.total = 0;
- } else {
- this.ProjectDatas = res.data.Maintenance.records;
- this.total = res.data.Maintenance.total;
- }
- });
-
- },
+ // //获取项目数据
+ // getProjectData() {
+ // this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
+ // page: 1,
+ // pageSize: 100,
+ // }, {
+ // _this: this
+ // }, res => {
+ // if (res.data === null) {
+ // this.ProjectDatas = "";
+ // this.total = 0;
+ // } else {
+ // this.ProjectDatas = res.data.Maintenance.records;
+ // this.total = res.data.Maintenance.total;
+ // }
+ // });
+ //
+ // },
//提交
submit() {
const id = this.addForm.id;
@@ -1004,13 +1192,31 @@ export default {
});*/
});
},
+ //查询项目下的标准
+ getStandDatas() {
+ this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
+ 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 => {
+ this.$set(item, "ZCCSSRQ", item.zccssrq);
+ this.$set(item, "XCXSSRQ", item.xcxssrq);
+ })
+ this.total = res.data.count;
+ }, e => {
+ });
+ },
//新增事件
addModel() {
this.dataList = []
- this.serialNumber = true
this.drawerTitle = "新增";
- this.getProjectData()
this.drawerTable = true
+ this.getStandDatas()
},
//编辑事件
projectEdit(row) {
@@ -1022,9 +1228,8 @@ export default {
}
})
let productId = this.projectId
- this.getProjectData()
+ // this.getProjectData()
this.getStandData(productId)
- this.serialNumber = false
this.drawerTable = true;
},
//点击查看按钮事件
@@ -1091,6 +1296,15 @@ export default {
});
},
// 分页事件
+ pageChange(page) {
+ this.page = page;
+ this.getStandDatas()
+ },
+ pageSizeChange(pageSize) {
+ this.pageSize = pageSize;
+ this.getStandDatas()
+ },
+ // 分页事件
pageChangeNo(page) {
this.pageNo = page;
this.getTableByPage();
@@ -1099,6 +1313,11 @@ export default {
this.pageSizeNo = pageSize;
this.getTableByPage();
},
+ //产品线change事件
+ handleChangeLine(val){
+ this.addForm.productLine = val.productLine
+ this.ProjectDatas = val.sarStandProjectLibraries
+ },
/** 项目名称change事件 */
handleChange(val) {
@@ -1108,18 +1327,11 @@ export default {
}
this.addForm.productId = val.id
this.addForm.productId = val.projectNumber
- this.addForm.productLine = val.productLine
this.addForm.productName = val.projectName
this.addForm.productType = val.projectPlatfor
this.serialNumber = false
- let productId = val.id
- this.getStandData(productId)
- },
- /** 标准号change事件 */
- standChange(item) {
- this.addForm.standId = item.standId
- this.addForm.standName = item.standName
- this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
+ // let productId = val.id
+ // this.getStandData(productId)
},
/** 责任工程师选择 */
choiceZRR(type, title, id) {
@@ -1179,11 +1391,28 @@ export default {
this.addForm.responsibleUnit = nameList;
},
+ //获取产品线数据
+ getProductData() {
+ this.$http.get("sarStandProjectLibrary/queryProjectManager", {
+ current: 1,
+ PageSize:100,
+ }, {
+ _this: this
+ }, res => {
+ res.data.records.forEach(item => {
+ if(item.productLine){
+ this.productLines.push(item)
+ }
+ })
+ }, e => {
+
+ });
+ },
},
mounted() {
- //查询已维护的项目
- this.getProjectData();
+ //查询产品线
+ this.getProductData()
this.getData()
// 加载所有的部门
this.getOrgTreeSource();
@@ -1192,6 +1421,9 @@ export default {
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index eb756219f..884424ec9 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -78,7 +78,7 @@
label="章节编号"
sortable
align="center"
- width="180">
+ width="120">
+
@@ -198,23 +199,13 @@
width="200"
align="center"
label="新车型实施日期">
-
- {{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}
-
基础信息
基础信息
审批历史