暂存

src/HDrpManagement/contractManage/components/addContract.vue

@@ -630,7 +630,7 @@ export default {
       callback()
     }
     var NumberSize = (rule, value, callback) => {
-      if (isNaN(parseFloat(value))){
+      if (isNaN(parseFloat(value)) && value !== ''){
         return callback(new Error('输入不合法，请输入数值'))
       }else if (+value > 100 || +value < 0 ) {
         return callback(new Error('折扣范围(0-100%)'));

src/HDrpManagement/contractManage/components/editContract.vue

@@ -635,7 +635,7 @@ export default {
       callback()
     }
     var NumberSize = (rule, value, callback) => {
-      if (isNaN(parseFloat(value))){
+      if (isNaN(parseFloat(value)) && value !== ''){
         return callback(new Error('输入不合法，请输入数值'))
       }else if (+value > 100 || +value <= 0 && value) {
         return callback(new Error('折扣范围(1-100%)'));

src/HDrpManagement/projectData/index.vue

@@ -130,6 +130,12 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <el-button-group>
+                        <el-button type="primary" size="small">全部</el-button>
+                        <el-button type="primary" size="small">本年</el-button>
+                      </el-button-group>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="typeTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目类型分析" :dataid="typeMapParam.content.dataid"></exportFile>
                     </div>