channel

src/App.vue

@@ -18,4 +18,14 @@ export default {
      font-weight: 600;
      color:rgb(87, 86, 86)
  }
+ /* ¶Card 卡片 */
+ .clearfix{
+    line-height: 20px;
+    font-size: 18px;
+    font-weight: 600;
+  }
+ .topClass{
+    color:rgb(97, 174, 247)
+  }
+  
 </style>

src/api/channel.js

@@ -22,10 +22,12 @@ export default {
   channelEdit: function(data){
     return request({
       url: '/supplier/update',
-      method: 'post',
+      method: 'put',
       data: data
     })
   },
+
+  // <!-- -->
   //编辑
   channelDelete: function(data){
     return request({
@@ -35,20 +37,24 @@ export default {
     })
   },
 
+
+  // 供应商列表
   channel(operator){
     return request({
         url:"/channel/list",
         method:"POST",
-        params:operator
+        data:operator
     })
   },
 
+
+  //供应商删除
   channelDelete(ChannelId){
     return request({
       url:"/channel/delete",
       method:"PUT",
-      params:{ChannelId:ChannelId}
+      data:{ChannelId:ChannelId}
   })
   }
 
-}
+}

src/views/channel/channel.vue

@@ -13,8 +13,10 @@
       </div>
       <div class="flexend">
         <el-button class="filter-item"  icon="el-icon-search" type="primary" plain @click="Search">搜索</el-button>
-        <el-button class="classitem" style="marginRight:50px" type="primary" plain icon="el-icon-plus" @click="Search">新增</el-button>
+        <el-button class="classitem" style="marginRight:50px" type="primary" plain icon="el-icon-plus" @click="dataFormAdd">新增</el-button>
       </div>
+
+      <!-- 表格数据 -->
       <el-table v-loading="loading" :data="tableData" border style="width: 100%">
 
           <el-table-column label="通道ID" align="center" show-overflow-tooltip>
@@ -25,7 +27,7 @@
 
           <el-table-column label="通道名称" align="center" show-overflow-tooltip>
               <template slot-scope="scope" @click="hookLook(scope.row)">
-                  <span @click="hookLook(scope.row)">{{ scope.row.channelName }}</span>
+                  <el-button type="text" @click="hookLook(scope.row)">{{ scope.row.channelName }}</el-button>
               </template>
           </el-table-column>
 
@@ -43,14 +45,14 @@
 
           <el-table-column label="是否有效" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
-                  <el-tag v-if="scope.row.isValid==0" size="warning">无效</el-tag>
+                  <el-tag v-if="scope.row.isValid==0" type="danger" size="warning">无效</el-tag>
                   <el-tag v-if="scope.row.isValid==1" size="small">有效</el-tag>
               </template>
           </el-table-column>
 
-          <el-table-column label="供应商编码" align="center" show-overflow-tooltip>
+          <el-table-column label="供应商名称" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
-                  <span>{{ scope.row.supplierId }}</span>
+                  <span>{{ scope.row.supplierName }}</span>
               </template>
           </el-table-column>
 
@@ -65,7 +67,7 @@
           </el-table-column>
         
       </el-table>
-
+        <!-- 分页 -->
       <div class="pagination">
       <el-pagination
         current-page.sync="body.current"
@@ -79,6 +81,254 @@
         @current-change="handleCurrentChange"
       />
     </div>
+    
+     <!-- 新增与修改 -->
+    <el-dialog :title="operation?'新增通道':'编辑通道'" :visible.sync="dialogFormVisible" 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.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-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-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: 100%" >
+                  <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>
+          <el-button style="float: right;" type="primary" plain @click="addprice">添加通道产品</el-button>
+          <el-button style="marginRight:20px;float: right;" type="success" plain @click="addprice">结算价格批量定价</el-button>
+        </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="通道产品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> -->
+            </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.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="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="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 产品选择 -->
+    <el-dialog
+    title="添加产品"
+    :visible.sync="dialogVisible"
+    width="60%"
+    >
+         <div class="edit_dev">
+
+            <el-transfer
+                v-model="value"
+                filterable
+                :props="{
+                key: 'packageName',
+                label: 'packageName'
+                }"
+                :format="{
+                    noChecked: '${total}',
+                    hasChecked: '${checked}/${total}'
+                    }"
+                    :titles="['话费','话费']"
+                :data="data">
+            </el-transfer>
+         </div>
+    <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    </span>
+    </el-dialog>
+
+     <!-- 查看 -->
+    <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>
+      </div>
+    </el-dialog>
+
 
   </div>
 </template>
@@ -94,8 +344,32 @@ export default {
                 current:1,
                 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: [],
             tableData:[],
-            total:0
+            total:0,
+            operation: false, // true:新增, false:编辑
+            dialogVisible:false,   //新增产品
+            dialogFormVisible: false, // 控制弹出框
+            dialogFormLook:false,   //查看弹出框
+            formLabelWidth: '100px',   //新增宽度
+            loading:false,
+            dataForm:{
+
+            },
+             mobileOperator:[
+                {id:1,name:"移动"},
+                {id:3,name:"联通"},
+                {id:2,name:"电信"},
+            ],
+            rules2:[],
+            status:[{
+                id:1,
+                name:"有效"
+            },{
+                id:0,
+                name:"无效"
+            }],
         }
     },
     created(){
@@ -111,7 +385,60 @@ export default {
                 this.total = res.data.data.total
             })
         },
+        //新增弹框
+        dataFormAdd(){
+            this.operation = true // true:新增, false:编辑
+            this.dialogFormVisible = true // 控制弹出框
+        },
+        //编辑弹框
+        handleEdit(row){
+           this.operation = true // true:新增, false:编辑
+           this.dataForm = row
+           this.dialogFormVisible = true // 控制弹出框 
+        },
+        //删除API
+        ModifyDelete(row){
+            const that = this
+            that.$confirm('此操作将删除该通道, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+            .then(() => {
+                api.channelDelete(row.channelId).then((res)=>{
+                     if (response.status === 200) {
+                        that.$message({
+                            type: 'success',
+                            message: '删除成功'
+                        })
+                        that.Search()
+                     } else {
+                        that.$message({
+                            type: 'error',
+                            message: response.data.msg
+                        })
+                     }
+                })
+            })    
+        },
+        //查看弹框
+        hookLook(row){
+             console.log(row)
+            this.dialogFormLook = true
+            this.dataForm={
 
+            }
+            let newObj=JSON.parse(JSON.stringify(row))
+            this.dataForm = newObj
+        },
+        //新增和修改API
+        submitForm(){
+
+        },
+        //新增产品
+        addprice(){
+            this.dialogVisible = true
+        },
         // 搜索
         Search(){
             this.body.current = 1
@@ -121,19 +448,7 @@ export default {
         ModifyState(operator){
             operator.isValid ^= 1
         },
-        // 删除
-        ModifyDelete(operator){
-
-        },
-        // 编辑
-        handleEdit(){
-
-        },
-        // 查看详细
-        hookLook(){
-
-        },
-
+        
 
 
         handleSizeChange: function(val) {
@@ -148,7 +463,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 .flex{
      width: 90%;
      display: flex;
@@ -166,4 +481,11 @@ export default {
    /* margin: 0 auto; */
    padding-bottom: 20px;
 }
+.el-card {
+    border: 0px solid #e6ebf5;
+    margin-top: 20px;
+}
+.edit_dev >>> .el-transfer-panel {
+     width:250px;
+   }
 </style>

src/views/channel/index.vue

@@ -9,12 +9,11 @@
     <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="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span>{{ scope.row.supplierId }}</span>
+          <span>{{ scope.row.supplierCode }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column label="供应商名称" width="100" align="center" show-overflow-tooltip>
         <template slot-scope="scope" @click="handleLook(scope.row)">
@@ -49,8 +48,8 @@
 
       <el-table-column label="是否有效" width="90" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span v-if="scope.row.isValid==1">有效</span>
-          <span v-if="scope.row.isValid==0">无效</span>
+            <el-tag v-if="scope.row.isValid==0" type="danger" size="warning">无效</el-tag>
+            <el-tag v-if="scope.row.isValid==1" size="small">有效</el-tag>
         </template>
       </el-table-column>
 
@@ -201,12 +200,12 @@
         </el-row>
        <el-card  shadow="hover" v-if="!operation">
         <div slot="header" class="clearfix">
-          <span>供应商银行账户信息</span>
+          <span class="topClass">供应商银行账户信息</span>
           <el-button style="float: right;" type="primary" plain @click="addprice">添加银行卡</el-button>
         </div>
         <div>
           <!-- 添加银行卡 -->
-          <el-table :data="dataForm.priceData" >
+          <el-table :data="dataForm.bankCards" >
 
           <el-table-column label="银行卡" width="210" align="center"  show-overflow-tooltip>
             <template slot-scope="scope" >
@@ -224,7 +223,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>
+              <el-input  v-model="scope.row.account"></el-input>
               <!-- <span >{{ scope.row.account }}</span>   -->
             </template>
           </el-table-column>
@@ -480,33 +479,33 @@
             
           </el-col>
         </el-row>
-       <el-card  shadow="hover" v-if="!operation">
+       <el-card  shadow="hover" >
         <div slot="header" class="clearfix">
           <span>供应商银行账户信息</span>
           <!-- <el-button style="float: right;" type="primary" plain @click="addprice">添加银行卡</el-button> -->
         </div>
         <div>
           <!-- 添加银行卡 -->
-          <el-table :data="dataForm.priceData" >
+          <el-table :data="dataForm.bankCards" >
 
           <el-table-column label="银行卡" 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> -->
+              <!-- <el-input v-model="scope.row.cardNo"></el-input> -->
+              <span >{{ 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> -->
+              <!-- <el-input v-model="scope.row.bankDeposit"></el-input> -->
+              <span >{{ 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.creator"></el-input>
-              <!-- <span >{{ scope.row.account }}</span>   -->
+              <!-- <el-input  v-model="scope.row.creator"></el-input> -->
+              <span >{{ scope.row.account }}</span>  
             </template>
           </el-table-column>
 
@@ -596,7 +595,13 @@ export default {
         queryUrl:"",               //查询URL
         // field_37:"",               //联系商务
         // managePassword:"",         //后台密码
-        priceData:[]
+        bankCards:[
+          {
+            cardNo:"",       //银行卡
+            bankDeposit:"",   //开户行
+            account:"",     //账户名称    
+          }
+        ]
       },
       dataAddForm:{    //加款供应商信息
       },
@@ -611,7 +616,7 @@ export default {
       },   
       AddDialogForm:false,  //新增加款对话框
       dialogAdd:false,
-      priceData:[
+      bankCards:[
         // {cardNo:"18838392",bankDeposit:"222",account:"11",creator:"11",createTime:"11 "}
         ],             //银行卡
       tableData: []
@@ -645,7 +650,7 @@ export default {
         isValid:"",                //是否有效
         account:"",                //接入账号
         appKey:"",                 //接入密钥
-        ratio:"",                  //限速	
+        ratio:"1:30000",                 //限速	
         manageUrl:"",              //后台地址
         // billType:"",               //对账单类型
         linkName:"",               //供应商姓名
@@ -657,7 +662,7 @@ export default {
         queryUrl:"",               //查询URL
         // field_37:"",               //联系商务
         managePassword:"",         //后台密码
-        // priceData:[]
+        // bankCards:[]
       }
     },
     //加款对话框
@@ -688,7 +693,6 @@ export default {
     handleEdit: function(row) {
       this.dialogFormVisible = true
       this.operation = false
-      
       this.dataForm={
       supplierName:"",           //供应商名称
         mobile:"",                 //供应商电话
@@ -708,21 +712,24 @@ export default {
         queryUrl:"",               //查询URL
         // field_37:"",               //联系商务
         managePassword:"",         //后台密码
-        priceData:[]
+        bankCards:[
+          {
+            cardNo:"",       //银行卡
+            bankDeposit:"",   //开户行
+            account:"",     //账户名称    
+          }
+        ]
     }
       console.log(row)
-      if(row.priceData == undefined){    
+      if(row.bankCards == undefined){    
       //修改弹框时如果银行卡字段为undefined的时候赋值为空
-         row.priceData = []
+         row.bankCards = []
       }
       let newObj=JSON.parse(JSON.stringify(row))
       this.dataForm = newObj
      
       // this.dataForm = Object.assign({}, row)
       // this.dataForm.jobId = row.jobId
-      api.price(row).then((resp)=>{
-        this.dataForm.priceData = resp.data.data.records
-      })
     },
     //查看详情
     handleLook(row){
@@ -747,7 +754,7 @@ export default {
         queryUrl:"",               //查询URL
         // field_37:"",               //联系商务
         managePassword:"",         //后台密码
-        priceData:[]
+        bankCards:[]
     }
     let newObj=JSON.parse(JSON.stringify(row))
       this.dataForm = newObj
@@ -759,21 +766,21 @@ export default {
             if (!this.operation) {
               console.log(this.dataForm)
               // 编辑
-              // 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
-              //     })
-              //   }
-              // })
+              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)
             //   // 添加
@@ -798,19 +805,19 @@ export default {
     },
     //添加银行卡
     addprice(){
-      this.dataForm.priceData.push({
+      this.dataForm.bankCards.push({
           cardNo:"",       //银行卡
           bankDeposit:"",   //开户行
           account:"",       //供应商账户
           // creator:""       //创建者
       })
-       console.log(this.dataForm.priceData)
+       console.log(this.dataForm.bankCards)
     },
 
     //删除银行卡
     priceDelete(row,index){
-      this.dataForm.priceData.splice(index,1)
-      console.log(this.dataForm.priceData)
+      this.dataForm.bankCards.splice(index,1)
+      console.log(this.dataForm.bankCards)
     },
 
     // 状态
@@ -867,21 +874,15 @@ export default {
 </script>
 
 <style scoped>
-  .clearfix{
-    /* text-align: center; */
-    line-height: 20px;
-    font-size: 18px;
-    /* padding-top: 70px; */
-  }
+  
   .classAmountAdd{
     width: 85%;
     display: flex;
     margin: 0 auto;
     padding-top: 20px;
+    padding-bottom: 20px;
   }
-  .topClass{
-    color:rgb(145, 145, 145)
-  }
+
   .amountText{
     font-weight: 500;
     font-size: 16px;

src/views/login/index.vue

@@ -27,8 +27,8 @@
                 placeholder="账号"
                 name="username"
                 type="text"
-                autocomplete="off"
                 @keyup.enter.native="handleLogin"
+                autocomplete="off"
               >
                 <i slot="prefix" class="">
                   <svg-icon icon-class="user1" />
@@ -169,7 +169,7 @@
           </span>
 
           <span class="other-icon" @click="handleSocial('gitee')">
-            <a href='http://localhost:8081/auth/gitee'>
+            <!--<a href='http://localhost:8081/auth/gitee'>
             <svg
               t="1563366479009"
               class="fa-icon"
@@ -186,10 +186,10 @@
                 p-id="1419"
               />
             </svg>
-            </a>
+            <!--</a>
           </span>
           <span class="other-icon" @click="handleSocial('weixin')">
-            <a href='http://localhost:8081/auth/gitee'
+            <!--<a href='http://localhost:8081/auth/gitee'
             <svg
               t="1566549849419"
               class="icon"
@@ -212,7 +212,7 @@
               fill="#FFFFFF"
               p-id="2081"
             /></svg>
-            </a>
+            <!--</a>
           </span>
         </div>
         <div class="register">
@@ -294,9 +294,9 @@ export default {
   created() {
     // this.refreshCaptcha()
     // this.socialLogin()
-    const array = [{ a: 1 }, { a: 2 }, { a: 3 }, { a: 4 }, { a: 5 }]
-    const ary = array.map(res => {
-      return res.a
+    let array=[{a:1},{a:2},{a:3},{a:4},{a:5}]
+    let ary=array.map(res=>{
+       return res.a
     })
     // console.log(Math.max(ary))
   },

src/views/orderList/finance.vue

@@ -347,6 +347,11 @@
           <span>{{ scope.row.extorderId }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="通道订单号" width="120" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.gwSeqNo }}</span>
+        </template>
+      </el-table-column>  
 
       <el-table-column
         label="订单状态"

src/views/orderList/index.vue

@@ -439,8 +439,8 @@ export default {
           {id:2,name:"电信"},
       ],
       dealFlag:[
+        {id:"6",name:"成功"},        
         {id:"4",name:"失败"},
-        {id:"6",name:"成功"},
       ]
     }
   },

src/views/userList/index.vue

@@ -2,44 +2,12 @@
   <div class="app-container">
     <div class="filter-container" style="margin: 10px 0 10px 0">
       <span class="textSpan">客户名称:</span>
-      <el-input v-model="body.supplierName" style="width:200px;" placeholder="客户名称" size="small" clearable />
+      <el-input v-model="body.customerName" style="width:200px;" placeholder="客户名称" size="small" clearable />
       <el-button class="filter-item" icon="el-icon-search" type="primary" plain @click="reLoad">搜索</el-button>
       <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 type="selection" /> -->
-
-      <!-- <el-table-column label="客户ID" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.customerId }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="代理商提成" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.partnerCommission }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="代理商ID" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.partnerId }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="客户身份ID" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.identityId }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="合作伙伴类型" width="110" align="center">
-        <template slot-scope="scope">
-          <span v-if="scope.row.partnerType==1">流量营销</span>
-          <span v-if="scope.row.partnerType==2">渠道直充</span>
-        </template>
-      </el-table-column> -->
 
       <el-table-column label="客户名称" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -53,30 +21,6 @@
         </template>
       </el-table-column>
 
-      <!-- <el-table-column label="联系人姓名" width="110" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.linkmanName }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="联系人电话" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.linkmanMobile }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="联系人邮箱" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.linkmanEmail }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="联系人地址" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.address }}</span>
-        </template>
-      </el-table-column> -->
-
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.status === 0" size="small">待提交</el-tag>
@@ -85,77 +29,6 @@
         </template>
       </el-table-column>
 
-      <!-- <el-table-column label="登录帐号" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.account }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="登录密码,md5加密字符串" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.passwd }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="服务密码,有APP终端客户自行修改；初始密码为“888888" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.svrPasswd }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="支付密码,渠道营销客户无此字段内容" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.payPasswd }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="Logo图片组ID" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.logoGroupId }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="Logo图片URL" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.logoUrl }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="二维码组ID" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.twoCode }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="二维码图片URL" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.twoCodeUrl }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="Logo图片组ID" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.logoGroupId }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="Logo图片组ID" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.logoGroupId }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="微信号" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.wechatNo }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="终端结算价格,默认为产品定价，可以由直充渠道合作伙伴统一进行设置" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.settlePrice }}</span>
-        </template>
-      </el-table-column> -->
 
       <el-table-column label="帐号余额" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -181,24 +54,6 @@
         </template>
       </el-table-column>
 
-      <!-- <el-table-column label="是否第一次登录,1:不是0:是" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.isFirstLogin }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="删除标识" width="100" align="center">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.isDeleted==1" type="danger">已删除</el-tag>
-          <el-tag v-if="scope.row.isDeleted==0" type="danger">未删除</el-tag>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="创建者" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.creator }}</span>
-        </template>
-      </el-table-column> -->
 
       <el-table-column label="创建时间" width="200" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -206,29 +61,6 @@
         </template>
       </el-table-column>
 
-      <!-- <el-table-column label="修改者" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.updator }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="修改时间" width="200" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.updateTime }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="客户等级" width="200" align="center">
-        <template slot-scope="scope">
-          <span>{{ scope.row.customerLevel }}</span>
-        </template>
-      </el-table-column> -->
-
-      <!-- <el-table-column label="客户登录账户id" width="100" align="center" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.userId }}</span>
-        </template>
-      </el-table-column> -->
 
       <el-table-column label="操作" fixed="right" min-width="200" align="center">
         <template slot-scope="scope">
@@ -262,45 +94,47 @@ export default {
   data() {
     return {
       body: {
+        customerName:"",
         size: 10,
         current: 1
       },
+      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'
-        }
+        // {
+        //   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'
+        // }
       ]
     }
   },
@@ -318,7 +152,9 @@ export default {
       console.log('ModifyDelete')
     },
     reLoad() {
+      this.loading = true
       api.Search(this.body).then((res) => {
+        this.loading =false
         this.tableData = res.data.data.records
         this.total = res.data.data.total
       })