From 4b300fa389134ae746f2d41707a52ce5f108e63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 31 Jan 2023 15:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=BE=80?=
 =?UTF-8?q?=E6=9D=A5=E4=BF=A1=E6=81=AF=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/basicUnitMaintain.js            |  8 ++++
 src/views/basic/corpMaintain/corpMaintain.vue | 38 +++++++++-------
 src/views/basic/corpMaintain/corpSelect.vue   | 44 +++++++++++--------
 .../corpMaintain/corpSingleRelevance.vue      |  8 ++++
 4 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/src/api/basic/basicUnitMaintain.js b/src/api/basic/basicUnitMaintain.js
index d6cb498f..4bd03b4f 100644
--- a/src/api/basic/basicUnitMaintain.js
+++ b/src/api/basic/basicUnitMaintain.js
@@ -88,4 +88,12 @@ export function removeRl(query) {
     });
 }
 
+export function getSystemParamConfig(query) {
+  return axios({
+    url: "/udiwms/basic/unit/maintain/getSystemParamConfig",
+    method: "post",
+    data: query
+  });
+}
+
 
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index 7a101768..76c73596 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -14,6 +14,7 @@
                         <el-option label="全部" value=""></el-option>
                         <el-option label="客户" value="1"></el-option>
                         <el-option label="供应商" value="2"></el-option>
+                        <el-option label="特殊科室" value="3"></el-option>
                         <el-option label="特殊往来" value="4"></el-option>
                     </el-select>
                 </el-form-item>
@@ -65,7 +66,7 @@
         <el-dialog
             :title="combinTypeMap[combinType]"
             :visible.sync="selectDrugDialogVisible"
-            width="85%"
+            width="80%"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             v-if="selectDrugDialogVisible"
@@ -110,42 +111,42 @@
             </el-table>
             <el-form :model="editQuery" :rules="formRules" style="margin-top: 20px" label-width="120px" ref="dataForm">
               <el-row  type="flex">
-                <el-col :span="11" type="flex">
+                <el-col :span="12" type="flex">
                   <el-form-item label="往来单位名称" prop="name">
                       <el-input v-model="editQuery.name" size="small" style="width: 90%" auto-complete="off" @input="change()" splaceholder="请输入往来单位名称"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="11" type="flex">
+                <el-col :span="12" type="flex">
                   <el-form-item label="往来单位编码" prop="erpId">
                     <el-input v-model="editQuery.erpId" style="width: 90%" auto-complete="off" disabled="true" splaceholder="请输入往来单位编码"></el-input>
                   </el-form-item>
                 </el-col>
                 </el-row>
                 <el-row type="flex">
-                  <el-col :span="11" type="flex">
+                  <el-col :span="12" type="flex">
                     <el-form-item label="社会信用号" prop="creditNo">
                       <el-input v-model="editQuery.creditNo" style="width: 90%" splaceholder="请输入社会信用号" auto-complete="off"></el-input>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="11" type="flex">
+                  <el-col :span="12" type="flex">
                     <el-form-item label="联系人" prop="contact">
                       <el-input v-model="editQuery.contact"  splaceholder="请输入联系人" style="width: 90%" auto-complete="off"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :type="flex">
-                  <el-col :span="11" type="flex">
+                  <el-col :span="12" type="flex">
                     <el-form-item label="地址" prop="addr">
                       <el-input type="" v-model="editQuery.addr" splaceholder="请输入地址" style="width: 90%" auto-complete="off"></el-input></el-form-item>
                     </el-col>
-                  <el-col :span="11" type="flex">
+                  <el-col :span="12" type="flex">
                     <el-form-item label="联系电话" prop="mobile">
                       <el-input v-model="editQuery.mobile" splaceholder="请输入联系电话" auto-complete="off" style="width: 90%"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :type="flex">
-                  <el-col :span="11" type="flex">
+                  <el-col :span="12" type="flex">
                     <el-form-item label="往来单位类型" prop="corpType">
                       <el-select v-model="editQuery.corpType"  style="width: 90%" placeholder="请选择往来单位类型">
                         <el-option
@@ -157,7 +158,7 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="11" type="flex">
+                  <el-col :span="12" type="flex">
                     <el-form-item label="拼音码" prop="spell">
                       <el-input v-model="editQuery.spell"  placeholder="请输入拼音码" auto-complete="off" style="width: 90%"></el-input>
                     </el-form-item>
@@ -174,7 +175,7 @@
 </template>
 
 <script>
-import {getBasicUnitMaintains, basicUnitMaintainSave, deleteBasicUnitMaintain, getThrsysUnit, removeRl} from "@/api/basic/basicUnitMaintain";
+import {getBasicUnitMaintains, basicUnitMaintainSave, deleteBasicUnitMaintain, getThrsysUnit, removeRl,getSystemParamConfig} from "@/api/basic/basicUnitMaintain";
 import selectUnit from "./corpRelevance";
 import selectSingleUnit from "./corpSingleRelevance";
 import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
@@ -232,8 +233,8 @@ export default {
                     label: "供应商"
                 },
                 {
-                    value: 5,
-                    label: "医院客户"
+                    value: 3,
+                    label: "内部科室"
                 },
                 {
                     value: 4,
@@ -290,11 +291,10 @@ export default {
             this.thirdIdColumn = false;
             getBasicUnitMaintains(this.query)
                 .then((response) => {
+                    this.getSystemParamConfig();
                     this.loading = false;
-                    this.erpIdColumn = response.data.BUMErpIdValue == "1" ? true : false;
-                    this.thirdIdColumn = response.data.BUMThirdIdValue == "1" ? true : false;
-                    this.list = response.data.page.list || [];
-                    this.total = response.data.page.total || 0;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
                 })
                 .catch(() => {
                     this.loading = false;
@@ -302,6 +302,12 @@ export default {
                     this.total = 0;
                 });
         },
+      getSystemParamConfig(){
+        getSystemParamConfig().then((req) => {
+          this.erpIdColumn = req.data.BUMErpIdValue == "1" ? true : false;
+          this.thirdIdColumn = req.data.BUMThirdIdValue == "1" ? true : false;
+        })
+      },
       hideSearch() {
         this.showSearch = !this.showSearch;
       },
diff --git a/src/views/basic/corpMaintain/corpSelect.vue b/src/views/basic/corpMaintain/corpSelect.vue
index 2a2d600e..71dc5290 100644
--- a/src/views/basic/corpMaintain/corpSelect.vue
+++ b/src/views/basic/corpMaintain/corpSelect.vue
@@ -23,6 +23,8 @@
             </el-button-group>
         </div>
 
+        <el-divider style="margin: 15px"></el-divider>
+
         <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column label="序号" type="index"></el-table-column>
@@ -51,7 +53,7 @@
             title="往来单位详情"
             :visible.sync="formVisible"
             :before-close="hideForm"
-            width="80%"
+            width="60%"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             append-to-body
@@ -63,45 +65,45 @@
                 <el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column>
             </el-table>
 
-            <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
+            <el-form :model="formData" :rules="formRules" style="margin-top: 20px" ref="dataForm" label-width="100px">
               <el-row>
-                <el-col :span="6">
+                <el-col :span="12">
                   <el-form-item label="往来单位名称:" prop="name">
                     <el-input v-model="formData.name" size="small" style="width: 90%"  @input="change()" splaceholder="请输入往来单位名称"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="12">
                   <el-form-item label="往来单位编码:" prop="erpId">
                     <el-input v-model="formData.erpId" style="width: 90%" splaceholder="请输入往来单位编码" auto-complete="off" disabled="true"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="6">
+                <el-col :span="12">
                   <el-form-item label="社会信用号:" prop="creditNo">
                     <el-input v-model="formData.creditNo" style="width: 90%" splaceholder="请输入社会信用号" auto-complete="off"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="12">
                   <el-form-item label="联系人:" prop="contact">
                     <el-input v-model="formData.contact" style="width: 90%" splaceholder="请输入联系人" auto-complete="off"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="6">
+                <el-col :span="12">
                   <el-form-item label="地址:" prop="addr">
                     <el-input type="" v-model="formData.addr" style="width: 90%" splaceholder="请输入地址" ete="off"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="12">
                 <el-form-item label="联系电话:" prop="mobile">
                   <el-input v-model="formData.mobile" auto-complete="off" splaceholder="请输入联系电话" style="width: 90%"></el-input>
                 </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="6">
+                <el-col :span="12">
                   <el-form-item label="拼音码:" prop="spell">
                     <el-input v-model="formData.spell" auto-complete="off" splaceholder="请输入拼音码" style="width: 90%"></el-input>
                   </el-form-item>
@@ -114,11 +116,11 @@
 </template>
 
 <script>
-    import {
-        getBasicUnitMaintains,
-        basicUnitMaintainSave,
-        deleteBasicUnitMaintain, getThrsysUnit
-    } from "@/api/basic/basicUnitMaintain";
+import {
+  getBasicUnitMaintains,
+  basicUnitMaintainSave,
+  deleteBasicUnitMaintain, getThrsysUnit, getSystemParamConfig
+} from "@/api/basic/basicUnitMaintain";
     import {corpUpload} from "@/api/thrsys/smp"
     import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
     import {exportExcel} from "@/api/basic/corpExport"
@@ -211,10 +213,9 @@
                     .then((response) => {
                         console.log(response)
                         this.loading = false;
-                        this.erpIdColumn = response.data.BUMErpIdValue == "1" ? true : false;
-                        this.thirdIdColumn = response.data.BUMThirdIdValue == "1" ? true : false;
-                        this.list = response.data.page.list || [];
-                        this.total = response.data.page.total || 0;
+                        this.getSystemParamConfig();
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
                     })
                     .catch(() => {
                         this.loading = false;
@@ -457,7 +458,12 @@
                         this.list = [];
                     });
             },
-
+          getSystemParamConfig(){
+            getSystemParamConfig().then((req) => {
+              this.erpIdColumn = req.data.BUMErpIdValue == "1" ? true : false;
+              this.thirdIdColumn = req.data.BUMThirdIdValue == "1" ? true : false;
+            })
+          },
             getThirdSysDetail() {
                 let query = {
                     id: this.editQuery.id,
diff --git a/src/views/basic/corpMaintain/corpSingleRelevance.vue b/src/views/basic/corpMaintain/corpSingleRelevance.vue
index f3d9b207..b17004da 100644
--- a/src/views/basic/corpMaintain/corpSingleRelevance.vue
+++ b/src/views/basic/corpMaintain/corpSingleRelevance.vue
@@ -36,12 +36,18 @@
 
         <el-card class="el-card">
                 <el-form :model="unitQuery" label-width="100px" v-show="showSearch" size="mini">
+                  <el-row>
+                    <el-col span="6">
                     <el-form-item label="往来单位编码:">
                         <el-input v-model="unitQuery.unitId" style="width: 90%" placeholder="往来单位编码" clearable></el-input>
                     </el-form-item>
+                    </el-col>
+                    <el-col span="6">
                     <el-form-item label="往来单位:">
                         <el-input v-model="unitQuery.name" style="width: 90%" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
+                    </el-col>
+                    <el-col span="6">
                     <el-form-item label="外部系统:">
                         <el-select v-model="thirdSysFk" style="width: 90%" placeholder="请选择第三方系统" disabled="true">
                             <el-option
@@ -54,6 +60,8 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    </el-col>
+                  </el-row>
                 </el-form>
 
           <div class="top-right-btn">