From 69b06b9e6385d4dcd275a6bab1da1f7b984f5db3 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 26 Jul 2023 18:05:30 +0800
Subject: [PATCH] customer

---
 .../customerOrg/customerOrgEdit.vue           | 182 +++++++-----------
 .../PatientRegisterRefuseList.vue             |   6 +-
 src/store/index.js                            |   2 +-
 3 files changed, 74 insertions(+), 116 deletions(-)

diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue
index a06cc50..94a25f0 100644
--- a/src/components/customerOrg/customerOrgEdit.vue
+++ b/src/components/customerOrg/customerOrgEdit.vue
@@ -1,33 +1,21 @@
 <template>
   <div style="display: flex">
     <div>
-      <el-form
-        ref="form"
-        :model="customerOrg.customerOrgRd"
-        label-width="110px"
-        :rules="rules"
-        size="medium"
-      >
+      <el-form ref="form" :model="customerOrg.customerOrgRd" label-width="100px" :rules="rules" size="medium">
         <el-row>
           <el-col :span="8">
             <el-form-item label="单位名称" prop="displayName">
-              <el-input
-                v-model="customerOrg.customerOrgRd.displayName"
-              ></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.displayName" placeholder="请输入单位名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="简称" prop="shortName">
-              <el-input
-                v-model="customerOrg.customerOrgRd.shortName"
-              ></el-input>
+            <el-form-item label="单位简称" prop="shortName">
+              <el-input v-model="customerOrg.customerOrgRd.shortName" placeholder="请输入单位简称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="发票抬头" prop="invoiceName">
-              <el-input
-                v-model="customerOrg.customerOrgRd.invoiceName"
-              ></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.invoiceName" placeholder="请输入发票抬头" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -41,119 +29,84 @@
                   ...customerOrg.treeprops,
                 }"
                 :show-all-levels="false"
-                clearable
-                filterable
+                clearable filterable disabled
               >
               </el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系电话" prop="telephone">
-              <el-input
-                v-model="customerOrg.customerOrgRd.telephone"
-              ></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.telephone" placeholder="请输入联系电话" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="传真" prop="fax">
-              <el-input v-model="customerOrg.customerOrgRd.fax"></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.fax" placeholder="请输入传真" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="邮政编码" prop="postalCode">
-              <el-input
-                v-model="customerOrg.customerOrgRd.postalCode"
-              ></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.postalCode" placeholder="请输入邮政编码" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="地址" prop="address">
-              <el-input v-model="customerOrg.customerOrgRd.address"></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.address" placeholder="请输入地址" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="开户银行" prop="bank">
-              <el-input v-model="customerOrg.customerOrgRd.bank"></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.bank" placeholder="请输入开户银行" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="银行账号" prop="accounts">
-              <el-input v-model="customerOrg.customerOrgRd.accounts"></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.accounts" placeholder="请输入银行账号" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单位性质" prop="orgTypeId">
-              <el-select
-                v-model="customerOrg.customerOrgRd.orgTypeId"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="item in data.customerOrgType"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
-                </el-option>
+              <el-select v-model="customerOrg.customerOrgRd.orgTypeId" placeholder="请选择" filterable >
+                <el-option v-for="item in data.customerOrgType" :key="item.id" :label="item.displayName" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="单位简码" prop="simpleCode">
-              <el-input
-                v-model="customerOrg.customerOrgRd.simpleCode"
-                placeholder="由系统自动生成"
-                disabled
-              ></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.simpleCode" placeholder="由系统自动生成" disabled />
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
+          </el-col>          
+        </el-row>
+        <el-row>
+          <el-col :span="6">
             <el-form-item label="体检中心" prop="organizationUnitId">
-              <el-select
-                v-model="customerOrg.customerOrgRd.organizationUnitId"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="item in data.organizationdata"
-                  :key="item.id"
-                  :label="item.displayName"
-                  :value="item.id"
-                >
-                </el-option>
+              <el-select v-model="customerOrg.customerOrgRd.organizationUnitId" placeholder="请选择" filterable >
+                <el-option v-for="item in data.organizationdata" :key="item.id" :label="item.displayName" :value="item.id" />
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="customerOrg.customerOrgRd.remark"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+          </el-col>          
+          <el-col :span="6">
             <el-form-item label="加锁" prop="isLock">
-              <el-radio v-model="customerOrg.customerOrgRd.isLock" label="Y"
-                >是</el-radio
-              >
-              <el-radio v-model="customerOrg.customerOrgRd.isLock" label="N"
-                >否</el-radio
-              >
+              <el-radio v-model="customerOrg.customerOrgRd.isLock" label="Y" >是</el-radio>
+              <el-radio v-model="customerOrg.customerOrgRd.isLock" label="N" >否</el-radio>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="状态" prop="isActive">
-              <el-radio v-model="customerOrg.customerOrgRd.isActive" label="Y"
-                >启用</el-radio
-              >
-              <el-radio v-model="customerOrg.customerOrgRd.isActive" label="N"
-                >停用</el-radio
-              >
+              <el-radio v-model="customerOrg.customerOrgRd.isActive" label="Y">启用</el-radio>
+              <el-radio v-model="customerOrg.customerOrgRd.isActive" label="N">停用</el-radio>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="显示顺序" prop="displayOrder">
-              <el-input
-                v-model="customerOrg.customerOrgRd.displayOrder"
-              ></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.displayOrder" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="customerOrg.customerOrgRd.remark" maxlength="100" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -162,38 +115,23 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="创建者">
-              <el-input
-                v-model="customerOrg.customerOrgRd.creatorName"
-                disabled
-              ></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.creatorName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="创建时间" style="margin-left: -5%">
-              <el-input
-                :value="customerOrg.customerOrgRd.creationTime | dateFormat"
-                disabled 
-                style="width: 90%"
-              ></el-input>
+              <el-input :value="customerOrg.customerOrgRd.creationTime | dateFormat" disabled style="width: 90%" />
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="修改者" style="margin-left: -25%">
-              <el-input
-                v-model="customerOrg.customerOrgRd.creatorName"
-                disabled
-              ></el-input>
+              <el-input v-model="customerOrg.customerOrgRd.creatorName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="7">
             <el-form-item label="修改时间" style="margin-left: -5%">
-              <el-input
-                :value="
-                  customerOrg.customerOrgRd.lastModificationTime | dateFormat
-                "
-                disabled
-                style="width: 90%"
-              ></el-input>
+              <el-input :value="customerOrg.customerOrgRd.lastModificationTime | dateFormat "
+                disabled style="width: 90%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -201,14 +139,16 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 5%" width="150px">
-      <el-button type="primary" @click="add">新增</el-button>
-      <el-button
-        type="primary"
-        @click="Onsubmit('form')"
-        style="margin-left: 0; margin-top: 10px"
-        >保存</el-button
-      >
-      <div style="margin-top: 10px">
+      <div class="btnList">
+        <el-button type="primary" @click="add">新增</el-button>
+      </div>
+      <div class="btnList">
+        <el-button type="primary" @click="add('child')">新增子单位</el-button>
+      </div>
+      <div class="btnList">
+        <el-button type="success" @click="Onsubmit('form')" >保存</el-button>
+      </div>
+      <div class="btnList">
         <el-button type="danger" @click="del">删除</el-button>
       </div>
     </div>
@@ -362,9 +302,20 @@ export default {
       });
     },
     //新增弹框
-    add() {
+    add(child) {
+
+      if(child){
+        if(!this.customerOrg.customerOrgId){
+          this.$message.info("请先选择单位")
+          return
+        }
+        this.customerOrg.customerOrgRd = { id: "", isLock: "N", isActive: "Y" ,parentId:this.customerOrg.customerOrgId};
+      }else{
+        this.customerOrg.customerOrgRd = { id: "", isLock: "N", isActive: "Y" };
+      }
+
       this.customerOrg.customerOrgId = "";
-      this.customerOrg.customerOrgRd = { id: "", isLock: "N", isActive: "Y" };
+      
     },
 
     //删除
@@ -384,4 +335,7 @@ export default {
 ::v-deep .el-form-item {
   margin-bottom: 5px;
 }
+.btnList{
+  margin-bottom: 10px;
+}
 </style>
diff --git a/src/components/patientRegister/PatientRegisterRefuseList.vue b/src/components/patientRegister/PatientRegisterRefuseList.vue
index 2ab078d..8c4aa81 100644
--- a/src/components/patientRegister/PatientRegisterRefuseList.vue
+++ b/src/components/patientRegister/PatientRegisterRefuseList.vue
@@ -137,7 +137,11 @@
             </template>
           </el-table-column>
           <el-table-column prop="lastModifierName" label="操作员" width="100" />
-          <el-table-column prop="lastModificationTime" label="操作时间" width="180" />
+          <el-table-column prop="lastModificationTime" label="操作时间" width="180" >
+            <template slot-scope="scope">
+              <div>{{ lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss") }}</div>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <div style="margin-left: 10px;width:100px;">
diff --git a/src/store/index.js b/src/store/index.js
index fe88bfd..13e4fc2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -17,7 +17,7 @@ export default new Vuex.Store({
         children: "treeChildren",
       }, //树形组件的数据结构
       customerOrgId: "", //当前单位ID（可根据此值是否为空，判断是新增还是编辑）
-      customerOrgRd: { id: "", displayName: "单位名称" }, //单个体检单位记录值
+      customerOrgRd: { id: "", isLock: "N", isActive: "Y",}, //单个体检单位记录值
       customerOrgRegisterList: [], //单位体检次数登记列表
       contactPersonList: [], //联系人列表
       contactMethodList: [], //联系方式列表