Merge remote-tracking branch 'origin/dev'

src/views/system/OperateGoodsInfo/index.vue

@@ -310,8 +310,10 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.goodsPrice"
+                oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
+                min="0"
                 type="number"
-                oninput=" if(value.length>7){value=value.slice(0,7)}"
+                placeholder="小数点后两位(元)"
               ></el-input>
             </template>
           </el-table-column>
@@ -319,8 +321,8 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.goodsStock"
-                type="number"
+                maxlength="9"
-                oninput="if(value.length>9){value=value.slice(0,9)}"
+                oninput="value=value.replace(/[^\d]/g,'')"
               ></el-input>
             </template>
           </el-table-column>
@@ -328,8 +330,8 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.attributeDetailsSort"
-                type="number"
+                maxlength="9"
-                oninput=" if(value.length>9){value=value.slice(0,9)}"
+                oninput="value=value.replace(/[^\d]/g,'')"
               ></el-input>
             </template>
           </el-table-column>
@@ -623,7 +625,6 @@ export default {
     this.getList();
     this.info();
     this.infos();
-    // this.getList2();
   },
   methods: {
     upwhetherShelf(row) {
@@ -748,12 +749,6 @@ export default {
       // this.getListByUserquery.pageNum = 1;
       this.info();
     },
-    // getList2() {
-    //   stationList(this.getListByUserquery).then((res) => {
-    //     this.total2 = res.total;
-    //     this.nurseStationlist = res.rows;
-    //   });
-    // },
     resetQuery2() {
       this.resetForm("queryForm");
       (this.getListByUserquery = {
@@ -873,6 +868,9 @@ export default {
         if (valid) {
           if (this.form.goodsInfoId != null) {
             this.form.id = this.form.goodsInfoId;
+            this.form.goodDetailsLists.forEach((e) => {
+              e.goodsPrice = Number(e.goodsPrice);
+            });
             updateGoodsInfo(this.form).then((response) => {
               var obj = { pictureUrlList: [] };
               if (this.imgone != this.form.goodsPictureUrl) {
@@ -889,7 +887,9 @@ export default {
               this.getList();
             });
           } else {
-            // this.nurseStationId=this.form.nurseStationId
+            this.form.goodDetailsLists.forEach((e) => {
+              e.goodsPrice = Number(e.goodsPrice);
+            });
             addGoodsInfo(this.form).then((response) => {
               console.log(this.form);
               this.$modal.msgSuccess("新增成功");

src/views/system/StationDepartment/index.vue

@@ -8,10 +8,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item
+      <el-form-item label="护理站" prop="nurseStationId">
-        label="护理站"
-        prop="nurseStationId"
-      >
         <el-select
           v-model="queryParams.nurseStationId"
           placeholder="请选择护理站"
@@ -26,7 +23,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-     
+
       <el-form-item label="科室编码" prop="departmentCode">
         <el-input
           v-model="queryParams.departmentCode"
@@ -614,7 +611,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-  
+
         nurseStationDepartmentList: [
           {
             nurseStationId: "",
@@ -639,26 +636,25 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-    
+      // this.queryParams = {
-        // this.queryParams = {
+      //   pageNum: 1,
-        //   pageNum: 1,
+      //   pageSize: 10,
-        //   pageSize: 10,
+
-     
+      //   departmentCode: null,
-        //   departmentCode: null,
+      //   departmentName: null,
-        //   departmentName: null,
+      //   departmentPerson: null,
-        //   departmentPerson: null,
+      //   phone: null,
-        //   phone: null,
+      //   nurseStationName: null,
-        //   nurseStationName: null,
+      // };
-        // };
+      if (this.nurseStationlist[0]) {
-        if (this.nurseStationlist[0]) {
         this.queryParams.pageNum = 1;
         this.queryParams.pageSize = 10;
         this.queryParams.departmentCode = null;
         this.queryParams.departmentName = null;
       }
-        this.handleQuery();
+      this.handleQuery();
-      },
+    },
-    
+
     addhd() {
       this.loading = true;
       getListByUser(this.nurseStationqueryParams).then((res) => {
@@ -677,10 +673,10 @@ export default {
     //权限列表
     info() {
       getListByUser(this.nurseStationqueryParams).then((res) => {
-          this.total2 = res.total;
+        this.total2 = res.total;
-          this.nurseStationlist = res.rows;
+        this.nurseStationlist = res.rows;
-          this.queryParams.nurseStationId = res.rows[0].id;
+        this.queryParams.nurseStationId = res.rows[0].id;
-          this.getList();
+        this.getList();
       });
     },
     // 多选框选中数据
@@ -708,6 +704,20 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if (this.form.id == null) {
+        this.form.nurseStationId =
+          this.form.nurseStationDepartmentList[0].nurseStationId;
+        this.form.departmentCode =
+          this.form.nurseStationDepartmentList[0].departmentCode;
+        this.form.departmentName =
+          this.form.nurseStationDepartmentList[0].departmentName;
+        this.form.departmentPerson =
+          this.form.nurseStationDepartmentList[0].departmentPerson;
+        this.form.nurseStationName =
+          this.form.nurseStationDepartmentList[0].nurseStationName;
+        this.form.phone = this.form.nurseStationDepartmentList[0].phone;
+      }
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {

src/views/system/diseaseInfo/index.vue

@@ -99,16 +99,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="疾病名称" align="center" prop="diseaseName" />
       <el-table-column label="疾病编码" align="center" prop="diseaseCode" />
-      <el-table-column
+      <el-table-column label="创建时间" align="center" prop="createTime" />
-        label="创建时间"
+      <el-table-column label="创建人" align="center" prop="createBy" />
-        align="center"
-        prop="createTime"
-      />
-        <el-table-column
-        label="创建人"
-        align="center"
-        prop="createBy"
-      />
       <el-table-column
         label="操作"
         align="center"
@@ -188,10 +180,8 @@
           >
             <el-input
               v-model="item.sort"
-              placeholder="不可输入小数点"
+              maxlength="10"
-              type="number"
+              oninput="value=value.replace(/[^\d]/g,'')"
-              min="0"
-              oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
             />
           </el-form-item>
           <el-button
@@ -242,6 +232,7 @@
             v-model="form.sort"
             placeholder="请输入排序"
             maxlength="10"
+            oninput="value=value.replace(/[^\d]/g,'')"
           />
         </el-form-item>
       </el-form>
@@ -417,6 +408,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if (this.form.id == null) {
+        this.form.diseaseName = this.form.diseaseInfoList[0].diseaseName;
+        this.form.sort = this.form.diseaseInfoList[0].sort;
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {

src/views/system/goodsCategory/index.vue

@@ -193,8 +193,8 @@
         <el-form-item label="显示顺序" prop="sort">
           <el-input
             v-model="form.sort"
-            type="number"
+            maxlength="9"
-            oninput="if(value.length>9){value=value.slice(0,9)}"
+            oninput="value=value.replace(/[^\d]/g,'')"
             placeholder="请输入显示顺序"
           />
         </el-form-item>

src/views/system/goodsInfo/goodsInfojs.js

@@ -242,16 +242,7 @@ export default {
                 }, ],
             }, ];
         },
-        // clickinnerVisible() {
+
-        //   this.innerVisible = true;
-        // },
-        // nurseclick(row) {
-        //   console.log(this.form);
-        //   console.log(row);
-        //   this.form.nurseStationId = row.id;
-        //   this.StationName = row.nurseStationName;
-        //   this.innerVisible = false;
-        // },
         handleQuery2() {
             // this.getListByUserquery.pageNum = 1;
             this.getList2();
@@ -271,8 +262,6 @@ export default {
             this.handleQuery2();
         },
         addcancel() {
-            // this.innerVisible = false;
-            // this.innerVisiblexg = false;
             this.resetQuery2();
         },
 
@@ -377,6 +366,9 @@ export default {
             this.$refs["form"].validate((valid) => {
                 if (valid) {
                     if (this.form.goodsInfoId != null) {
+                          this.form.goodDetailsLists.forEach((e) => {
+                            e.goodsPrice = Number(e.goodsPrice);
+                          });
                         this.form.id = this.form.goodsInfoId;
                         updateGoodsInfo(this.form).then((response) => {
                             var obj = { pictureUrlList: [] };
@@ -393,7 +385,9 @@ export default {
                             this.getList();
                         });
                     } else {
-                        // this.nurseStationId=this.form.nurseStationId
+                        this.form.goodDetailsLists.forEach((e) => {
+                            e.goodsPrice = Number(e.goodsPrice);
+                          });
                         addGoodsInfo(this.form).then((response) => {
                             console.log(this.form);
                             this.$modal.msgSuccess("新增成功");
@@ -504,4 +498,4 @@ export default {
             });
         },
     },
-};
+};

src/views/system/goodsInfo/index.vue

@@ -293,9 +293,10 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.goodsPrice"
-                type="number"
+                oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
                 min="0"
-                oninput=" if(value.length>7){value=value.slice(0,7)}"
+                type="number"
+                placeholder="小数点后两位(元)"
               ></el-input>
             </template>
           </el-table-column>
@@ -303,9 +304,8 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.goodsStock"
-                type="number"
+                maxlength="9"
-                min="0"
+                oninput="value=value.replace(/[^\d]/g,'')"
-                oninput="if(value.length>9){value=value.slice(0,9)}"
               ></el-input>
             </template>
           </el-table-column>
@@ -313,8 +313,8 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.attributeDetailsSort"
-                type="number"
+                maxlength="10"
-                oninput=" if(value.length>9){value=value.slice(0,9)}"
+                oninput="value=value.replace(/[^\d]/g,'')"
               ></el-input>
             </template>
           </el-table-column>

src/views/system/nurseType/index.vue

@@ -356,6 +356,9 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if (this.form == null) {
+        this.form.nurseTypeName = this.form.nurseTypeList[0].nurseTypeName;
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {

src/views/system/person/personjs.js

@@ -465,6 +465,15 @@ export default {
         },
         /** 提交按钮 */
         submitForm() {
+            if (this.form.id == null) {
+                this.form.nursePersonName = this.form.nurseStationPersonList[0].nursePersonName
+                this.form.nursePersonType = this.form.nurseStationPersonList[0].nursePersonType
+                this.form.sex = this.form.nurseStationPersonList[0].sex
+                this.form.address = this.form.nurseStationPersonList[0].address
+                this.form.departmentCode = this.form.nurseStationPersonList[0].departmentCode
+                this.form.departmentName = this.form.nurseStationPersonList[0].departmentName
+                this.form.phone = this.form.nurseStationPersonList[0].phone
+            }
             console.log(this.form);
             this.$refs["form"].validate((valid) => {
                 if (valid) {

src/views/system/station/index.vue

@@ -272,11 +272,10 @@
         </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input
+            placeholder="请输入排序"
             v-model="form.sort"
-            placeholder="排序不可输入小数点"
+            maxlength="8"
-            type="number"
+            oninput="value=value.replace(/[^\d]/g,'')"
-            min="0"
-            oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>8){value=value.slice(0,8)}"
           />
         </el-form-item>
         <el-form-item label="负责人" prop="dutyPerson">
@@ -355,10 +354,8 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.labelSort"
-                  placeholder="排序不可输入小数点"
+                  maxlength="10"
-                  type="number"
+                  oninput="value=value.replace(/[^\d]/g,'')"
-                  min="0"
-                  oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
                 ></el-input>
               </template>
             </el-table-column>

src/views/system/stationConsumable/index.vue

@@ -229,7 +229,7 @@
             maxlength="10"
           />
         </el-form-item>
-        <el-form-item label="耗材包价格(元)" prop=" ">
+        <el-form-item label="耗材包价格(元)" prop="consumablePrice">
           <el-input
             v-model="form.consumablePrice"
             placeholder="请输入耗材包价格"
@@ -240,11 +240,10 @@
         </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input
+            placeholder="请输入排序"
             v-model="form.sort"
-            placeholder="不可输入小数点"
+            maxlength="10"
-            type="number"
+            oninput="value=value.replace(/[^\d]/g,'')"
-            min="0"
-            oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
           />
         </el-form-item>
       </el-form>
@@ -345,11 +344,10 @@
             :prop="`nurseStationConsumables.${index}.sort`"
           >
             <el-input
+              placeholder="请输入排序"
               v-model="item.sort"
-              placeholder="不可输入小数点"
+              maxlength="10"
-              type="number"
+              oninput="value=value.replace(/[^\d]/g,'')"
-              min="0"
-              oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
             />
           </el-form-item>
           <el-button
@@ -985,6 +983,19 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      if (this.form.id == null) {
+        this.form.consumableDetail =
+          this.form.nurseStationConsumables[0].consumableDetail;
+        this.form.nurseStationId =
+          this.form.nurseStationConsumables[0].nurseStationId;
+        this.form.consumableUnit =
+          this.form.nurseStationConsumables[0].consumableUnit;
+        this.form.consumablePrice =
+          this.form.nurseStationConsumables[0].consumablePrice;
+        this.form.sort = this.form.nurseStationConsumables[0].sort;
+      } else {
+        this.form.consumablePrice = Number(this.form.consumablePrice);
+      }
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -994,6 +1005,9 @@ export default {
               this.getList();
             });
           } else {
+            this.form.nurseStationConsumables.forEach((e) => {
+              e.consumablePrice = Number(e.consumablePrice);
+            });
             addStationConsumable(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.nurseStationName = "请选择所属护理站";

src/views/system/stationItem/index.vue

@@ -273,11 +273,10 @@
         </el-form-item>
         <el-form-item label="排序" prop="nurseStationItem.sort">
           <el-input
+            placeholder="请输入排序"
             v-model="form.nurseStationItem.sort"
-            placeholder="不可输入小数点"
+            maxlength="10"
-            type="number"
+            oninput="value=value.replace(/[^\d]/g,'')"
-            min="0"
-            oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
           />
         </el-form-item>
         <el-form-item
@@ -317,8 +316,8 @@
                 <el-input
                   v-model="scope.row.price"
                   placeholder="小数点后两位(元)"
-                  type="number"
                   min="0"
+                  type="number"
                   oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>6){value=value.slice(0,6)}"
                 ></el-input>
               </template>
@@ -381,10 +380,8 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.consumableCount"
-                  placeholder="不可输入小数点"
+                  maxlength="9"
-                  min="0"
+                  oninput="value=value.replace(/[^\d]/g,'')"
-                  oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
-                  type="number"
                 ></el-input>
               </template>
             </el-table-column>
@@ -1094,6 +1091,7 @@ export default {
     submitForm() {
       this.form.nurseStationItemConsumables.forEach((e) => {
         e.nurseStationConsumableId = e.id;
+        e.consumableCount = Number(e.consumableCount);
       });
       this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
       this.$refs["form"].validate((valid) => {
@@ -1109,12 +1107,18 @@ export default {
             if (obj.pictureUrlList.length > 0) {
               updatePicture(obj).then((res) => {});
             }
+            this.form.nurseStationItemPrices.forEach((e) => {
+              e.price = Number(e.price);
+            });
             updateNurseItem(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
+            this.form.nurseStationItemPrices.forEach((e) => {
+              e.price = Number(e.price);
+            });
             addNurseItem(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.$forceUpdate();