فهرست منبع

账户列表 联调

jiayufei 3 سال پیش
والد
کامیت
869ed49d21

+ 13 - 1
src/views/modules/policy-management/policy-management.less

@@ -53,8 +53,18 @@
 }
 }
 /deep/ .audit-policy-class {
 /deep/ .audit-policy-class {
     width: 930px !important;
     width: 930px !important;
+    .audit-policy-footer {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-top: 1px solid #e8e8e8;
+        .cancel-btn {
+            margin-right: 12px;
+            margin-top: 12px;
+        }
+    }
     .ant-modal-body {
     .ant-modal-body {
-        height: 420px;
+        height: 440px;
         overflow-y: auto;
         overflow-y: auto;
     }
     }
     .audit-policy-icon {
     .audit-policy-icon {
@@ -66,6 +76,8 @@
     }
     }
     .policy-line-quen {
     .policy-line-quen {
         display: flex;
         display: flex;
+        height: 345px;
+        overflow-y: auto;
         .line-quen-left,
         .line-quen-left,
         .line-quen-right {
         .line-quen-right {
             flex: 1;
             flex: 1;

+ 11 - 8
src/views/modules/policy-management/policy-management.vue

@@ -21,21 +21,21 @@
                         label="公司名称:"
                         label="公司名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.companyName" placeholder="请输入公司名称"/>
+                        <a-input v-model="configForm.companyName" placeholder="请输入公司名称" allow-clear/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
                         class="grid-form-item"
                         class="grid-form-item"
                         label="广告主名称:"
                         label="广告主名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.adverName" placeholder="请输入广告主名称"/>
+                        <a-input v-model="configForm.adverName" placeholder="请输入广告主名称" allow-clear/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
                         class="grid-form-item"
                         class="grid-form-item"
                         label="产品名称:"
                         label="产品名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.productName" placeholder="请输入产品名称"/>
+                        <a-input v-model="configForm.productName" placeholder="请输入产品名称" allow-clear/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item label="媒体:">
                     <a-form-item label="媒体:">
                         <a-select v-model="configForm.creativeMedia" style="width: 100px" allow-clear>
                         <a-select v-model="configForm.creativeMedia" style="width: 100px" allow-clear>
@@ -216,12 +216,8 @@
             title="审核政策"
             title="审核政策"
             :visible="auditPolicyStatus"
             :visible="auditPolicyStatus"
             :closable="false"
             :closable="false"
-            :footer="queryByIdList.updateOperation.includes('审核拒绝')"
-            okText="审核通过"
-            cancelText="审核拒绝"
+            :footer="null"
             dialog-class="audit-policy-class"
             dialog-class="audit-policy-class"
-            @ok="handleAuditSure"
-            @cancel="handleAuditCancel"
         >
         >
             <div>
             <div>
                 <span class="audit-policy-icon" @click="handleCloseAuditPolicy"><a-icon type="close"/></span>
                 <span class="audit-policy-icon" @click="handleCloseAuditPolicy"><a-icon type="close"/></span>
@@ -315,6 +311,13 @@
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
+                <div v-if="queryByIdList.updateOperation.includes('审核拒绝')" solt="footer" class="audit-policy-footer">
+                    <div></div>
+                    <div>
+                        <a-button type="default" class="cancel-btn" @click="handleAuditCancel">审核拒绝</a-button>
+                        <a-button type="primary" @click="handleAuditSure">审核通过</a-button>
+                    </div>
+                </div>
             </div>
             </div>
         </a-modal>
         </a-modal>
         <!-- 审核拒绝 -->
         <!-- 审核拒绝 -->

+ 15 - 5
src/views/modules/settlement-account/settlement-account.vue

@@ -28,28 +28,28 @@
                         label="广告主名称:"
                         label="广告主名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.advertiserName" placeholder="请输入广告主名称"/>
+                        <a-input v-model="configForm.advertiserName" placeholder="请输入广告主名称" allow-clear/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
                         class="grid-form-item"
                         class="grid-form-item"
                         label="产品名称:"
                         label="产品名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.productName" placeholder="请输入产品名称"/>
+                        <a-input v-model="configForm.productName" placeholder="请输入产品名称" allow-clear/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
                         class="grid-form-item"
                         class="grid-form-item"
                         label="项目名称:"
                         label="项目名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.projectName" placeholder="请输入项目名称"/>
+                        <a-input v-model="configForm.projectName" placeholder="请输入项目名称" allow-clear/>
                     </a-form-item>
                     </a-form-item>
                     <a-form-item
                     <a-form-item
                         class="grid-form-item"
                         class="grid-form-item"
                         label="账户名称:"
                         label="账户名称:"
                         :colon="false"
                         :colon="false"
                     >
                     >
-                        <a-input v-model="configForm.accountName" placeholder="请输入账户名称"/>
+                        <a-input v-model="configForm.accountName" placeholder="请输入账户名称" allow-clear/>
                     </a-form-item>
                     </a-form-item>
                 </a-row>
                 </a-row>
                 <a-row>
                 <a-row>
@@ -105,6 +105,14 @@
                 :scroll="{x: 1800}"
                 :scroll="{x: 1800}"
                 :loading="controlLoading"
                 :loading="controlLoading"
             >
             >
+                <span slot="productName" slot-scope="text">
+                    <a-tooltip placement="top">
+                        <template slot="title">
+                            <span>{{ text }}</span>
+                        </template>
+                        <span>{{ text }}</span>
+                    </a-tooltip>
+                </span>
                 <span slot="mediaId" slot-scope="text">
                 <span slot="mediaId" slot-scope="text">
                     <span>{{ text === 1 ? '头条' : '快手' }}</span>
                     <span>{{ text === 1 ? '头条' : '快手' }}</span>
                 </span>
                 </span>
@@ -271,7 +279,9 @@ export default {
                     title: '产品名称',
                     title: '产品名称',
                     align: 'center',
                     align: 'center',
                     dataIndex: 'productName',
                     dataIndex: 'productName',
-                    width: 200
+                    ellipsis: true,
+                    width: 200,
+                    scopedSlots: {customRender: 'productName'}
                 },
                 },
                 {
                 {
                     title: '项目名称',
                     title: '项目名称',