修改

dsk-operate-ui/src/assets/styles/index.scss

@@ -231,7 +231,7 @@ li {
 }
 .app-container {
   width: 100%;
-  padding: 16px 24px;
+  padding: 16px 24px !important;
   background-color: #f5f5f5;
   box-sizing: border-box;
   .el-input__inner {

dsk-operate-ui/src/assets/styles/project.scss

@@ -5,7 +5,7 @@
 .miantitle{
   color: #232323;
   font-size: 12px;
-  margin: 12px 24px;
+  margin: 12px 0;
   >span{
     opacity: 0.4;
     &:last-child{opacity:0.8}

dsk-operate-ui/src/views/custom/customList/index.vue

 <template>
-  <div  @click = 'handleALL'>
+  <div  @click = 'handleALL' class="app-container">
     <div class="miantitle">
       <span>客户管理</span>
       <span> / 客户列表</span>
     </div>
-    <div class="app-container">
+    <div>
       <el-card class="box-card noborder min1370">
         <div class="tables ">
           <div class="empty" v-if="tableData.total==0 && !isSkeleton">

dsk-operate-ui/src/views/custom/historicalCustomers/index.vue

 <template>
-  <div  @click = 'handleALL'>
-    <div class="app-container">
-      <el-card class="box-card noborder">
-        <div class="tables">
-          <div class="empty" v-if="tableData.total==0&& !isSkeleton">
-            <img src="@/assets/images/project/empty.png">
-            <div class="p1">抱歉，没找到相关数据</div>
-            <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+  <div class="app-container" @click = 'handleALL'>
+    <el-card class="box-card noborder">
+      <div class="tables">
+        <div class="empty" v-if="tableData.total==0&& !isSkeleton">
+          <img src="@/assets/images/project/empty.png">
+          <div class="p1">抱歉，没找到相关数据</div>
+          <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+        </div>
+        <div class="table_search">
+          <div class="newSearch">
+            <el-input type="text" v-model="searchParam.companyName" clearable placeholder="输入企业名称查询"  @change="clearname" >
+              <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" width="16px" @click="handleCurrentChange(1)"></i>
+            </el-input>
           </div>
-          <div class="table_search">
-            <div class="newSearch">
-              <el-input type="text" v-model="searchParam.companyName" clearable placeholder="输入企业名称查询"  @change="clearname" >
-                <i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" width="16px" @click="handleCurrentChange(1)"></i>
-              </el-input>
-            </div>
-            <div class="dc">
-              <div class="total">共{{tableData.total}}条</div>
-            </div>
+          <div class="dc">
+            <div class="total">共{{tableData.total}}条</div>
           </div>
-          <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="tableData.total > 10 ? 'hover' : 'false'" max-height="640"
-            :data="tableData.rows"
-            stripe border
-            style="width: 100%">
-            <el-table-column
-              prop="index"
-              label="序号"
-              fixed="left"
-              width="60">
-              <template slot-scope='scope'>
-                <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="date"
-              label="企业名称"
-              fixed="left"
-              width="316">
+        </div>
+        <skeleton v-if="isSkeleton"></skeleton>
+        <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="tableData.total > 10 ? 'hover' : 'false'" max-height="640"
+                  :data="tableData.rows"
+                  stripe border
+                  style="width: 100%">
+          <el-table-column
+            prop="index"
+            label="序号"
+            fixed="left"
+            width="60">
+            <template slot-scope='scope'>
+              <span>{{ (searchParam.pageNum - 1) * searchParam.pageSize + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="企业名称"
+            fixed="left"
+            width="316">
             <template slot-scope="scope">
               <div class="ps1">
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'business')" v-html="scope.row.companyName"></div>
@@ -48,159 +47,158 @@
               </div>
             </template>
 
-            </el-table-column>
-            <el-table-column
-              prop="cooperationProject"
-              label="合作项目"
-              width="90">
-              <template slot-scope="scope">
-                {{scope.row.cooperationProject || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="followProject"
-              label="跟进项目"
-              width="90">
-              <template slot-scope="scope">
-                {{scope.row.followProject || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="reserveProject"
-              label="储备项目"
-              width="90">
-              <template slot-scope="scope">
-                {{scope.row.reserveProject || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="legalPerson"
-              label="法定代表人"
-              width="110">
-              <template slot-scope="scope">
-                {{scope.row.legalPerson || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="registerAddress"
-              label="注册地区"
-              width="160">
-              <template slot-scope="scope">
-                {{scope.row.registerAddress || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="registerCapitalStr"
-              label="注册资本金（万元）"
-              width="160">
-              <template slot-scope="scope">
-                <span v-if="scope.row.registerCapital && scope.row.registerCapital>0">{{scope.row.registerCapital}}</span><span v-else>--</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="creditLevel"
-              label="企业主体评级" width="100">
-              <template slot-scope="scope">
-                {{scope.row.creditLevel || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="isOn"
-              label="上市公司" width="76">
-              <template slot-scope="scope">
-                {{scope.row.isOn == 1?"是":"否"}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="isMajor"
-              label="局级大客户" width="88">
-              <template slot-scope="scope">
+          </el-table-column>
+          <el-table-column
+            prop="cooperationProject"
+            label="合作项目"
+            width="90">
+            <template slot-scope="scope">
+              {{scope.row.cooperationProject || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="followProject"
+            label="跟进项目"
+            width="90">
+            <template slot-scope="scope">
+              {{scope.row.followProject || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="reserveProject"
+            label="储备项目"
+            width="90">
+            <template slot-scope="scope">
+              {{scope.row.reserveProject || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="legalPerson"
+            label="法定代表人"
+            width="110">
+            <template slot-scope="scope">
+              {{scope.row.legalPerson || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="registerAddress"
+            label="注册地区"
+            width="160">
+            <template slot-scope="scope">
+              {{scope.row.registerAddress || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="registerCapitalStr"
+            label="注册资本金（万元）"
+            width="160">
+            <template slot-scope="scope">
+              <span v-if="scope.row.registerCapital && scope.row.registerCapital>0">{{scope.row.registerCapital}}</span><span v-else>--</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="creditLevel"
+            label="企业主体评级" width="100">
+            <template slot-scope="scope">
+              {{scope.row.creditLevel || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="isOn"
+            label="上市公司" width="76">
+            <template slot-scope="scope">
+              {{scope.row.isOn == 1?"是":"否"}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="isMajor"
+            label="局级大客户" width="88">
+            <template slot-scope="scope">
                 <span v-if="scope.row.isMajor != null">
                 {{scope.row.isMajor == 1?"是":"否"}}
                 </span>
-                <span v-else>--</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="customerLevel"
-              label="客户等级" width="76">
-              <template slot-scope="scope">
-                {{scope.row.customerLevel || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="companyNature"
-              label="客户性质" width="76">
-              <template slot-scope="scope">
-                {{scope.row.companyNature || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="companyLevel"
-              label="客户级别" width="76">
-              <template slot-scope="scope">
-                {{scope.row.companyLevel || '--'}}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="address"
-              label="企业母公司" width="268">
-              <template slot-scope="scope">
-                <div class="">{{scope.row.superCompany || '--'}}</div>
-              </template>
-            </el-table-column>
-            <el-table-column :key="keys"
-              prop="mainBusiness"
-              label="主营业务" width="400">
-              <template slot-scope="scope">
-                <div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div>
-                <div v-if="scope.row.mainBusiness1">
-                  <div class="box"  v-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div>
-                  <div class="box"  v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div>
-                </div>
-                <div v-else>{{scope.row.mainBusiness}}</div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="companyAttribute" :key="keys+2"
-              label="发包属性" width="400">
-              <template slot-scope="scope">
-                <div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div>
-                <div v-if="scope.row.companyAttribute1">
-                  <div class="box"  v-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div>
-                  <div class="box"  v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div>
-                </div>
-                <div v-else>{{scope.row.companyAttribute}}</div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="followUser"
-              label="跟进人" width="110">
-              <template slot-scope="scope">
-                {{scope.row.followUser || '--'}}
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="bottems" v-if="tableData.total>searchParam.pageSize">
-            <el-pagination
-              background
-              :page-size="searchParam.pageSize"
-              :current-page="searchParam.pageNum"
-              @current-change="handleCurrentChange"
-              layout="prev, pager, next"
-              :total="tableData.total">
-            </el-pagination>
-          </div>
-          <div class="delform" v-if="RLcompanyName">
-            <div class="words">再次认领将会恢复默认客户数据</div>
-            <div>
-              <div class="btnsmall btn_primary h28" @click="RL">确定</div>
-              <div class="btnsmall btn_cancel h28" @click="RLcompanyName = ''">取消</div>
-            </div>
+              <span v-else>--</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="customerLevel"
+            label="客户等级" width="76">
+            <template slot-scope="scope">
+              {{scope.row.customerLevel || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="companyNature"
+            label="客户性质" width="76">
+            <template slot-scope="scope">
+              {{scope.row.companyNature || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="companyLevel"
+            label="客户级别" width="76">
+            <template slot-scope="scope">
+              {{scope.row.companyLevel || '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="企业母公司" width="268">
+            <template slot-scope="scope">
+              <div class="">{{scope.row.superCompany || '--'}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column :key="keys"
+                           prop="mainBusiness"
+                           label="主营业务" width="400">
+            <template slot-scope="scope">
+              <div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div>
+              <div v-if="scope.row.mainBusiness1">
+                <div class="box"  v-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div>
+                <div class="box"  v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div>
+              </div>
+              <div v-else>{{scope.row.mainBusiness}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="companyAttribute" :key="keys+2"
+            label="发包属性" width="400">
+            <template slot-scope="scope">
+              <div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div>
+              <div v-if="scope.row.companyAttribute1">
+                <div class="box"  v-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div>
+                <div class="box"  v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div>
+              </div>
+              <div v-else>{{scope.row.companyAttribute}}</div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="followUser"
+            label="跟进人" width="110">
+            <template slot-scope="scope">
+              {{scope.row.followUser || '--'}}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="bottems" v-if="tableData.total>searchParam.pageSize">
+          <el-pagination
+            background
+            :page-size="searchParam.pageSize"
+            :current-page="searchParam.pageNum"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="tableData.total">
+          </el-pagination>
+        </div>
+        <div class="delform" v-if="RLcompanyName">
+          <div class="words">再次认领将会恢复默认客户数据</div>
+          <div>
+            <div class="btnsmall btn_primary h28" @click="RL">确定</div>
+            <div class="btnsmall btn_cancel h28" @click="RLcompanyName = ''">取消</div>
           </div>
         </div>
-      </el-card>
-    </div>
+      </div>
+    </el-card>
   </div>
 </template>
 

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -223,10 +223,10 @@ export default {
         page:this.pageIndex,
       }
       if(this.queryParams.field){
-        params.field=this.queryParams.field
+        params.page.field=this.queryParams.field
       }
       if(this.queryParams.order){
-        params.order=this.queryParams.order
+        params.page.order=this.queryParams.order
       }
       params.aptitudeQueryDto={
         filePlaceType:this.activeName === 'first' ? 3 : 2,