diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index 1a1f1b2..62a2fb1 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -350,6 +350,7 @@
         </el-table>
         <!-- 分页插件 -->
         <el-pagination
+          style="margin-top: 5px"
           @size-change="sizeChangeHandle2"
           @current-change="currentChangeHandle2"
           :current-page="pageIndex2"
@@ -359,7 +360,7 @@
           layout="total, sizes, prev, pager, next, jumper">
         </el-pagination>
       </div>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:35px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="partModelFlag=false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -864,6 +865,7 @@
       </el-table>
       <!-- 分页插件 -->
       <el-pagination
+        style="margin-top: 5px"
         @size-change="sizeChangeHandle4"
         @current-change="currentChangeHandle4"
         :current-page="pageIndex4"
diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index ac32b64..f265cca 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -1,11 +1,10 @@
 <template>
   <div class="mod-config">
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-      <el-form :inline="true" label-position="top" style="margin-top: 0px">
-        <el-button type="primary" @click="addModal">新增</el-button>
-        <el-button type="primary" @click="partImportModal">料号导入</el-button>
-        <el-button type="primary" icon="el-icon-upload" @click="projectPartUpload">Excel导入</el-button>
-        <download-excel
+    <el-form label-position="top" style="margin-left: 2px;">
+      <el-button type="primary" @click="addModal">新增</el-button>
+      <el-button type="primary" @click="partImportModal">料号导入</el-button>
+      <el-button type="primary" icon="el-icon-upload" @click="projectPartUpload">Excel导入</el-button>
+      <download-excel
           :fields="fields()"
           :data="exportData"
           type="xls"
@@ -19,13 +18,12 @@
           class="el-button el-button--primary el-button--medium">
           {{ '导出' }}
         </download-excel>
-      </el-form>
     </el-form>
+
     <el-table
       :data="dataList"
       height="240"
       border
-      v-loading="dataListLoading"
       style="width: 100%; ">
       <el-table-column
         v-for="(item,index) in columnList" :key="index"
@@ -73,6 +71,18 @@
 <!--      </el-table-column>-->
     </el-table>
 
+    <!-- 分页插件 -->
+    <el-pagination
+      style="margin-top: 5px"
+      @size-change="sizeChangeHandle2"
+      @current-change="currentChangeHandle2"
+      :current-page="pageIndex2"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize2"
+      :total="totalPage2"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
     <!-- 物料新增/编辑模态框 -->
     <el-dialog :title="modalData.title" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="1000px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
@@ -509,7 +519,6 @@
         :height="300"
         :data="itemModalList"
         border
-        v-loading="dataListLoading"
         style="width: 100%;">
         <el-table-column
           v-for="(item,index) in columnDetailList" :key="index"
@@ -590,7 +599,7 @@
           <el-form-item :label="'物料名称'">
             <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
           </el-form-item>
-          <el-form-item :label="'物料状态'">
+          <el-form-item :label="'物料来源'">
             <el-select v-model="searchData.searchType" style="width: 120px">
               <el-option label="Project Part" value="Y"></el-option>
               <el-option label="Inventory Part" value="N"></el-option>
@@ -840,13 +849,17 @@ import {
           partDesc: '',
           partNos: '',
           page: 1,
-          limit: 10
+          limit: 10,
+          page2: 1,
+          limit2: 10
         },
         pageIndex: 1,
         pageSize: 20,
         totalPage: 0,
+        pageIndex2: 1,
+        pageSize2: 20,
+        totalPage2: 0,
         visible: false,
-        dataListLoading: false,
         currentRow: '',
         columnList:[
           {
@@ -938,7 +951,7 @@ import {
             columnProp: "statusDesc",
             headerAlign: "center",
             align: "center",
-            columnLabel: "物料状态",
+            columnLabel: "物料来源",
             columnHidden: false,
             columnImage: false,
             status: true,
@@ -1484,6 +1497,19 @@ import {
         this.searchTypeChange()
       },
 
+      // 子明细每页数
+      sizeChangeHandle2 (val) {
+        this.pageSize2 = val
+        this.pageIndex2 = 1
+        this.searchTable()
+      },
+
+      // 子明细当前页
+      currentChangeHandle2 (val) {
+        this.pageIndex2 = val
+        this.searchTable()
+      },
+
       // 获取用户的bu
       getBuBySite () {
         let tempData = {
@@ -1637,20 +1663,28 @@ import {
           partNo: '',
           partDesc: '',
           partNos: '',
+          page2: 1,
+          limit2: 10
         }
         //刷新表格
         this.searchTable()
       },
 
-      searchTable(){
+      searchTable () {
+        this.searchData.limit2 = this.pageSize2
+        this.searchData.page2 = this.pageIndex2
         getProjectInfoPartList(this.searchData).then(({data}) => {
           //区分请求成功和失败的状况
           if (data && data.code === 0) {
-            this.dataList = data.rows
+            // this.dataList = data.rows
+            this.dataList = data.page.list
+            this.pageIndex2 = data.page.currPage
+            this.pageSize2 = data.page.pageSize
+            this.totalPage2 = data.page.totalCount
           } else {
             this.dataList = []
           }
-        });
+        })
       },
 
       addModal () {
@@ -2092,6 +2126,7 @@ import {
         this.searchData.partNos = ''
         this.handleGetProjectPartList();
       },
+
       handleGetProjectPartList(){
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
@@ -2112,7 +2147,7 @@ import {
         let partNos = this.partList2.map(part => part.partNo)
         // 使用 join 将 partNo 连接成一个字符串
         this.searchData.partNos = partNos.join(",")
-        this.handleGetProjectPartList();
+        this.handleGetProjectPartList()
       },
 
       // 关闭后刷新列表
@@ -2415,7 +2450,6 @@ import {
               message: '刷新成功',
               type: 'success',
               duration: 1500,
-
               onClose: () => {
               }
             })
@@ -2426,16 +2460,16 @@ import {
           }
         })
       },
+
       //导出excel
       createExportData() {
-        return this.dataList;
+        return this.dataList
       },
-      startDownload() {
-        //  this.exportData = this.dataList
 
-      },
-      finishDownload() {
-      },
+      startDownload() {},
+
+      finishDownload() {},
+
       fields() {
         let json = "{"
         this.columnList.forEach((item, index) => {
@@ -2447,9 +2481,9 @@ import {
         })
         json += "}"
         let s = eval("(" + json + ")")
-
         return s
       },
+
       closeDataFromDialog(){
         this.dataForm={
           id:0,
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 497d174..20e95da 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -67,12 +67,11 @@
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                                             style="width: 100px; height: 80px"/></span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
-
     </el-table>
+
     <el-pagination
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
@@ -82,7 +81,8 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
-    <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+
+    <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
       <el-tab-pane label="项目信息" name="info">
         <el-form label-position="top" style="margin-top: 0px; margin-left: 0px;">
           <el-row :gutter="20">
@@ -2015,8 +2015,10 @@
   }
 </script>
 
-<style >
-
+<style scoped lang="scss">
+  /deep/ .customer-tab .el-tabs__content {
+    padding: 5px !important;
+  }
 
   .el-transfer-panel {
     border: 2px solid #17b3a3;
diff --git a/src/views/modules/quotation/sellForQuotation/customerInfo.vue b/src/views/modules/quotation/sellForQuotation/customerInfo.vue
index c2a587a..dfa28bb 100644
--- a/src/views/modules/quotation/sellForQuotation/customerInfo.vue
+++ b/src/views/modules/quotation/sellForQuotation/customerInfo.vue
@@ -3,94 +3,65 @@
 <!--    <el-divider content-position="left">直接客户</el-divider>-->
     <el-form  label-position="top" label-width="100px" >
       <el-row :gutter="20">
-        <el-col :span="4"><div class="grid-content bg-purple">
-          <el-form-item :label="'直接客户代码'">
-            <el-input v-model="customerData.customerNo" readonly  ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="8"><div class="grid-content bg-purple">
-          <el-form-item :label="'客户名称'">
-            <el-input v-model="customerData.customerDesc" readonly  ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple">
-          <el-form-item :label="'客户币种'">
-            <el-input v-model="customerData.customerCurrency" readonly ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple">
-          <el-form-item :label="'年营业额'">
-            <el-input v-model="customerData.turnoverOfYear" readonly  ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple">
-          <el-form-item :label="'年潜在投入'">
-            <el-input v-model="customerData.potentialRevenueOfYear" readonly  ></el-input>
-          </el-form-item>
-        </div></el-col>
+        <el-col :span="4">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'客户代码'">
+              <el-input v-model="customerData.customerNo" readonly></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'客户名称'">
+              <el-input v-model="customerData.customerDesc" readonly></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="4">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'行业'">
+              <el-input v-model="customerData.customerIndustry" readonly></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="4">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'客户分组'">
+              <el-input v-model="customerData.customerGroup" readonly></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="4">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'客户类型'">
+              <el-input v-model="customerData.customerType" readonly></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="4"><div class="grid-content bg-purple">
-          <el-form-item :label="'重要程度'">
-            <el-input v-model="customerData.importantCustomer" readonly ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="4"><div class="grid-content bg-purple">
-          <el-form-item :label="'客户状态'">
-            <el-input v-model="customerData.customerStatus" readonly ></el-input>
-          </el-form-item>
-        </div></el-col>
-        <el-col :span="16"><div class="grid-content bg-purple">
-          <el-form-item :label="'客户描述'">
-            <el-input v-model="customerData.customerDescription" readonly ></el-input>
-          </el-form-item>
-        </div></el-col>
+        <el-col :span="4">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'重要程度'">
+              <el-input v-model="customerData.importantCustomer" readonly ></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="4">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'客户状态'">
+              <el-input v-model="customerData.customerStatus" readonly ></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
+        <el-col :span="16">
+          <div class="grid-content bg-purple">
+            <el-form-item :label="'客户描述'">
+              <el-input v-model="customerData.customerDescription" readonly ></el-input>
+            </el-form-item>
+          </div>
+        </el-col>
       </el-row>
-<!--      <el-divider content-position="left">终端客户</el-divider>-->
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="4"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'终端客户代码'">-->
-<!--            <el-input v-model="finalCustomerData.customerNo" readonly  ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-<!--        <el-col :span="8"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'终端客户名称'">-->
-<!--            <el-input v-model="finalCustomerData.customerDesc" readonly  ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-<!--        <el-col :span="4"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'客户币种'">-->
-<!--            <el-input v-model="finalCustomerData.customerCurrency" readonly ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-<!--        <el-col :span="4"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'年营业额'">-->
-<!--            <el-input v-model="finalCustomerData.turnoverOfYear" readonly  ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-<!--        <el-col :span="4"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'年潜在投入'">-->
-<!--            <el-input v-model="finalCustomerData.potentialRevenueOfYear" readonly  ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-<!--      </el-row>-->
-<!--      <el-row :gutter="20">-->
-<!--        <el-col :span="4"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'重要程度'">-->
-<!--            <el-input v-model="finalCustomerData.importantCustomer" readonly ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-<!--        <el-col :span="4"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'客户状态'">-->
-<!--            <el-input v-model="finalCustomerData.customerStatus" readonly ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-<!--        <el-col :span="16"><div class="grid-content bg-purple">-->
-<!--          <el-form-item :label="'客户描述'">-->
-<!--            <el-input v-model="finalCustomerData.customerDescription" readonly ></el-input>-->
-<!--          </el-form-item>-->
-<!--        </div></el-col>-->
-<!--      </el-row>-->
     </el-form>
   </div>
 </template>