panhui 4 سال پیش
والد
کامیت
db88e8f920

+ 30 - 0
src/main/vue/src/styles/app.less

@@ -519,8 +519,38 @@ li {
     .filters-item + .filters-item {
         margin-left: 10px;
     }
+    .filters-item {
+        .el-radio-button__inner {
+            line-height: 16px;
+        }
+    }
+
+    .el-input--mini .el-input__inner {
+        line-height: 32px;
+        height: 32px;
+    }
+    margin-bottom: 10px;
 }
 .filters-container {
     display: flex;
     flex-direction: row-reverse;
+    align-items: center;
+}
+
+.filter-time {
+    display: flex;
+    align-items: center;
+    margin: 0 10px 10px;
+    .name {
+        font-size: 12px;
+        color: #303133;
+        line-height: 22px;
+        white-space: nowrap;
+        margin-right: 5px;
+    }
+
+    .el-range-editor--small.el-input__inner {
+        height: 32px;
+        line-height: 32px;
+    }
 }

+ 16 - 1
src/main/vue/src/views/DomesticPatentList.vue

@@ -18,6 +18,20 @@
             >
                 <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
+            <!-- <div class="filter-time">
+                <span class="name">申请日期</span>
+
+                <el-date-picker
+                    v-model="time"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始月份"
+                    end-placeholder="结束月份"
+                    value-format="yyyy-MM-dd"
+                    size="small"
+                >
+                </el-date-picker>
+            </div> -->
             <div class="filters-left">
                 <el-radio-group class="filters-item" v-model="applyStatus" size="mini" @change="refreash">
                     <el-radio-button v-for="(item, index) in statusOptions" :key="index" :label="item.value">
@@ -121,7 +135,8 @@ export default {
             url: '/domesticPatent/allDTO',
             downloading: false,
             applyStatus: '',
-            logoWorkflow: ''
+            logoWorkflow: '',
+            time: []
         };
     },
     computed: {

+ 5 - 3
src/main/vue/src/views/InternationalPatentAdd.vue

@@ -150,6 +150,7 @@
     </div>
 </template>
 <script>
+import { format } from 'date-fns';
 export default {
     name: 'InternationalPatentEdit',
     created() {
@@ -224,9 +225,10 @@ export default {
                 },
                 attachment4: {
                     validator: (rule, value, callback) => {
-                        if (!value.url && value.name) {
-                            callback(new Error('请上传' + value.name));
-                        } else if (value.url && !value.name) {
+                        console.log(value);
+                        if (!value.url && value.attachmentName) {
+                            callback(new Error('请上传' + value.attachmentName));
+                        } else if (value.url && !value.attachmentName) {
                             callback(new Error('请输入附件名称'));
                         } else {
                             callback();