1.品牌基础表

src/utils/dict.js

@@ -78,7 +78,8 @@ export const DICT_TYPE = {
   CUSTOMER_COMPLAINT_STATUS: 'customer_complaint_status',
   ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type',
   ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status',
-  PWD_TYPE: 'pwd_type'
+  PWD_TYPE: 'pwd_type',
+  BRAND_REG_TYPE: 'brand_registry_type',
 
 }
 

src/views/ecw/productBrank/index.vue

@@ -12,8 +12,17 @@
       <el-form-item label="排序" prop="aorder">
         <el-input v-model="queryParams.aorder" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="是否备案，字典" prop="filing">
-        <el-input v-model="queryParams.filing" placeholder="请输入是否备案，字典" clearable @keyup.enter.native="handleQuery"/>
+<!--      <el-form-item label="是否备案" prop="filing">-->
+<!--        <el-select v-model="queryParams.filing" placeholder="请选择是否备案，字典" clearable size="small">-->
+<!--          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_REGISTRY_TYPE)"-->
+<!--                       :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="是否备案" prop="filing">
+        <el-select v-model="queryParams.filing" placeholder="请选择是否备案" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_REG_TYPE)"
+                     :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
       </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
@@ -44,13 +53,19 @@
       <el-table-column label="品牌中文标题" align="center" prop="titleZh" />
       <el-table-column label="品牌英文标题" align="center" prop="titleEn" />
       <el-table-column label="排序" align="center" prop="aorder" />
-      <el-table-column label="是否备案，字典" align="center" prop="filing">
+      <el-table-column label="是否备案" align="center" prop="filing">
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :type="r in recordStatus" :value="scope.row.filing" />-->
+<!--        </template>-->
         <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.BRAND_REGISTRY_TYPE" :value="scope.row.filing" />
+          <dict-tag :type="DICT_TYPE.BRAND_REG_TYPE" :value="scope.row.filing" />
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['ecw:product-brank:update']">修改</el-button>
@@ -75,9 +90,19 @@
         <el-form-item label="排序" prop="aorder">
           <el-input v-model="form.aorder" placeholder="请输入排序" />
         </el-form-item>
-        <el-form-item label="是否备案，字典" prop="filing">
-          <el-input v-model="form.filing" placeholder="请输入是否备案，字典" />
-        </el-form-item>
+<!--        <el-form-item label="是否备案" prop="filing">-->
+<!--          <el-radio-group v-model="form.filing">-->
+<!--            <el-radio v-for="dict in recordStatus"-->
+<!--                      :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+
+        <el-form-item label="是否备案" prop="filing">
+            <el-select v-model="form.filing" placeholder="请选择是否备案">
+              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_REG_TYPE)"
+                         :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -89,6 +114,9 @@
 
 <script>
 import { createProductBrank, updateProductBrank, deleteProductBrank, getProductBrank, getProductBrankPage, exportProductBrankExcel } from "@/api/ecw/productBrank";
+import { CommonStatusEnum } from '@/utils/constants';
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+
 
 export default {
   name: "ProductBrank",
@@ -124,7 +152,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      recordStatus: getDictDatas(DICT_TYPE.BRAND_REG_TYPE),
     };
   },
   created() {
@@ -134,6 +163,9 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
+      if(this.queryParams!=null&&this.queryParams.filing===''){
+        this.queryParams.filing=null;
+      }
       // 处理查询参数
       let params = {...this.queryParams};
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');