2023-10-31

src/HDrpManagement/projectData/index.vue

@@ -180,21 +180,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="gradTableParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="gradTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.dataid=$event[$event.length - 1];gradTableParam.content.username='';$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';$refs.gradTable.listData();gradInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -263,21 +254,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="scoreTableParam1.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="scoreTableParam1.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {scoreMapParam1.content.type=1;scoreMapParam1.content.dataid=$event[$event.length - 1];scoreTableParam1.content.type=1;scoreTableParam1.content.dataid=$event[$event.length - 1];scoreTableParam1.content.username='';$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';scoreMapParam1.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.username='';$refs.scoreTable.listData();scoreInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -360,21 +342,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="addParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="addParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {addParam.content.type=1;addParam.content.dataid=$event[$event.length - 1];addParam.content.username='';addFun()} else {addParam.content.dataid='';addParam.content.type='';addParam.content.username='';addFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -413,21 +386,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="baobeiParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="baobeiParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {baobeiParam.content.type=1;baobeiParam.content.dataid=$event[$event.length - 1];baobeiParam.content.username='';baobeiFun()} else {baobeiParam.content.dataid='';baobeiParam.content.type='';baobeiParam.content.username='';baobeiFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -466,21 +430,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="baojiaParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="baojiaParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {baojiaParam.content.type=1;baojiaParam.content.dataid=$event[$event.length - 1];baojiaParam.content.username='';baojiaFun()} else {baojiaParam.content.dataid='';baojiaParam.content.type='';baojiaParam.content.username='';baojiaFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -519,21 +474,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="fllowParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="fllowParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {fllowParam.content.type=1;fllowParam.content.dataid=$event[$event.length - 1];fllowParam.content.username='';fllowFun()} else {fllowParam.content.dataid='';fllowParam.content.type='';fllowParam.content.username='';fllowFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -572,21 +518,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="fllowTableParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="fllowTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {fllowMapParam.content.type=1;fllowMapParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.type=1;fllowTableParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.username='';$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';$refs.projectFllowTable.listData();fllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -655,21 +592,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="contactTableParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="contactTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {contactMapParam.content.type=1;contactMapParam.content.dataid=$event[$event.length - 1];contactTableParam.content.type=1;contactTableParam.content.dataid=$event[$event.length - 1];contactTableParam.content.username='';$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';$refs.projectContactTable.listData();contactInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -738,21 +666,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="customerTableParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="customerTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {customerMapParam.content.type=1;customerMapParam.content.dataid=$event[$event.length - 1];customerTableParam.content.type=1;customerTableParam.content.dataid=$event[$event.length - 1];customerTableParam.content.username='';$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.username='';$refs.projectCustomerTable.listData();customerInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -821,21 +740,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="scoreTableParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="scoreTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {scoreMapParam.content.type=1;scoreMapParam.content.dataid=$event[$event.length - 1];scoreTableParam.content.type=1;scoreTableParam.content.dataid=$event[$event.length - 1];scoreTableParam.content.username='';$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.username='';$refs.projectScoreTable.listData();projectScoreInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -904,21 +814,12 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="unfllowTableParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="unfllowTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.type=1;unfllowTableParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -1039,21 +940,12 @@
               <div class="panel-select" style="margin-top:90px">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-<<<<<<< HEAD
-                    <el-cascader 
-                      ref="selectdep" 
-                      size="small" 
-                      v-model="dateParam.content.dataid" 
-                      :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-=======
                     <el-cascader
                       ref="selectdep"
                       size="small"
                       v-model="dateParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
->>>>>>> mergeBranch
                       @change="$event => {if($event.length) {[$event.length - 1];dateParam.content.type=1;dateParam.content.dataid=$event[$event.length - 1];dateParam.content.username='';getDate()} else {dateParam.content.dataid='';dateParam.content.type='';dateParam.content.username='';getDate()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
@@ -1101,7 +993,7 @@
                 <selectProject :projectType="projectType" :projectLead="projectLead" :tradefieldSelect="tradefieldSelect"  @selectRow="selectRow" ref="selectProject">
                   <div slot="input" style="display:flex;align-items:center">
                     <el-input v-model="projectname" style="width:300px" size="small" placeholder="请选择项目" @focus="$refs.selectProject.visible=true"></el-input>
-                    <el-button @click="projectname='';dateParam.content.where.sa_projectid='';getDate()" size="mini" type="text" v-if="dateParam.content.where.sa_projectid">清空</el-button>
+                    <el-button style="margin-left:10px" @click="projectname='';dateParam.content.where.sa_projectid='';getDate()" size="mini" type="text" v-if="dateParam.content.where.sa_projectid">清空</el-button>
                   </div>
                 </selectProject>
               </div>
@@ -1117,7 +1009,7 @@
                     <el-option label="结案" value="结案"></el-option>
                   </el-select>
                 </div>
-                <span style="margin:0 25px">至</span>
+                <span style="margin:0 35px 0 25px">至</span>
                 <div class="mt-10 inline-16">
                   <label  class="search__label">结束节点:</label>
                   <el-select v-model="dateParam.content.endnode" placeholder="结束节点" @change="getDate" size="small" clearable>