FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-12-10 17:04:03 +08:00
parent 190d39a6af 94c6e32dbe
commit d4da72e48f
9 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+6
View File
@@ -92,6 +92,12 @@
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrq"
width="200" width="200"
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+10 -3
View File
@@ -94,6 +94,12 @@
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrq"
width="200" width="200"
@@ -470,9 +476,7 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => { 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=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -480,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear); this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort); this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber); this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
} }
}) })
}) })
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+10 -3
View File
@@ -94,6 +94,12 @@
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrq"
width="200" width="200"
@@ -468,9 +474,7 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => { 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=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -478,6 +482,9 @@ export default {
this.$set(items, "standYear", item.standYear); this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort); this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber); this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
} }
}) })
}) })
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+10 -3
View File
@@ -94,6 +94,12 @@
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrq"
width="200" width="200"
@@ -470,9 +476,7 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => { 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=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -480,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear); this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort); this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber); this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
} }
}) })
}) })
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
-1
View File
@@ -455,7 +455,6 @@ export default {
this.isSubmit = true; this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+9
View File
@@ -103,6 +103,12 @@
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrq"
width="200" width="200"
@@ -807,6 +813,9 @@ export default {
this.$set(items, "standYear", item.standYear); this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort); this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber); this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
} }
}) })
}) })
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+10 -4
View File
@@ -94,7 +94,12 @@
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrq"
width="200" width="200"
@@ -430,9 +435,7 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => { 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=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -440,6 +443,9 @@ export default {
this.$set(items, "standYear", item.standYear); this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort); this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber); this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
} }
}) })
}) })
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+10 -3
View File
@@ -94,6 +94,12 @@
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrq"
width="200" width="200"
@@ -468,9 +474,7 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => { 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=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -478,6 +482,9 @@ export default {
this.$set(items, "standYear", item.standYear); this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort); this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber); this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
} }
}) })
}) })
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+10 -3
View File
@@ -94,6 +94,12 @@
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrq"
width="200" width="200"
@@ -470,9 +476,7 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => { 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=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -480,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear); this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort); this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber); this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
} }
}) })
}) })