我的客户，公海客户调整

src/Form/publicCustomer/add.vue

@@ -142,6 +142,181 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
+            <el-col :span="24">
+              <el-form-item label="联系人:"  prop="contactsinfo.name">
+                <el-popover
+                    placement="bottom-start"
+                    width="900"
+                    v-model="enterpriseContact.show"
+                    trigger="click">
+                  <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
+                    <el-tab-pane label="企业联系人" name="first" >
+                      <el-table
+                          border
+                          height="500px"
+                          :data="enterpriseContact.listData"
+                          @row-click="enterpriseContactSelect"
+                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+                          size="mini">
+                        <el-table-column width="80" label="姓名">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.name?scope.row.name:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="手机号">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="邮箱">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.email?scope.row.email:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="部门">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.position?scope.row.position:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="职位">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.depname?scope.row.depname:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="80"  label="性别">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.sex?scope.row.sex:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="生日">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.birthday?scope.row.birthday:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="300"  label="家庭住址">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="备注">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.remarks?scope.row.remarks:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+                        <div class="container normal-panel" style="text-align:right">
+                          <el-pagination
+                              background
+                              @size-change="handleSizeChangeEnterprise"
+                              @current-change="handleCurrentChangeEnterprise"
+                              :current-page="enterpriseContact.currentPage"
+                              :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
+                              layout="total,sizes, prev, pager, next, jumper"
+                              :total="enterpriseContact.total">
+                          </el-pagination>
+                        </div>
+                        <slot name="footerLeft"></slot>
+                      </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="我的联系人" name="second">
+                      <el-table
+                          border
+                          :data="myContacts.listData"
+                          height="500px"
+                          @row-click="myContactSelect"
+                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+                          size="mini">
+                        <el-table-column width="80" label="姓名">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.name?scope.row.name:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="手机号">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="邮箱">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.email?scope.row.email:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="部门">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.position?scope.row.position:'--' }}</span>
+                          </template>
+                        </el-table-column><el-table-column width="120"  label="职位">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.depname?scope.row.depname:'--' }}</span>
+                        </template>
+                      </el-table-column><el-table-column width="80"  label="性别">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.sex?scope.row.sex:'--' }}</span>
+                        </template>
+                      </el-table-column><el-table-column width="120"  label="生日">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.birthday?scope.row.birthday:'--' }}</span>
+                        </template>
+                      </el-table-column>
+                        <el-table-column width="300"  label="家庭住址">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="备注">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.remarks?scope.row.remarks:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+                        <div class="container normal-panel" style="text-align:right">
+                          <el-pagination
+                              background
+                              @size-change="handleSizeChangeMy"
+                              @current-change="handleCurrentChangeMy"
+                              :current-page="myContacts.currentPage"
+                              :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
+                              layout="total,sizes, prev, pager, next, jumper"
+                              :total="myContacts.total">
+                          </el-pagination>
+                        </div>
+                        <slot name="footerLeft"></slot>
+                      </div>
+                    </el-tab-pane>
+                  </el-tabs>
+                  <el-input  slot="reference"  autosize v-model="form.contactsinfo.name" placeholder="请输入联系人姓名" @input="searchData"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="24" v-if="isPhone">
+              <el-form-item label="联系方式:" prop="contactsinfo.phonenumber">
+                <el-button-group>
+                  <!--                  <el-button type="primary" size="mini" @click="phoneChang('手机')">手机号</el-button>
+                                    <el-button type="" size="mini" @click="phoneChang('座机')">座机电话</el-button>-->
+                  <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
+                  <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
+                </el-button-group>
+                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="!isPhone">
+              <el-form-item label="联系方式:" prop="contactsinfo.telephone">
+                <el-button-group>
+                  <!--                  <el-button type="" size="mini" @click="phoneChang('手机')">手机号</el-button>
+                                    <el-button type="primary" size="mini" @click="phoneChang('座机')">座机电话</el-button>-->
+                  <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
+                  <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
+                </el-button-group>
+                <el-input v-model="form.contactsinfo.telephone" placeholder="请输入座机电话" style="width: 100%;margin-top: 10px" ></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-col :span="24">
               <el-form-item label="税号:" prop="taxno">
                 <el-input v-model="form.taxno" placeholder="税号"></el-input>
@@ -267,6 +442,7 @@ export default {
   components:{duplicateCheck},
   data(){
     return {
+      activeName:'first',
       dialogFormVisible:false,
       isordercheck:true,
       isusedcheck:false,
@@ -314,7 +490,12 @@ export default {
         ispublic:1,
         telephone: "",
         sa_agentsid: "",
-        erpagentnum:""
+        erpagentnum:"",
+        contactsinfo: {
+          name: "",
+          telephone: "",
+          phonenumber: ""
+        },
       },
       value:'',
       rules:{
@@ -331,15 +512,26 @@ export default {
           { required: true, message: '请选择公海池', trigger: 'change'}
         ],
         contact: [
-          { required: true, message: '请输入法人', trigger: 'change' },
+          { required: false, message: '请输入法人', trigger: 'change' },
         ],
         telephone: [
-          { required: true, message: '请输入联系电话', trigger: 'change' },
+          { required: false, message: '请输入联系电话', trigger: 'change' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
         ],
         province: [
           { required: true, message: '请选择省市县', trigger: 'change' },
         ],
+        'contactsinfo.name':[
+          { required: true, message: '请输入联系人姓名', trigger: 'change,blur' }
+        ],
+        'contactsinfo.phonenumber': [
+          { required: true, message: '请输入联系电话', trigger: 'change' },
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
+        ],
+        'contactsinfo.telephone': [
+          { required: true, message: '请输入座机电话', trigger: 'change' },
+          { pattern:/^0\d{2,3}-\d{7,8}$/, message: '请输入正确座机电话',trigger: 'change' }
+        ],
       },
       customerParam:{
         "id": 20220920083901,
@@ -358,6 +550,42 @@ export default {
         total:0,
         currentPage:0,
       },
+      isPhone:true,
+      enterpriseContact:{
+        param:{
+          "content": {
+            "sys_enterpriseid": '',
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+          },
+          "id": 20221219193002,
+        },
+        listData:[],
+        total:0,
+        currentPage:0,
+        show:false
+      },
+      myContacts:{
+        param:{
+          "id": 20221219161202,
+          "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "ownertable":'sa_customers',
+            "ownerid":'',
+            "where": {
+              "condition": ""
+            }
+          }
+        },
+        listData:[],
+        total:0,
+        currentPage:0,
+        show:false
+      },
     }
   },
   computed:{
@@ -372,6 +600,7 @@ export default {
       this.queryCustomerGrade()
       this.getSysOption()
       this.getPublicList()
+      this.enterpriseContactList()
     },
     /*工商查询*/
     async businessSearch(){
@@ -542,7 +771,7 @@ export default {
     },
     onClose(){
       this.$refs['form'].resetFields();
-      this.form = {
+      /*this.form = {
         "sa_customersid": 0,//新增是传0
         "parentid": 0, //上级客户ID,默认或没有上级的时候传0
         "sys_enterpriseid": 0, //合作企业档案ID，新增是传0，更新
@@ -560,7 +789,7 @@ export default {
         "industry":"",//非必填，可选，所属行业
         "contact":"",//非必填，可选
         "phonenumber":""//非必填，可选
-      }
+      }*/
       this.dialogFormVisible = false
       this.checkResults = ''
       this.value = ''
@@ -678,6 +907,93 @@ export default {
       })
       this.publicList = res.data
     },
+    phoneChang(val){
+      if (val === '座机'){
+        this.isPhone = false
+      }else {
+        this.isPhone = true
+      }
+    },
+    searchData(){
+      this.changeTab()
+    },
+    changeTab(){
+      this.enterpriseContactList()
+      this.myContactList()
+    },
+    /*企业联系人*/
+    async enterpriseContactList(){
+      this.enterpriseContact.param.content.where.condition = this.form.name
+      this.enterpriseContact.param.content.sys_enterpriseid = 0
+      const res = await this.$api.requested(this.enterpriseContact.param)
+      this.enterpriseContact.listData = res.data
+      this.enterpriseContact.total = res.total
+      this.enterpriseContact.currentPage = res.pageNumber
+    },
+    /*选择企业联系人*/
+    enterpriseContactSelect(val){
+      this.form.contactsinfo.name = val.name
+      if (val.phonenumber.indexOf('-') != '-1'){
+        this.isPhone = false
+        let areaCode = val.phonenumber.substring(0,val.phonenumber.indexOf('-'))
+        let telephone = val.phonenumber.substring(areaCode.length+1)
+        this.form.contactsinfo.telephone = areaCode + '-' + telephone
+        this.form.contactsinfo.phonenumber = ''
+      }else {
+        this.isPhone = true
+        this.form.contactsinfo.phonenumber = val.phonenumber
+        this.form.contactsinfo.telephone = ''
+      }
+      this.enterpriseContact.show = false
+    },
+    handleSizeChangeEnterprise(val) {
+      // console.log(`每页 ${val} 条`);
+      this.enterpriseContact.param.content.pageSize = val
+      this.enterpriseContactList()
+    },
+    handleCurrentChangeEnterprise(val) {
+      // console.log(`当前页: ${val}`);
+      this.enterpriseContact.param.content.pageNumber = val
+      this.enterpriseContactList()
+    },
+    /*我的联系人*/
+    async myContactList(){
+      this.myContacts.param.content.where.condition = this.form.name
+      this.myContacts.param.content.sys_enterpriseid = 0
+      this.myContacts.param.content.ownerid = 0
+      const res = await this.$api.requested(this.myContacts.param)
+
+      this.myContacts.listData = res.data
+      this.myContacts.total = res.total
+      this.myContacts.currentPage = res.pageNumber
+    },
+    /*选择我的联系人*/
+    myContactSelect(val){
+
+      this.form.contactsinfo.name = val.name
+      if (val.phonenumber.indexOf('-') != '-1'){
+        this.isPhone = false
+        let areaCode = val.phonenumber.substring(0,val.phonenumber.indexOf('-'))
+        let telephone = val.phonenumber.substring(areaCode.length+1)
+        this.form.contactsinfo.telephone = areaCode + '-' + telephone
+        this.form.contactsinfo.phonenumber = ''
+      }else {
+        this.isPhone = true
+        this.form.contactsinfo.phonenumber = val.phonenumber
+        this.form.contactsinfo.telephone = ''
+      }
+      this.enterpriseContact.show = false
+    },
+    handleSizeChangeMy(val) {
+      // console.log(`每页 ${val} 条`);
+      this.myContacts.param.content.pageSize = val
+      this.myContactList()
+    },
+    handleCurrentChangeMy(val) {
+      // console.log(`当前页: ${val}`);
+      this.myContacts.param.content.pageNumber = val
+      this.myContactList()
+    },
   },
   mounted() {
 

src/Form/publicCustomer/edit.vue

@@ -139,6 +139,31 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
+            <el-col :span="24">
+              <el-form-item label="联系人:" >
+                <el-input   autosize v-model="form.contactsinfo.name" placeholder="请输入联系人姓名" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="isPhone">
+              <el-form-item label="联系方式:" prop="contactsinfo.phonenumber">
+                <el-button-group>
+                  <el-radio v-model="isPhone" :label="true" disabled>手机号</el-radio>
+                  <el-radio v-model="isPhone" :label="false" disabled>座机电话</el-radio>
+                </el-button-group>
+                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="!isPhone">
+              <el-form-item label="联系方式:" prop="contactsinfo.telephone">
+                <el-button-group>
+                  <el-radio v-model="isPhone" :label="true" disabled>手机号</el-radio>
+                  <el-radio v-model="isPhone" :label="false" disabled>座机电话</el-radio>
+                </el-button-group>
+                <el-input v-model="form.contactsinfo.telephone" placeholder="请输入座机电话" style="width: 100%;margin-top: 10px" disabled></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-col :span="24">
               <el-form-item label="税号:" prop="taxno">
                 <el-input v-model="form.taxno" placeholder="税号"></el-input>
@@ -265,6 +290,7 @@ export default {
   components:{duplicateCheck},
   data(){
     return {
+      isPhone:true,
       dialogFormVisible:false,
       isordercheck:true,
       isusedcheck:false,
@@ -313,7 +339,12 @@ export default {
         phonenumber:"",//非必填，可选
         ispublic:1,
         telephone: "",
-        sa_agentsid: ""
+        sa_agentsid: "",
+        contactsinfo: {
+          name: "",
+          telephone: "",
+          phonenumber: ""
+        }
       },
       rules:{
         enterprisename:[
@@ -326,10 +357,10 @@ export default {
           { required: true, message: '请填写客户来源', trigger: 'blur'}
         ],
         contact: [
-          { required: true, message: '请输入法人', trigger: 'change,blur' },
+          { required: false, message: '请输入法人', trigger: 'change,blur' },
         ],
         telephone: [
-          { required: true, message: '请输入联系电话', trigger: 'change,blur' },
+          { required: false, message: '请输入联系电话', trigger: 'change,blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
         ],
         province: [
@@ -386,6 +417,20 @@ export default {
       if (this.form.grade === 0){
         this.form.grade = ''
       }
+      this.form.contactsinfo.name = this.form.contactsinfo[0].name
+      if (this.form.contactsinfo[0].telephone){
+        this.isPhone = false
+        this.form.contactsinfo.telephone = this.form.contactsinfo[0].telephone
+        /* let areaCode = val.phonenumber.substring(0,val.phonenumber.indexOf('-'))
+         let telephone = val.phonenumber.substring(areaCode.length+1)
+         this.form.contactsinfo.telephone = areaCode + '-' + telephone
+         this.form.contactsinfo.phonenumber = ''*/
+      }else {
+        this.isPhone = true
+        this.form.contactsinfo.phonenumber = this.form.contactsinfo[0].phonenumber
+        /* this.form.contactsinfo.phonenumber = val.phonenumber
+         this.form.contactsinfo.telephone = ''*/
+      }
 
     },
     /*工商查询*/

src/Form/salerPrivatecustomer/add.vue

@@ -80,7 +80,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户等级:" >
+              <el-form-item label="客户等级:" prop="grade">
                 <el-select v-model="form.grade" placeholder="请选择客户等级" style="width: 100%">
                   <el-option
                       v-for="item in options.customerGrade"
@@ -94,7 +94,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户分类:" >
+              <el-form-item label="客户分类:" prop="customergrade">
                 <el-select v-model="form.customergrade" placeholder="请选择客户分类" style="width: 100%">
                   <el-option
                       v-for="item in options.customerClassification"
@@ -121,7 +121,7 @@
             </el-col>-->
 
             <el-col :span="24">
-              <el-form-item  label="客户行业:" >
+              <el-form-item  label="客户行业:" prop="industry">
                 <el-select
                     ref="sle"
                     style="width:100%;"
@@ -142,6 +142,179 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系人:"  prop="contactsinfo.name">
+                <el-popover
+                    placement="bottom-start"
+                    width="900"
+                    v-model="enterpriseContact.show"
+                    trigger="click">
+                  <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">
+                    <el-tab-pane label="企业联系人" name="first" >
+                      <el-table
+                          border
+                          height="500px"
+                          :data="enterpriseContact.listData"
+                          @row-click="enterpriseContactSelect"
+                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+                          size="mini">
+                        <el-table-column width="80" label="姓名">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.name?scope.row.name:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="手机号">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="邮箱">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.email?scope.row.email:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="部门">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.position?scope.row.position:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="职位">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.depname?scope.row.depname:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="80"  label="性别">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.sex?scope.row.sex:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="生日">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.birthday?scope.row.birthday:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="300"  label="家庭住址">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="备注">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.remarks?scope.row.remarks:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+                        <div class="container normal-panel" style="text-align:right">
+                          <el-pagination
+                              background
+                              @size-change="handleSizeChangeEnterprise"
+                              @current-change="handleCurrentChangeEnterprise"
+                              :current-page="enterpriseContact.currentPage"
+                              :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
+                              layout="total,sizes, prev, pager, next, jumper"
+                              :total="enterpriseContact.total">
+                          </el-pagination>
+                        </div>
+                        <slot name="footerLeft"></slot>
+                      </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="我的联系人" name="second">
+                      <el-table
+                          border
+                          :data="myContacts.listData"
+                          height="500px"
+                          @row-click="myContactSelect"
+                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+                          size="mini">
+                        <el-table-column width="80" label="姓名">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.name?scope.row.name:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="手机号">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="邮箱">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.email?scope.row.email:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="部门">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.position?scope.row.position:'--' }}</span>
+                          </template>
+                        </el-table-column><el-table-column width="120"  label="职位">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.depname?scope.row.depname:'--' }}</span>
+                        </template>
+                      </el-table-column><el-table-column width="80"  label="性别">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.sex?scope.row.sex:'--' }}</span>
+                        </template>
+                      </el-table-column><el-table-column width="120"  label="生日">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.birthday?scope.row.birthday:'--' }}</span>
+                        </template>
+                      </el-table-column>
+                        <el-table-column width="300"  label="家庭住址">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="备注">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.remarks?scope.row.remarks:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+                        <div class="container normal-panel" style="text-align:right">
+                          <el-pagination
+                              background
+                              @size-change="handleSizeChangeMy"
+                              @current-change="handleCurrentChangeMy"
+                              :current-page="myContacts.currentPage"
+                              :page-sizes="[20, 50, 100, 200]"
+                              :page-size="20"
+                              layout="total,sizes, prev, pager, next, jumper"
+                              :total="myContacts.total">
+                          </el-pagination>
+                        </div>
+                        <slot name="footerLeft"></slot>
+                      </div>
+                    </el-tab-pane>
+                  </el-tabs>
+                  <el-input  slot="reference"  autosize v-model="form.contactsinfo.name" placeholder="请输入联系人姓名" @input="searchData"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="24" v-if="isPhone">
+              <el-form-item label="联系方式:" prop="contactsinfo.phonenumber">
+                <el-button-group>
+<!--                  <el-button type="primary" size="mini" @click="phoneChang('手机')">手机号</el-button>
+                  <el-button type="" size="mini" @click="phoneChang('座机')">座机电话</el-button>-->
+                  <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
+                  <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
+                </el-button-group>
+                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="!isPhone">
+              <el-form-item label="联系方式:" prop="contactsinfo.telephone">
+                <el-button-group>
+<!--                  <el-button type="" size="mini" @click="phoneChang('手机')">手机号</el-button>
+                  <el-button type="primary" size="mini" @click="phoneChang('座机')">座机电话</el-button>-->
+                  <el-radio v-model="isPhone" :label="true" @change="phoneChang('手机')">手机号</el-radio>
+                  <el-radio v-model="isPhone" :label="false" @change="phoneChang('座机')">座机电话</el-radio>
+                </el-button-group>
+                <el-input v-model="form.contactsinfo.telephone" placeholder="请输入座机电话" style="width: 100%;margin-top: 10px" ></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="24">
               <el-form-item label="税号:" prop="taxno">
@@ -175,7 +348,7 @@
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="上级企业:" >
+              <el-form-item label="上级企业:" prop="superiorenterprisename">
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -232,12 +405,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户来源:" >
+              <el-form-item label="客户来源:" prop="source">
                 <el-input v-model="form.source" placeholder="请输入客户来源" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="归属经销商:" >
+              <el-form-item label="归属经销商:" prop="sa_agentsid">
                 <el-select v-model="form.sa_agentsid" placeholder="请选择经销商" style="width: 100%">
                   <el-option
                       v-for="item in options.distributor"
@@ -279,6 +452,7 @@ export default {
   components:{enterprise,duplicateCheck},
   data(){
     return {
+      activeName:'first',
       dialogFormVisible:false,
       visibleEnterprise:false,
       customerShow:false,
@@ -293,6 +467,7 @@ export default {
           "keyword":''
         },
       },
+
       businessShow:false,
       total:0,
       currentPage:0,
@@ -317,7 +492,12 @@ export default {
         ispublic:0,//1:公海客户，0：私域客户，自己新建的
         telephone: "",
         sa_agentsid: "",
-        erpagentnum:""
+        erpagentnum:"",
+        contactsinfo: {
+          name: "",
+          telephone: "",
+          phonenumber: ""
+        },
       },
       value:'',
       options:{
@@ -337,15 +517,26 @@ export default {
           { required: true, message: '还未选择客户类型', trigger: 'change' },
         ],
         contact: [
-          { required: true, message: '请输入法人', trigger: 'change' },
+          { required: false, message: '请输入法人', trigger: 'change' },
         ],
         telephone: [
-          { required: true, message: '请输入联系电话', trigger: 'change' },
+          { required: false, message: '请输入联系电话', trigger: 'change' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
         ],
         province: [
           { required: true, message: '请选择省市县', trigger: 'blur' },
         ],
+        'contactsinfo.name':[
+            { required: true, message: '请输入联系人姓名', trigger: 'change,blur' }
+        ],
+        'contactsinfo.phonenumber': [
+          { required: true, message: '请输入联系电话', trigger: 'change' },
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
+        ],
+        'contactsinfo.telephone': [
+          { required: true, message: '请输入座机电话', trigger: 'change' },
+          { pattern:/^0\d{2,3}-\d{7,8}$/, message: '请输入正确座机电话',trigger: 'change' }
+        ],
       },
       customerParam:{
         "id": 20220920083901,
@@ -364,6 +555,42 @@ export default {
         total:0,
         currentPage:0,
       },
+      isPhone:true,
+      enterpriseContact:{
+        param:{
+          "content": {
+            "sys_enterpriseid": '',
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+          },
+          "id": 20221219193002,
+        },
+        listData:[],
+        total:0,
+        currentPage:0,
+        show:false
+      },
+      myContacts:{
+        param:{
+          "id": 20221219161202,
+          "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "ownertable":'sa_customers',
+            "ownerid":'',
+            "where": {
+              "condition": ""
+            }
+          }
+        },
+        listData:[],
+        total:0,
+        currentPage:0,
+        show:false
+      },
     }
   },
   computed:{
@@ -381,6 +608,7 @@ export default {
       this.industryList()
       this.queryCustomerGrade()
       this.queryDistributor()
+      this.enterpriseContactList()
     },
     /*工商查询*/
     async businessSearch(){
@@ -467,7 +695,7 @@ export default {
     },
     onClose () {
       this.$refs['form'].resetFields();
-      this.form = {
+     /* this.form = {
         sa_customersid:0,
         sys_enterpriseid:0,
         enterprisename:'',
@@ -485,7 +713,7 @@ export default {
         county:'',
         address:'',
         ispublic:0
-      }
+      }*/
       this.dialogFormVisible = false
       this.checkResults = ''
       this.value = ''
@@ -640,7 +868,94 @@ export default {
       })
       this.options.distributor = res.data
       console.log(this.options.distributor,'经销商')
-    }
+    },
+    phoneChang(val){
+      if (val === '座机'){
+        this.isPhone = false
+      }else {
+        this.isPhone = true
+      }
+    },
+    searchData(){
+      this.changeTab()
+    },
+    changeTab(){
+      this.enterpriseContactList()
+      this.myContactList()
+    },
+    /*企业联系人*/
+    async enterpriseContactList(){
+      this.enterpriseContact.param.content.where.condition = this.form.name
+      this.enterpriseContact.param.content.sys_enterpriseid = 0
+      const res = await this.$api.requested(this.enterpriseContact.param)
+      this.enterpriseContact.listData = res.data
+      this.enterpriseContact.total = res.total
+      this.enterpriseContact.currentPage = res.pageNumber
+    },
+    /*选择企业联系人*/
+    enterpriseContactSelect(val){
+      this.form.contactsinfo.name = val.name
+      if (val.phonenumber.indexOf('-') != '-1'){
+        this.isPhone = false
+        let areaCode = val.phonenumber.substring(0,val.phonenumber.indexOf('-'))
+        let telephone = val.phonenumber.substring(areaCode.length+1)
+        this.form.contactsinfo.telephone = areaCode + '-' + telephone
+        this.form.contactsinfo.phonenumber = ''
+      }else {
+        this.isPhone = true
+        this.form.contactsinfo.phonenumber = val.phonenumber
+        this.form.contactsinfo.telephone = ''
+      }
+      this.enterpriseContact.show = false
+    },
+    handleSizeChangeEnterprise(val) {
+      // console.log(`每页 ${val} 条`);
+      this.enterpriseContact.param.content.pageSize = val
+      this.enterpriseContactList()
+    },
+    handleCurrentChangeEnterprise(val) {
+      // console.log(`当前页: ${val}`);
+      this.enterpriseContact.param.content.pageNumber = val
+      this.enterpriseContactList()
+    },
+    /*我的联系人*/
+    async myContactList(){
+      this.myContacts.param.content.where.condition = this.form.name
+      this.myContacts.param.content.sys_enterpriseid = 0
+      this.myContacts.param.content.ownerid = 0
+      const res = await this.$api.requested(this.myContacts.param)
+
+      this.myContacts.listData = res.data
+      this.myContacts.total = res.total
+      this.myContacts.currentPage = res.pageNumber
+    },
+    /*选择我的联系人*/
+    myContactSelect(val){
+
+      this.form.contactsinfo.name = val.name
+      if (val.phonenumber.indexOf('-') != '-1'){
+        this.isPhone = false
+        let areaCode = val.phonenumber.substring(0,val.phonenumber.indexOf('-'))
+        let telephone = val.phonenumber.substring(areaCode.length+1)
+        this.form.contactsinfo.telephone = areaCode + '-' + telephone
+        this.form.contactsinfo.phonenumber = ''
+      }else {
+        this.isPhone = true
+        this.form.contactsinfo.phonenumber = val.phonenumber
+        this.form.contactsinfo.telephone = ''
+      }
+      this.enterpriseContact.show = false
+    },
+    handleSizeChangeMy(val) {
+      // console.log(`每页 ${val} 条`);
+      this.myContacts.param.content.pageSize = val
+      this.myContactList()
+    },
+    handleCurrentChangeMy(val) {
+      // console.log(`当前页: ${val}`);
+      this.myContacts.param.content.pageNumber = val
+      this.myContactList()
+    },
   }
 }
 </script>

src/Form/salerPrivatecustomer/edit.vue

@@ -138,6 +138,31 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
+            <el-col :span="24">
+              <el-form-item label="联系人:" >
+                <el-input   autosize v-model="form.contactsinfo.name" placeholder="请输入联系人姓名" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="isPhone">
+              <el-form-item label="联系方式:" prop="contactsinfo.phonenumber">
+                <el-button-group>
+                  <el-radio v-model="isPhone" :label="true" disabled>手机号</el-radio>
+                  <el-radio v-model="isPhone" :label="false" disabled>座机电话</el-radio>
+                </el-button-group>
+                <el-input v-model="form.contactsinfo.phonenumber" placeholder="请输入手机号" style="width: 100%;margin-top: 10px" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="!isPhone">
+              <el-form-item label="联系方式:" prop="contactsinfo.telephone">
+                <el-button-group>
+                  <el-radio v-model="isPhone" :label="true" disabled>手机号</el-radio>
+                  <el-radio v-model="isPhone" :label="false" disabled>座机电话</el-radio>
+                </el-button-group>
+                <el-input v-model="form.contactsinfo.telephone" placeholder="请输入座机电话" style="width: 100%;margin-top: 10px" disabled></el-input>
+              </el-form-item>
+            </el-col>
+
             <el-col :span="24">
               <el-form-item label="税号:" >
                 <el-input v-model="form.taxno" placeholder="请输入企业税号" style="width: 100%"></el-input>
@@ -219,6 +244,7 @@ export default {
   components:{enterprise,duplicateCheck},
   data(){
     return {
+      isPhone:true,
       dialogFormVisible:false,
       visibleEnterprise:false,
       checkResults:'',
@@ -258,7 +284,12 @@ export default {
         ispublic:0,//1:公海客户，0：私域客户，自己新建的
         telephone: "",
         sa_agentsid: "",
-        value:''
+        value:'',
+        contactsinfo: {
+          name: "",
+          telephone: "",
+          phonenumber: ""
+        }
       },
       options:{
         type:[],
@@ -276,15 +307,26 @@ export default {
           { required: true, message: '还未选择客户类型', trigger: 'change' },
         ],
         contact: [
-          { required: true, message: '请输入法人', trigger: 'change,blur' },
+          { required: false, message: '请输入法人', trigger: 'change,blur' },
         ],
         telephone: [
-          { required: true, message: '请输入联系电话', trigger: 'change,blur' },
+          { required: false, message: '请输入联系电话', trigger: 'change,blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
         ],
         province: [
           { required: true, message: '请选择省市县', trigger: 'change,blur' },
         ],
+        'contactsinfo.name':[
+          { required: false, message: '请输入联系人姓名', trigger: 'change,blur' }
+        ],
+        'contactsinfo.phonenumber': [
+          { required: false, message: '请输入联系电话', trigger: 'change' },
+          { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'change' }
+        ],
+        'contactsinfo.telephone': [
+          { required: false, message: '请输入座机电话', trigger: 'change' },
+          { pattern:/^0\d{2,3}-\d{7,8}$/, message: '请输入正确座机电话',trigger: 'change' }
+        ],
       }
     }
   },
@@ -324,7 +366,6 @@ export default {
         this.data[e] !== '' ?this.form.value.push(this.data[e]):''
       })*/
       this.form = Object.assign({},this.form,this.data)
-      console.log(this.form,"编辑")
       this.form.value = [this.form.province,this.form.city,this.form.county]
       if (this.form.grade === 0){
         this.form.grade = ''
@@ -332,6 +373,20 @@ export default {
       if (this.form.sa_agentsid === 0){
         this.form.sa_agentsid  = ''
       }
+      this.form.contactsinfo.name = this.form.contactsinfo[0].name
+      if (this.form.contactsinfo[0].telephone){
+        this.isPhone = false
+        this.form.contactsinfo.telephone = this.form.contactsinfo[0].telephone
+       /* let areaCode = val.phonenumber.substring(0,val.phonenumber.indexOf('-'))
+        let telephone = val.phonenumber.substring(areaCode.length+1)
+        this.form.contactsinfo.telephone = areaCode + '-' + telephone
+        this.form.contactsinfo.phonenumber = ''*/
+      }else {
+        this.isPhone = true
+        this.form.contactsinfo.phonenumber = this.form.contactsinfo[0].phonenumber
+       /* this.form.contactsinfo.phonenumber = val.phonenumber
+        this.form.contactsinfo.telephone = ''*/
+      }
       /*if (this.form.parentid === 0){
         this.form.parentid = '未选择'
       }*/

src/SDrpManagement/invoicePrediction/detail/orderDetail.vue

@@ -1,12 +1,12 @@
 <template>
-  <div style="height: calc(100vh - 245px)">
+  <div style="margin-bottom: -10px">
     <addOrder v-if="!isDisabled && tool.checkAuth($route.name,'order')" ref="addOrder" :param="paramAdd" :tablecols="tablecolsAdd" :title="'添加订单'" class="inline-16" @add="addOrder"
               @adds="addOrders" @uploadData="uploadData" @onSuccess="onSuccess" :dataType="'订单'"></addOrder>
     <el-button @click="delAll" :type="list.length === 0?'':'primary'" size="small" v-if="!isDisabled && tool.checkAuth($route.name,'order')" :disabled="list.length === 0">一键删除</el-button>
     <el-button v-if="!isDisabled && tool.checkAuth($route.name,'order')" :type="items.length > 0?'primary':''" size="small" @click="delOrders" class="inline-16" :disabled="items.length === 0">删 除</el-button>
     <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
     </el-input>
-    <tableList height="240px" ref="orderRef" style="margin-top: 10px" :checkbox="true"  :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation"
+    <tableList height="300px" ref="orderRef" style="margin-top: 10px" :checkbox="true"  :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation"
                highlight-current-row @selectionChange="selectionChange"  @rowClick="rowClick">
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'operation'">
@@ -45,12 +45,12 @@
 <!--        <el-button size="mini" type="text" @click="delOrder(scope.data)" :disabled="isDisabled" :loading="loading">删 除</el-button>-->
       </template>
     </tableList>
-    <div>
-      <div class=" container "  style="text-align:left;float: left">
+    <div style="display: flex;justify-content: space-between;margin: 10px">
+      <div style="line-height: 30px;vertical-align: middle">
         <span style="font-size: 14px">出货预测金额: ¥{{alloutamount > 10000?tool.formatAmount(alloutamount/10000,2)+'万':tool.formatAmount(alloutamount,2)}}</span>
         <span style="font-size: 14px;margin-left: 10px">开票预测金额: ¥{{allinvoiceamount > 10000?tool.formatAmount(allinvoiceamount/10000,2)+'万':tool.formatAmount(allinvoiceamount,2)}}</span>
       </div>
-      <div  class="container " style="text-align:right;float: right">
+      <div>
         <el-pagination
             background
             @size-change="handleSizeChange"
@@ -64,14 +64,14 @@
       </div>
     </div>
     <!-- 产品   -->
-    <div style="margin-top: 60px;">
+    <div style="margin-top: 10px;">
       <div >
         <el-button @click="delAllProduct" :type="productList.length === 0?'':'primary'" size="small" v-if="!isDisabled && tool.checkAuth($route.name,'order')" :disabled="productList.length === 0">一键删除</el-button>
         <el-button v-if="!isDisabled && tool.checkAuth($route.name,'order')" :type="productItems.length > 0?'primary':''" size="small" @click="delProducts" class="inline-16" :disabled="productItems.length === 0">删 除</el-button>
         <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="productsParam.content.where.condition?productsParam.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="productsParam.content.where.condition" @keyup.native.enter="listProduct(productsParam.content.pageNumber = 1)" @clear="listProduct(productsParam.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
         </el-input>
       </div>
-      <tableList height="calc(100vh - 684px)" ref="productRef" style="margin-top: 10px" :checkbox="true"  :layout="tablecolsProduct" :data="productList" :opwidth="200" :custom="true"  fixedName="operation"
+      <tableList height="545px" ref="productRef" style="margin-top: 10px" :checkbox="true"  :layout="tablecolsProduct" :data="productList" :opwidth="200" :custom="true"  fixedName="operation"
                 @selectionChange="selectionChangeProduct"  :headerOptions="['plandeliverydate']">
         <template v-slot:header="scope">
           <div v-if="scope.column.columnname == 'plandeliverydate'">
@@ -152,22 +152,24 @@
           <el-button v-if="tool.checkAuth($route.name,'order')" size="mini" type="text" @click="delProduct(scope.data)" :disabled="isDisabled" :loading="loading">删 除</el-button>
         </template>
       </tableList>
-      <div class=" container "  style="text-align:left;float: left">
-        <span style="font-size: 14px">总数量：{{totalqty}}</span>
-        <span style="font-size: 14px;margin-left: 10px">总金额: ¥{{totalamount > 10000?tool.formatAmount(totalamount/10000,2)+'万':tool.formatAmount(totalamount,2)}}</span>
-        <span style="font-size: 14px;margin-left: 10px">折后金额: ¥{{totaldefaultamount > 10000?tool.formatAmount(totaldefaultamount/10000,2)+'万':tool.formatAmount(totaldefaultamount,2)}}</span>
-      </div>
-      <div  class="container " style="text-align:right;float: right">
-        <el-pagination
-            background
-            @size-change="handleSizeChangeProduct"
-            @current-change="handleCurrentChangeProduct"
-            :current-page="productsParam.content.pageNumber"
-            :page-sizes="[20, 50, 100, 200]"
-            :page-size="20"
-            layout="total,sizes, prev, pager, next, jumper"
-            :total="productTotal">
-        </el-pagination>
+      <div style="display: flex;justify-content: space-between;margin: 10px">
+        <div style="line-height: 30px;vertical-align: middle">
+          <span style="font-size: 14px">总数量：{{totalqty}}</span>
+          <span style="font-size: 14px;margin-left: 10px">总金额: ¥{{totalamount > 10000?tool.formatAmount(totalamount/10000,2)+'万':tool.formatAmount(totalamount,2)}}</span>
+          <span style="font-size: 14px;margin-left: 10px">折后金额: ¥{{totaldefaultamount > 10000?tool.formatAmount(totaldefaultamount/10000,2)+'万':tool.formatAmount(totaldefaultamount,2)}}</span>
+        </div>
+        <div>
+          <el-pagination
+              background
+              @size-change="handleSizeChangeProduct"
+              @current-change="handleCurrentChangeProduct"
+              :current-page="productsParam.content.pageNumber"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="20"
+              layout="total,sizes, prev, pager, next, jumper"
+              :total="productTotal">
+          </el-pagination>
+        </div>
       </div>
     </div>
   </div>

src/SDrpManagement/projectPrediction/detail/projectListDetail.vue

@@ -1,13 +1,12 @@
 <template>
-  <div style="height: calc(100vh - 245px)">
-    <div >
+  <div style="margin-bottom: -10px;display: inline-block;width: 100%">
       <addProject v-if="!isDisabled && tool.checkAuth($route.name,'projectProduct')" ref="addProject" :param="paramProject" class="inline-16" @add="addProject" @adds="addProjects" @uploadData="uploadData" @onSuccess="onSuccess"></addProject>
       <el-button @click="delProjectAll" :type="list.length === 0?'':'primary'" size="small" v-if="!isDisabled && tool.checkAuth($route.name,'projectProduct')" :disabled="list.length === 0">一键删除</el-button>
       <el-button v-if="!isDisabled && tool.checkAuth($route.name,'projectProduct')" :type="items.length > 0?'primary':''" size="small" @click="delProjects" class="inline-16" :disabled="items.length === 0">删 除</el-button>
       <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="projectParam.content.where.condition?projectParam.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="projectParam.content.where.condition"
                  @keyup.native.enter="listData(projectParam.content.pageNumber = 1)" @clear="listData(projectParam.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
       </el-input>
-      <tableList :height="'245px'" ref="projectRef" style="margin-top: 10px" :checkbox="true"  :layout="projectCols" :data="list" :opwidth="200" :custom="true"  fixedName="operation"
+      <tableList height="300px" ref="projectRef" style="margin-top: 10px;" :checkbox="true"  :layout="projectCols" :data="list" :opwidth="200" :custom="true"  fixedName="operation"
                  highlight-current-row @selectionChange="selectionChange" @rowClick="rowClick" >
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'operation'">
@@ -23,22 +22,24 @@
           <el-button size="mini" type="text" @click="delProject(scope.data)" :disabled="isDisabled" :loading="loading">删 除</el-button>
         </template>
       </tableList>
-      <div class=" container "  style="text-align:left;float: left">
-        <span style="font-size: 14px">预测金额: ¥{{projectPrice > 10000 ?tool.formatAmount(projectPrice/10000,2)+'万':tool.formatAmount(projectPrice,2)}}</span>
+      <div style="display: flex;justify-content: space-between;margin: 10px">
+        <div style="line-height: 30px;vertical-align: middle">
+          <span style="font-size: 14px">预测金额: ¥{{projectPrice > 10000 ?tool.formatAmount(projectPrice/10000,2)+'万':tool.formatAmount(projectPrice,2)}}</span>
+        </div>
+        <div>
+          <el-pagination
+              background
+              @size-change="handleSizeChangeProject"
+              @current-change="handleCurrentChangeProject"
+              :current-page="projectParam.content.pageNumber"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="20"
+              layout="total,sizes, prev, pager, next, jumper"
+              :total="totalProject">
+          </el-pagination>
+        </div>
       </div>
-      <div  class="container " style="text-align:right;float: right">
-        <el-pagination
-            background
-            @size-change="handleSizeChangeProject"
-            @current-change="handleCurrentChangeProject"
-            :current-page="projectParam.content.pageNumber"
-            :page-sizes="[20, 50, 100, 200]"
-            :page-size="20"
-            layout="total,sizes, prev, pager, next, jumper"
-            :total="totalProject">
-        </el-pagination>
-      </div>
-    </div>
+
     <div style="float: left;width: 100%">
       <el-row >
         <el-col :span="15">
@@ -53,7 +54,7 @@
           <span style="float: right;line-height: 40px;height:40px;font-size:13px;vertical-align: auto">折扣(%)：</span>
         </el-col>
       </el-row>
-      <tableList :height="'calc(100vh - 695px)'" style="margin-top: 10px" :checkbox="true"  :layout="productCols" :data="productList" :opwidth="200" :custom="true"  fixedName="operation"
+      <tableList height="545px" style="margin-top: 10px" :checkbox="true"  :layout="productCols" :data="productList" :opwidth="200" :custom="true"  fixedName="operation"
                  @selectionChange="selectionChangePro">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'operation'">
@@ -83,20 +84,22 @@
           <el-button size="mini" type="text" @click="delProduct(scope.data)" :disabled="isDisabled" :loading="loadingProduct">删 除</el-button>
         </template>
       </tableList>
-      <div class=" container "  style="text-align:left;float: left">
-        <span style="font-size: 14px">预测金额: ¥{{tool.formatAmount(productPrice,2)}}</span>
-      </div>
-      <div  class="container " style="text-align:right;float: right">
-        <el-pagination
-            background
-            @size-change="handleSizeChangeProduct"
-            @current-change="handleCurrentChangeProduct"
-            :current-page="productParam.content.pageNumber"
-            :page-sizes="[20, 50, 100, 200]"
-            :page-size="20"
-            layout="total,sizes, prev, pager, next, jumper"
-            :total="totalProduct">
-        </el-pagination>
+      <div style="display: flex;justify-content: space-between;margin: 10px">
+        <div style="line-height: 30px;vertical-align: middle">
+          <span style="font-size: 14px">预测金额: ¥{{tool.formatAmount(productPrice,2)}}</span>
+        </div>
+        <div>
+          <el-pagination
+              background
+              @size-change="handleSizeChangeProduct"
+              @current-change="handleCurrentChangeProduct"
+              :current-page="productParam.content.pageNumber"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="20"
+              layout="total,sizes, prev, pager, next, jumper"
+              :total="totalProduct">
+          </el-pagination>
+        </div>
       </div>
     </div>
     <el-drawer