Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/contactData/index.vue

@@ -543,7 +543,7 @@ export default {
       this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
       this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
-      this.$refs.contactsAddAnalysisRef.listData(dataid,type,1,state,null)
+      this.$refs.contactsAddAnalysisRef.listData(dataid,type,isleave,state,null)
 
       /*联系人关联线索情况统计*/
       this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
@@ -551,7 +551,7 @@ export default {
       this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
       this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfCluesRef.paramTable.content.pageNumber = 1
-      this.$refs.statisticsOfCluesRef.listData(dataid,type,1,state,null)
+      this.$refs.statisticsOfCluesRef.listData(dataid,type,isleave,state,null)
 
       /*联系人关联客户情况统计*/
       this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
@@ -559,7 +559,7 @@ export default {
       this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
       this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfCustomerRef.paramTable.content.pageNumber = 1
-      this.$refs.statisticsOfCustomerRef.listData(dataid,type,1,state,null)
+      this.$refs.statisticsOfCustomerRef.listData(dataid,type,isleave,state,null)
 
       /*联系人关联项目情况统计*/
       this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
@@ -567,7 +567,7 @@ export default {
       this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
       this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfProjectRef.paramTable.content.pageNumber = 1
-      this.$refs.statisticsOfProjectRef.listData(dataid,type,1,state,null)
+      this.$refs.statisticsOfProjectRef.listData(dataid,type,isleave,state,null)
 
       /*联系人跟进情况统计*/
       this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
@@ -575,14 +575,14 @@ export default {
       this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
       this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfFollowRef.paramTable.content.pageNumber = 1
-      this.$refs.statisticsOfFollowRef.listData(dataid,type,1,state,null)
+      this.$refs.statisticsOfFollowRef.listData(dataid,type,isleave,state,null)
 
       /*近12月联系人跟进分析*/
       this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
       this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
       this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
-      this.$refs.contactsFollowAnalysisRef.listData(dataid,type,1,state,null)
+      this.$refs.contactsFollowAnalysisRef.listData(dataid,type,isleave,state,null)
 
       /*联系人未跟进天数分析*/
       this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
@@ -590,7 +590,7 @@ export default {
       this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
       this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfUnFollowRef.paramTable.content.pageNumber = 1
-      this.$refs.statisticsOfUnFollowRef.listData(dataid,type,1,state,null)
+      this.$refs.statisticsOfUnFollowRef.listData(dataid,type,isleave,state,null)
     },
     /*联系人数据概况*/
     async queryMainData(dataid,dateType){

src/HDrpManagement/productInspectionMag/modules/checkInfo.vue

@@ -47,6 +47,7 @@
                 size="small"
                 :placeholder="$t('请选择技术要求')"
                 style="width: 100%"
+                @focus="askSelect(scope.column.data.optionname)"
             >
               <el-option
                   v-for="item in askList"
@@ -87,7 +88,8 @@
         <div v-else-if="scope.column.columnname == 'operation'">
           <el-button type="text" size="small" v-if="isAdd && nowIndex == scope.column.data.rowindex" @click="onSave(scope.column.data)" style="color: #e6a23c" :disabled="disabled">{{$t(`保存`)}}</el-button>
           <el-button type="text" size="small" class="inline-16" v-else @click="onEdit(scope.column.data)" :disabled="disabled">{{$t(`编辑`)}}</el-button>
-          <el-button size="small" type="text"  style="color: #f56c6c" :disabled="disabled" @click="delInfo(scope.column.data)">{{$t(`删除`)}}</el-button>
+          <el-button size="small" type="text"  style="color: #f56c6c"  v-if="!isEdit || nowIndex != scope.column.data.rowindex" :disabled="disabled" @click="delInfo(scope.column.data)">{{$t(`删除`)}}</el-button>
+          <el-button size="small" type="text"  style="color: #f56c6c"  v-if="isEdit && nowIndex == scope.column.data.rowindex" :disabled="disabled" @click="isEdit = false;isSave = false;isAdd = false;listData(param.content.pageNumner = 1)">{{$t(`取消`)}}</el-button>
         </div>
         <div v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
       </template>
@@ -136,7 +138,8 @@ export default {
       isOptionname:'',
       isAsk:'',
       isAnswer:'',
-      isSave:false
+      isSave:false,
+      isEdit:false,
     }
   },
   methods:{
@@ -216,6 +219,7 @@ export default {
           this.nowIndex = ''
           this.listData()
           this.isSave = false
+          this.isEdit = false
         }
       }else {
 
@@ -226,6 +230,7 @@ export default {
       this.queryType()
       this.nowIndex = data.rowindex
       this.isAdd = true
+      this.isEdit = true
     },
     selectChange(val){
       this.list[this.nowIndex - 1].ask = ''
@@ -234,6 +239,13 @@ export default {
           this.askList = item.subvalues
         }
       })
+    },
+    askSelect(val){
+      this.optionnameList.forEach(item=>{
+        if (val == item.value){
+          this.askList = item.subvalues
+        }
+      })
     }
   },
   mounted() {