Merge branch 'master' of http://81.70.217.145:3000/shentun/peisweb

package-lock.json

@@ -4255,7 +4255,7 @@
     },
     "node_modules/crypto-js": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
       "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
     },
     "node_modules/css-declaration-sorter": {

src/components/unitGrouping/unitGroupCategory.vue

@@ -70,7 +70,15 @@
             prop="displayName"
           ></el-table-column>
 
-          <el-table-column label="价格" prop="price"></el-table-column>
+          <el-table-column label="价格" prop="price">
+            <template slot-scope="scope">
+              <input
+                type="text"
+                v-model="scope.row.price"
+                @blur="inputchang(scope.row)"
+              />
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <div class="operatebottom">
@@ -136,7 +144,6 @@
   </div>
 </template>
 <script>
-
 import { getapi, postapi } from "@/api/api";
 import { mapState } from "vuex";
 export default {
@@ -156,6 +163,7 @@ export default {
       temporaryselection: [], //已选组合项目table
       copegroupdata: [], //复制分组
       addrulst: [], //添加保存的Id
+      price: "", //价格
     };
   },
   computed: {
@@ -166,6 +174,10 @@ export default {
     this.getportfolioitems();
   },
   methods: {
+    inputchang(v) {
+      this.price = v.price;
+      console.log(this.price);
+    },
     //保存按钮
     Onsubmit() {
       if (!this.personnelUnit.customerOrgGroupId) {
@@ -195,6 +207,10 @@ export default {
     },
     //移除按钮
     addselecteditems() {
+      console.log(this.personnelUnit.id);
+      if (this.personnelUnit.form.id == "") {
+        alert("请先选择单位类别");
+      } else {
         //personnelUnit.nogroupselected
         if (this.rightselctedata.length == 0) {
           this.$message.warning("已选数据为空无法移动");
@@ -208,7 +224,6 @@ export default {
             ) {
               this.tabledata.push(this.rightselctedata[i]);
               this.personnelUnit.nogroupselected.splice(i, 1);
-          
             }
             // this.tabledata.push(this.rightselctedata[i]);
           }
@@ -221,6 +236,7 @@ export default {
             });
           });
         }
+      }
     },
     //右侧勾选按钮
     selecteditems(val) {
@@ -230,6 +246,9 @@ export default {
     },
     // 添加按钮
     removedata() {
+      if (this.personnelUnit.form.id == "") {
+        alert("请先选择单位分组");
+      } else {
         if (this.unselecteddata.length == 0) {
           this.$message.warning("未选数据为空无法移动");
         } else {
@@ -243,11 +262,13 @@ export default {
               this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
             }
           }
-
+          console.log(this.price);
           this.unselecteddata.forEach((item) => {
+           this.price=item.price
             this.addrulst.push({
               asbitemId: item.id,
               price: item.price,
+              // price: this.price,
               customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
             });
           });
@@ -260,6 +281,7 @@ export default {
           //   this.selecteddata.push(this.unselecteddata[i]);
           // }
         }
+      }
     },
     // 左侧未选
     handleSelectionChange(val) {

src/store/index.js

@@ -13,33 +13,34 @@ export default new Vuex.Store({
         value: "id",
         children: "treeChildren",
       }, //树形组件的数据结构
-      customerOrgId:'',//当前单位ID（可根据此值是否为空，判断是新增还是编辑）
-      customerOrgRd:{displayName:'单位名称'}, //单个体检单位记录值
+      customerOrgId: '',//当前单位ID（可根据此值是否为空，判断是新增还是编辑）
+      customerOrgRd: { displayName: '单位名称' }, //单个体检单位记录值
       customerOrgRegisterList: [], //单位体检次数登记列表
-      contactPersonList:[],   //联系人列表
-      contactMethodList:[],    //联系方式列表
+      contactPersonList: [],   //联系人列表
+      contactMethodList: [],    //联系方式列表
 
     },
-    personnelUnit:{
-      customerOrgGroupId:'',
-      personnelgrouping:[], //人员分组
-      id:'',//根据Id选择的数据
-      form:{id:''},//列表每一项
-      nogroupselected:[],//已选分组
+    //体检单位分组
+    personnelUnit: {
+      customerOrgGroupId: '',
+      personnelgrouping: [], //人员分组
+      id: '',//根据Id选择的数据
+      form: { id: '' },//列表每一项
+      nogroupselected: [],//已选分组
     },
 
     //体检人员登记 add by pengjun
-    patientRegister:{
+    patientRegister: {
       customerOrgTreeAll: [], //体检单位列表（含个人）
-      patientRegisterId:'', //当前单位ID（可根据此值是否为空，判断是新增还是编辑）   
-      patientRegisterRd:{}, //体检人员记录
-      addTimes:0, //用于触发新增时初始化赋值
-      photo:'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg', //单独抽出，拍照时会更新
-      cameraVisble:false,  //拍照控件显示
+      patientRegisterId: '', //当前单位ID（可根据此值是否为空，判断是新增还是编辑）   
+      patientRegisterRd: {}, //体检人员记录
+      addTimes: 0, //用于触发新增时初始化赋值
+      photo: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg', //单独抽出，拍照时会更新
+      cameraVisble: false,  //拍照控件显示
       patientRegisterRdInit: {
         id: '', //id
         patientId: '00000000-0000-0000-0000-000000000000', //档案号ID 选择了档案就传档案号，未选就传00000-0000...
-        patientNo:'',//档案号
+        patientNo: '',//档案号
         customerOrgId: null, //单位编号
         customerOrgGroupId: null, //分组
         medicalPackageId: null,//套餐
@@ -90,18 +91,18 @@ export default new Vuex.Store({
     },
 
     //公共字典数据 add by pengjun    
-    dict:{
-      personOrgId:'00000000-0000-0000-0000-000000000000',  //个人体检单位ID
-      organization:[],  //体检中心
-      sex:[],         //性别
-      medicalType:[], //体检类别
-      personnelType:[], //人员类别
-      maritalStatus:[],//婚姻状况
-      sexHormoneTerm:[],//性激素期
-      nation:[], //民族
-      birthPlace:[], //籍惯 ，出生地
-      completeFlag:[ //体检完成标志
-        {id:'0',displayName:'预登记'},{id:'1',displayName:'正式登记'},{id:'2',displayName:'部份已检'},{id:'3',displayName:'已总检'},
+    dict: {
+      personOrgId: '00000000-0000-0000-0000-000000000000',  //个人体检单位ID
+      organization: [],  //体检中心
+      sex: [],         //性别
+      medicalType: [], //体检类别
+      personnelType: [], //人员类别
+      maritalStatus: [],//婚姻状况
+      sexHormoneTerm: [],//性激素期
+      nation: [], //民族
+      birthPlace: [], //籍惯 ，出生地
+      completeFlag: [ //体检完成标志
+        { id: '0', displayName: '预登记' }, { id: '1', displayName: '正式登记' }, { id: '2', displayName: '部份已检' }, { id: '3', displayName: '已总检' },
       ],
       medicalPackage:[], //所有套餐
       customerOrgGroupAll:[], //所有分组，不限单位，不限次数

src/views/Home.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-container>
+    <el-container style="background:">
       <el-header style="background-color: #ccc; line-height: 50px">
         <div class="navs">
           <div class="maintitle">神豚医疗信息系统</div>

src/views/fee-settings/Asbitem.vue

@@ -76,9 +76,9 @@
                   <el-select v-model="form.forSexId" placeholder="请选择">
                     <el-option
                       v-for="item in forSexId"
-                      :key="item.sexId"
+                      :key="item.id"
                       :label="item.displayName"
-                      :value="item.sexId"
+                      :value="item.id"
                     >
                     </el-option>
                   </el-select>
@@ -608,17 +608,19 @@ export default {
   methods: {
     Onsubmit() {
       let sampleGroupId = this.form.id;
-      console.log(this.form.id);
-      console.log(this.rightdata);
+      console.log(sampleGroupId);   
       let sdate = [];
+      console.log(this.rightdata,'2222');
       this.rightdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
-        sdate.push(sss);
-      });
-      this.leftdata.forEach((element) => {
-        let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
+        console.log('项目元素id',element.id);
+        console.log('组合项目id',sampleGroupId);    
+        let sss = { itemId: element.id, asbitemId: sampleGroupId };
         sdate.push(sss);
       });
+      // this.leftdata.forEach((element) => {
+      //   let sss = { sampleGroupId: sampleGroupId, asbitemId: element.id };
+      //   sdate.push(sss);
+      // });
       console.log(sdate);
       if (sampleGroupId == undefined) {
         this.$message.warning("请选择列表");
@@ -715,7 +717,8 @@ export default {
     //项目类别选择
     ischangs(v) {
       console.log(v);
-      getapi(`/api/app/diagnosis/in-item-type/${v}`).then((res) => {
+      //`/api/app/diagnosis/in-item-type/${v}`
+      getapi(`/api/app/asbitem/in-item-type/${v}`).then((res) => {
         console.log(res);
         this.leftdata = res.data;
       });
@@ -817,6 +820,7 @@ export default {
         //项目类别
         projectlist().then((res) => {
           this.itemTypeId = res.data.items;
+         
         });
         //仪器类别
         instrumentlist().then((res) => {
@@ -894,13 +898,18 @@ export default {
     addll() {
       this.dialogVisible = true;
       this.title = 1;
+    
       //性别
       examinationgender().then((res) => {
+           console.log(res);
         this.forSexId = res.data;
+         console.log(this.forSexId);
       });
       //项目类别
       projectlist().then((res) => {
-        this.itemTypeId = res.data.items;
+     
+        this.itemTypeId = res.data;
+        
       });
       //仪器类别
       instrumentlist().then((res) => {
@@ -914,11 +923,12 @@ export default {
     rowick(row) {
       asbitemgetid(row.id).then((res) => {
         this.form = res.data;
+       
       });
       getapi(
-        `/api/app/item-template-detail/item-template-in-item?ItemTemplateId=${row.id}`
+        `/api/app/asbitem-detail/asbitem-detail-in-item?AsbitemId=${row.id}`
       ).then((res) => {
-        console.log(res);
+        console.log(res,'右侧');
         let dq = res.data;
         if (dq.length > 0) {
           this.rightdata = [];

src/views/fee-settings/Item.vue

@@ -1578,6 +1578,7 @@ export default {
     },
     //新增弹框
     add() {
+      
       this.form.price = Number(this.form.price);
       this.title = 1;
       this.dialogVisible = true;

src/views/fee-settings/MedicalPackage.vue

@@ -606,7 +606,7 @@ export default {
         if (v) {
           if (this.title == 1) {
             this.form.price = Number(this.form.price);
-            postapi("/api/app/item-template", this.form).then((res) => {
+            postapi("/api/app/medical-package", this.form).then((res) => {
               this.$message.success("新增成功");
               this.getlist();
               this.dialogVisible = false;