合同居间新增调整

src/HDrpManagement/contractManage/components/addContract.vue

@@ -525,8 +525,8 @@
                   placement="bottom"
                   trigger="manual"
                   v-model="contractVisible"
-                  width="600">
-                  <selectContract   ref="contractRef" @onSelect="concratChange" @onCanel="contractVisible=false" ></selectContract>
+                  width="700">
+                  <selectContract  ref="contractRef" @onSelect="concratChange" @onCanel="contractVisible=false" ></selectContract>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('contractVisible')" v-model="form.ascription_title" placeholder="请选择合同"></el-input>
                 </el-popover>
               </el-form-item>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -528,7 +528,7 @@
                   placement="bottom"
                   trigger="manual"
                   v-model="contractVisible"
-                  width="600">
+                  width="700">
                   <selectContract ref="contractRef" @onSelect="concratChange" @onCanel="contractVisible=false"></selectContract>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('contractVisible')" v-model="form.ascription_title"></el-input>
                 </el-popover>

src/HDrpManagement/contractManage/components/selectContract.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="项目合同" name="项目">
         <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="queryProject(projectParam.content.pageNumber = 1)" @clear="queryProject(projectParam.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
         </el-input>
-        <table-new-layout style="margin-top: 10px" :layout="projectTableCols" :data="projectList" :width="true" :custom="true" @rowClick="rowClick">
+        <table-new-layout style="margin-top: 10px" :layout="projectTableCols" :data="projectList" :width="true" :custom="true" @rowClick="rowClick" height="500px">
           <template v-slot:customcol="scope">
             <p>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
@@ -16,7 +16,8 @@
               @current-change="handleCurrentChange"
               :current-page="currentPage"
               :page-sizes="[20, 50, 100, 200]"
-              :page-size="100"
+              :pager-count="5"
+              :page-size="20"
               layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
@@ -25,7 +26,7 @@
       <el-tab-pane label="客户合同" name="客户">
         <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="customerParam.content.where.condition?customerParam.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="customerParam.content.where.condition" @keyup.native.enter="queryCustomer(customerParam.content.pageNumber = 1)" @clear="queryCustomer(customerParam.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
         </el-input>
-        <table-new-layout style="margin-top: 10px" :layout="customerTableCols" :data="customerList" :width="true" :custom="true" @rowClick="rowClick">
+        <table-new-layout style="margin-top: 10px" :layout="customerTableCols" :data="customerList" :width="true" :custom="true" @rowClick="rowClick" height="500px">
           <template v-slot:customcol="scope">
             <p>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
@@ -37,7 +38,8 @@
               @current-change="handleCurrentChange"
               :current-page="currentPage"
               :page-sizes="[20, 50, 100, 200]"
-              :page-size="100"
+              :pager-count="5"
+              :page-size="20"
               layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
@@ -98,9 +100,11 @@ export default {
     handleClick() {
       if (this.activeName === '项目'){
         this.projectParam.content.pageNumber = 1
+        this.projectParam.content.pageSize = 20
         this.queryProject()
       }else {
         this.customerParam.content.pageNumber = 1
+        this.customerParam.content.pageSize = 20
         this.queryCustomer()
       }
     },

src/HDrpManagement/contractManage/index.vue

@@ -106,6 +106,14 @@
         <div v-else-if="scope.data.column.columnname == 'signamount'">
           <span>{{ tool.formatAmount(scope.data.column.data.signamount,1) }}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'enterprisename'">
+          <span v-if="scope.data.column.data.type === '居间'">
+            {{scope.data.column.data.ascription_enterprisename}}
+          </span>
+          <span v-else>
+            {{scope.data.column.data[[scope.data.column.columnname]]}}
+          </span>
+        </div>
         <div  v-else-if="scope.data.column.columnname == 'discountrate'">
 <!--          <div v-if="scope.data.column.data"></div>-->
 <!--          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}-->
@@ -131,7 +139,7 @@
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>
-        <span v-if="!scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.data[[scope.data.column.columnname]] !== 0">--</span>
+        <span v-if="!scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.data[[scope.data.column.columnname]] !== 0 && scope.data.column.columnname !== 'enterprisename'">--</span>
       </template>
       <template v-slot:tbOpreation="scope">
 <!--        <el-button size="mini" @click="$router.push({path:'/directSelling',query:{id:scope.data.data.sa_contractid,sys_enterpriseid:scope.data.data.sys_enterpriseid}})" type="text" >打印</el-button>-->

src/HDrpManagement/contractManage/modules/detail.vue

@@ -736,7 +736,7 @@ export default {
             value:this.mainData.enterprisename
           },
           {
-            label:'项目合同',
+            label:'合同',
             value:this.mainData.ascription_title
           },
 
@@ -748,6 +748,10 @@ export default {
             label:'项目编号',
             value:this.mainData.projectnum
           },
+          {
+            label:'客户名称',
+            value:this.mainData.ascription_enterprisename
+          },
           {
             label:'合同有效期',
             value:`${this.mainData.begdate}至${this.mainData.enddate}`,
@@ -1365,7 +1369,7 @@ export default {
                         value:this.mainData.enterprisename
                       },
                       {
-                        label:'项目合同',
+                        label:'合同',
                         value:this.mainData.ascription_title
                       },
 
@@ -1377,6 +1381,10 @@ export default {
                         label:'项目编号',
                         value:this.mainData.projectnum
                       },
+                      {
+                        label:'客户名称',
+                        value:this.mainData.ascription_enterprisename
+                      },
                       {
                         label:'合同有效期',
                         value:`${this.mainData.begdate}至${this.mainData.enddate}`,