Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

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

@@ -228,9 +228,12 @@ ul, li {
     border-color: #D9D9D9;
     color: #232323;
     &::placeholder {
-      color: rgba(35,35,35,0.5);
+      color: rgba(35,35,35,0.4);
     }
   }
+  .el-input__inner::placeholder{
+    color: rgba(35,35,35,0.4) !important;
+  }
   .el-select .el-input .el-select__caret{
     color: #232323;
   }

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

 <template>
     <div class="members">
-      <head-form
+      <head-form-new
+        ref="headForm"
         title="集团成员"
         :form-data="formData"
         :query-params="queryParams"
@@ -44,7 +45,7 @@
             </div>
           </div>
         </template>
-      </head-form>
+      </head-form-new>
       <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
       <tables
         v-if="!isSkeleton"
@@ -101,12 +102,12 @@
           {label: '企业地区', prop: 'address', minWidth: '200'},
         ],
         formData: [
-          { type: 4, fieldName: 'combineMemberLevels', value: '', placeholder: '成员层级', options:[]},
-          { type: 1, fieldName: 'businessType', value: '', placeholder: '主营业务', options:[]},
-          { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '地区', options:[]},
-          { type: 6, fieldName: 'money', value: '', placeholder: '注册资本', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[] },
-          { type: 0, fieldName: 'penalizeReasonType', value: '', placeholder: '筛选', options: []},
-          { type: 3, fieldName: 'searchValue', value: '', placeholder: '输入关键词查询'},
+          { type: 4, fieldName: 'combineMemberLevels', value: '', placeholder: '成员层级', options:[], uid: this.getUid()},
+          { type: 1, fieldName: 'businessType', value: '', placeholder: '主营业务', options:[], uid: this.getUid()},
+          { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '地区', options:[], uid: this.getUid()},
+          { type: 6, fieldName: 'money', value: '', placeholder: '注册资本', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[], uid: this.getUid() },
+          { type: 0, fieldName: 'penalizeReasonType', value: '', placeholder: '筛选', options: [], uid: this.getUid()},
+          { type: 3, fieldName: 'searchValue', value: '', placeholder: '输入关键词查询', uid: this.getUid()},
         ],
         cycj:[
           {
@@ -548,5 +549,6 @@
       font-size: 14px;
       color:#232323 !important;
     }
+    @import "@/assets/styles/search-common.scss";
   }
 </style>

dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue

 <template>
   <div class="performance">
-    <head-form
+    <head-form-new
+      ref="headForm"
       title="集团业绩"
       :form-data="formData"
       :query-params="queryParams"
@@ -12,7 +13,7 @@
       <template slot="slot">
 
       </template>
-    </head-form>
+    </head-form-new>
     <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
     <tables
       v-if="!isSkeleton"
@@ -84,14 +85,14 @@
           {label: '业主单位', prop: 'projectUnit', slot: true,minWidth: '190'},
         ],
         formData: [
-          { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[]},
-          { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[],dateTo:this.formatDate(new Date()) },
-          { type: 6, fieldName: 'money', value: '', placeholder: '中标金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[] },
-          { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150},
-          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150},
-          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:100},
+          { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[], uid: this.getUid()},
+          { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[],dateTo:this.formatDate(new Date()) , uid: this.getUid()},
+          { type: 6, fieldName: 'money', value: '', placeholder: '中标金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[], uid: this.getUid() },
+          { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150, uid: this.getUid()},
+          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
+          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:100, uid: this.getUid()},
           // { type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'},
-          { type: 3, fieldName: 'searchValue', value: '', placeholder: '查询'},
+          { type: 3, fieldName: 'searchValue', value: '', placeholder: '输入关键词查询', uid: this.getUid()},
         ],
         tableData:[],
         tableDataTotal:0,
@@ -323,5 +324,6 @@
         background: #F0F3FA;
       }
     }
+    @import "@/assets/styles/search-common.scss";
   }
 </style>

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmfx.vue

 <template>
   <div class="performance">
     <div class="content">
-      <head-form
+      <head-form-new
+        ref="headForm"
         title="集团施工项目最新招标"
         :form-data="formData"
         :query-params="queryParams"
         @handle-search="handleSearch"
         :slots="true"
         :isExcel="false"
-      ></head-form>
+      ></head-form-new>
       <span class="check">查看集团招标<i class="el-icon-arrow-right"></i></span>
       <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
       <div class="table-item" v-if="!isSkeleton">
@@ -212,7 +213,7 @@
     <div class="content">
       <head-form
         title="历史发包项目金额TOP10"
-        :form-data="formData"
+        :form-data="formData1"
         :query-params="queryParams1"
         @handle-search="handleSearch1"
         :slots="true"
@@ -284,9 +285,14 @@
           year:'2023'
         },
         formData: [
-          { type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [],width:150},
-          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110},
-          { type: 1, fieldName: 'year', value: '2023', placeholder: '年份', options: [],width:80},
+          { type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
+          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
+          { type: 1, fieldName: 'year', value: '2023', placeholder: '年份', options: [],width:80, uid: this.getUid()},
+        ],
+        formData1: [
+          { type: 4, fieldName: 'type', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
+          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
+          { type: 1, fieldName: 'year', value: '2023', placeholder: '年份', options: [],width:80, uid: this.getUid()},
         ],
         cgblList: [
           {name:'100%',value:'100%'},
@@ -315,6 +321,7 @@
     },
     created() {
       this.formData[1].options=this.cgblList;
+      this.formData1[1].options=this.cgblList;
       this.yearsData()
       //项目类型
       getDictType('project_type_new').then(result=>{
@@ -325,6 +332,10 @@
               name: data[i].dictLabel,
               value: data[i].dictValue,
             })
+            this.formData1[0].options.push({
+              name: data[i].dictLabel,
+              value: data[i].dictValue,
+            })
           }
         }
       })
@@ -350,6 +361,7 @@
         }
         this.yearOptions=Years.reverse()
         this.formData[2].options=Years
+        this.formData1[2].options=Years
       },
       handleQuery(params){
         // this.isSkeleton = true
@@ -879,6 +891,7 @@
 
 <style lang="scss" scoped>
   .performance{
+    @import "@/assets/styles/search-common.scss";
     /*height: calc(100% - 64px);*/
     .content{
       background: #ffffff;

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmmx.vue

 <template>
   <div class="performance">
-    <head-form
+    <head-form-new
+      ref="headForm"
       title=""
       :form-data="formData"
       :query-params="queryParams"
       :total="tableDataTotal"
       :isExcel="false"
       @handle-search="handleSearch"
-    ></head-form>
+    ></head-form-new>
     <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
     <tables
       v-if="!isSkeleton"
@@ -129,13 +130,13 @@
           {label: '代理单位', prop: 'agency',minWidth: '160',slot: true},
         ],
         formData: [
-          { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[]},
-          { type: 5, fieldName: 'time', value: '', placeholder: '招标发布时间', startTime: 'startTime', endTime: 'endTime',timeList:[] },
-          { type: 6, fieldName: 'money', value: '', placeholder: '预算金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[] },
-          { type: 1, fieldName: 'subjectMatters', value: '', placeholder: '招标采购分类', options: [],width:125},
-          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150},
-          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110},
-          { type: 3, fieldName: 'keys', value: '', placeholder: '查询'},
+          { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[], uid: this.getUid()},
+          { type: 5, fieldName: 'time', value: '', placeholder: '招标发布时间', startTime: 'startTime', endTime: 'endTime',timeList:[], uid: this.getUid() },
+          { type: 6, fieldName: 'money', value: '', placeholder: '预算金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[], uid: this.getUid() },
+          { type: 1, fieldName: 'subjectMatters', value: '', placeholder: '招标采购分类', options: [],width:125, uid: this.getUid()},
+          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150, uid: this.getUid()},
+          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110, uid: this.getUid()},
+          { type: 3, fieldName: 'keys', value: '', placeholder: '输入关键词查询'},
         ],
         tableData:[],
         tableDataTotal:0,
@@ -373,6 +374,7 @@
 
 <style lang="scss" scoped>
   .performance{
+    @import "@/assets/styles/search-common.scss";
     background: #ffffff;
     border-radius: 4px;
     padding: 16px;

dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue

@@ -493,7 +493,7 @@ export default {
 
         & > span {
           color: #232323;
-          color: rgba(35, 35, 35, 0.8);
+          color: rgba(35, 35, 35, 0.4);
           font-weight: 400;
           margin-left: 8px;
           line-height: 22px;
@@ -549,4 +549,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

dsk-operate-ui/src/views/detail/party-a/opport/announcement.vue

@@ -54,10 +54,10 @@ export default {
         {label: '报名截止日期', prop: 'overTime', width: '110'}
       ],
       formData: [
-        { type: 7, fieldName: 'province', value: '',props: {multiple: true}, placeholder: '项目地区', options: []},
-        { type: 4, fieldName: 'projectCategory', value: '', placeholder: '项目类型', options: []},
-        { type: 4, fieldName: 'tenderStage', value: '', placeholder: '招标阶段', options: []},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入关键词查询', options: []}
+        { type: 7, fieldName: 'province', value: '',props: {multiple: true}, placeholder: '项目地区', options: [], uid: this.getUid() },
+        { type: 4, fieldName: 'projectCategory', value: '', placeholder: '项目类型', options: [], uid: this.getUid() },
+        { type: 4, fieldName: 'tenderStage', value: '', placeholder: '招标阶段', options: [], uid: this.getUid() },
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入关键词查询', options: [], uid: this.getUid() }
       ],
       //列表
       tableLoading: false,