From e5028a75160e9d7d496ff0d330b03ac18d22c178 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Thu, 9 Jun 2022 15:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=B1=BB=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=AE=A1=E7=90=86=20=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/category/fieldManage/index.vue      | 44 ++++++++++++-------
 .../category/fieldManage/module/form.vue      | 16 +++----
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/views/category/fieldManage/index.vue b/src/views/category/fieldManage/index.vue
index ef5a922..34f22e0 100644
--- a/src/views/category/fieldManage/index.vue
+++ b/src/views/category/fieldManage/index.vue
@@ -20,38 +20,47 @@
         </template>
       </el-table-column>
       <el-table-column prop="isColumnLength" label="字段长度" min-width="85" />
-      <el-table-column prop="isColumnLength" label="著录形式" min-width="85" />
-      <el-table-column prop="isColumnLength" label="对应字典" min-width="85" />
-      <el-table-column prop="isColumnLength" label="显示长度" min-width="85" />
-      <el-table-column label="显示一整行" min-width="110">
+      <el-table-column label="著录形式" min-width="85">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.isDefaultValue" :disabled="true" />
+          <span v-if="scope.row.isInputClass === 'select'">下拉框</span>
+          <span v-if="scope.row.isInputClass === 'text'">文本框</span>
+          <span v-if="scope.row.isInputClass === 'date'">日期框</span>
+          <span v-if="scope.row.isInputClass === 'number'">数字框</span>
+          <span v-if="scope.row.isInputClass === 'popover'">弹出框</span>
+          <span v-if="scope.row.isInputClass === 'textarea'">文本域</span>
         </template>
       </el-table-column>
-      <el-table-column label="输入字段" min-width="85">
+      <el-table-column prop="sysDictionaryId" label="对应字典" min-width="85" />
+      <el-table-column prop="editLength" label="显示长度" min-width="85" />
+      <el-table-column label="显示一整行" min-width="110" align="center">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.isDefaultValue" :disabled="true" />
+          <el-checkbox v-model="scope.row.isLine" :disabled="true" />
         </template>
       </el-table-column>
-      <el-table-column label="必填字段" min-width="85">
+      <el-table-column label="输入字段" min-width="85" align="center">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.isDefaultValue" :disabled="true" />
+          <el-checkbox v-model="scope.row.isInput" :disabled="true" />
         </template>
       </el-table-column>
-      <el-table-column label="自动生成" min-width="85">
+      <el-table-column label="必填字段" min-width="85" align="center">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.isDefaultValue" :disabled="true" />
+          <el-checkbox v-model="scope.row.isRequired" :disabled="true" />
         </template>
       </el-table-column>
-      <el-table-column label="自动补零" min-width="85">
+      <el-table-column label="自动生成" min-width="85" align="center">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.isDefaultValue" :disabled="true" />
+          <el-checkbox v-model="scope.row.isAuto" :disabled="true" />
         </template>
       </el-table-column>
-      <el-table-column prop="isColumnLength" label="位数" min-width="55" />
-      <el-table-column label="值不重复" min-width="85">
+      <el-table-column label="自动补零" min-width="85" align="center">
         <template slot-scope="scope">
-          <el-checkbox v-model="scope.row.isDefaultValue" :disabled="true" />
+          <el-checkbox v-model="scope.row.isFilling" :disabled="true" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="fillingDigit" label="位数" min-width="55" align="center" :formatter="digitFormatter" />
+      <el-table-column label="值不重复" min-width="85" align="center">
+        <template slot-scope="scope">
+          <el-checkbox v-model="scope.row.isNoRepetition" :disabled="true" />
         </template>
       </el-table-column>
     </el-table>
@@ -173,6 +182,9 @@ export default {
     handleClose(done) {
       this.deleteData = {}
       done()
+    },
+    digitFormatter(row, column, cellValue, index) {
+      return cellValue || '-'
     }
   }
 }
diff --git a/src/views/category/fieldManage/module/form.vue b/src/views/category/fieldManage/module/form.vue
index 89baf21..7d89d56 100644
--- a/src/views/category/fieldManage/module/form.vue
+++ b/src/views/category/fieldManage/module/form.vue
@@ -25,13 +25,13 @@
                 <el-option v-for="item in inputClassOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="对应字典" prop="isDefaultValueType">
+            <el-form-item label="对应字典" prop="sysDictionaryId">
               <el-select v-model="form.isDefaultValueType" placeholder="" :disabled="isDisabled">
                 <el-option v-for="item in dictionaryData" :key="item.id" :label="item.dicName" :value="item.dicCode" />
               </el-select>
             </el-form-item>
-            <el-form-item label="显示长度" prop="isInputLength">
-              <el-input v-model="form.isInputLength" :disabled="isDisabled" />
+            <el-form-item label="显示长度" prop="editLength">
+              <el-input v-model="form.editLength" :disabled="isDisabled" />
             </el-form-item>
             <el-form-item label="默认值" prop="isDefaultValue">
               <el-input v-model="form.isDefaultValue" :disabled="isDisabled" />
@@ -40,7 +40,7 @@
           <el-col :span="9">
             <el-form-item class="checkbox-item">
               <span>显示一整行</span>
-              <el-checkbox v-model="form.isFullrow" label="" name="isFullrow" :disabled="isDisabled" />
+              <el-checkbox v-model="form.isLine" label="" name="isLine" :disabled="isDisabled" />
             </el-form-item>
             <el-form-item class="checkbox-item">
               <span>输入字段</span>
@@ -60,9 +60,9 @@
             </el-form-item>
             <el-form-item class="checkbox-item">
               <span>自动补零</span>
-              <el-checkbox v-model="form.isSupplement" label="" name="isSupplement" :disabled="isDisabled" @change="changeSupplement" />
+              <el-checkbox v-model="form.isFilling" label="" name="isFilling" :disabled="isDisabled" @change="changeSupplement" />
             </el-form-item>
-            <el-form-item class="input-num" label="位数" prop="isSupplementNum">
+            <el-form-item class="input-num" label="位数" prop="fillingDigit">
               <!-- <el-input v-model="form.isSupplementNum" type="number" :min="1" :disabled="isDisabled || !form.isSupplement" /> -->
               <el-input-number v-model="form.isSupplementNum" controls-position="right" :min="1" :disabled="isDisabled || !form.isSupplement" style="width:80px" />
               <span>位</span>
@@ -193,10 +193,6 @@ export default {
           return false
         }
       })
-    },
-    resetForm(formName) {
-      // this.$refs[formName].resetFields()
-      // console.log(this.thisFields)
     }
   }
 }