常用字符

src/store/index.js

@@ -38,7 +38,7 @@ export default new Vuex.Store({
       patientRegisterRd: { id: "" }, //体检人员记录
       patientRegisterTimes: 0, //体检人员登记窗口显示次数(弃用)
       addTimes: 0, //用于触发新增时初始化赋值
-      saveTimes:0,  //用于体检登记时，触发分组调整保存
+      saveTimes: 0,  //用于体检登记时，触发分组调整保存
       photo:
         "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出，拍照时会更新
       cameraVisble: false, //拍照控件显示
@@ -87,49 +87,49 @@ export default new Vuex.Store({
       }, //体检人员记录（初始值）一般创建用
       customerOrgGroupAsb: [], //选中分组所包含的组合项目
       medicalPackageAsb: [], //选中套餐所包含的组合项目
-      customerOrgGroupChange:0,   //控制体检列表记录切换时，0 无需触发更换分组操作
-      medicalPackageChange:0,     //控制体检列表记录切换时，0 无需触发更换套餐操作
+      customerOrgGroupChange: 0,   //控制体检列表记录切换时，0 无需触发更换分组操作
+      medicalPackageChange: 0,     //控制体检列表记录切换时，0 无需触发更换套餐操作
       query: {
         times: 0, //触发查询次数
         customerOrgId: "", //体检单位ID
         CustomerOrgParentId: "", //单位父级ID
-        customerOrgFlag:true,    //单位作为查询条件
+        customerOrgFlag: true,    //单位作为查询条件
       }, //查询条件
       customerOrgGroup: [], //分组（针对单位）
       patientRegisterAbs: [], //人员已选组合项目
-      
+
     },
 
     //体检医生诊台
-    doctorCheck:{
-      prBase:{
-        id:'', //体检登记ID
+    doctorCheck: {
+      prBase: {
+        id: '', //体检登记ID
       },   //人员体检登记显示基本信息
 
-      RegisterCheckEdit:{
-        id:'',
-        checkDoctorId:null,
-        checkDate:'',
-        completeFlag:'0',
-        LastModificationTime:'',
-        LastModifierId:null,
-        isLock:'N',
-        isAudit:'N',
-        auditorUserId:null,
-        auditTime:'',
+      RegisterCheckEdit: {
+        id: '',
+        checkDoctorId: null,
+        checkDate: '',
+        completeFlag: '0',
+        LastModificationTime: '',
+        LastModifierId: null,
+        isLock: 'N',
+        isAudit: 'N',
+        auditorUserId: null,
+        auditTime: '',
       },                          //组合项目详情
-      RegisterCheckList:[],       //人员体检 组合项目列表
-      RegisterCheck:{},           //单组合项目记录
-      RegisterCheckId:'',         //
-      checkItemList:[],           //组合项目包含的明细项目
-      checkItem:{},               //单项目记录
-      checkSummaryList:[],        //小结
-      checkSuggestionList:[],     //建议 
+      RegisterCheckList: [],       //人员体检 组合项目列表
+      RegisterCheck: {},           //单组合项目记录
+      RegisterCheckId: '',         //
+      checkItemList: [],           //组合项目包含的明细项目
+      checkItem: {},               //单项目记录
+      checkSummaryList: [],        //小结
+      checkSuggestionList: [],     //建议 
     },
 
     //总检医生
-    sumDoctorCheck:{
-      sumPREdit:{},               //总检医生时间等相关信息
+    sumDoctorCheck: {
+      sumPREdit: {},               //总检医生时间等相关信息
     },
 
     //公共字典数据 add by pengjun
@@ -137,7 +137,7 @@ export default new Vuex.Store({
       personOrgId: "00000000-0000-0000-0000-000000000000", //个人体检单位ID
       organization: [], //体检中心
       sex: [], //性别(人员档案用)
-      forSex:[],  //适用性别
+      forSex: [],  //适用性别
       medicalType: [], //体检类别
       personnelType: [], //人员类别
       maritalStatus: [], //婚姻状况
@@ -157,7 +157,7 @@ export default new Vuex.Store({
         { id: "1", displayName: "已检" },
         { id: "2", displayName: "弃检" },
       ],
-      sumAudit:[
+      sumAudit: [
         //总检审核
         { id: "Y", displayName: "已审核" },
         { id: "N", displayName: "未审核" }
@@ -168,7 +168,7 @@ export default new Vuex.Store({
         { id: "1", displayName: "单位支付" },
         { id: "2", displayName: "赠送" },
       ],
-      checkTypeFlag:[
+      checkTypeFlag: [
         { id: "0", displayName: "检验" },
         { id: "1", displayName: "功能检查" },
       ],
@@ -204,41 +204,41 @@ export default new Vuex.Store({
       }
     },
 
-    doctorCheckPrBaseInit(state){
+    doctorCheckPrBaseInit(state) {
       state.doctorCheck.prBase = {
-        id:'', //体检登记ID
-        patientRegisterNo:'', //条码号
-        patientNo:'', //档案号
-        patientName:'', //姓名
-        sexId:'', //性别
-        medicalTimes:'', //体检次数
-        maritalStatusId:'', //婚姻
-        creationTime:'', //体检日期
-        customerOrgParentName:'', //单位
-        customerOrgName:'', //部门
-        medicalTypeId:'', //体检类别
-        personnelTypeId:'', //人员类别
-        nationId:'', //民族
-        mobileTelephone:'', //手机
+        id: '', //体检登记ID
+        patientRegisterNo: '', //条码号
+        patientNo: '', //档案号
+        patientName: '', //姓名
+        sexId: '', //性别
+        medicalTimes: '', //体检次数
+        maritalStatusId: '', //婚姻
+        creationTime: '', //体检日期
+        customerOrgParentName: '', //单位
+        customerOrgName: '', //部门
+        medicalTypeId: '', //体检类别
+        personnelTypeId: '', //人员类别
+        nationId: '', //民族
+        mobileTelephone: '', //手机
       }   //人员体检登记显示基本信息
     },
 
-    sumPREditInit(state){
+    sumPREditInit(state) {
       state.sumDoctorCheck.sumPREdit = {
-        id:'', //体检登记ID
-        completeFlag:'',   //完成状态
-        summaryDoctor:'', //总检医生
-        summaryDate:'',   //总检日期
-        isAudit:'',       //审核状态
-        auditDoctor:'', //审核医生
-        auditDate:'',   //审核日期
+        id: '', //体检登记ID
+        completeFlag: '',   //完成状态
+        summaryDoctor: '', //总检医生
+        summaryDate: '',   //总检日期
+        isAudit: '',       //审核状态
+        auditDoctor: '', //审核医生
+        auditDate: '',   //审核日期
       }   //人员体检登记显示基本信息
     },
   },
 
   actions: {
     //获取体检人员所选组合项目
-    getPatientRegisterAbs(context, id){
+    getPatientRegisterAbs(context, id) {
       //console.log(`vuex getPatientRegisterAbs /api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, context.state.dict.asbItemAll)
       getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`).then(
         (res) => {
@@ -248,7 +248,7 @@ export default new Vuex.Store({
               key: "patientRegister.patientRegisterAbs",
               value: res.data,
             });
-            
+
             context.commit("setData", {
               key: "dict.asbItem",
               value: arrayReduce(
@@ -267,16 +267,16 @@ export default new Vuex.Store({
     getCustomerOrgGroup(context, customerOrgld) {
       console.log(`vuex /api/app/customer-org-group/in-customer-org-id/${customerOrgld}`);
       getapi(`/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`)
-      .then((res) => {
-        console.log("vuex getCustomerOrgGroup", res.data);
-        if (res.code == 1) {
-          //this.patientRegister.customerOrgGroup = res.data
-          context.commit("setData", {
-            key: "patientRegister.customerOrgGroup",
-            value: res.data,
-          });
-        }
-      });
+        .then((res) => {
+          console.log("vuex getCustomerOrgGroup", res.data);
+          if (res.code == 1) {
+            //this.patientRegister.customerOrgGroup = res.data
+            context.commit("setData", {
+              key: "patientRegister.customerOrgGroup",
+              value: res.data,
+            });
+          }
+        });
     },
   },
   modules: {},

src/views/basic-dictionary/CommonChar.vue

@@ -92,7 +92,7 @@
               <el-col :span="7">
                 类别
                 <el-select
-                  v-model="value"
+                  v-model="form.commonCharName"
                   placeholder="请选择"
                   @change="change"
                 >
@@ -177,7 +177,7 @@
   </div>
 </template>
 <script>
-import Sortable from "sortablejs";
+import Sortable, { get } from "sortablejs";
 import {
   frequentlyusedlist,
   categorytype,
@@ -188,6 +188,7 @@ import {
   sortcommonwords,
   commondelt,
 } from "../../request/systemapi";
+import { getapi } from "@/api/api";
 export default {
   data() {
     return {
@@ -199,6 +200,7 @@ export default {
       },
       form: {
         displayName: "",
+        ars: "",
       },
       ars: [],
       tableData: [],
@@ -242,6 +244,7 @@ export default {
     },
     change(v) {
       this.form.ids = v;
+      console.log(v);
     },
     //取消排序
     cancellation() {
@@ -335,9 +338,10 @@ export default {
     },
     //确定新增或者编辑
     addoredit() {
+      console.log(this.form.ids);
       if (this.form.displayName == undefined) {
         this.$message.warning("请输入名称");
-      } else if (this.value == "") {
+      } else if (this.form.ars == "") {
         this.$message.warning("请选择项目"); //测试时校验选择项目不为空
       } else {
         if (this.title == 1) {
@@ -385,6 +389,11 @@ export default {
         console.log(res);
         this.form = res.data;
       });
+      // //获取类别
+      // getapi("/api/app/common-char-type/in-filter").then((res) => {
+      //   console.log(res, "类别");
+      //   this.ars = res.data.items;
+      // });
       console.log(row);
     },
   },

src/views/fee-settings/Asbitem.vue

@@ -99,7 +99,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="价格" prop="price">
-                  <el-input v-model="form.price"></el-input>
+                  <el-input v-model="form.price" type="number"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -176,7 +176,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="候诊时间" prop="queueTime">
-                  <el-input v-model="form.queueTime"></el-input>
+                  <el-input v-model="form.queueTime" type="nember"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -675,6 +675,7 @@ export default {
         this.rightdata.splice(this.num, 1);
         this.leftdata.push(this.leftobj);
         this.isdislob = true;
+        // this.isdislob=false
         this.updatedate();
       }
     },
@@ -832,7 +833,11 @@ export default {
           this.form = res.data;
         });
         //性别
-        examinationgender().then((res) => {
+        // examinationgender().then((res) => {
+        //   this.forSexId = res.data;
+        // });
+        //适用性别
+        getapi("/api/app/for-sex").then((res) => {
           this.forSexId = res.data;
         });
         //项目类别

src/views/fee-settings/Item.vue

@@ -1304,7 +1304,7 @@ export default {
         this.itemTypeId = res.data.items;
       });
       //性别
-      getapi("/api/app/sex").then((res) => {
+      getapi("/api/app/for-sex").then((res) => {
         this.forSexId = res.data;
       });
       //诊断级别