1/6

src/views/main/PrintingNew/addForm.vue

@@ -13,14 +13,17 @@
           <a-col :span="8">
             <a-form-item label="显示名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
-                placeholder="请选择显示名称"
+                placeholder="请输入显示名称"
                 v-decorator="['displayName', { rules: [{ required: true, message: '请输入显示名称！' }] }]"
               />
             </a-form-item>
           </a-col>
           <a-col :md="8">
             <a-form-item label="模板类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-select v-decorator="['type', { rules: [{ required: true, message: '请选择模板类型！' }] }]">
+              <a-select
+                placeholder="请选择模板类型"
+                v-decorator="['type', { rules: [{ required: true, message: '请选择模板类型！' }] }]"
+              >
                 <a-select-option value="FastReport">
                   FastReport
                 </a-select-option>
@@ -33,8 +36,8 @@
           <a-col :span="8">
             <a-form-item label="分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-select
-                placeholder="请选择类型名称"
-                v-decorator="['cateCode', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
+                placeholder="请选择分类"
+                v-decorator="['cateCode', { rules: [{ required: true, message: '请选择分类！' }] }]"
               >
                 <a-select-option v-for="item in CateData" :key="item.code" :value="item.code">
                   {{ item.name }}

src/views/main/PrintingNew/editForm.vue

@@ -13,14 +13,17 @@
           <a-col :span="8">
             <a-form-item label="显示名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
-                placeholder="请选择显示名称"
+                placeholder="请输入显示名称"
                 v-decorator="['displayName', { rules: [{ required: true, message: '请输入显示名称！' }] }]"
               />
             </a-form-item>
           </a-col>
           <a-col :md="8">
             <a-form-item label="模板类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-select v-decorator="['type', { rules: [{ required: true, message: '请选择模板类型！' }] }]">
+              <a-select
+                placeholder="请选择模板类型"
+                v-decorator="['type', { rules: [{ required: true, message: '请选择模板类型！' }] }]"
+              >
                 <a-select-option value="FastReport">
                   FastReport
                 </a-select-option>
@@ -33,8 +36,8 @@
           <a-col :span="8">
             <a-form-item label="分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-select
-                placeholder="请选择类型名称"
-                v-decorator="['cateCode', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
+                placeholder="请选择分类"
+                v-decorator="['cateCode', { rules: [{ required: true, message: '请选择分类！' }] }]"
               >
                 <a-select-option v-for="item in CateData" :key="item.code" :value="item.code">
                   {{ item.name }}

src/views/main/PrintingNew/index.vue

@@ -16,8 +16,8 @@
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="类型">
-                    <a-select v-model="queryParam.cateCode" style="width: 100%" placeholder="请选择类型" allow-clear>
+                  <a-form-item label="分类">
+                    <a-select v-model="queryParam.cateCode" style="width: 100%" placeholder="请选择分类" allow-clear>
                       <a-select-option v-for="item in CateData" :key="item.id" :value="item.code">
                         {{ item.name }}
                       </a-select-option>
@@ -105,8 +105,8 @@
         </vxe-column>
         <vxe-column title="操作" fixed="right" width="250" align="center">
           <template #default="{ row }">
-            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
             <vxe-button type="text" v-if="row.type == 'ExcelTemplate'" @click="FnExcel(row)">详细设置</vxe-button>
+            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
             <a-popconfirm
               title="请确认删除?"
               ok-text="是"