guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码冲突解决

2024-07-22新BI页面
liujun 2024-07-02 15:24:09 +08:00
parent 2ccd92f1c3
commit 0cdcd706bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/threeSystems/lawsRegulations/components/editTextLibrary.vue
View File

@ -326,7 +326,7 @@ export default {
SPECIFICATION_TYPES: [''], SPECIFICATION_TYPES: [''],
CATEGORY_LIST: [''], CATEGORY_LIST: [''],
STATUS: '', STATUS: '',
ASSOCIATION: '0', ASSOCIATION: '4',
types: [], types: [],
specification_types: [], specification_types: [],
category_list: [], category_list: [],

2
src/views/threeSystems/lawsRegulations/components/list.vue
View File

@ -288,7 +288,7 @@ export default {
STATUS: this.form.STATUS, STATUS: this.form.STATUS,
TYPE: this.form.TYPE_NAME, TYPE: this.form.TYPE_NAME,
DATE: this.form.DATE, DATE: this.form.DATE,
TEXT_NAME: this.TEXT_NAME, TEXT_NAME: this.form.TEXT_NAME,
ASSOCIATION: '4', ASSOCIATION: '4',
CORPINFO_ID: '0', CORPINFO_ID: '0',
MIGRATION_FLAG: '1' MIGRATION_FLAG: '1'