商标注册基本信息

src/main/vue/src/components/logoPatent/BaseInfo.vue

@@ -6,30 +6,18 @@
                 :model="formData"
                 :rules="rules"
                 ref="form"
-                label-width="136px"
+                label-width="10vw"
                 label-position="right"
                 size="small"
-                style="max-width: 500px;"
+                style="max-width: calc(400px + 20vw); margin: 0 auto; padding-right: 10vw;"
+                inline
             >
-                <el-form-item prop="userId" label="创建申请人">
-                    <el-input-number type="number" v-model="formData.userId"></el-input-number>
-                </el-form-item>
-                <el-form-item prop="name" label="名称">
-                    <el-input v-model="formData.name"></el-input>
-                </el-form-item>
-                <el-form-item prop="clientPartnerId" label="客户">
-                    <el-select v-model="formData.clientPartnerId" clearable filterable placeholder="请选择">
-                        <el-option
-                            v-for="item in clientPartnerIdOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        >
-                        </el-option>
-                    </el-select>
+                <el-form-item prop="name" label="商标logo">
+                    <el-input v-model="formData.name" style="width: calc(400px + 10vw);"></el-input>
                 </el-form-item>
+
                 <el-form-item prop="applyStatus" label="案件状态">
-                    <el-select v-model="formData.applyStatus" clearable filterable placeholder="请选择">
+                    <el-select disabled v-model="formData.applyStatus" clearable filterable placeholder="请选择">
                         <el-option
                             v-for="item in applyStatusOptions"
                             :key="item.value"
@@ -39,10 +27,11 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="logoWorkflow" label="当前流程">
-                    <el-select v-model="formData.logoWorkflow" clearable filterable placeholder="请选择">
+
+                <el-form-item prop="supplierPartnerId" label="供应商">
+                    <el-select v-model="formData.supplierPartnerId" clearable filterable placeholder="请选择">
                         <el-option
-                            v-for="item in logoWorkflowOptions"
+                            v-for="item in supplierPartnerIdOptions"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value"
@@ -50,10 +39,13 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="supplierPartnerId" label="供应商">
-                    <el-select v-model="formData.supplierPartnerId" clearable filterable placeholder="请选择">
+                <el-form-item prop="uwNo" label="寰球案号">
+                    <el-input disabled v-model="formData.uwNo"></el-input>
+                </el-form-item>
+                <el-form-item prop="clientPartnerId" label="客户">
+                    <el-select v-model="formData.clientPartnerId" clearable filterable placeholder="请选择">
                         <el-option
-                            v-for="item in supplierPartnerIdOptions"
+                            v-for="item in clientPartnerIdOptions"
                             :key="item.value"
                             :label="item.label"
                             :value="item.value"
@@ -61,9 +53,6 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="uwNo" label="寰球案号">
-                    <el-input v-model="formData.uwNo"></el-input>
-                </el-form-item>
                 <el-form-item prop="applyNo" label="商标申请号">
                     <el-input v-model="formData.applyNo"></el-input>
                 </el-form-item>
@@ -87,43 +76,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="contract" label="是否签约">
-                    <el-input v-model="formData.contract"></el-input>
-                </el-form-item>
-                <el-form-item prop="accept" label="是否受理">
-                    <el-input v-model="formData.accept"></el-input>
-                </el-form-item>
-                <el-form-item prop="correctionPeriod" label="回文补正期限">
-                    <el-date-picker
-                        v-model="formData.correctionPeriod"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择日期"
-                    >
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item prop="payment" label="是否缴费完成">
-                    <el-input v-model="formData.payment"></el-input>
-                </el-form-item>
-                <el-form-item prop="reviewRequire" label="是否符合审查要求">
-                    <el-input v-model="formData.reviewRequire"></el-input>
-                </el-form-item>
-                <el-form-item prop="rejectAll" label="是否全部驳回">
-                    <el-input v-model="formData.rejectAll"></el-input>
-                </el-form-item>
-                <el-form-item prop="rejectContent" label="驳回意见">
-                    <el-input v-model="formData.rejectContent"></el-input>
-                </el-form-item>
-                <el-form-item prop="rehear" label="是否复审">
-                    <el-input v-model="formData.rehear"></el-input>
-                </el-form-item>
-                <el-form-item prop="reHearPayment" label="复审缴费信息">
-                    <el-input v-model="formData.reHearPayment"></el-input>
-                </el-form-item>
-                <el-form-item prop="rehearResult" label="复审是否通过">
-                    <el-input v-model="formData.rehearResult"></el-input>
-                </el-form-item>
-                <el-form-item class="form-submit">
+                <el-form-item class="form-submit" style="width: calc(400px + 30vw); text-align: center;">
                     <el-button @click="onSave" :loading="saving" size="default" type="primary">保存 </el-button>
                     <el-button @click="onDelete" :loading="saving" size="default" type="danger" v-if="formData.id"
                         >删除

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

@@ -401,6 +401,7 @@ li {
     .el-tabs__content {
         flex-grow: 1;
         .flex-col();
+        overflow: visible;
     }
 
     .el-tabs__nav-wrap::after {
@@ -412,3 +413,12 @@ li {
         flex-grow: 1;
     }
 }
+
+.el-form--inline {
+    .el-input {
+        min-width: 200px;
+    }
+    .el-date-editor.el-input {
+        width: 200px;
+    }
+}

src/main/vue/src/styles/common/theme.less

@@ -2,7 +2,7 @@
 @prim: #D7AB41;
 @success: #67c23a;
 @danger: #f56c6c;
-@warn: #e6a23c;
+@warn: #FFA854;
 @text0: #181818;
 @text1: #000000;
 @text2: #606266;

src/main/vue/src/styles/element_theme/index.css

@@ -10545,17 +10545,17 @@
 .el-input.is-disabled .el-input__inner {
     background-color: #f5f7fa;
     border-color: #e4e7ed;
-    color: #c0c4cc;
+    color: #000000;
     cursor: not-allowed;
 }
 .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
-    color: #c0c4cc;
+    color: #000000;
 }
 .el-input.is-disabled .el-input__inner::-ms-input-placeholder {
-    color: #c0c4cc;
+    color: #000000;
 }
 .el-input.is-disabled .el-input__inner::placeholder {
-    color: #c0c4cc;
+    color: #000000;
 }
 .el-input.is-disabled .el-input__icon {
     cursor: not-allowed;

src/main/vue/src/views/LogoPatentEdit.vue

@@ -2,6 +2,27 @@
     <div class="edit-view">
         <page-title></page-title>
         <el-tabs class="edit-tabs" v-model="activeName">
+            <div class="right-btns">
+                <el-button type="primary" size="small">新增答复</el-button>
+            </div>
+            <div class="tips">
+                <div class="tips-text">
+                    <span class="name">当前流程节点</span>
+                    <span class="val">是否决定签约</span>
+                </div>
+
+                <div class="tips-text">
+                    <span class="name">处理人</span>
+                    <span class="val">夏秋雨</span>
+                </div>
+
+                <div class="tips-text">
+                    <span class="name">处理截止日期</span>
+                    <span class="val">无</span>
+                </div>
+
+                <el-button type="text" size="small">立即处理</el-button>
+            </div>
             <el-tab-pane label="基本信息" name="first">
                 <base-info></base-info>
             </el-tab-pane>
@@ -141,4 +162,49 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.edit-tabs {
+    position: relative;
+
+    .right-btns {
+        position: absolute;
+        right: 20px;
+        top: -44px;
+        .el-button {
+            min-width: 100px;
+        }
+    }
+}
+
+.tips {
+    .flex();
+    height: 40px;
+    background: tint(@warn, 68%);
+    border: 1px solid @warn;
+    margin: 20px 20px 0;
+    padding: 0 20px;
+    position: relative;
+
+    .tips-text {
+        margin-right: 60px;
+        .name {
+            font-size: 12px;
+            color: #5e6166;
+            line-height: 22px;
+        }
+
+        .val {
+            font-size: 12px;
+            font-weight: bold;
+            color: @warn;
+            line-height: 22px;
+            margin-left: 10px;
+        }
+    }
+
+    .el-button {
+        position: absolute;
+        right: 20px;
+    }
+}
+</style>