Merge branch 'dev' of licailing/uwip into master

src/main/java/com/izouma/uwip/utils/JpaUtils.java

@@ -288,10 +288,10 @@ public class JpaUtils {
                 if (isPatent) {
                     return criteriaBuilder.and(criteriaBuilder.equal(root.get("patent")
                             .get(property), DateTimeUtils
-                            .toLocalDateTime((String) value, "yyyy-MM-dd")));
+                            .toLocalDate((String) value, "yyyy-MM-dd")));
                 }
                 return criteriaBuilder.and(criteriaBuilder.equal(root.get(property), DateTimeUtils
-                        .toLocalDateTime((String) value, "yyyy-MM-dd")));
+                        .toLocalDate((String) value, "yyyy-MM-dd")));
             }
         } else {
             if (isPatent) {

src/main/vue/src/mixins/domesticPatent.js

@@ -4,7 +4,7 @@ export default {
             statusOptions: [
                 {
                     label: '全部阶段',
-                    value: '',
+                    value: 'APPLY_STAGE,SUBSTANTIVE_STAGE,REVIEW_STAGE,REVIEW_STAGE,GRANT_STAGE,COMPLETED',
                     type: '',
                     workflows: [
                         { label: '待添加供应商', value: 'ADD_SUPPLIERS' },

src/main/vue/src/mixins/internationalPatent.js

@@ -4,7 +4,7 @@ export default {
             statusOptions: [
                 {
                     label: '全部阶段',
-                    value: '',
+                    value: 'APPLY_STAGE,SUBSTANTIVE_STAGE,REVIEW_STAGE,REVIEW_STAGE,GRANT_STAGE,COMPLETED',
                     type: '',
                     workflows: [
                         { label: '待添加供应商', value: 'ADD_SUPPLIERS' },

src/main/vue/src/mixins/logoPatent.js

@@ -4,7 +4,7 @@ export default {
             applyStatusOptions: [
                 {
                     label: '全部阶段',
-                    value: '',
+                    value: 'APPLY_STAGE,SUBSTANTIVE_STAGE,REVIEW_STAGE,REVIEW_STAGE,GRANT_STAGE,COMPLETED',
                     type: '',
                     workflows: [
                         { label: '是否决定签约', value: 'IS_CONTRACT' },

src/main/vue/src/styles/app.less

@@ -516,20 +516,23 @@ li {
 
 .filters-left {
     flex-grow: 1;
-    .filters-item + .filters-item {
+    .filter-item + .filter-item {
         margin-left: 10px;
     }
-    .filters-item {
+    .filter-item {
         .el-radio-button__inner {
             line-height: 16px;
         }
     }
+}
+.filter-item {
+    margin-bottom: 10px;
+    margin-left: 15px;
 
     .el-input--mini .el-input__inner {
         line-height: 32px;
         height: 32px;
     }
-    margin-bottom: 10px;
 }
 .filters-container {
     display: flex;
@@ -554,3 +557,9 @@ li {
         line-height: 32px;
     }
 }
+
+@media screen and (max-width: 1520px) {
+    .filter-time {
+        display: none;
+    }
+}

src/main/vue/src/views/Admin.vue

@@ -314,6 +314,7 @@ export default {
 <style lang="less" scoped>
 #app {
     height: 100%;
+    min-width: 1200px;
 }
 /deep/ .aside {
     .el-menu {

src/main/vue/src/views/CountryPatentList.vue

@@ -19,30 +19,46 @@
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
 
+            <div class="filter-time filter-item">
+                <span class="name">申请日期</span>
+
+                <el-date-picker
+                    v-model="applyDate"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd"
+                    size="small"
+                    @change="refreash"
+                >
+                </el-date-picker>
+            </div>
+
+            <el-select
+                size="mini"
+                class="filter-item"
+                v-model="logoWorkflow"
+                placeholder="筛选节点流程"
+                clearable
+                filterable
+                @change="refreash"
+            >
+                <el-option
+                    v-for="item in selectLogoWorkflowOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                >
+                </el-option>
+            </el-select>
+
             <div class="filters-left">
-                <el-radio-group class="filters-item" v-model="applyStatus" size="mini" @change="refreash">
+                <el-radio-group class="filter-item" v-model="applyStatus" size="mini" @change="refreash">
                     <el-radio-button v-for="(item, index) in statusOptions" :key="index" :label="item.value">
                         {{ item.label }}
                     </el-radio-button>
                 </el-radio-group>
-
-                <el-select
-                    size="mini"
-                    class="filters-item"
-                    v-model="logoWorkflow"
-                    placeholder="筛选节点流程"
-                    clearable
-                    filterable
-                    @change="refreash"
-                >
-                    <el-option
-                        v-for="item in selectLogoWorkflowOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    >
-                    </el-option>
-                </el-select>
             </div>
         </div>
         <el-table

src/main/vue/src/views/DomesticPatentList.vue

@@ -18,44 +18,44 @@
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
-            <!-- <div class="filter-time">
+            <div class="filter-time filter-item">
                 <span class="name">申请日期</span>
 
                 <el-date-picker
-                    v-model="time"
+                    v-model="applyDate"
                     type="daterange"
                     range-separator="至"
-                    start-placeholder="开始月份"
-                    end-placeholder="结束月份"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
                     value-format="yyyy-MM-dd"
                     size="small"
+                    @change="refreash"
                 >
                 </el-date-picker>
-            </div> -->
+            </div>
+            <el-select
+                size="mini"
+                class="filter-item"
+                v-model="logoWorkflow"
+                placeholder="筛选节点流程"
+                clearable
+                filterable
+                @change="refreash"
+            >
+                <el-option
+                    v-for="item in selectLogoWorkflowOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                >
+                </el-option>
+            </el-select>
             <div class="filters-left">
-                <el-radio-group class="filters-item" v-model="applyStatus" size="mini" @change="refreash">
+                <el-radio-group class="filter-item" v-model="applyStatus" size="mini" @change="refreash">
                     <el-radio-button v-for="(item, index) in statusOptions" :key="index" :label="item.value">
                         {{ item.label }}
                     </el-radio-button>
                 </el-radio-group>
-
-                <el-select
-                    size="mini"
-                    class="filters-item"
-                    v-model="logoWorkflow"
-                    placeholder="筛选节点流程"
-                    clearable
-                    filterable
-                    @change="refreash"
-                >
-                    <el-option
-                        v-for="item in selectLogoWorkflowOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    >
-                    </el-option>
-                </el-select>
             </div>
         </div>
         <el-table
@@ -134,9 +134,9 @@ export default {
             search: '',
             url: '/domesticPatent/allDTO',
             downloading: false,
-            applyStatus: '',
+            applyStatus: 'APPLY_STAGE,SUBSTANTIVE_STAGE,REVIEW_STAGE,REVIEW_STAGE,GRANT_STAGE,COMPLETED',
             logoWorkflow: '',
-            time: []
+            applyDate: []
         };
     },
     computed: {
@@ -174,7 +174,8 @@ export default {
                 search: this.search,
                 query: {
                     applyStatus: this.applyStatus,
-                    workflow: this.logoWorkflow
+                    workflow: this.logoWorkflow,
+                    applyDate: this.applyDate
                 }
             };
         },

src/main/vue/src/views/InternationalPatentList.vue

@@ -18,31 +18,46 @@
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
+            <div class="filter-time filter-item">
+                <span class="name">申请日期</span>
+
+                <el-date-picker
+                    v-model="applyDate"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd"
+                    size="small"
+                    @change="refreash"
+                >
+                </el-date-picker>
+            </div>
+
+            <el-select
+                size="mini"
+                class="filter-item"
+                v-model="logoWorkflow"
+                placeholder="筛选节点流程"
+                clearable
+                filterable
+                @change="refreash"
+            >
+                <el-option
+                    v-for="item in selectLogoWorkflowOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                >
+                </el-option>
+            </el-select>
 
             <div class="filters-left">
-                <el-radio-group class="filters-item" v-model="applyStatus" size="mini" @change="refreash">
+                <el-radio-group class="filter-item" v-model="applyStatus" size="mini" @change="refreash">
                     <el-radio-button v-for="(item, index) in statusOptions" :key="index" :label="item.value">
                         {{ item.label }}
                     </el-radio-button>
                 </el-radio-group>
-
-                <el-select
-                    size="mini"
-                    class="filters-item"
-                    v-model="logoWorkflow"
-                    placeholder="筛选节点流程"
-                    clearable
-                    filterable
-                    @change="refreash"
-                >
-                    <el-option
-                        v-for="item in selectLogoWorkflowOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    >
-                    </el-option>
-                </el-select>
             </div>
         </div>
         <el-table
@@ -118,8 +133,9 @@ export default {
             search: '',
             url: '/internationalPatent/allDTO',
             downloading: false,
-            applyStatus: '',
-            logoWorkflow: ''
+            applyStatus: 'APPLY_STAGE,SUBSTANTIVE_STAGE,REVIEW_STAGE,REVIEW_STAGE,GRANT_STAGE,COMPLETED',
+            logoWorkflow: '',
+            applyDate: []
         };
     },
     computed: {
@@ -157,7 +173,8 @@ export default {
                 search: this.search,
                 query: {
                     applyStatus: this.applyStatus,
-                    workflow: this.logoWorkflow
+                    workflow: this.logoWorkflow,
+                    applyDate: this.applyDate
                 }
             };
         },

src/main/vue/src/views/LogoPatentList.vue

@@ -18,31 +18,45 @@
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
+            <div class="filter-time filter-item">
+                <span class="name">申请日期</span>
+
+                <el-date-picker
+                    v-model="applyDate"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd"
+                    size="small"
+                    @change="refreash"
+                >
+                </el-date-picker>
+            </div>
+            <el-select
+                size="mini"
+                class="filter-item"
+                v-model="logoWorkflow"
+                placeholder="筛选节点流程"
+                clearable
+                filterable
+                @change="refreash"
+            >
+                <el-option
+                    v-for="item in selectLogoWorkflowOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                >
+                </el-option>
+            </el-select>
 
             <div class="filters-left">
-                <el-radio-group class="filters-item" v-model="applyStatus" size="mini" @change="refreash">
+                <el-radio-group class="filter-item" v-model="applyStatus" size="mini" @change="refreash">
                     <el-radio-button v-for="(item, index) in applyStatusOptions" :key="index" :label="item.value">
                         {{ item.label }}
                     </el-radio-button>
                 </el-radio-group>
-
-                <el-select
-                    size="mini"
-                    class="filters-item"
-                    v-model="logoWorkflow"
-                    placeholder="筛选节点流程"
-                    clearable
-                    filterable
-                    @change="refreash"
-                >
-                    <el-option
-                        v-for="item in selectLogoWorkflowOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    >
-                    </el-option>
-                </el-select>
             </div>
         </div>
         <el-table
@@ -107,8 +121,9 @@ export default {
             search: '',
             url: '/logoPatent/all',
             downloading: false,
-            applyStatus: '',
-            logoWorkflow: ''
+            applyStatus: 'APPLY_STAGE,SUBSTANTIVE_STAGE,REVIEW_STAGE,REVIEW_STAGE,GRANT_STAGE,COMPLETED',
+            logoWorkflow: '',
+            applyDate: []
         };
     },
     computed: {
@@ -139,7 +154,8 @@ export default {
                 search: this.search,
                 query: {
                     applyStatus: this.applyStatus,
-                    logoWorkflow: this.logoWorkflow
+                    logoWorkflow: this.logoWorkflow,
+                    applyDate: this.applyDate
                 }
             };
         },