Browse Source

基础信息表页面优化

ljb 9 months ago
parent
commit
0e942602f4

+ 0 - 1
src/option/RDSystemManage/list.js

@@ -14,7 +14,6 @@ export default {
   searchMenuSpan: 6,
   border: true,
   index: true,
-  selection: true,
   searchLabelWidth: 160,
   labelWidth: 145,
   menuWidth: 160,

+ 2 - 2
src/views/RD-system-manage/list.vue

@@ -7,7 +7,7 @@
       :spanMethod="spanMethod"
     >
       <template slot="menuLeft">
-        <el-button
+        <!-- <el-button
           type="danger"
           size="small"
           icon="el-icon-delete"
@@ -15,7 +15,7 @@
           @click="handleDelete"
         >
           删 除
-        </el-button>
+        </el-button> -->
         <el-button
           type="warning"
           size="small"

+ 0 - 3
src/views/basic-resource/basic-database/subject-setting.vue

@@ -285,9 +285,6 @@ export default {
         if (!!currParent) {
           parentNames.push(currParent.name);
         }
-        console.log(parentNames)
-
-
       }
       
       return { ...params, accSubject: parentNames.length ? `${parentNames.join('\\')}\\${params.name}` : params.name }

+ 7 - 4
src/views/basic-resource/comp-basic-info/comp-info-setting.vue

@@ -2,7 +2,7 @@
   <basic-container>
 
     <basic-card title="LOGO设置">
-      <avue-form :option="logoOption" v-model="logoForm" style="width: 320px; margin: 0;" @submit="handleSubmitLogo"></avue-form>
+      <avue-form :option="logoOption" v-model="logoForm" style="width: 100%; margin: 0;" @submit="handleSubmitLogo"></avue-form>
     </basic-card>
 
     <div style="padding-left: 16px;">
@@ -30,12 +30,12 @@
 
     <basic-card title="高企证书上传">
       <el-button type="primary" plain size="small" @click="handleLastYearData(2)" style="margin-bottom: 12px;">读取上年度数据</el-button>
-      <avue-form :option="picOption" v-model="picForm" style="width: 320px; margin: 0;" @submit="handleHighTecChange"></avue-form>
+      <avue-form :option="picOption" v-model="picForm" style="width: 100%; margin: 0;" @submit="handleHighTecChange"></avue-form>
     </basic-card>
 
     <basic-card title="出勤时间设置">
       <el-button type="primary" plain size="small" @click="handleLastYearData(1)" style="margin-bottom: 12px;">读取上年度数据</el-button>
-      <avue-form :option="attendOption" v-model="attendForm" @submit="handleSubmitAtten" style="width: 320px; margin: 0;"></avue-form>
+      <avue-form :option="attendOption" v-model="attendForm" @submit="handleSubmitAtten" style="width: 600px; margin: 0;"></avue-form>
     </basic-card>
   </basic-container>
 </template>
@@ -65,6 +65,7 @@ export default {
       logoOption: {
         submitText: '保存',
         emptyBtn: false,
+        menuSpan: 4,
         column: [
           {
             label: "企业LOGO",
@@ -94,6 +95,7 @@ export default {
       picOption: {
         submitText: '保存',
         emptyBtn: false,
+        menuSpan: 4,
         column: [
           {
             label: "高企证书",
@@ -118,12 +120,13 @@ export default {
       attendOption: {
         submitText: '保存',
         emptyBtn: false,
+        menuSpan: 4,
         column: [
          {
             label: '作息时间',
             prop: 'workHours',
             type: 'number',
-            span: 24,
+            span: 9,
             min: 0,
             precision: 1,
          }

+ 9 - 1
src/views/basic-resource/comp-basic-info/components/comp-info-table.vue

@@ -49,7 +49,15 @@
         <tr>
           <td class="label">高企认定年度</td>
           <td>
-            <input v-model="form.highTechYear" style="width: 100%; border: none;" />
+            <el-date-picker
+              v-model="form.highTechYear"
+              type="year"
+              placeholder="请选择高企认定年度"
+              value-format="yyyy"
+              size="small"
+              style="width: 200px"
+            >
+            </el-date-picker>
           </td>
           <td class="label">高企编号</td>
           <td>