项目添加年份数据展示和筛选

src/views/modules/sys/project/AssessForm.vue

@@ -32,6 +32,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="年份" prop="year"
+                          :rules="[
+                  {required: true, message:'年份不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.year" placeholder="请填写年份"     ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="评估目的" prop="evaluationObjective"
                           :rules="[
                  ]">
@@ -425,6 +433,7 @@
           permissionFlag: '', // 判断是否为当前登录人参数
           customerName: '',
           projectName: '',
+          year: '',
           evaluationObjective: '',
           projectType: '',
           evaluationBaseDate: '',
@@ -571,6 +580,7 @@
         this.inputForm = {
           customerName: '',
           projectName: '',
+          year: '',
           evaluationObjective: '',
           projectType: '',
           evaluationBaseDate: '',

src/views/modules/sys/project/AssessList.vue

@@ -5,6 +5,14 @@
          <el-form-item prop="projectName">
                 <el-input size="small" v-model="searchForm.projectName" placeholder="项目名称" clearable></el-input>
          </el-form-item>
+        <el-form-item prop="year">
+          <el-date-picker
+            v-model="searchForm.year"
+            type="year"
+            value-format="yyyy"
+            placeholder="选择年份">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item prop="documentNum">
           <el-input size="small" v-model="searchForm.documentNum" placeholder="文号" clearable></el-input>
         </el-form-item>
@@ -40,8 +48,8 @@
 <!--            <el-button v-if="hasPermission('sys:post:edit')" type="warning" size="small" icon="el-icon-edit-outline" @click="edit()" :disabled="$refs.projectTable && $refs.projectTable.getCheckboxRecords().length !== 1" plain>修改</el-button>-->
             <el-button v-if="hasPermission('sys:project:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.projectTable && $refs.projectTable.getCheckboxRecords().length === 0" plain>删除</el-button>
             <el-button v-if="hasPermission('sys:project:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>
-            <el-button v-if="hasPermission('sys:project:exportFile')"  type="default" @click="downloadFile()" size="small">下载</el-button>
-            <span style="margin-left:20px">文件上传比例 {{proport}}</span>
+            <el-button v-if="hasPermission('sys:project:exportFile')"  type="warning" plain @click="downloadFile()" size="small">完成比例</el-button>
+            <span style="margin-left:20px;color: #999999">文件上传比例 {{proport}}</span>
           </template>
         </vxe-toolbar>
         <div style="height: calc(100% - 80px);">
@@ -83,6 +91,7 @@
                         <span v-else>{{scope.row.projectName}}</span>
                     </template>
                 </vxe-column>
+                <vxe-column width="80px"  title="年份" field="year" > </vxe-column>
                 <vxe-column width="200px"  title="文号" field="documentNum" > </vxe-column>
                 <vxe-column width="110px"  title="协议号" field="protocolNum" > </vxe-column>
                 <vxe-column width="200px"  title="客户名称" field="customerName" > </vxe-column>
@@ -161,6 +170,7 @@
       return {
         searchForm: {
           customerName: '',
+          year: '',
           projectName: '',
           projectHead: ''
         },

src/views/modules/sys/project/ConsultationForm.vue

@@ -32,6 +32,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="年份" prop="year"
+                          :rules="[
+                  {required: true, message:'年份不能为空', trigger:'blur'}
+                 ]">
+              <el-input v-model="inputForm.year" placeholder="请填写年份"     ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="评估目的" prop="evaluationObjective"
                           :rules="[
                  ]">
@@ -428,6 +436,7 @@
           permissionFlag: '', // 判断是否为当前登录人参数
           customerName: '',
           projectName: '',
+          year: '',
           evaluationObjective: '',
           projectType: '',
           evaluationBaseDate: '',
@@ -558,6 +567,7 @@
         this.inputForm = {
           customerName: '',
           projectName: '',
+          year: '',
           evaluationObjective: '',
           projectType: '',
           evaluationBaseDate: '',

src/views/modules/sys/project/ConsultationList.vue

@@ -6,6 +6,14 @@
          <el-form-item prop="projectName">
                 <el-input size="small" v-model="searchForm.projectName" placeholder="项目名称" clearable></el-input>
          </el-form-item>
+        <el-form-item prop="year">
+          <el-date-picker
+            v-model="searchForm.year"
+            type="year"
+            value-format="yyyy"
+            placeholder="选择年份">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item prop="documentNum">
           <el-input size="small" v-model="searchForm.documentNum" placeholder="文号" clearable></el-input>
         </el-form-item>
@@ -41,8 +49,8 @@
 <!--            <el-button v-if="hasPermission('sys:post:edit')" type="warning" size="small" icon="el-icon-edit-outline" @click="edit()" :disabled="$refs.projectTable && $refs.projectTable.getCheckboxRecords().length !== 1" plain>修改</el-button>-->
             <el-button v-if="hasPermission('sys:project:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.projectTable && $refs.projectTable.getCheckboxRecords().length === 0" plain>删除</el-button>
             <el-button v-if="hasPermission('sys:project:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>
-            <el-button v-if="hasPermission('sys:project:exportFile')"  type="default" @click="downloadFile()" size="small">下载</el-button>
-            <span style="margin-left:20px">文件上传比例 {{proport}}</span>
+            <el-button v-if="hasPermission('sys:project:exportFile')"  type="warning" plain @click="downloadFile()" size="small">完成比例</el-button>
+            <span style="margin-left:20px;color: #999999">文件上传比例 {{proport}}</span>
           </template>
         </vxe-toolbar>
         <div style="height: calc(100% - 80px);">
@@ -84,6 +92,7 @@
                   <span v-else>{{scope.row.projectName}}</span>
                 </template>
               </vxe-column>
+              <vxe-column width="80px"  title="年份" field="year" > </vxe-column>
               <vxe-column width="200px"  title="文号" field="documentNum" > </vxe-column>
               <vxe-column width="110px"  title="协议号" field="protocolNum" > </vxe-column>
               <vxe-column width="200px"  title="客户名称" field="customerName" > </vxe-column>
@@ -163,6 +172,7 @@
         searchForm: {
           customerName: '',
           projectName: '',
+          year: '',
           projectHead: ''
         },
         dataList: [],