From 2ff5ac129b2e425be07db0b291a9474c8fbe690a Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 10 Jun 2020 15:30:44 +0800 Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E7=BB=BC=E6=B2=BB=E7=9F=9B=E8=B0=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../conflictmediate-add-or-update.vue | 194 ++++++++++++++++++ .../modules/conflict/conflictmediate.vue | 164 +++++++++++++++ 2 files changed, 358 insertions(+) create mode 100644 src/views/modules/conflict/conflictmediate-add-or-update.vue create mode 100644 src/views/modules/conflict/conflictmediate.vue diff --git a/src/views/modules/conflict/conflictmediate-add-or-update.vue b/src/views/modules/conflict/conflictmediate-add-or-update.vue new file mode 100644 index 0000000..f62d199 --- /dev/null +++ b/src/views/modules/conflict/conflictmediate-add-or-update.vue @@ -0,0 +1,194 @@ + + + diff --git a/src/views/modules/conflict/conflictmediate.vue b/src/views/modules/conflict/conflictmediate.vue new file mode 100644 index 0000000..7e75278 --- /dev/null +++ b/src/views/modules/conflict/conflictmediate.vue @@ -0,0 +1,164 @@ + + +