Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

src/components/unitGrouping/unitGroupCategory.vue

@@ -74,8 +74,7 @@
             <template slot-scope="scope">
               <el-input
                 type="text"
-                v-model="scope.row.price"
-                @change="inputchang(scope.row, $event.target.value)"
+                v-model="personnelUnit.nogroupselected[scope.$index].price"
               />
             </template>
           </el-table-column>
@@ -175,10 +174,8 @@ export default {
   },
   methods: {
     inputchang(row, newVal) {
-      console.log(row);
-      console.log(newVal);
-      // this.price = v.price;
-      // console.log(this.price);
+      this.price = row.price;
+      console.log(this.price);
     },
     //保存按钮
     Onsubmit() {
@@ -186,6 +183,7 @@ export default {
         alert("请先选择单位分组");
         return;
       } else {
+        console.log(this.personnelUnit.nogroupselected);
         postapi("/api/app/customer-org-group-detail/many", this.addrulst).then(
           (res) => {
             this.$message.success("操作成功");
@@ -213,6 +211,8 @@ export default {
       if (this.personnelUnit.form.id == "") {
         alert("请先选择单位类别");
       } else {
+        // 让按钮恢复禁用
+        this.saveornot = false;
         //personnelUnit.nogroupselected
         if (this.rightselctedata.length == 0) {
           this.$message.warning("已选数据为空无法移动");
@@ -220,21 +220,19 @@ export default {
           let count = this.rightselctedata.length - 1;
           for (var i = count; i >= 0; i--) {
             // this.personnelUnit.nogroupselected.splice(i, 1);
-
             // !this.rightselctedata.includes(this.rightselctedata[i].displayName)
             [...new Set(this.rightselctedata)];
-
             this.tabledata.push(this.rightselctedata[i]);
             this.personnelUnit.nogroupselected.splice(i, 1);
-
             // this.tabledata.push(this.rightselctedata[i]);
           }
+          console.log(this.personnelUnit.customerOrgGroupId);
+        
           // this.
           this.rightselctedata.forEach((item) => {
-            console.log(this.personnelUnit.customerOrgGroupId);
             this.addrulst.push({
               asbitemId: item.id,
-              price: item.price,
+              price: price,
               // price: this.price,
               customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
             });
@@ -258,32 +256,40 @@ export default {
         } else {       
           this.saveornot = false;
           let count = this.unselecteddata.length - 1;          
-          let uniqueSet = [...new Set(this.unselecteddata, ...this.tabledata)];
-          const filteredArray = [];
           for (var i = count; i >= 0; i--) {
             // this.tabledata.splice(i, 1);
-            this.unselecteddata.push(this.unselecteddata[i]);
-            this.tabledata.splice(i, 1);
+            if ([...new Set(this.unselecteddata)]) {
+              // this.unselecteddata.push(this.unselecteddata[i]);
+              this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
+              this.tabledata.splice(i, 1);
+            }
             // this.personnelUnit.nogroupselected.push(this.unselecteddata[i]);
           }
           console.log(this.personnelUnit.customerOrgGroupId);
           this.unselecteddata.forEach((item) => {
-            this.price = item.price;
+            // var price = "";
+            // if (this.price == "") {
+            //   price = item.price;
+            // } else {
+            //   price = this.price;
+            // }
+              //获取最新价格        
+          });
+           let prices = "";
+          this.personnelUnit.nogroupselected.forEach((items) => {
+            prices = items.price;
+            console.log(prices);
+            // this.price = item.price;
+            console.log(price);
             this.addrulst.push({
-              asbitemId: item.id,
-              price: item.price,
-              // price: this.psrice,
+              asbitemId: "3a0b2f0c-f884-bec4-a350-79b46b455a2d",
+              // price: prices,
+              price: this.psrice,
               customerOrgGroupId: this.personnelUnit.customerOrgGroupId,
             });
           });
           console.log(this.addrulst, "hhhhhhh");
-          // this.selecteddata = this.unselecteddata;
-          // 复制
-          //  let count = this.unselecteddata.length - 1;
-          // for (var i = count; i >= 0; i--) {
-          //   this.tabledata.splice(i, 1);
-          //   this.selecteddata.push(this.unselecteddata[i]);
-          // }
+       
         }
       }
     },

src/utlis/mm.js

@@ -1,3 +1,3 @@
-export default {
-  apiurl: "http://ver.wh613.com:9529",
-};
+export default{
+    apiurl:'http://140.143.162.39:9529',
+}

src/views/basic-dictionary/GuideType.vue

@@ -665,6 +665,7 @@ export default {
     //确定编辑或者新增
     addoredit() {
       if (this.title == 1) {
+          this.form={}
         if (this.form.displayName == "") {
           this.$message.warning("请输入名称");
         } else {
@@ -720,6 +721,7 @@ export default {
     //新增弹框
     guideadd() {
       this.dialogVisible = true;
+    
       this.title = 1;
     },
     //编辑弹框

src/views/basic-dictionary/MedicalConclusion.vue

@@ -219,6 +219,8 @@ export default {
       dialogVisible: false,
       form: {
         displayName: "",
+        medicalConclusionTypeId:'',
+        ars:'',
       },
       Selectacategory: [],
       Selectvalue: "",
@@ -288,6 +290,8 @@ export default {
     },
 
     isselctvalue(v) {
+      this.form.medicalConclusionTypeId=v
+      console.log(v);
       this.pages.TypeId = v;
       console.log(v);
       console.log(this.pages.TypeId);
@@ -428,6 +432,7 @@ export default {
     },
     change(v) {
       this.selars = v;
+      this.form.medicalConclusionTypeId=v
       console.log(this.form.ids);
     },
     //确定新增或者编辑
@@ -435,7 +440,8 @@ export default {
       if (this.title == 1) {
         addconclusion({
           displayName: this.form.displayName,
-          medicalConclusionTypeId: this.form.ars,
+          // medicalConclusionTypeId: this.form.ars,
+            medicalConclusionTypeId: this.form.medicalConclusionTypeId,
         }).then((res) => {
           this.$message.success("新增成功");
           this.getlist();

src/views/basic-dictionary/Nation.vue

@@ -240,7 +240,10 @@ export default {
       //   console.log(res);
 
       // });
-      this.form = row;
+    
+        this.form = row;
+      
+
       console.log(row);
     },
     //删除
@@ -412,6 +415,7 @@ export default {
     addll() {
       this.dialogVisible = true;
       this.title = 1;
+       this.form={}
     },
     //获取列表
     getlist() {

src/views/common-settings/SampleGroup.vue

@@ -466,7 +466,8 @@ export default {
     // 获取项目类别接口
     posjectlist() {
       projectlist().then((res) => {
-        this.projectid = res.data.items;
+        console.log(res);
+        this.projectid = res.data;
       });
     },
     handlechang(value, direction, movedkeys) {

src/views/fee-settings/Asbitem.vue

@@ -638,7 +638,10 @@ export default {
       // console.log(sdate);
       if (sampleGroupId == undefined) {
         this.$message.warning("请选择列表");
-      } else {
+      } else if(this.itemid==''){
+        this.$message.warning('请选择项目')
+      }
+      else {
         postapi("/api/app/asbitem-detail/many", sdate).then((res) => {
           this.$message.success("操作成功");
           this.isdislob = true;

src/views/fee-settings/Diagnosis.vue

@@ -605,7 +605,8 @@ export default {
       this.form = {};
       //项目类别
       projectlist().then((res) => {
-        this.itemTypeId = res.data.items;
+        this.itemTypeId = res.data;
+        console.log(res);
       });
       //性别
       examinationgender().then((res) => {

src/views/fee-settings/Item.vue

@@ -123,14 +123,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="项目类别" prop="itemTypeId">
-              <el-cascader
+              <!-- <el-cascader
                 v-model="form.itemTypeId"
                 :options="itemTypeId"
                 :props="props"
                 :show-all-levels="false"
               >
-              </el-cascader>
-              <!-- <el-select v-model="form.itemTypeId" placeholder="请选择">
+              </el-cascader> -->
+              <el-select v-model="form.itemTypeId" placeholder="请选择">
                 <el-option
                   v-for="item in itemTypeId"
                   :key="item.id"
@@ -138,7 +138,7 @@
                   :value="item.id"
                 >
                 </el-option>
-              </el-select> -->
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -1564,12 +1564,14 @@ export default {
       this.$refs.form.validate((v) => {
         if (v) {
           if (this.title == 1) {
+                 this.form.price=Number( this.form.price)
             addproject(this.form).then((res) => {
-              this.$message.success("新增成功");
+              this.$message.success("新增成功222");
               this.getlist();
               this.dialogVisible = false;
             });
           } else if (this.title == 2) {
+       
             projectedit(this.form.id, this.form).then((res) => {
               this.$message.success("修改成功");
               this.getlist();

src/views/fee-settings/SysParmType.vue

@@ -37,7 +37,7 @@
           <el-table-column prop="remark" label="备注" width="360">
           </el-table-column>
           <el-table-column label="创建者" prop="creatorName"></el-table-column>
-          <el-table-column label="创建时间">
+          <el-table-column label="创建时间" width="200">
             <template slot-scope="scope">
               {{ scope.row.creationTime | dateFormat }}
             </template>

src/views/login/Login.vue

@@ -78,7 +78,7 @@ export default {
           //   scope: "Peis",
           // }).then((res) => {
           //   console.log(res);
-          // });
+          // });  "http://81.70.217.145:9529/connect/token",
           this.$axios
             .post(
               "http://ver.wh613.com:9529/connect/token",