szx 3 лет назад
Родитель
Сommit
18330a65eb

+ 3 - 7
src/views/_pageOptions/table-account.ts

@@ -14,11 +14,7 @@ export const TableColumnOfAccount = [
     dataIndex: "account_name",
     ellipsis: true,
   },
-  {
-    title: "公众号appid",
-    dataIndex: "app_id",
-    ellipsis: true,
-  },
+
   {
     title: "平台",
     dataIndex: "platform",
@@ -30,7 +26,7 @@ export const TableColumnOfAccount = [
     ellipsis: true,
   },
   {
-    title: "回传方式",
+    title: "回传条件",
     width: 140,
     dataIndex: "module",
     slots: {
@@ -47,7 +43,7 @@ export const TableColumnOfAccount = [
   //   }
   // },
   {
-    title: "站点回传比例(%)",
+    title: "回传比例(%)",
     dataIndex: "rate",
     width: 140,
     slots: {

+ 2 - 2
src/views/account/kuaishou.vue

@@ -7,7 +7,7 @@
       @confirm="onSearch"
       @cancel="onCancel"
     >
-      <div class="tool-bar-item">
+      <!-- <div class="tool-bar-item">
         <p class="label">回传方式</p>
         <a-select class="full-width" v-model:value="query.report_module">
           <a-select-option key="all" :value="''">全部</a-select-option>
@@ -16,7 +16,7 @@
           >
           <a-select-option key="ad" value="ad">按计划回传</a-select-option>
         </a-select>
-      </div>
+      </div> -->
     </tool-bar>
     <a-table
       rowKey="id"

+ 29 - 9
src/views/account/orange.vue

@@ -16,16 +16,26 @@
         </a-table>
 
         <!-- 回传配置 -->
+        <!-- <a-modal
+            title="Title"
+            :visible="visible"
+            :confirm-loading="confirmLoading"
+            @ok="handleOk"
+            @cancel="handleCancel"
+        >
+            <p>{{ ModalText }}</p>
+        </a-modal>-->
 
-        <a-drawer
+        <a-modal
             title="回传配置"
-            placement="right"
             :closable="true"
             width="50%"
             v-model:visible="visibleMatchLog"
+            @ok="handleOk"
+            @cancel="handleCancel"
         >
-            <OrangeForm :formrate="formrate" @getShowFlag="getOrangeShowFlag"/>
-        </a-drawer>
+            <OrangeForm :formrate="formrate" @getShowFlag="getOrangeShowFlag"  ref="OrForm"></OrangeForm>
+        </a-modal>
 
         <a-drawer
             title="日志详情"
@@ -60,6 +70,7 @@ export default defineComponent({
         OrangeForm,
     },
     setup() {
+        const OrForm = ref()
         const state = reactive({
             list: ref<OListItem[]>([]),
             searching: false,
@@ -111,7 +122,6 @@ export default defineComponent({
         };
         onMounted(() => {
             initOrangedata();
-            console.log(1);
         });
 
         //搜索传入的值
@@ -137,17 +147,27 @@ export default defineComponent({
             state.query.report_module = "";
             onSearch({ name: "" });
         };
-        const getOrangeShowFlag = (value:boolean) => {
+        const getOrangeShowFlag = (value: boolean) => {
             console.log(value)
-            state.visibleMatchLog=!value
+            state.visibleMatchLog = !value
+        }
+        const handleCancel=()=>{
+
+        }
+        const handleOk=()=>{
+             console.log(OrForm.value.submit)
+             OrForm.value.submit()
         }
         return {
             ...toRefs(state),
             onSearch,
             onCancel,
             showDrawerLog,
-            showDrawerMactch, 
-            getOrangeShowFlag
+            showDrawerMactch,
+            getOrangeShowFlag,
+            handleOk,
+            handleCancel,
+            OrForm
         };
     },
 });

+ 9 - 9
src/views/account/orangeform.vue

@@ -10,11 +10,11 @@
             <a-form-item label="回传比例">
                 <a-input addon-after="%" v-model:value="formState.rate" placeholder="请输入回传比例" />
             </a-form-item>
-            <a-form-item :wrapper-col="buttonItemLayout.wrapperCol">
+            <!-- <a-form-item :wrapper-col="buttonItemLayout.wrapperCol">
                 <a-button type="primary" @click="submit">确定</a-button>
                 <span style="padding:20px;"></span>
                 <a-button type="primary" @click="cancel">取消</a-button>
-            </a-form-item>
+            </a-form-item>-->
         </a-form>
     </div>
 </template>
@@ -45,10 +45,11 @@ interface OrangeForm {
     };
 }
 export default defineComponent({
+    name:'OrangeForm',
     props: {
         formrate: String || undefined,
     },
-    emits: ["getShowFlag"],
+    emits: ["getShowFlag",'handleOk'],
     setup(props, ctx) {
         const state: OrangeForm = reactive({
             value: "",
@@ -66,7 +67,7 @@ export default defineComponent({
             rate: "100",
             condition: "",
         });
-
+        const OrangeFormMsg=ref('OrangeForm')
         const formItemLayout = computed(() => {
             const { layout } = formState;
             return layout === "horizontal"
@@ -103,21 +104,20 @@ export default defineComponent({
             if (res.data.result == 1) {
                 console.log(res.data.result)
                 message.success("修改回传比例成功!");
-            }else{
+            } else {
                 message.error("修改失败,暂无配置");
             }
+            ctx.emit('getShowFlag', showFlag.showflag)
         };
         //点击关闭抽屉层
-        const cancel = () => {
-            ctx.emit('getShowFlag', showFlag.showflag)
-        }
+   
         return {
             formState,
             formItemLayout,
             buttonItemLayout,
             ...toRefs(state),
             submit,
-            cancel
+            OrangeFormMsg
         };
     },
 });