0402

src/main/vue/src/components/logoPatent/Accept.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="是否受理" prop="accept">
                 <el-radio-group v-model="form.accept">

src/main/vue/src/components/logoPatent/Announcement.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="公告通知书" prop="attachment1">
                 <attachment-upload

src/main/vue/src/components/logoPatent/AttachmentAdd.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="附件名称" prop="attachmentName">
                 <!-- <el-input v-model="form.attachmentName" placeholder="请输入附件名"></el-input> -->

src/main/vue/src/components/logoPatent/AttachmentList.vue

@@ -9,6 +9,7 @@
             row-class-name="table-row"
             cell-class-name="table-cell"
             :height="tableHeight"
+            v-loading="tableLoading"
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->

src/main/vue/src/components/logoPatent/Correction.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="回文补正" prop="attachment1">
                 <attachment-upload

src/main/vue/src/components/logoPatent/Dismiss.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="是否复审" prop="rehear">
                 <el-radio-group v-model="form.rehear">

src/main/vue/src/components/logoPatent/Handle.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="商标注册证" prop="attachment1">
                 <attachment-upload

src/main/vue/src/components/logoPatent/Maintenance.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="选择供应商" prop="supplierPartnerId">
                 <!-- <el-input v-model="form.attachmentName" placeholder="请输入附件名"></el-input> -->

src/main/vue/src/components/logoPatent/Payment.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="是否缴费完成" prop="payment">
                 <el-radio-group v-model="form.payment">

src/main/vue/src/components/logoPatent/Review.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="是否符合审查要求" prop="reviewRequire">
                 <el-radio-group v-model="form.reviewRequire">

src/main/vue/src/components/logoPatent/ReviewSeF.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="缴费通知书" prop="attachment1">
                 <div slot="label" style="line-height: 22px;">

src/main/vue/src/components/logoPatent/ReviewSeS.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="缴费信息" prop="reHearPayment">
                 <el-input v-model="form.reHearPayment" placeholder="请输入" clearable></el-input>

src/main/vue/src/components/logoPatent/ReviewSeT.vue

@@ -5,8 +5,8 @@
             :model="form"
             :rules="rules"
             ref="form"
-            label-width="120px"
-            style="padding-right: 120px;"
+            label-width="140px"
+            style="padding-right: 130px;"
         >
             <el-form-item label="复审是否通过" prop="rehearResult">
                 <el-radio-group v-model="form.rehearResult">

src/main/vue/src/components/logoPatent/Signed.vue

@@ -5,7 +5,8 @@
             :model="form"
             ref="form"
             :rules="rules"
-            label-width="110px"
+            label-width="140px"
+            style="padding-right: 130px;"
             :inline="false"
             size="normal"
         >
@@ -28,7 +29,7 @@
                 </attachment-upload>
             </el-form-item>
             <el-form-item prop="payRatio" label="支付比例">
-                <el-select v-model="form.payRatio" clearable filterable placeholder="请选择">
+                <el-select style="width: 100%;" v-model="form.payRatio" clearable filterable placeholder="请选择">
                     <el-option
                         v-for="item in payRatioOptions"
                         :key="item.value"
@@ -39,8 +40,8 @@
                 </el-select>
             </el-form-item>
             <el-form-item>
-                <el-button @click="onSave" type="primary">提交</el-button>
-                <el-button @click="cancel">返回</el-button>
+                <el-button style="width: 150px;" @click="onSave" type="primary">提交</el-button>
+                <el-button style="width: 120px;" @click="cancel">返回</el-button>
             </el-form-item>
         </el-form>
     </el-dialog>

src/main/vue/src/mixins/pageableTable.js

@@ -8,7 +8,8 @@ export default {
             tableData: [],
             sort: {},
             sortStr: '',
-            tableHeight: 200
+            tableHeight: 200,
+            tableLoading: false
         };
     },
     created() {
@@ -46,9 +47,11 @@ export default {
                     data = { ...data, ...mergeData };
                 }
             }
+            this.tableLoading = true;
             this.$http
                 .post(this.url, data, { body: 'json' })
                 .then(res => {
+                    this.tableLoading = false;
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                     this.totalElements = res.totalElements;
@@ -57,6 +60,7 @@ export default {
                     }
                 })
                 .catch(e => {
+                    this.tableLoading = false;
                     console.log(e);
                     this.$message.error(e.error);
                 });

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

@@ -422,3 +422,14 @@ li {
         width: 200px;
     }
 }
+
+.el-dialog--center {
+    .el-dialog__header {
+        background: #f5f7fa;
+        font-size: 14px;
+        font-weight: bold;
+        color: #000000;
+        line-height: 50px;
+        padding: 0;
+    }
+}

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

@@ -3,10 +3,10 @@
         <page-title></page-title>
         <el-tabs class="edit-tabs" v-model="activeName" @tab-click="tabClick">
             <div class="right-btns">
-                <el-button type="primary" size="small">新增答复</el-button>
+                <!-- <el-button type="primary" size="small">新增答复</el-button> -->
                 <el-button type="primary" size="small">新增费用</el-button>
                 <el-button type="primary" size="small" @click="$refs.attachmentAdd.show = true">新增附件</el-button>
-                <el-button type="primary" size="small">分案/接续流程</el-button>
+                <!-- <el-button type="primary" size="small">分案/接续流程</el-button> -->
             </div>
             <div class="tips" v-if="nowStatus && formData.applyStatus !== 'COMPLETED'">
                 <div class="tips-text">
@@ -35,7 +35,7 @@
             <el-tab-pane label="费用信息" name="third">
                 <fee-list ref="feeList" :logoPatentInfo="formData"></fee-list>
             </el-tab-pane>
-            <el-tab-pane label="流程信息" name="fourth"></el-tab-pane>
+            <!-- <el-tab-pane label="流程信息" name="fourth"></el-tab-pane> -->
         </el-tabs>
 
         <signed ref="sign" :info="formData" @submit="submit" @uploadAttement="uploadAttement"></signed>
@@ -298,3 +298,14 @@ export default {
     }
 }
 </style>
+<style lang="less">
+.el-dialog {
+    .el-form {
+        .el-form-item {
+            &:last-child {
+                margin-top: 70px;
+            }
+        }
+    }
+}
+</style>