0325

src/main/vue/src/components/AddressPicker.vue

@@ -169,7 +169,7 @@ export default {
             if (option && option.city) {
                 var geocoder = new AMap.Geocoder({});
 
-                geocoder.getLocation(option.city, function (status, result) {
+                geocoder.getLocation(option.city, function(status, result) {
                     if (status === 'complete' && result.info === 'OK') {
                         console.log(result);
                     }

src/main/vue/src/components/PageTitle.vue

@@ -76,5 +76,8 @@ export default {
             display: inline-block;
         }
     }
+    .el-button {
+        min-width: 100px;
+    }
 }
 </style>

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

@@ -0,0 +1,262 @@
+<template>
+    <div class="edit-view__content-wrapper">
+        <div class="edit-view__content-section">
+            <divider />
+            <el-form
+                :model="formData"
+                :rules="rules"
+                ref="form"
+                label-width="136px"
+                label-position="right"
+                size="small"
+                style="max-width: 500px;"
+            >
+                <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>
+                <el-form-item prop="applyStatus" label="案件状态">
+                    <el-select v-model="formData.applyStatus" clearable filterable placeholder="请选择">
+                        <el-option
+                            v-for="item in applyStatusOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="logoWorkflow" label="当前流程">
+                    <el-select v-model="formData.logoWorkflow" clearable filterable placeholder="请选择">
+                        <el-option
+                            v-for="item in logoWorkflowOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="supplierPartnerId" label="供应商">
+                    <el-select v-model="formData.supplierPartnerId" clearable filterable placeholder="请选择">
+                        <el-option
+                            v-for="item in supplierPartnerIdOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </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>
+                <el-form-item prop="applyDate" label="商标申请日">
+                    <el-date-picker
+                        v-model="formData.applyDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择日期"
+                    >
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item prop="payRatio" label="支付比例">
+                    <el-select v-model="formData.payRatio" clearable filterable placeholder="请选择">
+                        <el-option
+                            v-for="item in payRatioOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </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-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"
+                        >删除
+                    </el-button>
+                    <el-button @click="$router.go(-1)" size="default">取消</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'LogoPatentEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('logoPatent/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.clientPartnerIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.supplierPartnerIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            clientPartnerIdOptions: [],
+            applyStatusOptions: [
+                { label: '申请阶段', value: 'APPLY_STAGE' },
+                { label: '初审阶段', value: 'FIRST_REVIEW_STAGE' },
+                { label: '实审阶段', value: 'SUBSTANTIVE_STAGE' },
+                { label: '复审阶段', value: 'REVIEW_STAGE' },
+                { label: '授权阶段', value: 'GRANT_STAGE' },
+                { label: '已完成', value: 'COMPLETED' }
+            ],
+            logoWorkflowOptions: [
+                { label: '是否决定签约', value: 'IS_CONTRACT' },
+                { label: '待维护案件', value: 'TO_BE_MAINTAINED' },
+                { label: '待受理', value: 'PENDING' },
+                { label: '待审查', value: 'PENDING_REVIEW' },
+                { label: '驳回处理', value: 'DISMISS' },
+                { label: '公告初审', value: 'ANNOUNCEMENTS' },
+                { label: '证件办理', value: 'HANDLE' }
+            ],
+            supplierPartnerIdOptions: [],
+            payRatioOptions: [
+                { label: '全款', value: 'FULL_AMOUNT' },
+                { label: '首付80%', value: 'DOWN_PAYMENT_80' },
+                { label: '首付50%', value: 'DOWN_PAYMENT_50' }
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/logoPatent/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/logoPatent/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/router.js

@@ -159,9 +159,17 @@ const router = new Router({
                         title: '配置选项'
                     }
                 },
+                {
+                    path: '/logoPatentAdd',
+                    name: 'logoPatentAdd',
+                    component: () => import(/* webpackChunkName: "logoPatentEdit" */ '@/views/LogoPatentAdd.vue'),
+                    meta: {
+                        title: '新增商标'
+                    }
+                },
                 {
                     path: '/logoPatentEdit',
-                    name: 'LogoPatentEdit',
+                    name: 'logoPatentEdit',
                     component: () => import(/* webpackChunkName: "logoPatentEdit" */ '@/views/LogoPatentEdit.vue'),
                     meta: {
                         title: '商标申请编辑'

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

@@ -362,6 +362,7 @@ li {
     .el-button {
         min-width: 120px;
     }
+    padding-top: 48px;
 }
 
 .input-pre-zh {
@@ -380,3 +381,34 @@ li {
         color: #eead81;
     }
 }
+.edit-tabs {
+    flex-grow: 1;
+    .flex-col();
+    overflow: hidden;
+    .el-tabs__header {
+        margin: 0 0;
+        height: 50px;
+        background: #ffffff;
+        min-height: 50px;
+        padding: 0 20px;
+
+        .el-tabs__item {
+            height: 50px;
+            line-height: 50px;
+            padding: 0 25px;
+        }
+    }
+    .el-tabs__content {
+        flex-grow: 1;
+        .flex-col();
+    }
+
+    .el-tabs__nav-wrap::after {
+        content: none;
+    }
+
+    .el-tab-pane {
+        .flex-col();
+        flex-grow: 1;
+    }
+}

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

@@ -4,7 +4,7 @@
 @danger: #f56c6c;
 @warn: #e6a23c;
 @text0: #181818;
-@text1: #323233;
+@text1: #000000;
 @text2: #606266;
 @text3: #939599;
 @text4: #c6c8cc;

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

@@ -920,7 +920,7 @@
 .el-pagination {
     white-space: nowrap;
     padding: 2px 5px;
-    color: #303133;
+    color: #000000;
     font-weight: 700;
 }
 .el-pagination::after,
@@ -982,7 +982,7 @@
     background-size: 16px;
     cursor: pointer;
     margin: 0;
-    color: #303133;
+    color: #000000;
 }
 .el-pagination .btn-next .el-icon,
 .el-pagination .btn-prev .el-icon {
@@ -1156,7 +1156,7 @@
 .el-pager li.btn-quicknext,
 .el-pager li.btn-quickprev {
     line-height: 28px;
-    color: #303133;
+    color: #000000;
 }
 .el-pager li.btn-quicknext.disabled,
 .el-pager li.btn-quickprev.disabled {
@@ -1231,7 +1231,7 @@
 .el-dialog__title {
     line-height: 24px;
     font-size: 18px;
-    color: #303133;
+    color: #000000;
 }
 .el-dialog__body {
     padding: 30px 20px;
@@ -1563,11 +1563,11 @@
 }
 .el-menu--horizontal > .el-submenu:focus .el-submenu__title,
 .el-menu--horizontal > .el-submenu:hover .el-submenu__title {
-    color: #303133;
+    color: #000000;
 }
 .el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
     border-bottom: 2px solid #d7ab41;
-    color: #303133;
+    color: #000000;
 }
 .el-menu--horizontal > .el-submenu .el-submenu__title {
     height: 60px;
@@ -1592,16 +1592,16 @@
 }
 .el-menu--horizontal .el-menu .el-menu-item.is-active,
 .el-menu--horizontal .el-menu .el-submenu.is-active > .el-submenu__title {
-    color: #303133;
+    color: #000000;
 }
 .el-menu--horizontal .el-menu-item:not(.is-disabled):focus,
 .el-menu--horizontal .el-menu-item:not(.is-disabled):hover {
     outline: 0;
-    color: #303133;
+    color: #000000;
 }
 .el-menu--horizontal > .el-menu-item.is-active {
     border-bottom: 2px solid #d7ab41;
-    color: #303133;
+    color: #000000;
 }
 .el-menu--collapse {
     width: 64px;
@@ -1670,7 +1670,7 @@
 }
 .el-menu-item {
     font-size: 14px;
-    color: #303133;
+    color: #000000;
     padding: 0 20px;
     cursor: pointer;
     -webkit-transition: border-color 0.3s, background-color 0.3s, color 0.3s;
@@ -1713,7 +1713,7 @@
 }
 .el-submenu__title {
     font-size: 14px;
-    color: #303133;
+    color: #000000;
     padding: 0 20px;
     cursor: pointer;
     -webkit-transition: border-color 0.3s, background-color 0.3s, color 0.3s;
@@ -1935,7 +1935,7 @@
     font-size: 14px;
     font-weight: 500;
     vertical-align: middle;
-    color: #303133;
+    color: #000000;
 }
 .el-switch__label.is-active {
     color: #d7ab41;
@@ -2969,7 +2969,7 @@
     margin: -1px;
 }
 .el-year-table .el-icon {
-    color: #303133;
+    color: #000000;
 }
 .el-year-table td {
     text-align: center;
@@ -3069,7 +3069,7 @@
     font-size: 20px;
     vertical-align: middle;
     display: table-cell;
-    color: #303133;
+    color: #000000;
 }
 .el-date-range-picker__time-picker-wrap {
     position: relative;
@@ -3252,7 +3252,7 @@
     padding: 0 5px;
     line-height: 32px;
     width: 5%;
-    color: #303133;
+    color: #000000;
 }
 .el-range-editor--medium.el-input__inner,
 .el-range-editor--small.el-input__inner {
@@ -3413,7 +3413,7 @@
 }
 .el-picker-panel__icon-btn {
     font-size: 12px;
-    color: #303133;
+    color: #000000;
     border: 0;
     background: 0 0;
     cursor: pointer;
@@ -3528,7 +3528,7 @@
     cursor: pointer;
 }
 .el-time-spinner__item.active:not(.disabled) {
-    color: #303133;
+    color: #000000;
     font-weight: 700;
 }
 .el-time-spinner__item.disabled {
@@ -3614,7 +3614,7 @@
     background-color: transparent;
     outline: 0;
     font-size: 12px;
-    color: #303133;
+    color: #000000;
 }
 .el-time-panel__btn.confirm {
     font-weight: 800;
@@ -3664,7 +3664,7 @@
     padding: 18px 20px;
 }
 .el-popover__title {
-    color: #303133;
+    color: #000000;
     font-size: 16px;
     line-height: 1;
     margin-bottom: 12px;
@@ -3739,7 +3739,7 @@
     margin-bottom: 0;
     font-size: 18px;
     line-height: 1;
-    color: #303133;
+    color: #000000;
 }
 .el-message-box__headerbtn {
     position: absolute;
@@ -3956,7 +3956,7 @@
     text-decoration: none;
     -webkit-transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
     transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-    color: #303133;
+    color: #000000;
 }
 .el-breadcrumb__inner a:hover,
 .el-breadcrumb__inner.is-link:hover {
@@ -4221,7 +4221,7 @@
     list-style: none;
     font-size: 14px;
     font-weight: 500;
-    color: #303133;
+    color: #000000;
     position: relative;
 }
 .el-tabs__item:focus,
@@ -5021,7 +5021,7 @@
 .el-notification__title {
     font-weight: 700;
     font-size: 16px;
-    color: #303133;
+    color: #000000;
     margin: 0;
 }
 .el-notification__content {
@@ -5260,13 +5260,13 @@
 }
 .el-tooltip__popper[x-placement^='top'] .popper__arrow {
     bottom: -6px;
-    border-top-color: #303133;
+    border-top-color: #000000;
     border-bottom-width: 0;
 }
 .el-tooltip__popper[x-placement^='top'] .popper__arrow::after {
     bottom: 1px;
     margin-left: -5px;
-    border-top-color: #303133;
+    border-top-color: #000000;
     border-bottom-width: 0;
 }
 .el-tooltip__popper[x-placement^='bottom'] {
@@ -5275,26 +5275,26 @@
 .el-tooltip__popper[x-placement^='bottom'] .popper__arrow {
     top: -6px;
     border-top-width: 0;
-    border-bottom-color: #303133;
+    border-bottom-color: #000000;
 }
 .el-tooltip__popper[x-placement^='bottom'] .popper__arrow::after {
     top: 1px;
     margin-left: -5px;
     border-top-width: 0;
-    border-bottom-color: #303133;
+    border-bottom-color: #000000;
 }
 .el-tooltip__popper[x-placement^='right'] {
     margin-left: 12px;
 }
 .el-tooltip__popper[x-placement^='right'] .popper__arrow {
     left: -6px;
-    border-right-color: #303133;
+    border-right-color: #000000;
     border-left-width: 0;
 }
 .el-tooltip__popper[x-placement^='right'] .popper__arrow::after {
     bottom: -5px;
     left: 1px;
-    border-right-color: #303133;
+    border-right-color: #000000;
     border-left-width: 0;
 }
 .el-tooltip__popper[x-placement^='left'] {
@@ -5303,43 +5303,43 @@
 .el-tooltip__popper[x-placement^='left'] .popper__arrow {
     right: -6px;
     border-right-width: 0;
-    border-left-color: #303133;
+    border-left-color: #000000;
 }
 .el-tooltip__popper[x-placement^='left'] .popper__arrow::after {
     right: 1px;
     bottom: -5px;
     margin-left: -5px;
     border-right-width: 0;
-    border-left-color: #303133;
+    border-left-color: #000000;
 }
 .el-tooltip__popper.is-dark {
-    background: #303133;
+    background: #000000;
     color: #fff;
 }
 .el-tooltip__popper.is-light {
     background: #fff;
-    border: 1px solid #303133;
+    border: 1px solid #000000;
 }
 .el-tooltip__popper.is-light[x-placement^='top'] .popper__arrow {
-    border-top-color: #303133;
+    border-top-color: #000000;
 }
 .el-tooltip__popper.is-light[x-placement^='top'] .popper__arrow::after {
     border-top-color: #fff;
 }
 .el-tooltip__popper.is-light[x-placement^='bottom'] .popper__arrow {
-    border-bottom-color: #303133;
+    border-bottom-color: #000000;
 }
 .el-tooltip__popper.is-light[x-placement^='bottom'] .popper__arrow::after {
     border-bottom-color: #fff;
 }
 .el-tooltip__popper.is-light[x-placement^='left'] .popper__arrow {
-    border-left-color: #303133;
+    border-left-color: #000000;
 }
 .el-tooltip__popper.is-light[x-placement^='left'] .popper__arrow::after {
     border-left-color: #fff;
 }
 .el-tooltip__popper.is-light[x-placement^='right'] .popper__arrow {
-    border-right-color: #303133;
+    border-right-color: #000000;
 }
 .el-tooltip__popper.is-light[x-placement^='right'] .popper__arrow::after {
     border-right-color: #fff;
@@ -8361,7 +8361,7 @@
     margin: 0;
     line-height: 36px;
     font-size: 14px;
-    color: #303133;
+    color: #000000;
 }
 .el-upload-cover + .el-upload__inner {
     opacity: 0;
@@ -8703,7 +8703,7 @@
 .el-card {
     border: 1px solid #ebeef5;
     background-color: #fff;
-    color: #303133;
+    color: #000000;
     -webkit-transition: 0.3s;
     transition: 0.3s;
 }
@@ -8804,8 +8804,8 @@
     width: 100%;
 }
 .el-step__head.is-process {
-    color: #303133;
-    border-color: #303133;
+    color: #000000;
+    border-color: #000000;
 }
 .el-step__head.is-wait {
     color: #c0c4cc;
@@ -8895,7 +8895,7 @@
 }
 .el-step__title.is-process {
     font-weight: 700;
-    color: #303133;
+    color: #000000;
 }
 .el-step__title.is-wait {
     color: #c0c4cc;
@@ -8917,7 +8917,7 @@
     font-weight: 400;
 }
 .el-step__description.is-process {
-    color: #303133;
+    color: #000000;
 }
 .el-step__description.is-wait {
     color: #c0c4cc;
@@ -9390,7 +9390,7 @@
     height: 48px;
     line-height: 48px;
     background-color: #fff;
-    color: #303133;
+    color: #000000;
     cursor: pointer;
     border-bottom: 1px solid #ebeef5;
     font-size: 13px;
@@ -9431,7 +9431,7 @@
 .el-collapse-item__content {
     padding-bottom: 25px;
     font-size: 13px;
-    color: #303133;
+    color: #000000;
     line-height: 1.769230769230769;
 }
 .el-collapse-item:last-child {
@@ -10812,7 +10812,7 @@
 }
 .el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label {
     font-size: 16px;
-    color: #303133;
+    color: #000000;
     font-weight: 400;
 }
 .el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label span {
@@ -11016,7 +11016,7 @@
     align-items: center;
 }
 .el-timeline-item__content {
-    color: #303133;
+    color: #000000;
 }
 .el-timeline-item__timestamp {
     color: #909399;
@@ -11162,7 +11162,7 @@
     position: absolute;
     background-color: #fff;
     padding: 0 20px;
-    color: #303133;
+    color: #000000;
 }
 .el-image__error,
 .el-image__placeholder {
@@ -11782,7 +11782,6 @@
 .el-button--small,
 .el-button--small.is-round {
     padding: 11px 15px;
-    min-width: 100px;
 }
 .el-button--small.is-circle {
     padding: 9px;
@@ -12052,7 +12051,7 @@
 }
 .el-page-header__content {
     font-size: 18px;
-    color: #303133;
+    color: #000000;
 }
 .el-checkbox {
     color: #606266;

src/main/vue/src/views/LogoPatentAdd.vue

@@ -14,13 +14,13 @@
                     :model="formData"
                     :rules="rules"
                     ref="form"
-                    label-width="136px"
+                    label-width="180px"
                     label-position="right"
                     size="small"
-                    style="max-width: 500px;"
+                    style="max-width: 480px;"
                 >
                     <el-form-item prop="name" label="商标logo">
-                        <el-input v-model="formData.name"></el-input>
+                        <el-input v-model="formData.name" placeholder="请输入注册的商标名"></el-input>
                     </el-form-item>
                     <el-form-item prop="clientPartnerId" label="选择客户">
                         <el-select v-model="formData.clientPartnerId" clearable filterable placeholder="请选择">
@@ -96,9 +96,7 @@ export default {
             saving: false,
             formData: {},
             rules: {
-                name:{
-                    
-                }
+                name: { required: true, message: '请输入注册的商标名', trigger: 'blur' }
             },
             clientPartnerIdOptions: [],
             applyStatusOptions: [
@@ -139,6 +137,9 @@ export default {
         submit() {
             let data = { ...this.formData };
 
+            data.userId = this.$store.state.userInfo.id;
+            data.applyStatus = 'APPLY_STAGE';
+
             this.saving = true;
             this.$http
                 .post('/logoPatent/save', data, { body: 'json' })
@@ -172,4 +173,8 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.el-select {
+    width: 100%;
+}
+</style>

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

@@ -1,149 +1,18 @@
 <template>
     <div class="edit-view">
-        <page-title>
-            <el-button @click="$router.go(-1)">取消</el-button>
-            <el-button @click="del" :loading="$store.state.fetchingData" type="danger" v-if="formData.id">
-                删除
-            </el-button>
-            <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-        </page-title>
-        <div class="edit-view__content-wrapper">
-            <div class="edit-view__content-section">
-                <divider />
-                <el-form
-                    :model="formData"
-                    :rules="rules"
-                    ref="form"
-                    label-width="136px"
-                    label-position="right"
-                    size="small"
-                    style="max-width: 500px;"
-                >
-                    <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>
-                    <el-form-item prop="applyStatus" label="案件状态">
-                        <el-select v-model="formData.applyStatus" clearable filterable placeholder="请选择">
-                            <el-option
-                                v-for="item in applyStatusOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item prop="logoWorkflow" label="当前流程">
-                        <el-select v-model="formData.logoWorkflow" clearable filterable placeholder="请选择">
-                            <el-option
-                                v-for="item in logoWorkflowOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item prop="supplierPartnerId" label="供应商">
-                        <el-select v-model="formData.supplierPartnerId" clearable filterable placeholder="请选择">
-                            <el-option
-                                v-for="item in supplierPartnerIdOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </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>
-                    <el-form-item prop="applyDate" label="商标申请日">
-                        <el-date-picker
-                            v-model="formData.applyDate"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择日期"
-                        >
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item prop="payRatio" label="支付比例">
-                        <el-select v-model="formData.payRatio" clearable filterable placeholder="请选择">
-                            <el-option
-                                v-for="item in payRatioOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </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-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"
-                            >删除
-                        </el-button>
-                        <el-button @click="$router.go(-1)" size="default">取消</el-button>
-                    </el-form-item>
-                </el-form>
-            </div>
-        </div>
+        <page-title></page-title>
+        <el-tabs class="edit-tabs" v-model="activeName">
+            <el-tab-pane label="基本信息" name="first">
+                <base-info></base-info>
+            </el-tab-pane>
+            <el-tab-pane label="附件列表" name="second"></el-tab-pane>
+            <el-tab-pane label="费用信息" name="third"></el-tab-pane>
+            <el-tab-pane label="流程信息" name="fourth"></el-tab-pane>
+        </el-tabs>
     </div>
 </template>
 <script>
+import BaseInfo from '../components/logoPatent/BaseInfo.vue';
 export default {
     name: 'LogoPatentEdit',
     created() {
@@ -159,7 +28,7 @@ export default {
                 });
         }
         this.$http
-            .get('/partner/all', { size: 1000, query: { del: false } })
+            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
             .then(res => {
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
@@ -175,7 +44,7 @@ export default {
                 this.$message.error(e.error);
             });
         this.$http
-            .get('/partner/all', { size: 1000, query: { del: false } })
+            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
             .then(res => {
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
@@ -219,7 +88,8 @@ export default {
                 { label: '全款', value: 'FULL_AMOUNT' },
                 { label: '首付80%', value: 'DOWN_PAYMENT_80' },
                 { label: '首付50%', value: 'DOWN_PAYMENT_50' }
-            ]
+            ],
+            activeName: 'first'
         };
     },
     methods: {
@@ -265,6 +135,9 @@ export default {
                     }
                 });
         }
+    },
+    components: {
+        BaseInfo
     }
 };
 </script>

src/main/vue/src/views/LogoPatentEdit1.vue

@@ -0,0 +1,271 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)">取消</el-button>
+            <el-button @click="del" :loading="$store.state.fetchingData" type="danger" v-if="formData.id">
+                删除
+            </el-button>
+            <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <divider />
+                <el-form
+                    :model="formData"
+                    :rules="rules"
+                    ref="form"
+                    label-width="136px"
+                    label-position="right"
+                    size="small"
+                    style="max-width: 500px;"
+                >
+                    <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>
+                    <el-form-item prop="applyStatus" label="案件状态">
+                        <el-select v-model="formData.applyStatus" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in applyStatusOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="logoWorkflow" label="当前流程">
+                        <el-select v-model="formData.logoWorkflow" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in logoWorkflowOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="supplierPartnerId" label="供应商">
+                        <el-select v-model="formData.supplierPartnerId" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in supplierPartnerIdOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </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>
+                    <el-form-item prop="applyDate" label="商标申请日">
+                        <el-date-picker
+                            v-model="formData.applyDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="payRatio" label="支付比例">
+                        <el-select v-model="formData.payRatio" clearable filterable placeholder="请选择">
+                            <el-option
+                                v-for="item in payRatioOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value"
+                            >
+                            </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-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"
+                            >删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" size="default">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name: 'LogoPatentEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('logoPatent/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+        this.$http
+            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.clientPartnerIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post('/partner/all', { size: 1000, query: { del: false } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.supplierPartnerIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {},
+            clientPartnerIdOptions: [],
+            applyStatusOptions: [
+                { label: '申请阶段', value: 'APPLY_STAGE' },
+                { label: '初审阶段', value: 'FIRST_REVIEW_STAGE' },
+                { label: '实审阶段', value: 'SUBSTANTIVE_STAGE' },
+                { label: '复审阶段', value: 'REVIEW_STAGE' },
+                { label: '授权阶段', value: 'GRANT_STAGE' },
+                { label: '已完成', value: 'COMPLETED' }
+            ],
+            logoWorkflowOptions: [
+                { label: '是否决定签约', value: 'IS_CONTRACT' },
+                { label: '待维护案件', value: 'TO_BE_MAINTAINED' },
+                { label: '待受理', value: 'PENDING' },
+                { label: '待审查', value: 'PENDING_REVIEW' },
+                { label: '驳回处理', value: 'DISMISS' },
+                { label: '公告初审', value: 'ANNOUNCEMENTS' },
+                { label: '证件办理', value: 'HANDLE' }
+            ],
+            supplierPartnerIdOptions: [],
+            payRatioOptions: [
+                { label: '全款', value: 'FULL_AMOUNT' },
+                { label: '首付80%', value: 'DOWN_PAYMENT_80' },
+                { label: '首付50%', value: 'DOWN_PAYMENT_50' }
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/logoPatent/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/logoPatent/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

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

@@ -156,7 +156,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/logoPatentEdit',
+                path: '/logoPatentAdd',
                 query: {
                     ...this.$route.query
                 }

src/main/vue/src/views/Menus.vue

@@ -4,7 +4,7 @@
             <el-option v-for="item in categories" :label="item" :key="item" :value="item"></el-option>
         </el-select>
         <el-row :gutter="20">
-            <el-col :span="12">
+            <el-col :md="16" :lg="14" :xl="10">
                 <div class="menu-tree">
                     <el-tree
                         :data="menus"