Merge remote-tracking branch 'origin/master'

src/views/program/registered/ContactForm.vue

@@ -22,8 +22,7 @@
 <!--          </el-form-item>-->
 <!--        </el-form>-->
 
-        <vxe-table
-			:key="tableKey"
+        <el-table
           border="inner"
           auto-resize
           resizable
@@ -47,7 +46,7 @@
           <vxe-column width="" title="联系方式1" field="linkPhone"></vxe-column>
           <vxe-column width="" title="联系方式2" field="linkMobile"></vxe-column>
 
-        </vxe-table>
+        </el-table>
       </div>
 		<template #footer>
 			<span slot="footer" class="dialog-footer">
@@ -67,7 +66,6 @@
   export default {
     data () {
       return {
-		  tableKey: '',
         title: '',
         method: '',
         visible: false,
@@ -139,7 +137,6 @@
             data.workClientLinkman.forEach(i => {
               this.dataList.push(i)
             })
-			  this.tableKey = Math.random()
           })
         })
       },

src/views/program/registered/ProjectForm2022.vue

@@ -576,11 +576,13 @@
 					keep-source
 					@cell-click=""
 					@edit-closed=""
+					highlight-current-row
 					:edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '#'}"
 				>
 					<vxe-table-column field="name" title="姓名" :edit-render="{}">
 						<template #edit="scope">
 							<el-input v-model="scope.row.name" ></el-input>
+
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="workHours" title="预计工时（时）" :edit-render="{name: '$input'}">

src/views/program/registered/ProjectFormUpdate.vue

@@ -595,6 +595,8 @@
 				  :data="inputForm.members"
 				  style="margin-left: 5em"
 				  :key="memberKey"
+				  @cell-click=""
+				  @edit-closed=""
 				  highlight-current-row
 				  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: false, icon: '#'}"
 			  >
@@ -602,8 +604,8 @@
 					  <template v-slot:edit="scope">
 						  <vxe-input v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId)"  style="width: 100%" class="my-search">
 							  <template #suffix>
-								  <!--                    <i class="el-icon-search" @click="openUserSearch(scope.$rowIndex)"></i>-->
-								  <vxe-button  @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></vxe-button>
+								                      <i class="el-icon-search" @click="openUserSearch(scope.$rowIndex)"></i>
+<!--								  <vxe-button  @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></vxe-button>-->
 							  </template>
 						  </vxe-input>
 					  </template>

src/views/program/registered/RegisItemForm.vue

@@ -630,7 +630,9 @@
 					:key="memberKey"
 					:data="inputForm.members"
 					style="margin-left: 5em"
+					@cell-click=""
 					:edit-rules="validRulesMember"
+					@edit-closed=""
 					highlight-current-row
 					:edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear:  status === 'audit' || status === 'taskFormDetail' ? true : false, icon: '#'}"
 				>
@@ -643,7 +645,15 @@
 <!--							</vxe-input>-->
 <!--						</template>-->
 						<template v-slot:edit="scope">
-							<el-input v-model="scope.row.name" ></el-input>
+							<vxe-input v-model="scope.row.name" :disabled="commonJS.isNotEmpty(scope.row.userId) || status === 'audit' || status === 'taskFormDetail'"  style="width: 100%">
+<!--								<template #suffix>-->
+<!--									<vxe-button :disabled="status === 'audit' || status === 'taskFormDetail'" @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></vxe-button>-->
+<!--								</template>-->
+								<template #suffix>
+<!--									<i class="el-icon-search" @click="openUserSearch(scope.$rowIndex)"></i>-->
+									<el-button :disabled="status === 'audit' || status === 'taskFormDetail'"  @click="openUserSearch(scope.$rowIndex)" type="text" content="" icon="el-icon-search" ></el-button>
+								</template>
+							</vxe-input>
 						</template>
 					</vxe-table-column>
 					<vxe-table-column field="workHours" title="预计工时（时）" :edit-render="{name: '$input'}"  align="center">
@@ -1202,9 +1212,7 @@
               }
             }
           })
-			console.log('this.inputForm.members', this.inputForm.members)
           this.inputForm.members.forEach((item, index) => {
-          	console.log('item', item)
             if (this.commonJS.isEmpty(item.name)) {
               this.loading = false
               this.$message.error('项目组成员姓名不允许为空')
@@ -1338,7 +1346,6 @@
         this.$forceUpdate()
       },
       openContactForm (deputy) {
-      	console.log(1231231231)
         if (deputy === '0') {
           if (this.commonJS.isEmpty(this.inputForm.client) && this.commonJS.isEmpty(this.inputForm.propertyHolder)) {
             this.$message.error('请先填写合同委托方或委托人')