commit

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -470,13 +470,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
@@ -529,7 +530,6 @@ export default {
       this.listForm.bzFlag = "1";
       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,

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -467,16 +467,18 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -493,11 +495,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //提交事件

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -470,13 +470,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -471,7 +471,6 @@ export default {
       console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        if (item.form === undefined) {
           let dataChildren = []
           let dataListChildren = []
           this.listForm.prcNum = this.prcNum;
@@ -501,37 +500,6 @@ export default {
           dataListChildren = this.dataList.concat(dataListChildren)
           this.dataList = dataListChildren
           this.total = this.dataList.length;
-        } else {
-          this.listForm = item.form;
-          let dataChildren = []
-          let dataListChildren = []
-          this.listForm.dataList.forEach(item => {
-            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-              this.dataList.push(item)
-            }
-            item.children.forEach(items=> {
-              if(items.key === item.standId){
-                this.$set(items, "standName", item.standName);
-                this.$set(items, "standEnName", item.standEnName);
-                this.$set(items, "standYear", item.standYear);
-                this.$set(items, "standSort", item.standSort);
-                this.$set(items, "standNumber", item.standNumber);
-              }
-            })
-          })
-          this.listForm.dataList.forEach(item => {
-            dataChildren.push(item.children)
-          })
-          dataChildren.forEach((item,index) => {
-            dataListChildren = dataListChildren.concat(item)
-          })
-          dataListChildren = this.dataList.concat(dataListChildren)
-          this.dataList = dataListChildren
-          this.total = this.dataList.length;
-          // this.dataList = item.form.dataList[0].children;
-          // this.total = item.form.dataList[0].children.length;
-        }
-
       });
     },
     //驳回事件

src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue

@@ -468,13 +468,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -491,11 +494,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件

src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue

@@ -470,13 +470,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -161,7 +161,7 @@
             <template slot-scope="scope">
               <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
               <div class="table-jump" @click="changeState(scope.row)">
-                <div v-if="scope.row.sarState === 0">符合</div>
+                <div v-if="scope.row.unCount === 0">符合</div>
                 <div v-else >不符合</div>
               </div>
             </template>