Compare commits
	
		
			No commits in common. "23362cd6e533a6cbb452bd7f292ca11035231041" and "50a193e8f502fdc432d9b64fafc0bd1a29df0e09" have entirely different histories.
		
	
	
		
			23362cd6e5
			...
			50a193e8f5
		
	
		
| @ -66,38 +66,38 @@ | ||||
|           v-hasPermi="['system:category:add']" | ||||
|         >新增</el-button> | ||||
|       </el-col> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="success"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-edit"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          :disabled="single"--> | ||||
| <!--          @click="handleUpdate"--> | ||||
| <!--          v-hasPermi="['system:category:edit']"--> | ||||
| <!--        >修改</el-button>--> | ||||
| <!--      </el-col>--> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="danger"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-delete"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          :disabled="multiple"--> | ||||
| <!--          @click="handleDelete"--> | ||||
| <!--          v-hasPermi="['system:category:remove']"--> | ||||
| <!--        >删除</el-button>--> | ||||
| <!--      </el-col>--> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="warning"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-download"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          @click="handleExport"--> | ||||
| <!--          v-hasPermi="['system:category:export']"--> | ||||
| <!--        >导出</el-button>--> | ||||
| <!--      </el-col>--> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="success" | ||||
|           plain | ||||
|           icon="el-icon-edit" | ||||
|           size="mini" | ||||
|           :disabled="single" | ||||
|           @click="handleUpdate" | ||||
|           v-hasPermi="['system:category:edit']" | ||||
|         >修改</el-button> | ||||
|       </el-col> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="danger" | ||||
|           plain | ||||
|           icon="el-icon-delete" | ||||
|           size="mini" | ||||
|           :disabled="multiple" | ||||
|           @click="handleDelete" | ||||
|           v-hasPermi="['system:category:remove']" | ||||
|         >删除</el-button> | ||||
|       </el-col> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="warning" | ||||
|           plain | ||||
|           icon="el-icon-download" | ||||
|           size="mini" | ||||
|           @click="handleExport" | ||||
|           v-hasPermi="['system:category:export']" | ||||
|         >导出</el-button> | ||||
|       </el-col> | ||||
|       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | ||||
|     </el-row> | ||||
| 
 | ||||
| @ -145,8 +145,8 @@ | ||||
|         <el-form-item label="分类名称" prop="categoryName"> | ||||
|           <el-input v-model="form.categoryName" placeholder="请输入分类名称" /> | ||||
|         </el-form-item> | ||||
|         <el-form-item label="上级分类" prop="parentId"> | ||||
|           <el-input v-model="form.parentId" placeholder="请选择上级分类" /> | ||||
|         <el-form-item label="父ID" prop="parentId"> | ||||
|           <el-input v-model="form.parentId" placeholder="请输入父ID" /> | ||||
|         </el-form-item> | ||||
|         <el-form-item label="排序" prop="sort"> | ||||
|           <el-input v-model="form.sort" placeholder="请输入排序" /> | ||||
| @ -154,11 +154,11 @@ | ||||
|         <el-form-item label="分类描述" prop="description"> | ||||
|           <el-input v-model="form.description" placeholder="请输入分类描述" /> | ||||
|         </el-form-item> | ||||
| <!--        <el-form-item label="删除标志" prop="delFlag">--> | ||||
| <!--          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />--> | ||||
| <!--        </el-form-item>--> | ||||
|         <el-form-item label="语言标签" prop="categoryTags"> | ||||
|           <el-input v-model="form.categoryTags" placeholder="请选择语言标签" /> | ||||
|         <el-form-item label="删除标志" prop="delFlag"> | ||||
|           <el-input v-model="form.delFlag" placeholder="请输入删除标志" /> | ||||
|         </el-form-item> | ||||
|         <el-form-item label="标签" prop="categoryTags"> | ||||
|           <el-input v-model="form.categoryTags" placeholder="请输入标签" /> | ||||
|         </el-form-item> | ||||
|       </el-form> | ||||
|       <div slot="footer" class="dialog-footer"> | ||||
|  | ||||
| @ -1,14 +1,14 @@ | ||||
| <template> | ||||
|   <div class="app-container"> | ||||
|     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> | ||||
|       <el-form-item label="素材分组" prop="groupId"> | ||||
|         <el-input | ||||
|           v-model="queryParams.groupId" | ||||
|           placeholder="请选择素材分组" | ||||
|           clearable | ||||
|           @keyup.enter.native="handleQuery" | ||||
|         /> | ||||
|       </el-form-item> | ||||
| <!--      <el-form-item label="分组id" prop="groupId">--> | ||||
| <!--        <el-input--> | ||||
| <!--          v-model="queryParams.groupId"--> | ||||
| <!--          placeholder="请输入分组id"--> | ||||
| <!--          clearable--> | ||||
| <!--          @keyup.enter.native="handleQuery"--> | ||||
| <!--        />--> | ||||
| <!--      </el-form-item>--> | ||||
|       <el-form-item label="素材名称" prop="materialName"> | ||||
|         <el-input | ||||
|           v-model="queryParams.materialName" | ||||
|  | ||||
| @ -66,38 +66,38 @@ | ||||
|           v-hasPermi="['system:materialGroup:add']" | ||||
|         >新增</el-button> | ||||
|       </el-col> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="success"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-edit"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          :disabled="single"--> | ||||
| <!--          @click="handleUpdate"--> | ||||
| <!--          v-hasPermi="['system:materialGroup:edit']"--> | ||||
| <!--        >修改</el-button>--> | ||||
| <!--      </el-col>--> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="danger"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-delete"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          :disabled="multiple"--> | ||||
| <!--          @click="handleDelete"--> | ||||
| <!--          v-hasPermi="['system:materialGroup:remove']"--> | ||||
| <!--        >删除</el-button>--> | ||||
| <!--      </el-col>--> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="warning"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-download"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          @click="handleExport"--> | ||||
| <!--          v-hasPermi="['system:materialGroup:export']"--> | ||||
| <!--        >导出</el-button>--> | ||||
| <!--      </el-col>--> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="success" | ||||
|           plain | ||||
|           icon="el-icon-edit" | ||||
|           size="mini" | ||||
|           :disabled="single" | ||||
|           @click="handleUpdate" | ||||
|           v-hasPermi="['system:materialGroup:edit']" | ||||
|         >修改</el-button> | ||||
|       </el-col> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="danger" | ||||
|           plain | ||||
|           icon="el-icon-delete" | ||||
|           size="mini" | ||||
|           :disabled="multiple" | ||||
|           @click="handleDelete" | ||||
|           v-hasPermi="['system:materialGroup:remove']" | ||||
|         >删除</el-button> | ||||
|       </el-col> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="warning" | ||||
|           plain | ||||
|           icon="el-icon-download" | ||||
|           size="mini" | ||||
|           @click="handleExport" | ||||
|           v-hasPermi="['system:materialGroup:export']" | ||||
|         >导出</el-button> | ||||
|       </el-col> | ||||
|       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | ||||
|     </el-row> | ||||
| 
 | ||||
| @ -141,9 +141,9 @@ | ||||
|     <!-- 添加或修改素材分组管理对话框 --> | ||||
|     <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body> | ||||
|       <el-form ref="form" :model="form" :rules="rules" label-width="80px"> | ||||
| <!--        <el-form-item label="父ID" prop="parentId">--> | ||||
| <!--          <el-input v-model="form.parentId" placeholder="请输入父ID" />--> | ||||
| <!--        </el-form-item>--> | ||||
|         <el-form-item label="父ID" prop="parentId"> | ||||
|           <el-input v-model="form.parentId" placeholder="请输入父ID" /> | ||||
|         </el-form-item> | ||||
| <!--        <el-form-item label="部门ID" prop="deptId">--> | ||||
| <!--          <el-input v-model="form.deptId" placeholder="请输入部门ID" />--> | ||||
| <!--        </el-form-item>--> | ||||
|  | ||||
| @ -9,10 +9,10 @@ | ||||
| <!--          @keyup.enter.native="handleQuery"--> | ||||
| <!--        />--> | ||||
| <!--      </el-form-item>--> | ||||
|       <el-form-item label="标签名称" prop="tagName"> | ||||
|       <el-form-item label="分类名称" prop="tagName"> | ||||
|         <el-input | ||||
|           v-model="queryParams.tagName" | ||||
|           placeholder="请输入标签名称" | ||||
|           placeholder="请输入分类名称" | ||||
|           clearable | ||||
|           @keyup.enter.native="handleQuery" | ||||
|         /> | ||||
| @ -50,38 +50,38 @@ | ||||
|           v-hasPermi="['system:tags:add']" | ||||
|         >新增</el-button> | ||||
|       </el-col> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="success"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-edit"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          :disabled="single"--> | ||||
| <!--          @click="handleUpdate"--> | ||||
| <!--          v-hasPermi="['system:tags:edit']"--> | ||||
| <!--        >修改</el-button>--> | ||||
| <!--      </el-col>--> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="danger"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-delete"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          :disabled="multiple"--> | ||||
| <!--          @click="handleDelete"--> | ||||
| <!--          v-hasPermi="['system:tags:remove']"--> | ||||
| <!--        >删除</el-button>--> | ||||
| <!--      </el-col>--> | ||||
| <!--      <el-col :span="1.5">--> | ||||
| <!--        <el-button--> | ||||
| <!--          type="warning"--> | ||||
| <!--          plain--> | ||||
| <!--          icon="el-icon-download"--> | ||||
| <!--          size="mini"--> | ||||
| <!--          @click="handleExport"--> | ||||
| <!--          v-hasPermi="['system:tags:export']"--> | ||||
| <!--        >导出</el-button>--> | ||||
| <!--      </el-col>--> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="success" | ||||
|           plain | ||||
|           icon="el-icon-edit" | ||||
|           size="mini" | ||||
|           :disabled="single" | ||||
|           @click="handleUpdate" | ||||
|           v-hasPermi="['system:tags:edit']" | ||||
|         >修改</el-button> | ||||
|       </el-col> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="danger" | ||||
|           plain | ||||
|           icon="el-icon-delete" | ||||
|           size="mini" | ||||
|           :disabled="multiple" | ||||
|           @click="handleDelete" | ||||
|           v-hasPermi="['system:tags:remove']" | ||||
|         >删除</el-button> | ||||
|       </el-col> | ||||
|       <el-col :span="1.5"> | ||||
|         <el-button | ||||
|           type="warning" | ||||
|           plain | ||||
|           icon="el-icon-download" | ||||
|           size="mini" | ||||
|           @click="handleExport" | ||||
|           v-hasPermi="['system:tags:export']" | ||||
|         >导出</el-button> | ||||
|       </el-col> | ||||
|       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | ||||
|     </el-row> | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user