sum

src/components/customerOrg/ContactPerson.vue

@@ -73,44 +73,40 @@
       </div>
       <div style="margin-left: 10px; margin-top: 5%">
         <div style="margin-top: 10px">
-          <el-button type="primary" @click="add">新增</el-button>
+          <el-button type="primary" @click="add" class="btnClass">新增</el-button>
         </div>
         <div style="margin-top: 10px">
-          <el-button type="success" @click="edit">编辑</el-button>
+          <el-button type="success" @click="edit" class="btnClass">编辑</el-button>
         </div>
         <div style="margin-top: 10px">
-          <el-button type="danger" @click="del">删除</el-button>
+          <el-button type="danger" @click="del" class="btnClass">删除</el-button>
         </div>
       </div>
     </div>
     <!-- 联系人 -->
-    <el-dialog
-      :title="formTitle"
-      :visible.sync="dialogContactPerson"
-      width="480"
-    >
+    <el-dialog :title="formTitle" :visible.sync="dialogContactPerson" width="800px">
       <el-form :model="form" ref="form" label-width="100px" :rules="rules">
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="联系人">
-              <el-input v-model="form.displayName"></el-input>
+          <el-col :span="12">
+            <el-form-item prop="displayName" label="联系人">
+              <el-input v-model="form.displayName" size="small" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="职务">
-              <el-input v-model="form.title"></el-input>
+              <el-input v-model="form.title" size="small" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark"></el-input>
+              <el-input type="textarea" v-model="form.remark" size="small" maxlength="50" show-word-limit></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5">
             <el-form-item label="创建者">
-              <el-input v-model="form.creatorName" disabled></el-input>
+              <el-input v-model="form.creatorName" disabled size="small" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
@@ -119,12 +115,12 @@
                 :value="form.creationTime | dateFormat"
                 disabled
                 style="width: 90%"
-              ></el-input>
+                size="small" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="修改者" style="margin-left: -25%">
-              <el-input v-model="form.creatorName" disabled></el-input>
+              <el-input v-model="form.creatorName" disabled size="small" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
@@ -133,7 +129,7 @@
                 :value="form.lastModificationTime | dateFormat"
                 disabled
                 style="width: 90%"
-              ></el-input>
+                size="small" ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -143,30 +139,25 @@
           border
           height="300"
           row-key="id"
-          size="small"
-          class="el-table__body-wrapper tbody"
+          size="small"          
           highlight-current-row
           ref="contactMethod"
         >
           <el-table-column prop="contactMethodType" label="类型">
             <template slot-scope="scope">
-              <el-select v-model="customerOrg.contactMethodList[scope.$index].contactMethodType">
+              <el-select v-model="scope.row.contactMethodType" size="small" >
                 <el-option v-for="item in Methodtypes" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </template>
           </el-table-column>
           <el-table-column prop="contactMethodValue" label="联系方式">
             <template slot-scope="scope">
-              <el-input v-model="customerOrg.contactMethodList[scope.$index].contactMethodValue" required/>
+              <el-input v-model="scope.row.contactMethodValue" required size="small" />
             </template>
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="60">
             <template slot-scope="scope">
-              <i
-                class="el-icon-delete"
-                @click="deleteRow(scope.$index)"
-                size="medium"
-              ></i>
+              <i class="el-icon-delete" @click="deleteRow(scope.$index)" style="font-size: 24px;color: red;cursor:pointer;" ></i>
             </template>
           </el-table-column>
         </el-table>
@@ -174,7 +165,7 @@
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogContactPerson = false">取 消</el-button>
         <el-button type="success" @click="addMethod">新增联系方式</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button type="primary" @click="submit('form')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -199,7 +190,7 @@ export default {
       ],
 
       rules: {
-        displayName: [
+        displayName: [ 
           { required: true, message: "请输入名称", trigger: "blur" },
         ],
       },
@@ -285,64 +276,72 @@ export default {
     },
 
     //联系人信息提交
-    submit() {
+    submit(formName) {
       let body = {
         customerOrgId: "",
         displayName: "",
         title: "",
         remark: "",
       };
-      objCopy(this.form, body);
-      console.log("body", body);
-      if (this.formTitle === "新增") {
-        postapi("/api/app/contact-person", body)
-          .then((res) => {
-            //console.log('api/app/contact-person')
-            this.personId = res.data.id;
-            this.formTitle = "编辑";
-            return deletapi(`/api/app/contact-method/many/${this.personId}`);
-          })
-          .then((res) => {
-            //console.log(`deletapi api/app/contact-method/${this.personId}`)
-            let contactMethod = []; //联系方式form表单数据
-            this.customerOrg.contactMethodList.forEach((item, index) => {
-              contactMethod.push({
-                contactMethodValue: item.contactMethodValue,
-                contactMethodType: item.contactMethodType,
-                contactPersonId: this.personId,
+      this.$refs[formName].validate((valid,failField) => {
+        if (valid) {
+          objCopy(this.form, body);
+          console.log("body", body);
+          if (this.formTitle === "新增") {
+            postapi("/api/app/contact-person", body)
+              .then((res) => {
+                //console.log('api/app/contact-person')
+                this.personId = res.data.id;
+                this.formTitle = "编辑";
+                return deletapi(`/api/app/contact-method/many/${this.personId}`);
+              })
+              .then((res) => {
+                //console.log(`deletapi api/app/contact-method/${this.personId}`)
+                let contactMethod = []; //联系方式form表单数据
+                this.customerOrg.contactMethodList.forEach((item, index) => {
+                  contactMethod.push({
+                    contactMethodValue: item.contactMethodValue,
+                    contactMethodType: item.contactMethodType,
+                    contactPersonId: this.personId,
+                  });
+                });
+                return postapi("/api/app/contact-method/many", contactMethod);
+              })
+              .then((res) => {
+                //console.log('api/app/contact-method/many')
+                this.getContactPersonList(this.customerOrg.customerOrgId);
+                this.$message.success("操作成功！");
               });
-            });
-            return postapi("/api/app/contact-method/many", contactMethod);
-          })
-          .then((res) => {
-            //console.log('api/app/contact-method/many')
-            this.getContactPersonList(this.customerOrg.customerOrgId);
-            this.$message.success("操作成功！");
-          });
-      } else {
-        putapi(`/api/app/contact-person/${this.personId}`, body)
-          .then((res) => {
-            //console.log(`/api/app/contact-person/${this.personId}`)
-            return deletapi(`/api/app/contact-method/many/${this.personId}`);
-          })
-          .then((res) => {
-            console.log(`deletapi api/app/contact-method/${this.personId}`);
-            let contactMethod = []; //联系方式form表单数据
-            this.customerOrg.contactMethodList.forEach((item, index) => {
-              contactMethod.push({
-                contactMethodValue: item.contactMethodValue,
-                contactMethodType: item.contactMethodType,
-                contactPersonId: this.personId,
+          } else {
+            putapi(`/api/app/contact-person/${this.personId}`, body)
+              .then((res) => {
+                //console.log(`/api/app/contact-person/${this.personId}`)
+                return deletapi(`/api/app/contact-method/many/${this.personId}`);
+              })
+              .then((res) => {
+                console.log(`deletapi api/app/contact-method/${this.personId}`);
+                let contactMethod = []; //联系方式form表单数据
+                this.customerOrg.contactMethodList.forEach((item, index) => {
+                  contactMethod.push({
+                    contactMethodValue: item.contactMethodValue,
+                    contactMethodType: item.contactMethodType,
+                    contactPersonId: this.personId,
+                  });
+                });
+                return postapi("/api/app/contact-method/many", contactMethod);
+              })
+              .then((res) => {
+                //console.log('api/app/contact-method/many')
+                this.getContactPersonList(this.customerOrg.customerOrgId);
+                this.$message.success("操作成功！");
               });
-            });
-            return postapi("/api/app/contact-method/many", contactMethod);
-          })
-          .then((res) => {
-            //console.log('api/app/contact-method/many')
-            this.getContactPersonList(this.customerOrg.customerOrgId);
-            this.$message.success("操作成功！");
-          });
-      }
+          }
+        }else{
+          //console.log('failField',failField)
+          this.$message.warning("未通过数据校验！");
+          return false;
+        }
+      })
     },
 
     //新增联系方式
@@ -368,4 +367,8 @@ export default {
   },
 };
 </script>
-<style scoped></style>
+<style scoped>
+.btnClass{
+  width:110px;
+}
+</style>

src/components/customerOrg/customerOrgEdit.vue

@@ -3,6 +3,22 @@
     <div>
       <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="parentId">
+              <el-cascader
+                v-model="customerOrg.customerOrgRd.parentId"
+                :options="customerOrg.customerOrgTree"
+                :props="{
+                  checkStrictly: true,
+                  expandTrigger: 'hover',
+                  ...customerOrg.treeprops,
+                }"
+                :show-all-levels="false"
+                clearable filterable disabled width="100px"
+              >
+              </el-cascader>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="单位名称" prop="displayName">
               <el-input v-model="customerOrg.customerOrgRd.displayName" placeholder="请输入单位名称" />
@@ -14,26 +30,29 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="发票抬头" prop="invoiceName">
-              <el-input v-model="customerOrg.customerOrgRd.invoiceName" placeholder="请输入发票抬头" />
+            <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-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="上级单位" prop="parentId">
-              <el-cascader
-                v-model="customerOrg.customerOrgRd.parentId"
-                :options="customerOrg.customerOrgTree"
-                :props="{
-                  checkStrictly: true,
-                  expandTrigger: 'hover',
-                  ...customerOrg.treeprops,
-                }"
-                :show-all-levels="false"
-                clearable filterable disabled
-              >
-              </el-cascader>
+            <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-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="显示顺序" prop="displayOrder">
+              <el-input type="number" v-model="customerOrg.customerOrgRd.displayOrder" />
             </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-form-item>
+          </el-col> 
           <el-col :span="8">
             <el-form-item label="联系电话" prop="telephone">
               <el-input v-model="customerOrg.customerOrgRd.telephone" placeholder="请输入联系电话" />
@@ -49,9 +68,14 @@
               <el-input v-model="customerOrg.customerOrgRd.postalCode" placeholder="请输入邮政编码" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="16">
             <el-form-item label="地址" prop="address">
-              <el-input v-model="customerOrg.customerOrgRd.address" placeholder="请输入地址" />
+              <el-input v-model="customerOrg.customerOrgRd.address" placeholder="请输入地址" maxlength="50" show-word-limit/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发票抬头" prop="invoiceName">
+              <el-input v-model="customerOrg.customerOrgRd.invoiceName" placeholder="请输入发票抬头" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -64,44 +88,20 @@
               <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-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-form-item>
-          </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-select>
-            </el-form-item>
-          </el-col>          
-          <el-col :span="6">
+        <el-row>                 
+          <el-col :span="8">
             <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-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <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-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="显示顺序" prop="displayOrder">
-              <el-input v-model="customerOrg.customerOrgRd.displayOrder" />
-            </el-form-item>
-          </el-col>
+          </el-col>          
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -115,41 +115,40 @@
         <el-row>
           <el-col :span="5">
             <el-form-item label="创建者">
-              <el-input v-model="customerOrg.customerOrgRd.creatorName" disabled />
+              <el-input v-model="customerOrg.customerOrgRd.creatorName" size="small" 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-form-item label="创建时间">
+              <el-date-picker v-model="customerOrg.customerOrgRd.creationTime" type="datetime" size="small" style="width: 100%" disabled/>
             </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-form-item label="修改者">
+              <el-input v-model="customerOrg.customerOrgRd.creatorName" size="small" 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-form-item label="修改时间">
+              <el-date-picker v-model="customerOrg.customerOrgRd.lastModificationTime" type="datetime" size="small" style="width: 100%" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 5%" width="150px">
+    <div style="margin-left: 10px; margin-top: 5%" >
       <div class="btnList">
-        <el-button type="primary" @click="add('')">新增</el-button>
+        <el-button type="primary" @click="add('')" class="btnClass">新增单位</el-button>
       </div>
       <div class="btnList">
-        <el-button type="primary" @click="add('child')">新增子单位</el-button>
+        <el-button type="primary" @click="add('child')" class="btnClass">新增子单位</el-button>
       </div>
       <div class="btnList">
-        <el-button type="success" @click="Onsubmit('form')" >保存</el-button>
+        <el-button type="success" @click="Onsubmit('form')" class="btnClass">保存</el-button>
       </div>
       <div class="btnList">
-        <el-button type="danger" @click="del">删除</el-button>
+        <el-button type="danger" @click="del" class="btnClass">删除</el-button>
       </div>
     </div>
   </div>
@@ -338,4 +337,7 @@ export default {
 .btnList{
   margin-bottom: 10px;
 }
+.btnClass{
+  width:110px;
+}
 </style>

src/components/customerOrg/customerOrgRegister.vue

@@ -48,13 +48,13 @@
       </el-table>
       <div style="margin-left: 10px; margin-top: 5%">
         <div style="margin-top: 10px">
-          <el-button type="primary" @click="add">增加次数</el-button>
+          <el-button type="primary" @click="add" class="btnClass">增加次数</el-button>
         </div>
         <div style="margin-top: 10px">
-          <el-button type="success" @click="edit">体检完成</el-button>
+          <el-button type="success" @click="edit" class="btnClass">体检完成</el-button>
         </div>
         <div style="margin-top: 10px">
-          <el-button type="danger" @click="cansel">取消完成</el-button>
+          <el-button type="danger" @click="cansel" class="btnClass">取消完成</el-button>
         </div>
       </div>
     </div>
@@ -144,4 +144,7 @@ export default {
 .box {
   display: flex;
 }
+.btnClass{
+  width:110px;
+}
 </style>

src/components/doctorCheck/CheckItemList.vue

@@ -8,7 +8,6 @@
             v-model="doctorCheck.checkItemList[scope.$index].result" :fetch-suggestions="querySearch" 
             placeholder="请输入结果值" @select="handleSelect" :disabled="doctorCheck.RegisterCheckEdit.completeFlag=='1' || doctorCheck.RegisterCheckEdit.completeFlag=='2'"/>
         </template>
-
       </el-table-column>
       <el-table-column prop="unit" label="单位" width="80" />
       <el-table-column prop="referenceRangeValue" label="参考范围" width="120" />
@@ -78,6 +77,7 @@ export default {
       // 调用 callback 返回建议列表的数据
       cb(results);
     },
+    
     createFilter(queryString) {
       return (restaurant) => {
         return (restaurant['value'].toLowerCase().indexOf(queryString.toLowerCase()) === 0);

src/components/patientRegister/PatientRegisterItem.vue

@@ -40,11 +40,15 @@
         </el-button>
       </div>
       <div class="btnList">
-        <span>折扣 </span>
-        <el-input style="width:55px;" v-model="discount" size="small" @input="changeAllDiscount" type="number"/>
+        <el-tooltip class="item" effect="dark" content="根据输入的折扣，自动计算折后总价" placement="top">
+          <span>折扣 </span>
+        </el-tooltip>
+        <el-input style="width:55px;" v-model="discount" size="small" @input="changeAllDiscount" type="number"/>                
       </div>
       <div class="btnList">
-        <span>总金额 </span>
+        <el-tooltip class="item" effect="dark" content="总金额即该人员此次体检实收金额，并根据此金额自动计算折扣" placement="top">
+          <span>总金额 </span>
+        </el-tooltip>
         <el-input style="width:70px;" v-model="total" size="small" @input="changeTotal" type="number"/>
       </div>
       <div class="btnList">        

src/main.js

@@ -7,6 +7,7 @@ import "element-ui/lib/theme-chalk/index.css";
 Vue.use(ElementUI);
 import axios from "axios";
 
+console.log('vue',Vue.prototype)
 Vue.prototype.$axios = axios;
 import JsonExcel from "vue-json-excel"; //vue全局导入导出excel
 import Print from "vue-print-nb";