From df22ed7d1123289c5b24f9fe3143cc8fc4cdad5e Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Mon, 9 Sep 2024 17:23:26 +0800
Subject: [PATCH] 运营主体可手动输入

---
 src/components/CompanyForm/index.vue    |  5 +++--
 src/views/baseCaseHandling/Form.vue     | 14 ++++++++++++++
 src/views/baseInspectionReport/Form.vue | 15 +++++++++++++++
 src/views/baseSystemInfo/index.vue      |  6 ++++--
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index 6d21199..95169f4 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -78,7 +78,7 @@
 				</el-col>
 				<el-col :span="24">
          		  <el-form-item label="所属区县" prop="areaId">
-         		    <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px">
+         		    <el-radio-group v-removeAriaHidden v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px">
          		      <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
          		    </el-radio-group>
          		  </el-form-item>
@@ -122,7 +122,8 @@ export default {
 			qualificationCertificate: [],
 			otherInfo: undefined,
 			contactUser: undefined,
-			contactPhone: undefined
+			contactPhone: undefined,
+			areaId: undefined,
 		},
 		rules: {
 			companyName: [
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index 481eec9..433db27 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -45,11 +45,14 @@
         <el-col :span="24">
           <el-form-item label="运营主体" prop="registeredEntity">
             <el-select
+              ref="companySelect"
               v-model="dataForm.registeredEntity"
               placeholder="请选择运营主体"
               clearable
               filterable 
               style="width: 100%"
+              @blur.native.capture="selectCompanyBlur"
+              @visible-change="visibleNameCompanyChange"
               :disabled="formType != 0 || dataForm.isHaveSystem"
             >
               <el-option
@@ -306,6 +309,17 @@ export default {
       let input = this.$refs.select.$children[0].$refs.input;
       input.blur();
     },
+    // 运营主体改变
+    selectCompanyBlur(e) {
+      let value = e.target.value;
+      if(!value) return;
+      this.dataForm.registeredEntity = e.target.value;
+    },
+    visibleNameCompanyChange(val) {
+      if (val) return
+      let input = this.$refs.companySelect.$children[0].$refs.input;
+      input.blur();
+    },
     goBack() {
       this.$emit("refresh");
     },
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 7fe85be..11eec91 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -52,11 +52,14 @@
         <el-col :span="23">
           <el-form-item label="运营主体" prop="company">
             <el-select
+              ref="companySelect"
               v-model="dataForm.company"
               placeholder="请选择运营主体"
               clearable
               filterable 
               style="width: 100%"
+              @blur.native.capture="selectCompanyBlur"
+              @visible-change="visibleNameCompanyChange"
               :disabled='isDisabledTypeByName || !!this.dataForm.id'
             >
               <el-option
@@ -327,6 +330,18 @@ export default {
       let input = this.$refs.select.$children[0].$refs.input;
       input.blur();
     },
+
+    // 运营主体改变
+    selectCompanyBlur(e) {
+      let value = e.target.value;
+      if(!value) return;
+      this.dataForm.company = e.target.value;
+    },
+    visibleNameCompanyChange(val) {
+      if (val) return
+      let input = this.$refs.companySelect.$children[0].$refs.input;
+      input.blur();
+    },
     loadList() {
       this.name_loading = true;
       request({
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 65213be..e6831f4 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -92,7 +92,9 @@
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
             <NCC-table v-loading="loading" :data="infoDataList">
-              <el-table-column show-overflow-tooltip prop="companyName" label="运营主体名称" align="center"/>
+              <el-table-column show-overflow-tooltip prop="companyName" label="运营主体名称" align="center">
+                <template slot-scope="scope">{{ scope.row.companyName || scope.row.companyId }}</template>
+              </el-table-column>
               <el-table-column show-overflow-tooltip prop="systemName" label="应用名称" align="center"/>
               <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template>
@@ -213,7 +215,7 @@ export default {
       },
       listQuery: {
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 20,
         sort: "desc",
         sidx: "",
       },
--
libgit2 0.21.4