Bläddra i källkod

修改:增加项目成员查看

zhuxinbo 5 år sedan
förälder
incheckning
db9ecf8304

+ 0 - 22
src/views/modules/advertiser/AdvertiserList.vue

@@ -38,31 +38,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <!--      <a-button type="primary" icon="download" @click="handleExportXls('广告主信息表')">导出</a-button>-->
-      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
-      <!--                @change="handleImportExcel">-->
-      <!--        <a-button type="primary" icon="import">导入</a-button>-->
-      <!--      </a-upload>-->
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
 
       <a-table
         ref="table"
@@ -73,7 +52,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>

+ 2 - 23
src/views/modules/advertiser/ProjectList.vue

@@ -12,8 +12,8 @@
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
-            <a-form-item label="广告主id">
-              <a-input placeholder="请输入广告主id" v-model="queryParam.advertiserId"></a-input>
+            <a-form-item label="广告主名称">
+              <a-input placeholder="请输入广告主名称" v-model="queryParam.advertiserName"></a-input>
             </a-form-item>
           </a-col>
         <template>
@@ -41,20 +41,10 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
     </div>
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
 
       <a-table
         ref="table"
@@ -65,7 +55,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
@@ -103,16 +92,6 @@
         description: '项目管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-           },
 		   {
             title: '项目名称',
             align:"center",

+ 108 - 21
src/views/modules/advertiser/ProjectMemberList.vue

@@ -3,6 +3,9 @@
   display: flex;
   justify-content: center;
 }
+.close-account-my-project .ant-modal-footer .ant-btn-primary {
+  display: none;
+}
 </style>
 <template>
   <a-card
@@ -46,15 +49,15 @@
         <span slot="mediaId" slot-scope="mediaId">{{ mediaId == 1 ? '头条' : '快手' }}</span>
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">{{ noTitleKey == 'myProject' ? '查看成员' : '账号绑定' }}</a>
-          <a-divider type="vertical" v-show="noTitleKey == 'myProject'" />
-          <a @click="addParams(record)" v-show="noTitleKey == 'myProject'">新增人员</a>
+          <a-divider type="vertical" />
+          <a @click="addParams(record)">{{ noTitleKey == 'myProject' ? '新增人员' : '查看账户' }}</a>
         </span>
       </a-table>
     </div>
     <!-- table区域-end -->
 
     <!--  查看项目成员 -->
-    <a-modal title="查看项目成员" v-model="visible" @ok="handleOk" width="800px">
+    <a-modal :title="title" v-model="visible" @ok="handleOk" width="800px" class="close-account-my-project">
       <div style="display:flex;line-height:50px;flex-wrap: wrap;">
         <div style="width:25%;text-align:center;" v-for="(item, index) of memberList" :key="index">
           <a-tag color="#2db7f5" @close="log(item.id)" closable
@@ -142,6 +145,28 @@
         </a-form-item>
       </a-form>
     </a-modal>
+
+    <!--  查看项目下的账号 -->
+    <a-modal
+      :title="titleAccount"
+      v-model="visibleAccount"
+      @ok="handleOk"
+      width="800px"
+      class="close-account-my-project"
+    >
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columnsAccount"
+        :dataSource="dataAccount"
+        :pagination="false"
+        :loading="loadingAccount"
+      >
+        <span slot="createTime" slot-scope="createTime">{{ createTime | getDate }}</span>
+      </a-table>
+    </a-modal>
   </a-card>
 </template>
 
@@ -161,6 +186,8 @@ export default {
   },
   data() {
     return {
+      title: '',
+      titleAccount: '',
       description: '我的项目',
       // 表头
       visible: false,
@@ -213,6 +240,31 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
+      columnsAccount: [
+        {
+          title: '账户id',
+          align: 'center',
+          dataIndex: 'accountId'
+        },
+        {
+          title: '账户名称',
+          align: 'center',
+          dataIndex: 'authName'
+        },
+        {
+          title: '所属人',
+          align: 'center',
+          dataIndex: 'userName'
+        },
+        {
+          title: '授权时间',
+          align: 'center',
+          dataIndex: 'createTime',
+          scopedSlots: { customRender: 'createTime' }
+        }
+      ],
+      loadingAccount: false,
+      dataAccount: [],
       dataSource: [],
       dataElse: [],
       ipagination: {},
@@ -226,7 +278,8 @@ export default {
       bindAuthorizationUrl: '/ctop/bindAccountAuth/authorization',
       appId: [],
       list: [],
-      options: []
+      options: [],
+      visibleAccount: false
     }
   },
   computed: {
@@ -251,9 +304,19 @@ export default {
       } else {
         return '暂无'
       }
+    },
+    getDate(value) {
+      let date = new Date(value)
+      let y = date.getFullYear()
+      let MM = date.getMonth() + 1
+      MM = MM < 10 ? '0' + MM : MM
+      let d = date.getDate()
+      d = d < 10 ? '0' + d : d
+      return y + '-' + MM + '-' + d
     }
   },
   methods: {
+    //   /ctop/userAllocation/getAccountsByProjectId    projectId  userId
     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     add(value, key) {
       var dataValue = value.split(',')
@@ -266,9 +329,11 @@ export default {
     },
     log(id) {
       deleteAction('/ctop/projectMember/delete', { id: id }).then(res => {
-        console.log(res)
         if (res.success) {
           this.getMemberList(this.projectId)
+          this.$message.success('删除成功')
+        } else {
+          this.$message.error(res.message)
         }
       })
     },
@@ -296,11 +361,16 @@ export default {
               dataIndex: 'projectName'
             },
             {
-              title: '管理人',
+              title: '广告主名称',
               align: 'center',
               dataIndex: 'advertiserName'
             },
             {
+              title: '管理人',
+              align: 'center',
+              dataIndex: 'responsibleName'
+            },
+            {
               title: '媒体类型',
               align: 'center',
               dataIndex: 'mediaId',
@@ -373,12 +443,9 @@ export default {
       })
     },
     handleOk(e) {
-      console.log(e)
       this.visible = false
     },
     handleOkAdd(e) {
-      console.log(e)
-
       var params = {}
       params.projectId = this.itemJson.id
       params.projectName = this.itemJson.projectName
@@ -386,25 +453,45 @@ export default {
 
       httpAction('/ctop/projectMember/batchAdd', params, 'post').then(res => {
         console.log(res)
-        this.visibleAdd = false
-        this.appId = []
-      })
-    },
-    addParams(item) {
-      this.visibleAdd = true
-      this.itemJson = item
-      console.log(this.itemJson)
-      getAction('/sys/user/getAllUserList', '').then(res => {
-        console.log(res)
         if (res.success) {
-          this.list = res.result
-          this.options = res.result
+          this.visibleAdd = false
+          this.appId = []
+          this.$message.success('添加成功')
+        } else {
+          this.$message.error('添加失败')
         }
       })
     },
+    addParams(item) {
+      if (this.noTitleKey == 'myProject') {
+        this.visibleAdd = true
+        this.itemJson = item
+        console.log(this.itemJson)
+        getAction('/sys/user/getAllUserList', '').then(res => {
+          if (res.success) {
+            this.list = res.result
+            this.options = res.result
+          }
+        })
+      } else {
+        this.visibleAccount = true
+        this.titleAccount = item.projectName
+        this.loadingAccount = true
+        getAction('/ctop/userAllocation/getAccountsByProjectId', {
+          projectId: item.projectId,
+          userId: this.userInfo().id
+        }).then(res => {
+          if (res.success) {
+            this.dataAccount = res.result
+            this.loadingAccount = false
+          }
+        })
+      }
+    },
     handleAdd() {},
     handleEdit(item) {
       if (this.noTitleKey == 'myProject') {
+        this.title = item.projectName
         this.projectId = item.id
         this.getMemberList(item.id)
       } else {

+ 144 - 201
src/views/modules/advertiser/UserAllocationList.vue

@@ -1,202 +1,145 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-
-
-          <template>
-            <a-col :md="6" :sm="8">
-              <a-form-item label="广告主ID">
-                <a-input placeholder="请输入广告主ID" v-model="queryParam.advertiserId"></a-input>
-              </a-form-item>
-            </a-col>
-
-
-            <a-col :md="6" :sm="8">
-              <a-form-item label="广告主名称">
-                <a-input placeholder="请输入广告主名称" v-model="queryParam.advertiserName"></a-input>
-              </a-form-item>
-            </a-col>
-
-
-          </template>
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
-                 {{ toggleSearchStatus ? '收起' : '展开' }}
-                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-               </a>-->
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('用户分配')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>
-            删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-
-        <div
-          slot="mediaIdShow"
-          slot-scope="text, record"
-        >{{typeArr[record.mediaId]}}</div>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <userAllocation-modal ref="modalForm" @ok="modalFormOk"></userAllocation-modal>
-  </a-card>
-</template>
-
-<script>
-  import UserAllocationModal from './modules/UserAllocationModal'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: "UserAllocationList",
-    mixins: [JeecgListMixin],
-    components: {
-      UserAllocationModal
-    },
-    data() {
-      return {
-        typeArr: ['', '头条', '快手'],
-
-        description: '用户分配管理页面',
-        // 表头
-        columns: [
-          {
-            title: '序号',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: "center",
-            customRender: function (t, r, index) {
-              return parseInt(index) + 1;
-            }
-          },
-
-          {
-            title: '指定分配人',
-            align: "center",
-            dataIndex: 'distributionName'
-          },
-
-          {
-            title: '广告主名称',
-            align: "center",
-            dataIndex: 'advertiserName'
-          },
-          {
-            title: '登录账号',
-            align: "center",
-            dataIndex: 'accountName'
-          },
-          {
-            title: '操作人姓名',
-            align: "center",
-            dataIndex: 'operationName'
-          },
-
-          {
-            title: '授权账户昵称',
-            align: "center",
-            dataIndex: 'authName'
-          },
-
-          {
-            title: '平台类型',
-            align: 'center',
-            dataIndex: 'mediaIdShow',
-            scopedSlots: { customRender: 'mediaIdShow' },
-           // dataIndex: 'mediaId'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align: "center",
-            scopedSlots: {customRender: 'action'},
-          }
-        ],
-        url: {
-          list: "/ctop/userAllocation/list",
-          delete: "/ctop/userAllocation/delete",
-          deleteBatch: "/ctop/userAllocation/deleteBatch",
-          exportXlsUrl: "ctop/userAllocation/exportXls",
-          importExcelUrl: "ctop/userAllocation/importExcel",
-        },
-      }
-    },
-    computed: {
-      importExcelUrl: function () {
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {}
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+          <a-col :md="8" :sm="8">
+            <a-form-item label="账号所属人">
+              <a-input placeholder="请输入所属人" v-model="queryParam.userName"></a-input>
+            </a-form-item>
+          </a-col>
+        <template>
+          <a-col :md="8" :sm="8">
+            <a-form-item label="广告主名称">
+              <a-input placeholder="请输入广告主名称" v-model="queryParam.advertiserName"></a-input>
+            </a-form-item>
+          </a-col>
+          </template>
+          <a-col :md="6" :sm="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 操作按钮区域 -->
+    <br>
+    <!-- table区域-begin -->
+    <div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange">
+
+        <span slot="mediaId" slot-scope="text">{{text==1?'头条':"快手"}}</span>
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <userAllocation-modal ref="modalForm" @ok="modalFormOk"></userAllocation-modal>
+  </a-card>
+</template>
+
+<script>
+  import UserAllocationModal from './modules/UserAllocationModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "UserAllocationList",
+    mixins:[JeecgListMixin],
+    components: {
+      UserAllocationModal
+    },
+    data () {
+      return {
+        description: '账号绑定管理页面',
+        // 表头
+        columns: [
+		   {
+            title: '账号所属人',
+            align:"center",
+            dataIndex: 'userName'
+           },
+		   {
+            title: '授权',
+            align:"center",
+            dataIndex: 'accountId'
+           },
+		   {
+            title: '广告主名称',
+            align:"center",
+            dataIndex: 'advertiserName'
+           },
+		   {
+            title: '项目名称',
+            align:"center",
+            dataIndex: 'projectName'
+           },
+		//    {
+        //     title: '输入账号  --登陆',
+        //     align:"center",
+        //     dataIndex: 'accountName'
+        //    },
+		   {
+            title: '授权名称',
+            align:"center",
+            dataIndex: 'authName'
+           },
+		   {
+            title: '平台类型',
+            align:"center",
+            dataIndex: 'mediaId',
+            scopedSlots: { customRender: 'mediaId' },
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/ctop/userAllocation/list",
+          delete: "/ctop/userAllocation/delete",
+          deleteBatch: "/ctop/userAllocation/deleteBatch",
+          exportXlsUrl: "ctop/userAllocation/exportXls",
+          importExcelUrl: "ctop/userAllocation/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
 </style>

+ 150 - 184
src/views/modules/advertiser/modules/UserAllocationModal.vue

@@ -1,184 +1,150 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-      
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="登陆人id">
-          <a-input placeholder="请输入登陆人id" v-decorator="['userId', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="账户id --授权">
-          <a-input placeholder="请输入账户id --授权" v-decorator="['accountId', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="广告主ID">
-          <a-input placeholder="请输入广告主ID" v-decorator="['advertiserId', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="指定分配人">
-          <a-input placeholder="请输入指定分配人" v-decorator="['distributionName', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="部门id">
-          <a-input placeholder="请输入部门id" v-decorator="['departmentId', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="管理员名称">
-          <a-input placeholder="请输入管理员名称" v-decorator="['adminName', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="广告主名称">
-          <a-input placeholder="请输入广告主名称" v-decorator="['advertiserName', {}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="输入账号  --登陆">
-          <a-input placeholder="请输入输入账号  --登陆" v-decorator="['accountName', {}]" />
-        </a-form-item>
-        <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="操作人姓名">
-            <a-input placeholder="请输入操作人姓名" v-decorator="['operationName', {}]"/>
-        </a-form-item>
-        <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="授权名称">
-            <a-input placeholder="请输入授权名称" v-decorator="['authName', {}]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="平台类型 1 头条 2快手">
-          <a-input placeholder="请输入平台类型 1 头条 2快手" v-decorator="['mediaId', {}]" />
-        </a-form-item>
-		
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import moment from "moment"
-
-  export default {
-    name: "UserAllocationModal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-        },
-        url: {
-          add: "/ctop/userAllocation/add",
-          edit: "/ctop/userAllocation/edit",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.model, 'userId', 'accountId', 'advertiserId', 'distributionName', 'departmentId', 'adminName', 'advertiserName', 'accountName', 'operationName', 'authName', 'mediaId'))
-		  //时间格式化
-        });
-
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-
-
-
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-
-
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-</style>
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账户所属人">
+          <a-input placeholder="请输入userName" v-decorator="['userName', {}]" disabled/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="账号id">
+          <a-input placeholder="请输入账户id --授权" v-decorator="['accountId', {}]" disabled />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="广告主名称">
+          <a-input placeholder="请输入广告主名称" v-decorator="['advertiserName', {}]" disabled/>
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="项目名称">
+          <a-input placeholder="请输入项目名称" v-decorator="['projectName', {}]" disabled />
+        </a-form-item>
+        <!-- <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="输入账号  --登陆">
+          <a-input placeholder="请输入输入账号  --登陆" v-decorator="['accountName', {}]" />
+        </a-form-item> -->
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="授权名称">
+          <a-input placeholder="请输入授权名称" v-decorator="['authName', {}]" />
+        </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="媒体类型">
+          <!-- <a-input placeholder="请输入平台类型 1 头条 2快手" /> -->
+          <a-select v-decorator="['mediaId', {}]" disabled>
+            <a-select-option value="1">头条</a-select-option>
+            <a-select-option value="2">快手</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { httpAction } from '@/api/manage'
+import pick from 'lodash.pick'
+import moment from 'moment'
+
+export default {
+  name: 'UserAllocationModal',
+  data() {
+    return {
+      title: '操作',
+      visible: false,
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      validatorRules: {},
+      url: {
+        add: '/ctop/userAllocation/add',
+        edit: '/ctop/userAllocation/edit'
+      }
+    }
+  },
+  created() {},
+  methods: {
+    add() {
+      this.edit({})
+    },
+    edit(record) {
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(
+          pick(
+            this.model,
+            'userId',
+            'userName',
+            'accountId',
+            'advertiserId',
+            'advertiserName',
+            'projectId',
+            'projectName',
+            'accountName',
+            'authName',
+            'mediaId'
+          )
+        )
+        //时间格式化
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit
+            method = 'put'
+          }
+          let formData = Object.assign(this.model, values)
+          //时间格式化
+
+          console.log(formData)
+          httpAction(httpurl, formData, method)
+            .then(res => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false
+              that.close()
+            })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped></style>