[update] 修改bug80351

src/components/selection/UserSelectByContact.vue

@@ -5,15 +5,19 @@
         :type="inputType"
         :autoSize="true"
         :rows="1"
-        disabled
+        readOnly
-        class="user-input"
+        :disabled="disabled"
+        :class="{
+          'input-readonly': !disabled,
+          'user-input': showBtn
+        }"
         :placeholder="placeholder"
         :value="checkedValue"
         @click="selectClick"
         :title="checkedValue"
       >
       </a-input>
-      <a-button type="primary" class="button-box" @click="selectClick" :disabled="disabled">
+      <a-button type="primary" class="button-box" @click="selectClick" :disabled="disabled" v-if="showBtn && !disabled">
         {{ $t('userSelect.select') }}
       </a-button>
     </div>
@@ -56,6 +60,12 @@ export default {
       type: String,
       required: false,
       default: 'text'
+    },
+    // 是否展示按钮
+    showBtn: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   watch: {
@@ -73,6 +83,10 @@ export default {
   },
   methods: {
     selectClick () {
+      // 禁用后不弹框
+      if (this.disabled) {
+        return
+      }
       this.$refs.selectModal.open(this.value)
     },
     selectChange (ids) {
@@ -106,7 +120,7 @@ export default {
     width: calc(100% - 70px);
   }
   // 因为需要加title，所以不能把鼠标事件去掉
-  /deep/ .ant-input-disabled {
+  /deep/ .input-readonly.ant-input-disabled {
     background: #fff;
     color: rgba(0, 0, 0, 0.65);
     cursor: default;

src/components/selection/UserSelectByWorkGroup.vue

@@ -5,15 +5,19 @@
         :type="inputType"
         :autoSize="true"
         :rows="1"
-        disabled
+        readOnly
-        class="user-input"
+        :disabled="disabled"
+        :class="{
+          'input-readonly': !disabled,
+          'user-input': showBtn
+        }"
         :placeholder="placeholder"
         :value="checkedValue"
         @click="selectClick"
         :title="checkedValue"
       >
       </a-input>
-      <a-button type="primary" class="button-box" @click="selectClick" :disabled="disabled">
+      <a-button type="primary" class="button-box" @click="selectClick" :disabled="disabled" v-if="showBtn && !disabled">
         {{ $t('userSelect.select') }}
       </a-button>
     </div>
@@ -56,6 +60,12 @@ export default {
       type: String,
       required: false,
       default: 'text'
+    },
+    // 是否展示按钮
+    showBtn: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   watch: {
@@ -73,6 +83,10 @@ export default {
   },
   methods: {
     selectClick () {
+      // 禁用后不弹框
+      if (this.disabled) {
+        return
+      }
       this.$refs.selectModal.open(this.value)
     },
     selectChange (ids) {
@@ -103,7 +117,7 @@ export default {
     width: calc(100% - 70px);
   }
   // 因为需要加title，所以不能把鼠标事件去掉
-  /deep/ .ant-input-disabled {
+  /deep/ .input-readonly.ant-input-disabled {
     background: #fff;
     color: rgba(0, 0, 0, 0.65);
     cursor: default;

src/views/personalCenter/taskCareOf/table/BasicLibraryInfo.vue

@@ -150,9 +150,10 @@ export default {
           dataIndex: 'transferUser',
           customRender: (value, row, index) => {
             return <user-selection v-model={this.dataSource[index].transferUser}
-              ref={'userSelection'}
               disabled={this.disabled} type={'radio'}
               filedName={this.dataSource[index].id + '-' + this.dataSource[index].type}
+              nameStr={this.dataSource[index].transferUser_dictText}
+              onNameChange={this.userNameChange} showBtn={false}
               placeholder={this.$t('pleaseSelect')} onChange={this.transferUserChange} />
           }
         }
@@ -194,15 +195,15 @@ export default {
         if (res.success) {
           this.$message.success(res.message)
           this.loadData()
-          this.$forceUpdate()
-          this.$refs.userSelection.$forceUpdate()
         } else {
           this.$message.warning(res.message)
         }
-      }).finally(() => {
-        this.loading = false
       })
     },
+    userNameChange (value, fieldName) {
+      const data = this.dataSource.find(item => item.id === fieldName.split('-')[0])
+      data.transferUser_dictText = value
+    },
     // 批量转交
     handleTransfer () {
       if (this.selectedRowKeys.length <= 0) {

src/views/personalCenter/taskCareOf/table/ProcessInfo.vue

@@ -22,6 +22,7 @@
               <j-dict-select-tag
                 :placeholder="$t('pleaseSelect')+$t('workCenter.processCenter.processType')"
                 dict-code="prc_type"
+                :dropdownMatchSelectWidth="false"
                 v-model="queryParam.prcType">
               </j-dict-select-tag>
             </a-form-item>
@@ -152,10 +153,11 @@ export default {
           customRender: (value, row, index) => {
             if (row.state) {
               return <user-selection v-model={this.dataSource[index].transferUser}
-                                     nameStr={this.dataSource[index].transferUser_dictText}
+                nameStr={this.dataSource[index].transferUser_dictText}
-                                     filedName={this.dataSource[index].taskId}
+                filedName={this.dataSource[index].taskId}
-                                     onChange={this.transferUserChange}
+                onChange={this.transferUserChange}
-                                     disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
+                onNameChange={this.userNameChange} showBtn={false}
+                disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
             } else {
               return this.global.emptyLine
             }
@@ -185,10 +187,12 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
-      }).finally(() => {
-        this.loading = false
       })
     },
+    userNameChange (value, fieldName) {
+      const data = this.dataSource.find(item => item.taskId === fieldName)
+      data.transferUser_dictText = value
+    },
     // 批量转交
     handleTransfer () {
       if (this.selectedRowKeys.length <= 0) {

src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue

@@ -205,7 +205,7 @@ export default {
           customRender: (value, row, index) => {
             return <user-selection v-model={this.dataSource[index].approvalUser}
               filedName={index + ''} onNameChange={this.userNameChange}
-              nameStr={this.dataSource[index].approvalUser_dictText}
+              nameStr={this.dataSource[index].approvalUser_dictText} showBtn={false}
               disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
           }
         }

src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue

@@ -252,7 +252,7 @@ export default {
             } else {
               // 不是被驳回的待办，可以设置联络人
               return <user-select-by-contact v-model={this.dataSource[index].contactUser}
-                nameStr={this.dataSource[index].contactUser_dictText}
+                nameStr={this.dataSource[index].contactUser_dictText} showBtn={false}
                 disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
             }
           }

src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue

@@ -196,7 +196,7 @@ export default {
           customRender: (value, row, index) => {
             return <user-selection v-model={this.dataSource[index].prcMainDraftUser}
               filedName={index + ''} onNameChange={this.userNameChange}
-              nameStr={this.dataSource[index].prcMainDraftUser_dictText}
+              nameStr={this.dataSource[index].prcMainDraftUser_dictText} showBtn={false}
               disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
           }
         }