From 09b13199647de109315c067ac1f7631852ac941f Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Mon, 25 Nov 2019 16:14:04 +0800
Subject: [PATCH] =?UTF-8?q?APP=E8=8F=9C=E5=8D=95=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/appmenutemplate-add-or-update.vue     | 62 +++++++++----------
 src/views/modules/sys/appmenutemplate.vue     | 30 ++++-----
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/views/modules/sys/appmenutemplate-add-or-update.vue b/src/views/modules/sys/appmenutemplate-add-or-update.vue
index 73acc909..fe9d4e99 100644
--- a/src/views/modules/sys/appmenutemplate-add-or-update.vue
+++ b/src/views/modules/sys/appmenutemplate-add-or-update.vue
@@ -8,6 +8,27 @@
              ref="dataForm"
              @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="模板名称"
+                    prop="templateName">
+        <el-input v-model="dataForm.templateName"
+                  placeholder="模板名称"></el-input>
+      </el-form-item>
+      <el-form-item label="模板编码"
+                    prop="templateCode">
+        <el-input v-model="dataForm.templateCode"
+                  placeholder="模板编码(tem-1,tem-2,tem-3)"></el-input>
+      </el-form-item>
+      <el-form-item label="标签颜色"
+                    prop="lableColor">
+        <el-input v-model="dataForm.lableColor"
+                  placeholder="标签颜色"></el-input>
+      </el-form-item>
+      <el-form-item label="背景颜色"
+                    prop="backgroundColor"
+                    v-if="!categoryVisible">
+        <el-input v-model="dataForm.backgroundColor"
+                  placeholder="背景颜色（渐变色为0时使用）"></el-input>
+      </el-form-item>
       <el-form-item label="是否渐变"
                     prop="gradationFlag">
         <el-select v-model="dataForm.gradationFlag"
@@ -19,12 +40,6 @@
                      :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="背景颜色"
-                    prop="backgroundColor"
-                    v-if="!categoryVisible">
-        <el-input v-model="dataForm.backgroundColor"
-                  placeholder="背景颜色（渐变色为0时使用）"></el-input>
-      </el-form-item>
       <el-form-item label="开始色"
                     prop="startColor"
                     v-if="categoryVisible">
@@ -37,21 +52,6 @@
         <el-input v-model="dataForm.endColor"
                   placeholder="终止色（渐变色为1时使用）"></el-input>
       </el-form-item>
-      <el-form-item label="标签颜色"
-                    prop="lableColor">
-        <el-input v-model="dataForm.lableColor"
-                  placeholder="标签颜色"></el-input>
-      </el-form-item>
-      <el-form-item label="模板编码"
-                    prop="templateCode">
-        <el-input v-model="dataForm.templateCode"
-                  placeholder="模板编码(tem-1,tem-2,tem-3)"></el-input>
-      </el-form-item>
-      <el-form-item label="模板名称"
-                    prop="templateName">
-        <el-input v-model="dataForm.templateName"
-                  placeholder="模板名称"></el-input>
-      </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -90,19 +90,19 @@ export default {
     dataRule () {
       return {
         gradationFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         backgroundColor: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         startColor: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         endColor: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         lableColor: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         templateCode: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -111,19 +111,19 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
diff --git a/src/views/modules/sys/appmenutemplate.vue b/src/views/modules/sys/appmenutemplate.vue
index 24fed360..aef0a5ec 100644
--- a/src/views/modules/sys/appmenutemplate.vue
+++ b/src/views/modules/sys/appmenutemplate.vue
@@ -33,33 +33,33 @@
                          header-align="center"
                          align="center"
                          width="50"></el-table-column>
-        <el-table-column prop="gradationFlag"
-                         label="是否渐变色"
-                         :formatter="formatGradationFlag"
+        <el-table-column prop="templateName"
+                         label="模板名称"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="backgroundColor"
-                         label="背景颜色"
+        <el-table-column prop="templateCode"
+                         label="模板编码"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="startColor"
-                         label="开始色"
+        <el-table-column prop="lableColor"
+                         label="标签颜色"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="endColor"
-                         label="终止色"
+        <el-table-column prop="backgroundColor"
+                         label="背景颜色"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="lableColor"
-                         label="标签颜色"
+        <el-table-column prop="gradationFlag"
+                         label="是否渐变色"
+                         :formatter="formatGradationFlag"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="templateCode"
-                         label="模板编码"
+        <el-table-column prop="startColor"
+                         label="开始色"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="templateName"
-                         label="模板名称"
+        <el-table-column prop="endColor"
+                         label="终止色"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column :label="$t('handle')"