前端更改提交

src/router/index.js

@@ -7,6 +7,8 @@ const Home = () => import('@/views/Home');
 const Main = () => import('@/views/main/main');
 // 个人中心
 const Customer = () => import('@/views/customer/Customer');
+const CustomerRecharge  = () => import('@/views/customer/customerRecharge');
+const custRecTime  = () => import('@/views/customer/custRecTime');
 // 系统管理部分
 const User = () => import('@/views/sys/user');
 
@@ -16,6 +18,7 @@ const billway = () => import('@/views/noCar/billway.vue');
 const nocarInvoice = () => import('@/views/noCar/invoice.vue');
 const billwayException = () => import('@/views/noCar/billwayException.vue');
 const noCarCalculateInfo = () => import('@/views/noCar/calculateInfo.vue');
+const hcInvoice = () => import('@/views/noCar/hcInvoice.vue');
 //自有车部分
 
 const selfcarRec = () => import('@/views/selfCar/selfcarRec.vue');
@@ -41,6 +44,8 @@ const router = new Router({
         {name: 'Main', path: '/main',component: Main},
         //客户管理
         {name: 'Customer', path: '/customer',component: Customer},
+        {name: 'customerRecharge', path: '/CustomerRecharge',component: CustomerRecharge},
+        {name: 'custRecTime', path: '/custRecTime',component: custRecTime},
         // 系统管理部分
         {name: 'User', path: '/user', component: User},
         // 无车部分
@@ -49,6 +54,7 @@ const router = new Router({
         {name: 'nocarInvoice', path: '/nocarInvoice', component: nocarInvoice},
         {name: 'billwayException', path: '/billwayException', component: billwayException},
         {name: 'noCarCalculateInfo', path: '/noCarCalculateInfo', component: noCarCalculateInfo},
+        {name: 'hcInvoice', path: '/hcInvoice', component: hcInvoice},
         //自有车部分
         {name: 'selfcarRec', path: '/selfcarRec', component: selfcarRec},
         {name: 'selfInvoice', path: '/selfInvoice', component: selfInvoice},

src/views/Home.vue

@@ -164,6 +164,14 @@ export default {
               id:1,
               path:"customer",
               authName:"客户管理"
+            },{
+              id:2,
+              path:"customerRecharge",
+              authName:"充值记录"
+            },{
+              id:3,
+              path:"custRecTime",
+              authName:"备案预警查询"
             }
           ]
          },
@@ -187,6 +195,10 @@ export default {
               id:4,
               path:"nocarInvoice",
               authName:"发票查询"
+            },{
+              id:5,
+              path:"hcInvoice",
+              authName:"红冲发票查询"
             }
           ]
          },{

src/views/customer/Customer.vue

@@ -26,21 +26,16 @@
             prop="customerName"
             show-overflow-tooltip>
           </el-table-column>
-           <!-- <el-table-column
-            prop="invoiceTime"
-            label="开票时间"
-            show-overflow-tooltip>
-          </el-table-column> -->
           <el-table-column
-            prop="company"
             label="主体名称"
+            prop="company"
             show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="usenumAll"
-            label="调用量"
+           <!-- <el-table-column
+            prop="invoiceTime"
+            label="开票时间"
             show-overflow-tooltip>
-          </el-table-column>
+          </el-table-column> -->
            <el-table-column
             prop="integrationType"
             label="对接方式"
@@ -48,6 +43,7 @@
              <template slot-scope="scope">
               <span v-if="scope.row.integrationType == 0" >接口</span>
               <span v-else-if="scope.row.integrationType == 1" >平台</span>
+              <span v-else-if="scope.row.integrationType == 3" >手工录入</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -152,8 +148,9 @@
         @close="addCustomerClose"
         :visible.sync="recVisList"
         style="font-size: 0px;">
-        <div class="tou">客户--备案列表</div>
+        <div class="tou">客户--备案列表  <el-button type="success" size="small" style="margin-left: 1%;" @click="showAddCustomerRec">添加</el-button></div>
         <div class="line"></div>
+      
          <!-- 表格部分 -->
        <template>
         <el-table
@@ -201,11 +198,14 @@
               <span v-if="scope.row.recStatus == 0">备案中</span>
               <span v-else-if="scope.row.recStatus == 1" style="color: green">备案成功</span>
               <span v-else-if="scope.row.recStatus == 2" style="color: red">备案失败</span>
+              <span v-else-if="scope.row.recStatus == 3" style="color: red">等待协议上传</span>
+              <span v-else-if="scope.row.recStatus == 4" style="color: red">手工停用</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="recStatus"
+            prop="contractSuc"
             label="协议上传状态"
+            width="120"
             show-overflow-tooltip>
              <template slot-scope="scope">
               <span v-if="scope.row.contractSuc == 1" style="color: green">协议上传成功</span>
@@ -219,6 +219,7 @@
              <template slot-scope="scope">
               <span v-if="scope.row.interType == 0">接口</span>
               <span v-if="scope.row.interType == 1">平台</span>
+              <span v-if="scope.row.interType == 3">手工录入</span>
             </template>
           </el-table-column>
            <el-table-column
@@ -237,6 +238,7 @@
             <template slot-scope="scope" show-overflow-tooltip>
                <el-link style="margin-left: 10px; cursor:pointer; color: blue;" @click="recInfo(scope.row)">备案信息</el-link>
                <el-link style="margin-left: 10px; cursor:pointer; color: blue;" @click="concatInfo(scope.row)">协议信息</el-link>
+               <el-link v-if="scope.row.recStatus == 1" style="margin-left: 10px; cursor:pointer; color: blue;" @click="stopUse(scope.row)">停用</el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -255,31 +257,39 @@
           
             <el-row :span="24">
               <el-col :span="12">
-                <el-form-item  label-width=120px label="协议类型">
-                <el-input v-model="customerRec.serviceType" auto-complete="off" readonly=true ></el-input>
+                 <el-form-item  label-width=120px label="协议类型" prop="serviceType">
+                    <el-select v-model="customerRec.serviceType" placeholder="运营范围" :disabled=true  style="width: 100%">
+                        <el-option
+                           v-for="item in serviceTypeList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
               </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item  label-width=120px label="协议文件名">
-                <el-input v-model="customerRec.contractFileName" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.contractFileName" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
           </el-row>
           <el-row :span="24">
               <el-col :span="12">
                 <el-form-item  label-width=120px label="服务开始时间">
-                <el-input v-model="customerRec.serviceStartTime" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.serviceStartTime" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item  label-width=120px label="服务结束时间">
-                <el-input v-model="customerRec.serviceEndTime" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.serviceEndTime" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
           </el-row> 
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="customerRecConform" type="primary">协议上传</el-button>
+          <el-button @click="contractDownload" type="primary">协议下载</el-button>
+          <el-button @click="contractAdd" type="primary">协议上传</el-button>
         </div>
       </el-dialog>
       <el-dialog
@@ -295,98 +305,260 @@
           <el-row :span="24">
               <el-col :span="12">
                 <el-form-item  label-width=120px label="客户名称">
-                <el-input v-model="customerRec.customerName" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.customerName" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
                    <el-form-item label-width=120px label="公司负责人">
-                   <el-input v-model="customerRec.companyLeader" readonly=true  style="width: 100%"></el-input>
+                   <el-input v-model="customerRec.companyLeader" :disabled=true  style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
           </el-row>
           <el-row :span="24">
               <el-col :span="12">
                 <el-form-item  label-width=120px label="负责人手机号">
-                <el-input v-model="customerRec.companyLeaderPhone" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.companyLeaderPhone" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
                    <el-form-item label-width=120px label="公司名称">
-                   <el-input v-model="customerRec.companyName" readonly=true style="width: 100%"></el-input>
+                   <el-input v-model="customerRec.companyName" :disabled=true style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
           </el-row>
           <el-row :span="24">
               <el-col :span="12">
                 <el-form-item  label-width=120px label="公司税号">
-                <el-input v-model="customerRec.companyReferencenum" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.companyReferencenum" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
                    <el-form-item label-width=120px label="公司开户行">
-                   <el-input v-model="customerRec.companyOpenbank" readonly=true style="width: 100%"></el-input>
+                   <el-input v-model="customerRec.companyOpenbank" :disabled=true style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
           </el-row>
          <el-row :span="24">
               <el-col :span="12">
                 <el-form-item  label-width=120px label="公司开户行账号">
-                <el-input v-model="customerRec.companyOpenbankAcc" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.companyOpenbankAcc" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
                    <el-form-item label-width=120px label="公司地址">
-                   <el-input v-model="customerRec.companyAdress"  style="width: 100%" readonly=true></el-input>
+                   <el-input v-model="customerRec.companyAdress"  style="width: 100%" :disabled=true></el-input>
                 </el-form-item>
               </el-col>
           </el-row>
            <el-row :span="24">
               <el-col :span="12">
                 <el-form-item  label-width=120px label="公司电话">
-                <el-input v-model="customerRec.companyPhone" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.companyPhone" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
-                   <el-form-item label-width=120px label="备案申请时间">
-                   <el-input v-model="customerRec.createtime"  style="width: 100%" readonly=true></el-input>
+                    <el-form-item label-width=120px label="业务类型">
+                   <el-select v-model="customerRec.bussinessType" placeholder="业务类型" :disabled=true  style="width: 100%">
+                        <el-option
+                          v-for="item in bussinessTypeList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
                 </el-form-item>
               </el-col>
           </el-row>
            <el-row :span="24">
               <el-col :span="12">
-                <el-form-item  label-width=120px label="公司类型">
+                <!-- <el-form-item  label-width=120px label="公司类型">
+                <el-input v-model="customerRec.companyType" auto-complete="off" readonly=true ></el-input>
+              </el-form-item> -->
+               <el-form-item label-width=120px label="公司类型" prop="companyType">
+                    <el-select v-model="customerRec.companyType" placeholder="公司类型"  style="width: 100%" :disabled=true>
+                        <el-option
+                          v-for="item in companyList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
+              </el-form-item>
+              </el-col>
+               <el-col :span="12">
+                <!-- <el-form-item  label-width=120px label="公司类型">
                 <el-input v-model="customerRec.companyType" auto-complete="off" readonly=true ></el-input>
+              </el-form-item> -->
+               <el-form-item label-width=120px label="运营范围" prop="operatingRangeType">
+                    <el-select v-model="customerRec.operatingRangeType" placeholder="运营范围"  style="width: 100%" :disabled=true>
+                        <el-option
+                          v-for="item in operatingRangeList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
               </el-form-item>
               </el-col>
           </el-row>
-           <!-- <el-row :span="24">
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="customerRecConform" type="primary">信息上传</el-button>
+          <el-button type="primary" @click="changeStatusM">生成文档</el-button>
+        </div>
+      </el-dialog>
+       <el-dialog
+        @close="custRecClose"
+        :visible.sync="addCustomerRecShow1"
+        style="font-size: 0px;">
+        <div class="tou">客户--备案信息</div>
+        <div class="line"></div>
+        <el-form
+          label-position="right"
+          label-width="80px"
+          :model="formUserList">
+          <el-row :span="24">
               <el-col :span="12">
-                <el-form-item  label-width=120px label="协议类型">
-                <el-input v-model="customerRec.serviceType" auto-complete="off" readonly=true ></el-input>
+                <el-form-item  label-width=120px label="客户名称">
+                <el-input v-model="customerRec.customerName" auto-complete="off" :disabled=true ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item  label-width=120px label="协议文件名">
-                <el-input v-model="customerRec.contractFileName" auto-complete="off" readonly=true ></el-input>
+                   <el-form-item label-width=120px label="公司负责人">
+                   <el-input v-model="customerRec.companyLeader"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row :span="24">
+              <el-col :span="12">
+                <el-form-item  label-width=120px label="负责人手机号">
+                <el-input v-model="customerRec.companyLeaderPhone" auto-complete="off"  ></el-input>
+              </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                   <el-form-item label-width=120px label="公司名称">
+                   <el-input v-model="customerRec.companyName"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+          </el-row>
+          <el-row :span="24">
+              <el-col :span="12">
+                <el-form-item  label-width=120px label="公司税号">
+                <el-input v-model="customerRec.companyReferencenum" auto-complete="off"  ></el-input>
+              </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                   <el-form-item label-width=120px label="公司开户行">
+                   <el-input v-model="customerRec.companyOpenbank"  style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+          </el-row>
+         <el-row :span="24">
+              <el-col :span="12">
+                <el-form-item  label-width=120px label="公司开户行账号">
+                <el-input v-model="customerRec.companyOpenbankAcc" auto-complete="off"  ></el-input>
+              </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                   <el-form-item label-width=120px label="公司地址">
+                   <el-input v-model="customerRec.companyAdress"  style="width: 100%" ></el-input>
+                </el-form-item>
+              </el-col>
+          </el-row>
+           <el-row :span="24">
+              <el-col :span="12">
+                <el-form-item  label-width=120px label="公司电话">
+                <el-input v-model="customerRec.companyPhone" auto-complete="off"  ></el-input>
+              </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                   <el-form-item label-width=120px label="业务类型">
+                   <el-select v-model="customerRec.bussinessType" placeholder="业务类型"  style="width: 100%">
+                        <el-option
+                          v-for="item in bussinessTypeList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+              </el-col>
+          </el-row>
+           <el-row :span="24">
+              <el-col :span="12">
+                <!-- <el-form-item  label-width=120px label="公司类型">
+                <el-input v-model="customerRec.companyType" auto-complete="off" readonly=true ></el-input>
+              </el-form-item> -->
+               <el-form-item label-width=120px label="公司类型" prop="companyType">
+                    <el-select v-model="customerRec.companyType" placeholder="公司类型"  style="width: 100%">
+                        <el-option
+                          v-for="item in companyList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
+              </el-form-item>
+              </el-col>
+               <el-col :span="12">
+                <!-- <el-form-item  label-width=120px label="公司类型">
+                <el-input v-model="customerRec.companyType" auto-complete="off" readonly=true ></el-input>
+              </el-form-item> -->
+               <el-form-item label-width=120px label="运营范围" prop="operatingRangeType">
+                    <el-select v-model="customerRec.operatingRangeType" placeholder="运营范围"  style="width: 100%">
+                        <el-option
+                          v-for="item in operatingRangeList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
+              </el-form-item>
+              </el-col>
+          </el-row>
+           <el-row :span="24">
+              <el-col :span="12">
+                <el-form-item  label-width=120px label="协议类型" prop="serviceType">
+                <el-select v-model="customerRec.serviceType" placeholder="运营范围"  style="width: 100%">
+                        <el-option
+                          v-for="item in serviceTypeList"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
+              </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label-width=120px label="协议文件" prop="contractFileName">
+                <el-upload
+                    class="avatar-uploader"
+                    style="width: 100%"
+                    action="#"
+                    :show-file-list="false"
+                    :http-request="httpRequest">
+                      <el-input label-width=120px v-model="customerRec.contractFileName" auto-complete="off"  style="width: 100%"></el-input>
+                      <!-- <el-button type="primary" @click="getFile(index)">选取文件</el-button> -->
+                  </el-upload>
+                  <el-input label-width=120px v-model="customerRec.base64Str" v-show="false" auto-complete="off"></el-input>
               </el-form-item>
               </el-col>
           </el-row>
           <el-row :span="24">
               <el-col :span="12">
                 <el-form-item  label-width=120px label="服务开始时间">
-                <el-input v-model="customerRec.serviceStartTime" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.serviceStartTime" auto-complete="off" ></el-input>
               </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item  label-width=120px label="服务结束时间">
-                <el-input v-model="customerRec.serviceEndTime" auto-complete="off" readonly=true ></el-input>
+                <el-input v-model="customerRec.serviceEndTime" auto-complete="off" ></el-input>
               </el-form-item>
               </el-col>
-          </el-row> -->
+          </el-row> 
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="customerRecConform" type="primary">信息上传</el-button>
-          <el-button type="primary" @click="changeStatusM">生成文档</el-button>
+          <el-button @click="customerRecAdd" type="primary">保存</el-button>
         </div>
       </el-dialog>
        <el-dialog
@@ -414,96 +586,6 @@
           <el-button type="primary" @click="customRecharge">充值</el-button>
         </div>
       </el-dialog>
-       <el-dialog
-        @close="addCustomerClose"
-        :visible.sync="carRecclose"
-        style="font-size: 0px;">
-        <div class="tou">客户--车辆备案</div>
-        <div class="line"></div>
-         <!-- 表格部分 -->
-       <template>
-        <el-table
-          v-loading="loading"
-          ref="multipleTable"
-          :data="coustomerCarTable"
-           height="370px"
-          border
-          tooltip-effect="dark">
-          <el-table-column
-            label="客户名称"
-            prop="customerName"
-            show-overflow-tooltip>
-          </el-table-column>
-           <el-table-column
-            prop="companyName"
-            label="公司名称"
-            show-overflow-tooltip>
-          </el-table-column>
-           <el-table-column
-            prop="businessType"
-            label="业务类型"
-            show-overflow-tooltip>
-             <template slot-scope="scope">
-              <span v-if="scope.row.businessType == 0">自有车</span>
-              <span v-if="scope.row.businessType == 1">外协车</span>
-              <span v-if="scope.row.businessType == 2">无车</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="carNum"
-            label="车牌号"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="carColor"
-            label="车辆颜色"
-            show-overflow-tooltip>
-          </el-table-column>
-           <el-table-column
-            prop="custPhone"
-            label="手机号"
-            show-overflow-tooltip>
-          </el-table-column>
-           <el-table-column
-            prop="etcNum"
-            label="ETC卡号"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="recStatus"
-            label="备案状态"
-            show-overflow-tooltip>
-             <template slot-scope="scope">
-              <span v-if="scope.row.recStatus == 1" style="color: green">备案成功</span>
-              <span v-else-if="scope.row.recStatus == 0" style="color: red">备案失败</span>
-            </template>
-          </el-table-column>
-           <el-table-column
-            prop="succTime"
-            label="成功时间"
-            show-overflow-tooltip>
-            
-          </el-table-column>
-          <el-table-column
-            prop="failTime"
-            label="失败时间"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
-            prop="failReason"
-            label="失败原因"
-            show-overflow-tooltip>
-          </el-table-column>
-           <el-table-column
-            label="操作"
-            width="280">
-            <template slot-scope="scope" show-overflow-tooltip>
-              <el-link v-if="scope.row.businessType == 1 || scope.row.businessType == 0" style="cursor:pointer; color: blue;" @click="alert(scope)">解绑</el-link>
-            </template>
-          </el-table-column>
-        </el-table>
-      </template> 
-      </el-dialog>
     </div>
 </template>
 <script type="text/javascript">
@@ -517,6 +599,15 @@
             coustomerTable:[],
             coustomerCarTable:[],
             customeRecQueryListTable:[],
+            companyList:[{id:1,name:"行业用户"},{id:2,name:"自营平台"},{id:3,name:"合作商户"}],
+            bussinessTypeList:[{id:"0",name:"自有车"},{id:"2",name:"无车"}],
+            operatingRangeList:[{id:1,name:"快递"},
+                                {id:2,name:"速运"},
+                                {id:3,name:"货运代理"},
+                                {id:4,name:"普通货运"},
+                                {id:5,name:"专线运输"},
+                                {id:6,name:"其他"}],
+            serviceTypeList:[{id:1,name:"一级产品"},{id:2,name:"二级产品"},{id:3,name:"三级产品"}],                    
             custAddrules: {
               customerName: [
                 { required: true, message: '请输入', trigger: 'blur' },
@@ -558,6 +649,7 @@
             pagesize: 8,
             total:'',
             addCustomerShow:false,
+            addCustomerRecShow1:false,
             changeStatus:false,
             recVis:false,
             concatVis:false,
@@ -570,6 +662,47 @@
           this.loadData();
         },
         methods:{
+          showAddCustomerRec(){
+            this.addCustomerRecShow1 =true;
+            this.customerRec.customerName = this.customer.customerName;
+          },
+          getBase64(file) {
+                this.customerRec.contractFileName = file.name;
+                this.$forceUpdate()
+                return new Promise((resolve, reject) => {
+                  let reader = new FileReader();
+                  let fileResult = "";
+                  reader.readAsDataURL(file);
+          　　　　　//开始转
+                  reader.onload = function() {
+                    fileResult = reader.result;
+                  };
+          　　　　　//转 失败
+                  reader.onerror = function(error) {
+                    reject(error);
+                  };
+          　　　　　//转 结束  咱就 resolve 出去
+                  reader.onloadend = function() {
+                    resolve(fileResult);
+                  };
+                });
+          },
+          httpRequest(data){　　// 没事儿就打印data看看呗　　　　//这是限制上传文件类型
+              const isPFX = data.file.type === "application/pdf";
+              const isLt2M = data.file.size / 1024 / 1024 < 2;
+
+              if (!isPFX) {
+                this.$message.error("上传文件只能是pdf格式!");
+              }else if (!isLt2M) {
+                this.$message.error("上传文件大小不能超过 2MB!");
+              }else{
+                // 转base64
+                this.getBase64(data.file).then(resBase64 => {
+                this.fileBase64 = resBase64.split(',')[1]　　//直接拿到base64信息
+                 this.customerRec.base64Str = resBase64.split(',')[1];
+                })
+                this.$message.success('文件上传成功');
+          }},
           addCustomer(formName){
                 this.$refs[formName].validate(async (valid) => {
                 if(valid) {
@@ -656,7 +789,32 @@
               this.customerRec = response.data.data;
             }
           },
+          stopUse(recoder){
+                  this.$confirm('此操作将任务状态改为删除状态, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                         type: 'warning'
+                   }).then(async () => {
+                       const response = await this.$http.post("customer/customeRecStop", {"customerName":recoder.customerName,"companyName":recoder.companyName});
+                       if (response.data.code === 0) {
+                            this.$message({
+                                type: 'success',
+                                 message: '停用成功'
+                             });
+                             recoder.recStatus=4;
+                        }else{
+                          this.$message({
+                              type: 'error',
+                              message: '停用失败：'+response.data.msg
+                          });
+                        }
+                   }).catch(() => {
+                      //几点取消的提示
+                   }); 
+            
+          },
            async recInfoList(recoder){
+             this.customer.customerName =recoder.customerName;
             const response = await this.$http.post(`lowerService/customeRecQueryList`, {"customerName":recoder.customerName});
             if (response.data.code === 0) {
               this.customeRecQueryListTable = response.data.data;
@@ -685,10 +843,28 @@
           custRecClose() {
             this.recVis = false,
             this.concatVis = false,
-            customerRec = {};
+            this.addCustomerRecShow1 =false;
+            this.customerRec = {};
+          },
+          async customerRecAdd(){
+             const response = await this.$http.post(`customer/customerRecAdd`, this.customerRec);
+                  if(response.data.code === 0) {
+                    this.loadData();
+                    this.addCustomerRecShow1 = false;
+                    this.$message({
+                      type: 'success',
+                      message: '保存成功'
+                    });
+                  }else {
+                    this.$message({
+                      type: 'error',
+                      message: '保存失败：'+response.data.msg
+                    });
+                  }
           },
           async customerRecConform(){
              const response = await this.$http.post(`customer/customeRec`, this.customerRec);
+             debugger
                   if(response.data.code === 0) {
                     this.loadData();
                     this.changeStatus = false;
@@ -703,6 +879,27 @@
                     });
                   }
           },
+          async contractAdd(){
+             const response = await this.$http.post(`customer/contractAdd`, this.customerRec);
+                  if(response.data.code === 0) {
+                    this.loadData();
+                    this.changeStatus = false;
+                    this.$message({
+                      type: 'success',
+                      message: '协议上传成功'
+                    });
+                  }else {
+                    this.$message({
+                      type: 'error',
+                      message: '协议上传失败：'+response.data.msg
+                    });
+                  }
+          },
+          contractDownload(){
+            const BASEURL = "http://127.0.0.1:18080/"
+            const token = sessionStorage.getItem('token');
+            window.open(BASEURL+'customer/contractDownload?customerRecId='+this.customerRec['id']+'&token='+token);
+          },
           // 列表展示
           async loadData() {
             const formData = new FormData();

src/views/customer/custRecTime.vue

@@ -0,0 +1,174 @@
+<template>
+    <div class="custRecTime_container">
+      <div class="title">
+        <el-row>
+          <el-col :span="24">
+            <div class="top">
+               <el-input  placeholder="客户名称" class="input-demo" v-model="formCondition.customName"></el-input>
+               <el-input  placeholder="到期日" class="input-demo" v-model="formCondition.endTime"></el-input>
+               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <!-- 表格部分 -->
+        <template>
+        <el-table
+          v-loading="loading"
+          ref="multipleTable"
+          :data="customeRecTimeListTable"
+           height="370px"
+          border
+          tooltip-effect="dark">
+          <el-table-column
+            label="客户名称"
+            prop="customerName"
+            show-overflow-tooltip>
+          </el-table-column>
+           <!-- <el-table-column
+            prop="companyLeader"
+            label="公司负责人"
+            show-overflow-tooltip>
+          </el-table-column> -->
+          <el-table-column
+            prop="companyName"
+            label="公司名称"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="recStatus"
+            label="备案状态"
+            show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.recStatus == 0">备案中</span>
+              <span v-else-if="scope.row.recStatus == 1" style="color: green">备案成功</span>
+              <span v-else-if="scope.row.recStatus == 2" style="color: red">备案失败</span>
+              <span v-else-if="scope.row.recStatus == 3" style="color: red">等待协议上传</span>
+              <span v-else-if="scope.row.recStatus == 4" style="color: red">手工停用</span>
+            </template>
+          </el-table-column>
+           <el-table-column
+            prop="serviceStartTime"
+            label="服务开始时间"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="serviceEndTime"
+            label="服务结束时间"
+            show-overflow-tooltip>
+          </el-table-column>
+        </el-table>
+      </template> 
+      <!-- 分页 -->
+      <div class="block">
+        <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="current"
+        :page-sizes="[6, 8, 10]"
+        :page-size="pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+        </el-pagination>
+      </div>
+    </div>
+</template>
+<script type="text/javascript">
+      export default {
+        data(){
+          return{
+            formCondition:{
+              companyName:'',
+              endTime:''
+            },
+            customeRecTimeListTable:[],
+            current: 1,
+            pagesize: 8,
+            total:''
+          }
+        },
+        created() {
+          this.loadData();
+        },
+        methods:{
+          // 列表展示
+          async loadData() {
+            const formData = new FormData();
+            formData.append('current', this.current);
+            formData.append('size', this.pagesize);
+
+            const response = await this.$http.post(`customer/findCustomerRecList`, formData);
+            if (response.data.code === 0) {
+              this.customeRecTimeListTable = response.data.data.records;
+              this.total = response.data.data.total;
+            }
+          },
+          // 分页方法
+          handleSizeChange(val) {
+            this.pagesize = val;
+            this.loadData();
+            console.log(`每页 ${val} 条`);
+          },
+          handleCurrentChange(val) {
+            this.current = val;
+              this.loadData();
+            // console.log(`当前页: ${val}`);
+          }
+        }
+      };
+</script>
+<style>
+.custRecTime_container {
+  border: 1px solid #d9d9d9;
+  border-radius: 10px;
+}
+.custRecTime_container .title {
+  font-size: 5px;
+  margin-bottom: 20px;
+}
+.custRecTime_container .top {
+  padding-top: 20px;
+  padding-left: 20px;
+}
+.custRecTime_container .text {
+  display: inline-block;
+  color: #000;
+  font-size: 16px ;
+  margin-left: 1%;
+}
+.custRecTime_container .input-demo {
+  display: inline-block;
+  width: 20%;
+  margin-left: 1%;
+}
+.custRecTime_container .block {
+  font-size: 5px;
+  text-align: center;
+  margin-top: 25px;
+  margin-bottom: 25px;
+}
+.custRecTime_container .el-dialog {
+  width: 60%;
+}
+.custRecTime_container .el-dialog__header, .el-dialog__body {
+  padding: 0 20px;
+}
+.custRecTime_container .tou {
+  font-size: 20px;
+  height: 30px;
+  line-height: 30px;
+  padding-top: 15px;
+}
+.custRecTime_container .line {
+  margin-top: 15px;
+  margin-bottom: 15px;
+  width: 100%;
+  height: 2px;
+  background-color: #d9d9d9;
+}
+.custRecTime_container .xinxi {
+  text-align: center;
+  margin: 15px auto;
+  font-size: 18px;
+}
+</style>

src/views/customer/customerRecharge.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="customerRecharge_container">
+      <div class="title">
+        <el-row>
+          <el-col :span="24">
+            <div class="top">
+               <el-input  placeholder="用户" class="input-demo" v-model="formCondition.customName"></el-input>
+               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <!-- 表格部分 -->
+        <template>
+        <el-table
+          v-loading="loading"
+          ref="multipleTable"
+          :data="customerRechargeList"
+           height="370px"
+          border
+          tooltip-effect="dark">
+          <el-table-column
+            label="客户名称"
+            prop="customerName"
+            show-overflow-tooltip>
+          </el-table-column>
+           <el-table-column
+            prop="rechargeMony"
+            label="金额"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="rechargeTime"
+            label="日期"
+            show-overflow-tooltip>
+          </el-table-column>
+        </el-table>
+      </template> 
+      <!-- 分页 -->
+      <div class="block">
+        <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="current"
+        :page-sizes="[6, 8, 10]"
+        :page-size="pagesize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total">
+        </el-pagination>
+      </div>
+    </div>
+</template>
+<script type="text/javascript">
+      export default {
+        data(){
+          return{
+            formCondition:{
+              companyName:'',
+            },
+            customerRechargeList:[],
+            current: 1,
+            pagesize: 8,
+            total:''
+          }
+        },
+        created() {
+          this.loadData();
+        },
+        methods:{
+          // 列表展示
+          async loadData() {
+            const formData = new FormData();
+            formData.append('current', this.current);
+            formData.append('size', this.pagesize);
+
+            const response = await this.$http.post(`customer/findCustomerRecharge`, formData);
+            if (response.data.code === 0) {
+              this.customerRechargeList = response.data.data.records;
+              this.total = response.data.data.total;
+            }
+          },
+          // 分页方法
+          handleSizeChange(val) {
+            this.pagesize = val;
+            this.loadData();
+            console.log(`每页 ${val} 条`);
+          },
+          handleCurrentChange(val) {
+            this.current = val;
+              this.loadData();
+            // console.log(`当前页: ${val}`);
+          }
+        }
+      };
+</script>
+<style>
+.customerRecharge_container {
+  border: 1px solid #d9d9d9;
+  border-radius: 10px;
+}
+.customerRecharge_container .title {
+  font-size: 5px;
+  margin-bottom: 20px;
+}
+.customerRecharge_container .top {
+  padding-top: 20px;
+  padding-left: 20px;
+}
+.customerRecharge_container .text {
+  display: inline-block;
+  color: #000;
+  font-size: 16px ;
+  margin-left: 1%;
+}
+.customerRecharge_container .input-demo {
+  display: inline-block;
+  width: 20%;
+  margin-left: 1%;
+}
+.customerRecharge_container .block {
+  font-size: 5px;
+  text-align: center;
+  margin-top: 25px;
+  margin-bottom: 25px;
+}
+.customerRecharge_container .el-dialog {
+  width: 60%;
+}
+.customerRecharge_container .el-dialog__header, .el-dialog__body {
+  padding: 0 20px;
+}
+.customerRecharge_container .tou {
+  font-size: 20px;
+  height: 30px;
+  line-height: 30px;
+  padding-top: 15px;
+}
+.customerRecharge_container .line {
+  margin-top: 15px;
+  margin-bottom: 15px;
+  width: 100%;
+  height: 2px;
+  background-color: #d9d9d9;
+}
+.customerRecharge_container .xinxi {
+  text-align: center;
+  margin: 15px auto;
+  font-size: 18px;
+}
+</style>

src/views/noCar/billway.vue

@@ -4,11 +4,12 @@
         <el-row>
           <el-col :span="24">
             <div class="top">
-               <el-input  placeholder="企业" class="input-demo" v-model="formCondition.companyName"></el-input>
-                <el-select v-model="formCondition.historyFlag" placeholder="请选择类型">
+               <el-input  placeholder="企业" class="input-demo" v-model="noCarWayBill.companyName"></el-input>
+                <el-select v-model="noCarWayBill.historyFlag" placeholder="请选择类型">
                       <el-option v-for="item in optionone" :key="item.value" :label="item.label" :value="item.value"/>
                 </el-select>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+               <el-button type="success" style="margin-left: 1%;">重新(待实现)</el-button>
             </div>
           </el-col>
         </el-row>
@@ -43,11 +44,6 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="plateColor"
-            label="车辆颜色"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
             prop="startTime"
             label="运单开始时间"
             width="120"
@@ -87,12 +83,12 @@
             label="运单状态"
             show-overflow-tooltip>
              <template slot-scope="scope">
-              <span v-if="scope.row.recStatus == 1" style="color: green">开票中</span>
-              <span v-else-if="scope.row.recStatus == -2" style="color: red">运单超时</span>
-              <span v-else-if="scope.row.recStatus == -1" style="color: red">指令开始</span>
-              <span v-else-if="scope.row.recStatus == 0" style="color: red">指令结束</span>
-              <span v-else-if="scope.row.recStatus == 3" style="color: red">开票完成</span>
-              <span v-else-if="scope.row.recStatus == 2" style="color: red">作废</span>
+              <span v-if="scope.row.billwayStatus == 1" style="color: green">开票中</span>
+              <span v-else-if="scope.row.billwayStatus == -2" style="color: red">运单超时</span>
+              <span v-else-if="scope.row.billwayStatus == -1" style="color: green">指令开始</span>
+              <span v-else-if="scope.row.billwayStatus == 0" style="color: green">指令结束</span>
+              <span v-else-if="scope.row.billwayStatus == 3" style="color: green">开票完成</span>
+              <span v-else-if="scope.row.billwayStatus == 2" style="color: red">作废</span>
             </template>
           </el-table-column>
         </el-table>
@@ -115,7 +111,7 @@
       export default {
         data(){
           return{
-            formCondition:{
+            noCarWayBill:{
               companyName:'',
               historyFlag:0
             },
@@ -141,7 +137,7 @@
             const formData = new FormData();
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
-
+            formData.append('hisFlag',this.noCarWayBill.historyFlag);
             const response = await this.$http.post(`noCar/findBillWay`, formData);
             if (response.data.code === 0) {
               this.billWayTable = response.data.data.records;

src/views/noCar/billwayException.vue

@@ -9,6 +9,7 @@
                       <el-option v-for="item in optionone" :key="item.value" :label="item.label" :value="item.value"/>
                 </el-select>
                <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+              
             </div>
           </el-col>
         </el-row>
@@ -43,11 +44,6 @@
             show-overflow-tooltip>
           </el-table-column>
           <el-table-column
-            prop="plateColor"
-            label="车辆颜色"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column
             prop="startTime"
             label="运单开始时间"
             width="120"
@@ -142,7 +138,7 @@
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
 
-            const response = await this.$http.post(`noCar/findBillWay`, formData);
+            const response = await this.$http.post(`noCar/findBillWayException`, formData);
             if (response.data.code === 0) {
               this.billWayTable = response.data.data.records;
               this.total = response.data.data.total;

src/views/noCar/hcInvoice.vue

@@ -0,0 +1,170 @@
+<template>
+    <div class="invoice_container">
+      <div class="title">
+        <el-row>
+          <el-col :span="24">
+            <div class="top">
+              <el-input  placeholder="客户" class="input-demo" v-model="formCondition.customerName"></el-input>
+              <el-input  placeholder="企业" class="input-demo" v-model="formCondition.companyName"></el-input>
+              <el-input  placeholder="月份 2021-07" class="input-demo" v-model="formCondition.month"></el-input>
+               <el-button type="success" style="margin-left: 1%;" @click="loadData">查询</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <!-- 表格部分 -->
+        <template>
+        <el-table
+          v-loading="loading"
+          ref="multipleTable"
+          :data="invoiceTable"
+           height="370px"
+          border
+          tooltip-effect="dark">
+          <el-table-column
+            prop="sellerName"
+            label="销方名称"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="sellerTaxpayerCode"
+            label="销方税号"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="buyerName"
+            label="购方名称"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="buyerTaxpayerCode"
+            label="购方税号"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="amount"
+            label="金额"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="rawInvoiceId"
+            label="原票id"
+             width="120"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="rawInvoiceCode"
+            label="原票发票代码"
+             width="140"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="rawInvoiceNum"
+            label="原票发票号码"
+            show-overflow-tooltip>
+          </el-table-column>
+        </el-table>
+      </template> 
+    </div>
+</template>
+<script type="text/javascript">
+      export default {
+        data(){
+          return{
+            formCondition:{
+              companyName:'',
+              customerName:'',
+              month:''
+            },
+           invoiceTable:[],
+          }
+        },
+        created() {
+          
+        },
+        methods:{
+          // 列表展示
+          async loadData() {
+            const formData = new FormData();
+            formData.append('current', this.current);
+            formData.append('size', this.pagesize);
+
+            const response = await this.$http.post('noCarService/hCVoiceQuery', this.formCondition);
+            if (response.data.code === 0) {
+              this.invoiceTable = response.data.data.records;
+            }else{
+              this.$message({
+                              type: 'error',
+                              message: ''+response.data.msg
+                          });
+            }
+          },
+          // 分页方法
+          handleSizeChange(val) {
+            this.pagesize = val;
+            this.loadData();
+            console.log(`每页 ${val} 条`);
+          },
+          handleCurrentChange(val) {
+            this.current = val;
+              this.loadData();
+            // console.log(`当前页: ${val}`);
+          }
+        }
+      };
+</script>
+<style>
+.invoice_container {
+  border: 1px solid #d9d9d9;
+  border-radius: 10px;
+}
+.invoice_container .title {
+  font-size: 5px;
+  margin-bottom: 20px;
+}
+.invoice_container .top {
+  padding-top: 20px;
+  padding-left: 20px;
+}
+.invoice_container .text {
+  display: inline-block;
+  color: #000;
+  font-size: 16px ;
+  margin-left: 1%;
+}
+.invoice_container .input-demo {
+  display: inline-block;
+  width: 20%;
+  margin-left: 1%;
+}
+.invoice_container .block {
+  font-size: 5px;
+  text-align: center;
+  margin-top: 25px;
+  margin-bottom: 25px;
+}
+.invoice_container .el-dialog {
+  width: 60%;
+}
+.invoice_container .el-dialog__header, .el-dialog__body {
+  padding: 0 20px;
+}
+.invoice_container .tou {
+  font-size: 20px;
+  height: 30px;
+  line-height: 30px;
+  padding-top: 15px;
+}
+.invoice_container .line {
+  margin-top: 15px;
+  margin-bottom: 15px;
+  width: 100%;
+  height: 2px;
+  background-color: #d9d9d9;
+}
+.invoice_container .xinxi {
+  text-align: center;
+  margin: 15px auto;
+  font-size: 18px;
+}
+</style>

src/views/noCar/invoice.vue

@@ -162,7 +162,7 @@
             formData.append('current', this.current);
             formData.append('size', this.pagesize);
 
-            const response = await this.$http.post('selfCar/findSelfCarInvoices', formData);
+            const response = await this.$http.post('noCar/findNocarInvoices', formData);
             if (response.data.code === 0) {
               this.invoiceTable = response.data.data.records;
               this.total = response.data.data.total;

src/views/noCar/nocarRec.vue

@@ -49,6 +49,18 @@
             prop="carColor"
             label="车辆颜色"
             show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.carColor == 0" style="color: green">蓝色</span>
+              <span v-else-if="scope.row.carColor == 1" >黄色</span>
+              <span v-else-if="scope.row.carColor == 2" >黑色</span>
+              <span v-else-if="scope.row.carColor == 3" >白色</span>
+              <span v-else-if="scope.row.carColor == 4" >渐变绿色</span>
+              <span v-else-if="scope.row.carColor == 5" >黄绿渐变色</span>
+              <span v-else-if="scope.row.carColor == 6" >蓝白渐变色</span>
+              <span v-else-if="scope.row.carColor == 7" >未确定</span>
+              <span v-else-if="scope.row.carColor == 8" >未确定</span>
+              <span v-else-if="scope.row.carColor == 9" >未确定</span>
+            </template>
           </el-table-column>
            <el-table-column
             prop="custPhone"

src/views/selfCar/selfcarRec.vue

@@ -49,6 +49,18 @@
             prop="carColor"
             label="车辆颜色"
             show-overflow-tooltip>
+             <template slot-scope="scope">
+              <span v-if="scope.row.plateColor == 0" style="color: green">蓝色</span>
+              <span v-else-if="scope.row.plateColor == 1" >黄色</span>
+              <span v-else-if="scope.row.plateColor == 2" >黑色</span>
+              <span v-else-if="scope.row.plateColor == 3" >白色</span>
+              <span v-else-if="scope.row.plateColor == 4" >渐变绿色</span>
+              <span v-else-if="scope.row.plateColor == 5" >黄绿渐变色</span>
+              <span v-else-if="scope.row.plateColor == 6" >蓝白渐变色</span>
+              <span v-else-if="scope.row.plateColor == 7" >未确定</span>
+              <span v-else-if="scope.row.plateColor == 8" >未确定</span>
+              <span v-else-if="scope.row.plateColor == 9" >未确定</span>
+            </template>
           </el-table-column>
            <el-table-column
             prop="custPhone"

src/views/sys/user.vue

@@ -47,7 +47,7 @@
             prop="roleName"
             label="权限"
             show-overflow-tooltip>
-             <template slot-scope="scope">
+             <!-- <template slot-scope="scope">
                <el-popover
               placement="top"
               width="400"
@@ -63,7 +63,7 @@
               </el-select>
                <el-link :underline="false"  type="primary" slot="reference" @click="showRole(scope.row)"> {{scope.row.roleName}}</el-link>
              </el-popover>
-            </template>
+            </template> -->
           </el-table-column>
           <!-- <el-table-column
             prop="phone"
@@ -409,18 +409,18 @@ export default{
         this.roleList = response.data.data;
       }
     },
-    showRole(row){
-        this.tempRole=[];
-        if(row.roleId == '' || row.roleId == null){
-          return;
-        }
-        var roleids = (row.roleId+'').split(',');
-        for(var i in roleids){
-          this.tempRole.push(parseInt(roleids[i]));
-        }
+    // showRole(row){
+    //     this.tempRole=[];
+    //     if(row.roleId == '' || row.roleId == null){
+    //       return;
+    //     }
+    //     var roleids = (row.roleId+'').split(',');
+    //     for(var i in roleids){
+    //       this.tempRole.push(parseInt(roleids[i]));
+    //     }
         
       
-    },
+    // },
     async changeRole(data,row){
         row.roleId ='';
         row.roleName = '无权限';