居间协议新增同步合作协议功能,项目商机合同调整，合同样式调整

src/HDrpManagement/contractManage/components/selectContract.vue

@@ -2,7 +2,7 @@
   <div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <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  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" height="500px">
           <template v-slot:customcol="scope">
@@ -146,5 +146,8 @@ export default {
 </script>
 
 <style scoped>
+  /deep/ .el-input__validateIcon {
+    display: none;
+  }
 
 </style>

src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -9,7 +9,7 @@
           <el-descriptions-item :labelStyle="{width:'120px'}" label="居间费">{{item.rebate}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="结算经销商">{{item.enterprisename?item.enterprisename:'--'}}</el-descriptions-item>
         </el-descriptions>
-        <table-new-layout :layout="tablecols" :data="tableData" :custom="true" :width="true" height="calc(100vh - 750px)">
+        <table-new-layout :layout="tablecols" :data="tableData" :custom="true" :width="true" height="calc(100vh - 750px)" minHeight="400px">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'price'">
               {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}

src/HDrpManagement/projectChange/modules/modules/contract/index.vue

@@ -26,10 +26,18 @@
           <div v-else-if="scope.column.columnname === 'operation'">
             <span>{{scope.column.data[scope.column.columnname]}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'enterprisename'">
+            <span v-if="scope.column.data.type === '居间'">
+              {{scope.column.data.ascription_enterprisename?scope.column.data.ascription_enterprisename:'--'}}
+            </span>
+            <span v-else>
+            {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
+          </span>
+          </div>
           <div v-else-if="scope.column.columnname === 'discountrate'">
             <span>{{Math.round((scope.column.data[scope.column.columnname] * 100)*100)/100}}</span>
           </div>
-          <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+          <p v-else>{{scope.column.data[scope.column.columnname] && scope.column.columnname !== 'enterprisename'?scope.column.data[scope.column.columnname]:'--'}}</p>
         </template>
         <template v-slot:opreation="scope">
          <!-- <edit :data="scope.data" class="inline-16" @editSuccess="onSuccess"></edit>

src/components/dynamic-newTable/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
-    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini" :height="height ? height : data.length <= 5?'280px':'calc(100vh - 268px)'"  @row-click="rowClick" style="width:100%;" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
+    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height ? height : data.length <= 5?'280px':'calc(100vh - 268px)'"  @row-click="rowClick" :style="{width:'100%',minHeight:minHeight?minHeight:''}" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
               :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
       <el-table-column
           type="selection"
@@ -35,7 +35,7 @@ export default {
     custom:是否启用自定义结构;
     opwidth:操作列宽度
   */
-  props:['layout','data','custom','height','fixedName','width','checkbox','redirect','customHeader'],
+  props:['layout','data','custom','height','fixedName','width','checkbox','redirect','customHeader','minHeight'],
   data () {
     return {
       list:[],