diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index 8359b012e..690d3e50f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -480,6 +480,7 @@ export default {
this.projectId = this.selectedList[0].id;
this.listForm.projectNumber = this.selectedList[0].projectNumber;
this.listForm.projectName = this.selectedList[0].projectName;
+ this.listForm.productLine = this.selectedList[0].productLine;
this.getStandData();
this.projectModel = false;
}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index f5c6021b1..65545af80 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -478,6 +478,7 @@ export default {
this.projectId = this.selectedList[0].id;
this.listForm.projectNumber = this.selectedList[0].projectNumber;
this.listForm.projectName = this.selectedList[0].projectName;
+ this.listForm.productLine = this.selectedList[0].productLine;
this.getStandData();
this.projectModel = false;
}
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index cefaecdc1..583ed86e1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -335,7 +335,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);
@@ -394,6 +393,7 @@ 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/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index c56b05480..879ff25bd 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -76,10 +76,14 @@
width="260px"
>
- {{
scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
}}
+ {{
+ scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear
+ }}
-
-
{
- if (res.ok) {
- // this.$message.success(res.message)
- this.getDataList()
- }
- }, e => {
- });
- }
- this.standList = []
- this.standList1 = []
- _this.standModel = false;
- }
+ okStand(){
+ if(this.standList.length > 0){
+ this.standList.forEach(item => {
+ let addIndex
+ addIndex = this.dataList.findIndex(items => {
+ return items.standId === item.id
+ })
+ if(addIndex > -1){
+ this.$message.warning('请勿重复添加数据')
+ }else{
+ this.dataList.push(item)
+ }
+ })
+ }else{
+ this.$message.warning('请至少选择一条数据进行添加')
+ }
},
+ // okStand() {
+ // let _this = this;
+ // if (this.standList.length < 1) {
+ // _this.$message.warning("请选择标准");
+ // } else {
+ // for (let i = 0; i < this.dataList.length; i++) {
+ // let newStand = false;
+ // for (let j = 0; j < this.standList.length; j++) {
+ // if (this.standList[j].id == this.dataList[i].standId) {
+ // newStand = true;
+ // this.standList.splice(j, 1)
+ // j--
+ // }
+ // }
+ // if (newStand) {
+ // _this.$message.warning("请勿重复添加数据");
+ // } else {
+ // // _this.dataList.push(item);
+ // }
+ // }
+ // this.standardData = []
+ // _this.standModel = false;
+ // for (var i = 0; i < this.standList.length; i++) {
+ // this.standList1.push({
+ // standId: this.standList[i].id,
+ // projectId: this.localProEO.id
+ // })
+ // }
+ // if (this.standList1 != '') {
+ // this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+ // _this: this
+ // }, res => {
+ // if (res.ok) {
+ // // this.$message.success(res.message)
+ // this.getDataList()
+ // }
+ // }, e => {
+ // });
+ // }
+ // this.standList = []
+ // this.standList1 = []
+ // _this.standModel = false;
+ // }
+ // },
//获取标准
getStandrd(data){
this.detailedId = data.id
@@ -763,6 +779,14 @@ export default {
this.standModel = true;
}
this.standardData = res.data.records
+ this.standardData.forEach(item => {
+ if(item.zccssrqgj === '-'){
+ item.zccssrqgj = ''
+ }
+ if(item.xcxssrqgj === '-'){
+ item.xcxssrq = ''
+ }
+ })
this.totalDo = res.data.total
this.standModel = true;
})