axios

config/index.js

@@ -9,18 +9,18 @@ module.exports = {
     proxyTable: {
       '/pre': {
         // target: 'http://app.bluefire.top:7999',//后端接口地址
-        // target: 'http://192.168.101.15:8081',//后端接口地址
-        target: 'http://192.168.2.114:8081',//后端接口地址
+        target: 'http://192.168.2.61:8081',//后端接口地址
+        // target: 'http://192.168.2.114:8081',//后端接口地址
+        // target: 'http://127.0.0.1:8081',//后端接口地址
         changeOrigin: true,  //是否跨域
         pathRewrite: {
           '^/pre': '/',//重写,
         }
       }
-
     },
 
     // 本地开发使用
-    host: '127.0.0.1',
+    host: '192.168.2.14',
     port: 9527,
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/channel.js

@@ -22,7 +22,7 @@ export default {
   channelEdit: function(data){
     return request({
       url: '/supplier/update',
-      method: 'put',
+      method: 'post',
       data: data
     })
   },
@@ -38,7 +38,9 @@ export default {
   },
 
 
-  // 供应商列表
+   //<!--通道 --->
+
+  // 通道列表
   channel(operator){
     return request({
         url:"/channel/list",
@@ -46,9 +48,18 @@ export default {
         data:operator
     })
   },
+  
+  // 通道添加
+  axiosAdd(operator){
+    return request({
+        url:"/channel/add",
+        method:"POST",
+        data:operator
+    })
+  },
 
 
-  //供应商删除
+  //通道删除
   channelDelete(ChannelId){
     return request({
       url:"/channel/delete",

src/api/orderList.js

@@ -21,15 +21,14 @@ export default {
       })
     }
   },
-
   dispatch:{
-      // /orderManagement/dispatchSearch
-    Search(data){
-      return request({
-        url: '/orderManagement/dispatchSearch',
-        method: 'post',
-        data: data
-      })
-    }
+    // /orderManagement/dispatchSearch
+  Search(data){
+    return request({
+      url: '/orderManagement/dispatchSearch',
+      method: 'post',
+      data: data
+    })
   }
 }
+}

src/api/userList.js

@@ -7,5 +7,12 @@ export default {
       method: 'get',
       params: operator
     })
+  },
+  userAdd(operator){
+    return request({
+      url:"/customer/add",
+      method:"post",
+      data: operator
+    })
   }
 }

src/router/index.js

@@ -73,7 +73,7 @@ export const constantRoutes = [
 ]
 
 export default new Router({
-  mode: 'history', // 去掉url中的#
+  // mode: 'history', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
 })

src/utils/request.js

@@ -34,9 +34,9 @@ service.interceptors.request.use(
 service.interceptors.response.use(
 
   response => {
-    console.log(response)
-    const code = response.status
-    if (code === 401) {
+    console.log(response.data)
+    const code = response.data.status
+    if (code === "401") {
       MessageBox.confirm(
         '登录状态已过期，您可以继续留在该页面，或者重新登录',
         '系统提示',
@@ -50,9 +50,9 @@ service.interceptors.response.use(
           location.reload() // 为了重新实例化vue-router对象 避免bug
         })
       })
-    } else if (code !== 200) {
+    } else if (code !== "200") {
       Notification.error({
-        title: response.data.msg,
+        title: response.data.message,
         duration: 1000
       })
       return Promise.reject('error')
@@ -80,14 +80,14 @@ service.interceptors.response.use(
         return Promise.reject(error)
       }
     }
-    if (code === 504) {
+    if (code === "504") {
       Notification.error({
         title: '服务器异常',
         duration: 2500
       })
       return Promise.reject(error)
     }
-    if (code === 401) {
+    if (code === "401") {
       MessageBox.confirm(
         '登录状态已过期，您可以继续留在该页面，或者重新登录',
         '系统提示',
@@ -101,7 +101,7 @@ service.interceptors.response.use(
           location.reload() // 为了重新实例化vue-router对象 避免bug
         })
       })
-    } else if (code === 403) {
+    } else if (code === "403") {
       router.push({ path: '/401' })
     } else {
       const errorMsg = error.response.data.message

src/views/channel/channel.vue

@@ -39,7 +39,9 @@
 
           <el-table-column label="运营商"  align="center" show-overflow-tooltip>
               <template slot-scope="scope">
-                  <span>{{ scope.row.operatorCode }}</span>
+                  <span v-if="scope.row.operator==1">移动</span>
+                  <span v-if="scope.row.operator==2">电信</span>
+                  <span v-if="scope.row.operator==3">联通</span>
               </template>
           </el-table-column>
 
@@ -59,10 +61,10 @@
           <el-table-column label="操作" fixed="right" min-width="200" align="center">
               <template slot-scope="scope">
 
-                <el-button v-if="scope.row.isValid==0" size="small" icon="el-icon-circle-check" type="success" plain @click="ModifyState(scope.row)">有效</el-button>
-                <el-button v-if="scope.row.isValid==1" size="small" icon="el-icon-circle-close" type="info" plain @click="ModifyState(scope.row)">无效</el-button>
-                <el-button size="small" icon="el-icon-edit" type="warning" plain @click="handleEdit(scope.row)">编辑</el-button>
-                <el-button size="small" icon="el-icon-delete" type="danger" plain @click="ModifyDelete(scope.row)">删除</el-button>
+                <!-- <el-button v-if="scope.row.isValid==0" size="small" icon="el-icon-circle-check" type="success"  @click="ModifyState(scope.row)">有效</el-button>
+                <el-button v-if="scope.row.isValid==1" size="small" icon="el-icon-circle-close" type="info"  @click="ModifyState(scope.row)">无效</el-button> -->
+                <el-button size="small" icon="el-icon-edit" type="warning"  @click="handleEdit(scope.row)">编辑</el-button>
+                <el-button size="small" icon="el-icon-delete" type="danger"  @click="ModifyDelete(scope.row)">删除</el-button>
               </template>
           </el-table-column>
         
@@ -87,25 +89,25 @@
       <el-form ref="dataForm" :model="dataForm" :rules="rules2" label-width="80px" size="small" label-position="right">
         <el-row :gutter="20">
           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-            <el-form-item label="通道名称" :label-width="formLabelWidth"  >
+            <el-form-item label="通道名称" prop="channelName" :label-width="formLabelWidth"  >
               <el-input v-model="dataForm.channelName" placeholder="请输入供应商ID" />
             </el-form-item>
           </el-col>
           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-              <el-form-item label="供应商名称" :label-width="formLabelWidth"  >
+              <el-form-item label="供应商名称" prop="supplierName" :label-width="formLabelWidth"  >
                 <el-input v-model="dataForm.supplierName" placeholder="请输入供应商名称" />
               </el-form-item>
           </el-col>
           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
               <el-form-item label="运营商" :label-width="formLabelWidth">
-                <el-select size="small" v-model="body.phoneOperator" clearable placeholder="请选择运营商" style="width: 100%" >
-                <el-option
-                v-for="item in mobileOperator"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-                />
-            </el-select>
+                <el-select size="small" v-model="dataForm.operator" clearable placeholder="请选择运营商" style="width: 100%" >
+                    <el-option
+                    v-for="item in mobileOperator"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                    />
+                </el-select>
               </el-form-item>
           </el-col>
         </el-row>
@@ -134,8 +136,8 @@
           </el-col>
         </el-row>
       
-      <!--  -->
-       <el-card  shadow="hover" >
+      <!-- 添加产品 -->
+       <el-card  shadow="hover" v-if="!operation">
         <div slot="header" class="clearfix">
           <span class="topClass">通道产品信息</span>
           <el-button style="float: right;" type="primary" plain @click="addprice">添加通道产品</el-button>
@@ -143,39 +145,45 @@
         </div>
         <div>
           <!-- 添加 -->
-          <el-table :data="dataForm.bankCards" >
+          <el-table :data="dataForm.channelProductInfos" >
 
-          <el-table-column label="话费名称" width="210" align="center"  show-overflow-tooltip>
+          <el-table-column label="产品Id" align="center"  show-overflow-tooltip>
             <template slot-scope="scope" >
-              <el-input v-model="scope.row.cardNo"></el-input>
+              <el-input v-model="scope.row.packageId"></el-input>
               <!-- <span v-else>{{ scope.row.cardNo }}</span> -->
             </template>
           </el-table-column>
-
+<!-- 
           <el-table-column label="通道产品ID" width="150" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.bankDeposit"></el-input>
-              <!-- <span v-else>{{ scope.row.bankDeposit }}</span> -->
+              <el-input v-model="scope.row.channelProductId"></el-input>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
-          <el-table-column label="通道产品名称" width="150" align="center" show-overflow-tooltip>
+          <el-table-column label="通道产品名称" align="center" show-overflow-tooltip>
             <template slot-scope="scope" >
-              <el-input  v-model="scope.row.account"></el-input>
+              <el-input  v-model="scope.row.channelProductName"></el-input>
               <!-- <span >{{ scope.row.account }}</span>   -->
             </template>
           </el-table-column>
 
-          <el-table-column label="结算价格" width="150" align="center" show-overflow-tooltip>
+          <el-table-column label="结算价格"  align="center" show-overflow-tooltip>
             <template slot-scope="scope" >
-              <el-input  v-model="scope.row.account"></el-input>
+              <el-input  v-model="scope.row.price"></el-input>
               <!-- <span >{{ scope.row.account }}</span>   -->
             </template>
           </el-table-column>
 
-          <el-table-column label="是否有效" width="150" align="center" show-overflow-tooltip >
+          <el-table-column label="是否有效"  align="center" show-overflow-tooltip >
             <template slot-scope="scope" >
-              <el-input v-model="scope.row.creator"></el-input>
+               <el-select size="small" v-model="scope.row.isValid"  placeholder="请选择是否有效" style="width: 90%" >
+                  <el-option
+                  v-for="item in status"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                  </el-select>
               <!-- <span >{{ scope.row.aaa }}</span> -->
             </template>
           </el-table-column>
@@ -227,102 +235,7 @@
 
      <!-- 查看 -->
     <el-dialog title="详情" :visible.sync="dialogFormLook" width="85%" center>
-      <el-form ref="dataForm" :model="dataForm" :rules="rules2" label-width="80px" size="small" label-position="right">
-        <el-row :gutter="20">
-          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-            <el-form-item label="通道名称" :label-width="formLabelWidth"  >
-              <el-input v-model="dataForm.supplierCode" placeholder="请输入供应商ID" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-              <el-form-item label="供应商名称" :label-width="formLabelWidth"  >
-                <el-input v-model="dataForm.channelName" placeholder="请输入供应商名称" />
-              </el-form-item>
-          </el-col>
-          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-              <el-form-item label="运营商" :label-width="formLabelWidth">
-                <el-input v-model="dataForm.email" placeholder="请选择适用区域" />
-              </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-              <el-form-item label="是否有效" :label-width="formLabelWidth" prop="isValid" >
-                  <el-select size="small" v-model="dataForm.isValid"  placeholder="请选择是否有效" style="width: 90%" >
-                  <el-option
-                  v-for="item in status"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  />
-                  </el-select>
-              </el-form-item>
-          </el-col>
-          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-              <el-form-item label="折扣(%)" :label-width="formLabelWidth"  >
-                <el-input v-model="dataForm.discount" placeholder="请输入折扣" />
-              </el-form-item>
-          </el-col>
-          <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
-              <el-form-item label="备注" :label-width="formLabelWidth"  >
-                <el-input v-model="dataForm.remark" placeholder="请输入备注" />
-              </el-form-item>
-          </el-col>
-        </el-row>
-      
-       <el-card  shadow="hover" >
-        <div slot="header" class="clearfix">
-          <span class="topClass">通道产品信息</span>
-        </div>
-        <div>
-          <!-- 添加 -->
-          <el-table :data="dataForm.bankCards" >
-
-          <el-table-column label="银行卡" width="210" align="center"  show-overflow-tooltip>
-            <template slot-scope="scope" >
-              <el-input v-model="scope.row.cardNo"></el-input>
-              <!-- <span v-else>{{ scope.row.cardNo }}</span> -->
-            </template>
-          </el-table-column>
-
-          <el-table-column label="开户行" width="150" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.bankDeposit"></el-input>
-              <!-- <span v-else>{{ scope.row.bankDeposit }}</span> -->
-            </template>
-          </el-table-column>
-
-          <el-table-column label="账户名称" width="150" align="center" show-overflow-tooltip>
-            <template slot-scope="scope" >
-              <el-input  v-model="scope.row.account"></el-input>
-              <!-- <span >{{ scope.row.account }}</span>   -->
-            </template>
-          </el-table-column>
-
-          <el-table-column label="创建者" width="150" align="center" show-overflow-tooltip >
-            <template slot-scope="scope" >
-              <!-- <el-input v-model="scope.row.creator"></el-input> -->
-              <span >{{ scope.row.aaa }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" width="150" align="center" show-overflow-tooltip >
-            <template slot-scope="scope" >
-              <!-- <el-input v-if="editable[scope.$index]" @input="onBurl(scope.row.facePrice,scope.row.payPrice)" v-model="scope.row.creator"></el-input> -->
-               <i class="el-icon-time"></i>
-              <span >{{ scope.row.createTime }}</span>
-            </template>
-          </el-table-column>
 
-          <el-table-column label="操作"  width="165" min-width="150" align="center">
-              <template slot-scope="scope">
-                <el-button type="danger" plain icon="el-icon-delete" @click="priceDelete(scope.row,scope.$index)">删除</el-button>
-              </template>
-            </el-table-column>
-        </el-table>
-        </div>
-       </el-card>
- 
-      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormLook = false">取 消</el-button>
         <el-button type="primary" @click="dialogFormLook = false">确 定</el-button>
@@ -345,7 +258,7 @@ export default {
                 channelName:""
             },
             data:[{id:1,creator:"wangdz",createTime:"2020-12-11 22:21:32",updator:"",updateTime:null,packageId:"DXHF1",packageName:"全国电信话费卡_1元",operatorCode:"DX",oprPackageId:"DXHF",activePeriod:6,flowAmount:1.0,zone:"00",zoneDesc:"全国",comboPackageStr:"",isCombo:"2"},{id:2,creator:"wangdz",createTime:"2020-12-11 22:21:32",updator:"",updateTime:null,packageId:"DXHF1",packageName:"全国电信话费卡_12元",operatorCode:"DX",oprPackageId:"DXHF",activePeriod:20,flowAmount:1.0,zone:"00",zoneDesc:"全国",comboPackageStr:"",isCombo:"2"},{id:3,creator:"wangdz",createTime:"2020-12-11 22:21:32",updator:"",updateTime:null,packageId:"DXHF1",packageName:"全国电信话费卡_13元",operatorCode:"DX",oprPackageId:"DXHF",activePeriod:3,flowAmount:1.0,zone:"00",zoneDesc:"全国",comboPackageStr:"",isCombo:"2"},{id:4,creator:"wangdz",createTime:"2020-12-11 22:21:32",updator:"",updateTime:null,packageId:"DXHF1",packageName:"全国电信话费卡_14元",operatorCode:"DX",oprPackageId:"DXHF",activePeriod:5,flowAmount:1.0,zone:"00",zoneDesc:"全国",comboPackageStr:"",isCombo:"2"},{id:5,creator:"wangdz",createTime:"2020-12-11 22:21:32",updator:"",updateTime:null,packageId:"DXHF1",packageName:"全国电信话费卡_15元",operatorCode:"DX",oprPackageId:"DXHF",activePeriod:6,flowAmount:1.0,zone:"00",zoneDesc:"全国",comboPackageStr:"",isCombo:"2"},{id:6,creator:"wangdz",createTime:"2020-12-11 22:21:32",updator:"",updateTime:null,packageId:"DXHF1",packageName:"全国电信话费卡_16元",operatorCode:"DX",oprPackageId:"DXHF",activePeriod:5,flowAmount:1.0,zone:"00",zoneDesc:"全国",comboPackageStr:"",isCombo:"2"}],
-        value: [],
+            value: [],
             tableData:[],
             total:0,
             operation: false, // true:新增, false:编辑
@@ -362,7 +275,11 @@ export default {
                 {id:3,name:"联通"},
                 {id:2,name:"电信"},
             ],
-            rules2:[],
+            rules2:{
+              supplierName: [{ required: true, message: '请输入供应商名称', trigger: 'blur' }], 
+              channelName: [{ required: true, message: '请输入通道名称', trigger: 'blur' }], 
+              isValid: [{ required: true, message: '请选择是否有效', trigger: 'blur' }],
+            },
             status:[{
                 id:1,
                 name:"有效"
@@ -373,7 +290,7 @@ export default {
         }
     },
     created(){
-        this.Search()
+        this.reLoad()
     },
     methods: {
         // 重载数据
@@ -389,17 +306,20 @@ export default {
         dataFormAdd(){
             this.operation = true // true:新增, false:编辑
             this.dialogFormVisible = true // 控制弹出框
+            this.dataForm = {}
+            this.$refs['dataForm'].resetFields();
         },
         //编辑弹框
         handleEdit(row){
-           this.operation = true // true:新增, false:编辑
-           this.dataForm = row
+           this.operation = false // true:新增, false:编辑
            this.dialogFormVisible = true // 控制弹出框 
+           this.dataForm = JSON.parse(JSON.stringify(row)) 
+           this.$refs['dataForm'].resetFields();
         },
         //删除API
         ModifyDelete(row){
             const that = this
-            that.$confirm('此操作将删除该通道, 是否继续?', '提示', {
+            that.$confirm('此操作将删除通道：' + row.channelName, '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
@@ -411,7 +331,7 @@ export default {
                             type: 'success',
                             message: '删除成功'
                         })
-                        that.Search()
+                        that.reLoad()
                      } else {
                         that.$message({
                             type: 'error',
@@ -433,11 +353,55 @@ export default {
         },
         //新增和修改API
         submitForm(){
-
+          this.$refs['dataForm'].validate((valid) => {
+                  if (valid) {
+                    if (!this.operation) {
+                      console.log(this.dataForm)
+                      // 编辑
+                      // api.channelEdit(this.dataForm).then(response => {
+                      //   if (response.status === 200) {
+                      //     this.$message({
+                      //       type: 'success',
+                      //       message: '操作成功'
+                      //     })
+                      //     this.dialogFormVisible = false
+                      //     this.reLoad()
+                      //   } else {
+                      //     this.$message({
+                      //       type: 'error',
+                      //       message: response.data.msg
+                      //     })
+                      //   }
+                      // })
+                    } else {
+                      console.log(this.dataForm)
+                    //   // 添加
+                      api.axiosAdd(this.dataForm).then(response => {
+                        if (response.status === 200) {
+                          this.$message({
+                            type: 'success',
+                            message: '操作成功'
+                          })
+                          this.dialogFormVisible = false
+                          this.reLoad()
+                        } else {
+                          this.$message({
+                            type: 'error',
+                            message: response.data.msg
+                          })
+                        }
+                      })
+                    }
+                  }
+                })
         },
         //新增产品
         addprice(){
+          if(this.dataForm.operator == null || this.dataForm.operator == ""){
+            console.log("weikong")
+          }else{
             this.dialogVisible = true
+          }
         },
         // 搜索
         Search(){

src/views/channel/index.vue

@@ -7,13 +7,7 @@
       <el-button class="classitem" style="marginRight:50px" type="primary" plain icon="el-icon-plus" @click="handleAdd">新增</el-button>
     </div>
     <el-table v-loading="loading" :data="tableData" border style="width: 100%">
-      <!-- <el-table-column type="selection" /> -->
 
-      <!-- <el-table-column label="供应商编码" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.supplierCode }}</span>
-        </template>
-      </el-table-column> -->
 
       <el-table-column label="供应商名称" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope" @click="handleLook(scope.row)">
@@ -61,12 +55,12 @@
 
       <el-table-column label="操作" fixed="right" min-width="200" align="center">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.isValid==0" size="small" icon="el-icon-circle-check" type="success" plain @click="ModifyState(scope.row)">有效</el-button>
-          <el-button v-if="scope.row.isValid==1" size="small" icon="el-icon-circle-close" type="info" plain @click="ModifyState(scope.row)">无效</el-button>
+          <!-- <el-button v-if="scope.row.isValid==0" size="small" icon="el-icon-circle-check" type="success" plain @click="ModifyState(scope.row)">有效</el-button>
+          <el-button v-if="scope.row.isValid==1" size="small" icon="el-icon-circle-close" type="info" plain @click="ModifyState(scope.row)">无效</el-button> -->
 
-          <el-button size="small" type="primary" plain icon="el-icon-plus" @click="amountAdd(scope.row)">加款</el-button>
-          <el-button size="small" icon="el-icon-edit" type="warning" plain @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button size="small" icon="el-icon-delete" type="danger" plain @click="ModifyDelete(scope.row)">删除</el-button>
+          <el-button size="small" type="primary"  icon="el-icon-plus" @click="amountAdd(scope.row)">加款</el-button>
+          <el-button size="small" icon="el-icon-edit" type="warning"  @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button size="small" icon="el-icon-delete" type="danger" autofocus  @click="ModifyDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
 
@@ -201,7 +195,7 @@
        <el-card  shadow="hover" v-if="!operation">
         <div slot="header" class="clearfix">
           <span class="topClass">供应商银行账户信息</span>
-          <el-button style="float: right;" type="primary" plain @click="addprice">添加银行卡</el-button>
+          <el-button style="float: right;" type="primary" plain @click="addprice(dataForm.supplierId)">添加银行卡</el-button>
         </div>
         <div>
           <!-- 添加银行卡 -->
@@ -221,9 +215,17 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="账户名称" width="150" align="center" show-overflow-tooltip>
+          <el-table-column label="类型" width="150" align="center" show-overflow-tooltip>
             <template slot-scope="scope" >
-              <el-input  v-model="scope.row.account"></el-input>
+              <el-select size="small" v-model="scope.row.distinguish"  placeholder="类型选择" >
+                  <el-option
+                  v-for="item in account"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  />
+                  </el-select>
+              <!-- <el-input  v-model="scope.row.account"></el-input> -->
               <!-- <span >{{ scope.row.account }}</span>   -->
             </template>
           </el-table-column>
@@ -231,7 +233,7 @@
           <el-table-column label="创建者" width="150" align="center" show-overflow-tooltip >
             <template slot-scope="scope" >
               <!-- <el-input v-model="scope.row.creator"></el-input> -->
-              <span >{{ scope.row.aaa }}</span>
+              <span >{{ scope.row.creator }}</span>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" width="150" align="center" show-overflow-tooltip >
@@ -244,7 +246,7 @@
 
           <el-table-column label="操作"  width="165" min-width="150" align="center">
               <template slot-scope="scope">
-                <el-button type="danger" plain icon="el-icon-delete" @click="priceDelete(scope.row,scope.$index)">删除</el-button>
+                <el-button type="danger" icon="el-icon-delete" @click="priceDelete(scope.row,scope.$index)">删除</el-button>
               </template>
             </el-table-column>
         </el-table>
@@ -413,7 +415,7 @@
           </el-col>
           <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
               <el-form-item  label="是否有效" :label-width="formLabelWidth" prop="isValid" >
-                  <el-select size="small" disabled v-model="dataForm.isValid"  style="width: 90%" >
+                  <el-select size="small" disabled v-model="dataForm.isValid"   >
                   <el-option
                   v-for="item in status"
                   :key="item.id"
@@ -619,7 +621,11 @@ export default {
       bankCards:[
         // {cardNo:"18838392",bankDeposit:"222",account:"11",creator:"11",createTime:"11 "}
         ],             //银行卡
-      tableData: []
+      tableData: [],
+      account:[
+        {id:1,name:"供应商"},
+        {id:2,name:"客户"}
+      ]
     }
   },
   created() {
@@ -664,6 +670,7 @@ export default {
         managePassword:"",         //后台密码
         // bankCards:[]
       }
+      this.$refs['dataForm'].resetFields();
     },
     //加款对话框
     amountAdd:function(row){
@@ -716,7 +723,9 @@ export default {
           {
             cardNo:"",       //银行卡
             bankDeposit:"",   //开户行
-            account:"",     //账户名称    
+            account:1,     //账户名称    
+            supplierId:row.supplierId,
+            distinguish:""
           }
         ]
     }
@@ -727,6 +736,7 @@ export default {
       }
       let newObj=JSON.parse(JSON.stringify(row))
       this.dataForm = newObj
+      this.$refs['dataForm'].resetFields();
      
       // this.dataForm = Object.assign({}, row)
       // this.dataForm.jobId = row.jobId
@@ -773,7 +783,7 @@ export default {
                     message: '操作成功'
                   })
                   this.dialogFormVisible = false
-                  this.getTenantList()
+                  this.reLoad()
                 } else {
                   this.$message({
                     type: 'error',
@@ -804,11 +814,13 @@ export default {
         })
     },
     //添加银行卡
-    addprice(){
+    addprice(supplierId){
       this.dataForm.bankCards.push({
           cardNo:"",       //银行卡
           bankDeposit:"",   //开户行
-          account:"",       //供应商账户
+          account:1,       //供应商账户
+          supplierId:supplierId,
+          distinguish:""
           // creator:""       //创建者
       })
        console.log(this.dataForm.bankCards)
@@ -828,7 +840,7 @@ export default {
     // 删除
     ModifyDelete(row) {
        const that = this
-      this.$confirm('此操作将删除该供应商, 是否继续?', '提示', {
+      this.$confirm('此操作将删除供应商：' + row.supplierName, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -838,6 +850,7 @@ export default {
             isDelete : 1,
             supplierId:row.supplierId,
           }
+          // row .isDelete = 1
           api.channelDelete(info).then(response => {
             if (response.status === 200) {
               this.$message({

src/views/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" src="../../../../assets/avatar/cnrhVkzwxjPwAaCfPbdc.png" class="sidebar-logo">
+        <img v-if="logo" src="http://oss.bluefire.top/bluefire/logo/logo2.jpg" class="sidebar-logo">
         <h1 v-else class="sidebar-title">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" src="../../../../assets/avatar/cnrhVkzwxjPwAaCfPbdc.png" class="sidebar-logo">
+        <img v-if="logo" src="http://oss.bluefire.top/bluefire/logo/logo2.jpg" class="sidebar-logo">
         <h1 class="sidebar-title">{{ title }} </h1>
       </router-link>
     </transition>
@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       title: '营销运营管理平台',
-      logo: 'https://gitee.com/li_haodong/picture_management/raw/master/pic/WechatIMG9.png'
+      logo: 'http://oss.bluefire.top/bluefire/logo/logo.jpg'
     }
   }
 }

src/views/login/index.vue

@@ -319,7 +319,7 @@ export default {
           this.loading = true
           this.$store.dispatch('LoginByUsername', this.loginForm).then(() => {
             this.loading = false
-            this.$router.push({ path: this.redirect || '/' })
+            this.$router.push({ path: this.redirect || '/orderList/index' })
           }).catch(() => {
             this.loading = false
             this.refreshCaptcha()

src/views/orderList/Distribute.vue

@@ -168,25 +168,25 @@
 
       <el-table-column label="发送时间" width="160" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.createDate}}</span>
+          <span>{{ scope.row.createDate}}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="回调时间" width="160" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.callbackTime }}</span>
+          <span>{{ scope.row.callbackTime }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="分发组次数" width="160" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.sendCount }}</span>
+          <span>{{ scope.row.sendCount }}</span>
         </template>
       </el-table-column>
 
       <el-table-column label="通道组次数" width="160" align="center">
         <template slot-scope="scope">
-          <span>{{ scope.row.batchCount }}</span>
+          <span>{{ scope.row.batchCount }}</span>
         </template>
       </el-table-column>
 
@@ -314,8 +314,8 @@ export default {
       api.dispatch.Search(this.body).then(res => {
         this.loading = false
         // this.tableData=res.data.data.records
-        // limitedDate ：发送时间
-        // lastModifyDate ：回调
+        // limitedDate ：发送时间
+        // lastModifyDate ：回调
         // usedTime   ：用时
         const tableData = res.data.data.records
         const arry = tableData.map((res) => {
@@ -449,4 +449,4 @@ export default {
  /* .classitem{
    background: salmon;
  } */
-</style>
+</style>

src/views/orderList/index.vue

@@ -193,7 +193,9 @@
            
             <el-button class="filter-item" icon="el-icon-delete" type="danger" plain @click="handleReset">置失败
             </el-button>
-            <el-button class="filter-item" type="success" icon="el-icon-check" plain @click="handleReset">置成功
+            <el-button class="filter-item" type="warning" icon="el-icon-check" plain @click="handleReset">置成功
+            </el-button>
+            <el-button class="filter-item" type="success" icon="el-icon-check" plain @click="handleReset">补单
             </el-button>
             
              <el-button class="classitem" style="marginRight:50px"  type="primary" plain  icon="el-icon-star-off"  @click="handleReset">导出

src/views/product/index.vue

@@ -7,10 +7,10 @@
                 <span class="textSpan">　运营商：</span>
                 <el-select size="small" v-model="body.Isp" clearable placeholder="请选择运营商" style="width: 65%" >
                 <el-option
-                v-for="item in status"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+                  v-for="item in status"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
                 />
                 </el-select>
             </div>
@@ -39,15 +39,14 @@
         <div class="flexend"> 
             <el-button class="filter-item" icon="el-icon-search" type="primary" plain @click="handleSearch">搜索</el-button>           
              <el-button class="classitem" style="marginRight:50px"  type="primary" plain  icon="el-icon-plus"  @click="handleAdd">新增
-            </el-button>  
+            </el-button>   
         </div>
         <!-- 表格 -->
-      <el-table v-loading="loading" :data="tableData"  border style="width: 100%">
+      <el-table v-loading="loading" :data="tableData"  border style="width: 100%">  
         <!-- <el-table-column type="selection" /> -->
-
-        <el-table-column label="产品ID" width="100" align="center" show-overflow-tooltip>
+        <el-table-column label="序号" width="60" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.productId }}</span>
+            <span>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
 
@@ -56,9 +55,16 @@
             <span>{{ scope.row.productName }}</span>
           </template>
         </el-table-column>
+
+        <!-- <el-table-column label="产品编号"  align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.productId }}</span>
+          </template>
+        </el-table-column> -->
+
         <el-table-column label="产品编码"  align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span>{{ scope.row.productCode }}</span>
+            <span>{{ scope.row.packageId }}</span>
           </template>
         </el-table-column>
 
@@ -83,11 +89,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="创建时间" width="130" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" fixed="right" min-width="100" align="center">
             <template slot-scope="scope">
               <!--<el-button @click="handRest(scope.row)" type="warning" size="small">重置密码</el-button>-->
-              <el-button size="small" icon="el-icon-edit" type="warning" plain @click="handleEdit(scope.row)">编辑</el-button>
-              <el-button size="small" icon="el-icon-delete" type="danger" plain @click="handleDelete(scope.row)">删除
+              <el-button size="small" icon="el-icon-edit" type="warning"  @click="handleEdit(scope.row)">编辑</el-button>
+              <el-button size="small" icon="el-icon-delete" type="danger" @click="handleDelete(scope.row)">删除
               </el-button>
             </template>
           </el-table-column>
@@ -110,17 +122,16 @@
       <!-- 添加或修改对话框 -->
         <el-dialog :title="operation?'新增产品':'编辑产品'" :visible.sync="dialogFormVisible" center>
           <el-form ref="dataForm" :model="dataForm" :rules="rules2" label-width="80px" size="small" label-position="right">
-
             <el-form-item label="产品名称" :label-width="formLabelWidth" prop="productName" >
               <el-input v-model.trim="dataForm.productName" style="width: 90%;"  placeholder="请输入产品名称" />
             </el-form-item>
-            <el-form-item label="面额" :label-width="formLabelWidth"  >
+            <el-form-item label="面额" :label-width="formLabelWidth"   prop="productPrice">
               <el-input v-model.trim="dataForm.productPrice" style="width: 90%;"  placeholder="请输入面额" />
             </el-form-item>
-            <el-form-item label="流量包ID" :label-width="formLabelWidth"  >
-              <el-input v-model.trim="dataForm.packageId" style="width: 90%;"  placeholder="请输入流量包ID" />
+            <el-form-item label="产品编码" :label-width="formLabelWidth" prop="packageId" >
+              <el-input v-model.trim="dataForm.packageId"  style="width: 90%;"  placeholder="请输入产品编码" />
             </el-form-item>
-            <el-form-item label="产品所属地区" :label-width="formLabelWidth"  >
+            <el-form-item label="产品所属地区" :label-width="formLabelWidth" prop="areaName" >
               <!-- <el-input v-model="dataForm.ZONE" style="width: 90%;" placeholder="请选择产品地区" /> -->
               <el-select size="small" v-model="dataForm.areaName" clearable placeholder="请选择产品地区" style="width: 90%" >
                 <el-option
@@ -131,7 +142,7 @@
                 />
                 </el-select>
             </el-form-item>
-            <el-form-item label="运营商" :label-width="formLabelWidth"  >
+            <el-form-item label="运营商" :label-width="formLabelWidth"  prop="operator">
                <el-select size="small" v-model="dataForm.operator"  placeholder="请选择运营商" style="width: 90%" >
                 <el-option
                 v-for="item in status"
@@ -141,7 +152,7 @@
                 />
                 </el-select>
             </el-form-item>
-            <el-form-item label="产品类型" :label-width="formLabelWidth"  >
+            <el-form-item label="产品类型" :label-width="formLabelWidth"  prop="productType">
                <el-select size="small" v-model="dataForm.productType"  placeholder="请选择产品类型" style="width: 90%" >
                 <el-option
                 v-for="item in type"
@@ -151,12 +162,6 @@
                 />
                 </el-select>
             </el-form-item>
-            <el-form-item label="产品编码" :label-width="formLabelWidth" >
-              <el-input v-model.trim="dataForm.productCode" style="width: 90%;"  placeholder="请输入产品编码" />
-            </el-form-item>
-            <el-form-item label="产品描述" :label-width="formLabelWidth" >
-              <el-input v-model.trim="dataForm.productDesc" style="width: 90%;"  placeholder="请输入产品描述" />
-            </el-form-item>
 
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -174,6 +179,7 @@ import { Search,province,ProductAdd,ProductEdit }  from '@/api/product'
 export default {
   data() {
     return {
+      isDelete:0,
       body:{
           productName:"",
           productPrice:"",
@@ -203,17 +209,22 @@ export default {
       dialogFormVisible: false, // 控制弹出框
       formLabelWidth: '120px',   //新增宽度
        rules2: {
-        productName: [{ required: true, message: '请输入产品名称', trigger: 'blur' }
-        ],
+        productName: [{ required: true, message: '请输入产品名称', trigger: 'blur' }],
+        productId: [{ required: true, message: '请输入产品编号', trigger: 'blur' }],
+        productType: [{ required: true, message: '请输入产品类型', trigger: 'blur' } ],
+        operator: [{ required: true, message: '请输入运营商', trigger: 'blur' } ],
+        areaName: [{ required: true, message: '请输入所属地区', trigger: 'blur' } ],
+        packageId: [{ required: true, message: '请输入产品编码', trigger: 'blur' } ],
+        productPrice: [{ required: true, message: '请输入面额', trigger: 'blur' } ],
       },
+      relues:{},
       dataForm:{
         productName:"",
         productPrice:"",
         areaName:"",
         operator:"",
-        productCode:"",
         productType:"",
-        productDesc:""
+        productId:""
       },
       page:1,
       size:10,
@@ -235,6 +246,7 @@ export default {
       params.append('operator', this.body.Isp)
       params.append('current', this.page)
       params.append('size', this.size)
+      params.append('isDelete', this.isDelete)
       Search(params).then((res) => {
         this.loading = false
         this.tableData=res.data.data.records
@@ -266,17 +278,20 @@ export default {
         productPrice:"",
         areaName:"",
         operator:"",
-        productCode:""
+        productId:""
       }
+      this.$refs['dataForm'].resetFields();
     },
     //编辑
     handleEdit: function(row) {
+      
       this.dataForm={}
+      // this.rules2 = {}
       this.dialogFormVisible = true
       this.operation = false 
       let newObj=JSON.parse(JSON.stringify(row))
       this.dataForm = newObj
-     
+     this.$refs['dataForm'].resetFields();
       // this.dataForm = Object.assign({}, row)
       // this.dataForm.jobId = row.jobId
     },
@@ -287,7 +302,7 @@ export default {
             if (!this.operation) {
               // 编辑
               ProductEdit(this.dataForm).then(response => {
-                if (response.status === 200) {
+                if (response.data.status == 200) {
                   this.$message({
                     type: 'success',
                     message: '操作成功'
@@ -297,7 +312,7 @@ export default {
                 } else {
                   this.$message({
                     type: 'error',
-                    message: response.data.msg
+                    message: response.data.message
                   })
                 }
               })
@@ -305,7 +320,8 @@ export default {
               console.log(this.dataForm)
             //   // 添加
               ProductAdd(this.dataForm).then(response => {
-                if (response.status === 200) {
+                console.log(response)
+                if (response.data.status == "200") {
                   this.$message({
                     type: 'success',
                     message: '操作成功'
@@ -313,10 +329,11 @@ export default {
                   this.dialogFormVisible = false
                   this.getTenantList()
                 } else {
-                  this.$message({
-                    type: 'error',
-                    message: response.data.msg
-                  })
+                  // console.log("醋味")
+                  // this.$message({
+                  //   type: 'error',
+                  //   message: response.message
+                  // })
                 }
               })
             }
@@ -327,12 +344,16 @@ export default {
     // 删除
     handleDelete: function(row) {
       const that = this
-      this.$confirm('此操作将删除该产品, 是否继续?', '提示', {
+      this.$confirm('此操作将删除产品：' + row.productName, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
+         let info={
+            isDelete : 1,
+            packageId:row.packageId,
+          }
           row.isDelete = 1
           ProductEdit(row).then(response => {
             if (response.status === 200) {

src/views/userList/index.vue

@@ -7,6 +7,7 @@
       <el-button class="classitem" style="marginRight:50px" type="primary" plain icon="el-icon-plus" @click="NewUser">新增</el-button>
     </div>
 
+    <!-- 表格 -->
     <el-table v-loading="loading" :data="tableData" border style="width: 100%">
 
       <el-table-column label="客户名称" align="center" show-overflow-tooltip>
@@ -23,9 +24,9 @@
 
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status === 0" size="small">待提交</el-tag>
-          <el-tag v-if="scope.row.status === 1" size="small">商用</el-tag>
-          <el-tag v-if="scope.row.status === 2" size="small">暂停</el-tag>
+          <el-tag v-if="scope.row.status === 1" size="small">有效</el-tag>
+          <el-tag v-if="scope.row.status === 2" size="small">无效</el-tag>
+          <el-tag v-if="scope.row.status === 3" size="small">暂停</el-tag>
         </template>
       </el-table-column>
 
@@ -54,7 +55,6 @@
         </template>
       </el-table-column>
 
-
       <el-table-column label="创建时间" width="200" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.createTime }}</span>
@@ -71,6 +71,117 @@
 
     </el-table>
 
+<!-- 添加或修改对话框 -->
+        <el-dialog :title="operation?'新增客户':'编辑客户'" width="85%" :visible.sync="dialogFormVisible" center>
+          <el-form ref="dataForm" :model="dataForm" :rules="rules2" label-width="80px" size="small" label-position="right">
+               <!-- 客户基本信息 -->
+              <el-card shadow="never"  >
+                <!-- <el-card  shadow="hover" > -->
+                <div slot="header" class="clearfix">
+                  <span class="topClass">客户基本信息</span>
+                </div>
+                <div>
+                    <el-row :gutter="20">
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                      <el-form-item label="客户名称" prop="customerName" :label-width="formLabelWidth"  >
+                        <el-input v-model="dataForm.customerName" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                        <el-form-item label="客户ID" :label-width="formLabelWidth"  >
+                          <el-input v-model="dataForm.customerId"  />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                        <el-form-item label="客户简称" prop="shorterName" :label-width="formLabelWidth">
+                          <el-input v-model="dataForm.shorterName"  />
+                        </el-form-item>
+                    </el-col>
+                  </el-row>
+                </div>
+              </el-card>  
+              <!-- 客户服务联系人信息 -->
+              <el-card shadow="never"  >
+                <!-- <el-card  shadow="hover" > -->
+                <div slot="header" class="clearfix">
+                  <span class="topClass">客户服务联系人信息</span>
+                </div>
+                <div>
+                    <el-row :gutter="20">
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                      <el-form-item label="联系人姓名" :label-width="formLabelWidth"  >
+                        <el-input v-model="dataForm.linkmanName" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                        <el-form-item label="联系人电话" :label-width="formLabelWidth"  >
+                          <el-input v-model="dataForm.linkmanMobile"  />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                        <el-form-item label="联系人邮箱" :label-width="formLabelWidth">
+                          <el-input v-model="dataForm.linkmanEmail"  />
+                        </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="20">
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                      <el-form-item label="联系人地址" :label-width="formLabelWidth"  >
+                        <el-input v-model="dataForm.address" />
+                      </el-form-item>
+                    </el-col> 
+                  </el-row>
+                </div>
+              </el-card>  
+              <!-- 其他 -->
+              <el-card shadow="never"  >
+                <!-- <el-card  shadow="hover" > -->
+                <div slot="header" class="clearfix">
+                  <span class="topClass">其他</span>
+                </div>
+                <div>
+                    <el-row :gutter="20">
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                      <el-form-item label="代理商提成比例" :label-width="formLabelWidth"  >
+                        <el-input v-model="dataForm.partnerCommission" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                        <el-form-item label="合作伙伴ID" :label-width="formLabelWidth"  >
+                          <el-input v-model="dataForm.partnerId"  />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                        <el-form-item label="价格校验" :label-width="formLabelWidth">
+                          <el-input v-model="dataForm.priceCheck"  />
+                        </el-form-item>
+                    </el-col>
+                  </el-row>
+                    <el-row :gutter="20">
+                    <el-col :span="6" :xs="24" :sm="12" :md="12" :lg="8">
+                      <el-form-item label="是否有效" :label-width="formLabelWidth"  >
+                       <el-select size="small"  v-model="dataForm.status">
+                        <el-option
+                        v-for="item in status"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                        />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+      
+                </div>
+              </el-card>  
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+          </div>
+        </el-dialog>
+
+    <!-- 分页 -->
     <div class="pagination">
       <el-pagination
         current-page.sync="body.current"
@@ -98,60 +209,56 @@ export default {
         size: 10,
         current: 1
       },
+      status:[{
+        id:1,
+        name:"有效"
+      },{
+        id:2,
+        name:"无效"
+      },{
+        id:3,
+        name:"暂停"
+      }],
+      operation: false, // true:新增, false:编辑
+      dialogFormVisible: false, // 控制弹出框
+      formLabelWidth: '120px',   //新增宽度
+      dataForm:{
+          userId:4,
+      },
+      rules2:{
+        shorterName: [{ required: true, message: '请输入客户简称', trigger: 'blur' }],
+        customerName: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
+      },
       loading:false,
       total: 1,
       tableData: [
-        // {
-        //   customerId: '123456789',
-        //   partnerCommission: 0,
-        //   partnerId: '123456789',
-        //   identityId: '客户身份ID',
-        //   partnerType: 1,
-        //   customerName: 'TEST',
-        //   shorterName: 'test',
-        //   linkmanName: '张**',
-        //   linkmanMobile: '1518512885',
-        //   linkmanEmail: 'xxx@xxx',
-        //   address: '四川 成都',
-        //   status: 1,
-        //   account: 'TEST',
-        //   passwd: 'xxxxx',
-        //   svrPasswd: 'xxxxx',
-        //   payPasswd: 'xxxxx',
-        //   logoGroupId: 'xxxxx',
-        //   logoUrl: 'xxx',
-        //   twoCode: 'xxx',
-        //   twoCodeUrl: 'xxx',
-        //   settlePrice: '10.11',
-        //   balance: '99999',
-        //   creditAmount: '10000',
-        //   currentAmount: '154842',
-        //   isFirstLogin: '1',
-        //   isDeleted: 1,
-        //   creator: 'Admin',
-        //   createTime: '2021-05-17 00:00:00',
-        //   updator: 'Admin',
-        //   updateTime: '2021-05-17 00:00:00',
-        //   customerLevel: 0,
-        //   userId: '123'
-        // }
+ 
       ]
     }
   },
   created() {
-    this.reLoad()
+    this.getTenantList()
   },
   methods: {
+    //新增弹框
     NewUser() {
-      console.log('NewUser')
+      this.operation = true
+      this.dialogFormVisible = true
+      this.dataForm = {
+          userId:4,
+      }
     },
-    ModifyEdit() {
-      console.log('ModifyEdit')
+    //编辑弹框
+    ModifyEdit(row) {
+      this.operation = false
+      this.dialogFormVisible = true
+      this.dataForm = row
     },
     ModifyDelete() {
       console.log('ModifyDelete')
     },
-    reLoad() {
+    //数据
+    getTenantList(){
       this.loading = true
       api.Search(this.body).then((res) => {
         this.loading =false
@@ -159,18 +266,71 @@ export default {
         this.total = res.data.data.total
       })
     },
+    //新增或修改API
+    submitForm(){
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            if (!this.operation) {
+              console.log(this.dataForm)
+              // 编辑
+              // api.channelEdit(this.dataForm).then(response => {
+              //   if (response.status === 200) {
+              //     this.$message({
+              //       type: 'success',
+              //       message: '操作成功'
+              //     })
+              //     this.dialogFormVisible = false
+              //     this.getTenantList()
+              //   } else {
+              //     this.$message({
+              //       type: 'error',
+              //       message: response.data.msg
+              //     })
+              //   }
+              // })
+            } else {
+              console.log(this.dataForm)
+            //   // 添加
+              api.userAdd(this.dataForm).then(response => {
+                if (response.status === 200) {
+                  this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                  })
+                  this.dialogFormVisible = false
+                  this.reLoad()
+                } else {
+                  this.$message({
+                    type: 'error',
+                    message: response.data.msg
+                  })
+                }
+              })
+            }
+          }
+        })
+    },
+    //搜索
+    reLoad() {
+      this.body.current = 1
+      this.getTenantList()
+    },
+    //页码
     handleSizeChange(val) {
       this.body.size = val
-      this.reLoad()
+      this.getTenantList()
     },
+    //换页
     handleCurrentChange(val) {
       this.body.current = val
-      this.reLoad()
+      this.getTenantList()
     }
   }
 }
 </script>
 
-<style>
-
+<style scoped>
+    .el-card {
+      border: 0px solid #fff;
+    }
 </style>