基础信息

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

@@ -29,7 +29,7 @@
                 </el-form-item>
 
                 <el-form-item prop="supplierPartnerId" label="供应商">
-                    <el-select v-model="formData.supplierPartnerId" clearable filterable placeholder="请选择">
+                    <el-select v-model="formData.supplierPartnerId" filterable placeholder="请选择">
                         <el-option
                             v-for="item in supplierPartnerIdOptions"
                             :key="item.value"
@@ -43,7 +43,7 @@
                     <el-input disabled v-model="formData.uwNo"></el-input>
                 </el-form-item>
                 <el-form-item prop="clientPartnerId" label="客户">
-                    <el-select readonly v-model="formData.clientPartnerId" clearable filterable placeholder="请选择">
+                    <el-select readonly v-model="formData.clientPartnerId" filterable placeholder="请选择">
                         <el-option
                             v-for="item in clientPartnerIdOptions"
                             :key="item.value"
@@ -53,12 +53,12 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="applyNo" label="商标申请号">
-                    <el-input v-model="formData.applyNo" readonly></el-input>
+                <el-form-item prop="id" label="商标申请号">
+                    <el-input v-model="formData.id" readonly></el-input>
                 </el-form-item>
-                <el-form-item prop="applyDate" label="商标申请日">
+                <el-form-item prop="createdAt" label="商标申请日">
                     <el-date-picker
-                        v-model="formData.applyDate"
+                        v-model="formData.createdAt"
                         type="date"
                         value-format="yyyy-MM-dd"
                         placeholder="选择日期"
@@ -67,7 +67,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item prop="payRatio" label="支付比例">
-                    <el-select readonly v-model="formData.payRatio" clearable filterable placeholder="请选择">
+                    <el-select readonly v-model="formData.payRatio" placeholder="请选择">
                         <el-option
                             v-for="item in payRatioOptions"
                             :key="item.value"

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

@@ -35,10 +35,10 @@
             <el-table-column prop="name" label="专利名称"> </el-table-column>
             <el-table-column prop="logoWorkflow" label="当前流程" :formatter="logoWorkflowFormatter"> </el-table-column>
             <el-table-column prop="userId" label="创建申请人"> </el-table-column>
-            <el-table-column prop="applyDate" label="商标申请日"> </el-table-column>
-            <el-table-column prop="clientPartnerId" label="客户"> </el-table-column>
-            <el-table-column prop="supplierPartnerId" label="供应商"> </el-table-column>
-            <el-table-column prop="applyNo" label="商标申请号"> </el-table-column>
+            <el-table-column prop="createdAt" label="商标申请日"> </el-table-column>
+            <el-table-column prop="clientPartner" label="客户"> </el-table-column>
+            <el-table-column prop="supplierPartner" label="供应商"> </el-table-column>
+            <el-table-column prop="id" label="商标申请号"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看详情</el-button>