Merge branch 'master' of git.taauav.net:gitadmin/jndz_admin_web

src/views/basicTable/category.vue

@@ -66,13 +66,6 @@
         ></el-table-column>
         <el-table-column label="操作" min-width="120" align="center">
           <template slot-scope="{ row }">
-             <el-link
-              @click="look(row)"
-              icon="el-icon-view"
-              type="primary"
-              :underline="false"
-              >查看</el-link
-            >
             <el-link
               @click="edit(row)"
               icon="el-icon-edit"
@@ -125,17 +118,17 @@
         ref="editForm"
         :rules="rules"
       >
-        <el-form-item label="考核年度:" prop="createTime">
-              <el-date-picker
-              :disabled='ischecked=="look"'
-                type="year"
-                placeholder="选择考核年度"
-                style="width: 100%"
-                v-model="form.createTime"
-                format="yyyy"
-                value-format="yyyy"
-              >
-              </el-date-picker>
+        <el-form-item label="考核年度:" prop="year">
+          <el-date-picker
+          :disabled='ischecked=="look"'
+            type="year"
+            placeholder="选择考核年度"
+            style="width: 100%"
+            v-model="form.year"
+            format="yyyy"
+            value-format="yyyy"
+          >
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="表格名称:" prop="name">
           <el-input
@@ -153,15 +146,6 @@
             v-model="form.code"
           ></el-input>
         </el-form-item>
-         <el-form-item v-if="ischecked == 'look'" label="创建人:" prop='createUser'>
-          <el-input
-          :disabled='ischecked=="look"'
-            placeholder="请输入创建人"
-            clearable
-            v-model="form.createUser"
-          ></el-input>
-        </el-form-item>
-      
         <el-form-item label="备注:">
           <el-input :disabled='ischecked=="look"' type="textarea" :rows="4" v-model="form.note"></el-input>
         </el-form-item>