Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	src/views/system/OperateGoodsInfo/index.vue
#	src/views/system/stationConsumable/indexjs.js
#	src/views/system/stationItem/index.vue
#	src/views/system/stationItem/stationItemjs.js

src/views/system/OperateGoodsInfo/index.vue

@@ -9,7 +9,7 @@
       label-width="100px"
     >
       <el-form-item label="所属护理站" prop="nurseStationName">
-         <el-button type="" class="stationbtn" @click="ParamsStation(true)">{{
+        <el-button type="" class="stationbtn" @click="ParamsStation(true)">{{
           queryParams.nurseStationName
         }}</el-button>
       </el-form-item>
@@ -298,9 +298,12 @@
           <el-table-column label="商品单价" align="center">
             <template slot-scope="scope">
               <el-input
-                v-model.number="scope.row.goodsPrice"
+
+                v-model="scope.row.goodsPrice"
                 type="number"
-                oninput=" if(value.length>7){value=value.slice(0,7)}"
+                oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
+                min="0"
+                placeholder="小数点后两位(元)"
               ></el-input>
             </template>
           </el-table-column>
@@ -308,8 +311,8 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.goodsStock"
-                type="number"
+                oninput="value=value.replace(/[^\d]/g,'')"
-                oninput="if(value.length>9){value=value.slice(0,9)}"
+                maxLength="9"
               ></el-input>
             </template>
           </el-table-column>
@@ -317,8 +320,8 @@
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.attributeDetailsSort"
-                type="number"
+                oninput="value=value.replace(/[^\d]/g,'')"
-                oninput=" if(value.length>9){value=value.slice(0,9)}"
+                maxLength="9"
               ></el-input>
             </template>
           </el-table-column>
@@ -468,8 +471,8 @@
 </template>
 
 <script>
-import indexjs from './indexjs.js'
+import indexjs from "./indexjs.js";
-export default indexjs
+export default indexjs;
 </script>
 <style lang="scss" scoped>
 .stationbtn {

src/views/system/OperateGoodsInfo/indexjs.js

@@ -116,7 +116,6 @@ export default {
                 goodsCategoryId: [
                     { required: true, message: "请选择商品分类名称", trigger: "blur" },
                 ],
-
                 goodsPurpose: [
                     { required: true, message: "请选择商品用途", trigger: "blur" },
                 ],
@@ -369,8 +368,7 @@ export default {
         },
         /** 提交按钮 */
         submitForm() {
-            console.log(this.form);
+            console.log(this.form)
-            console.log(this.goodDetailsLists);
             this.form.goodAttributeDetailsLists = [];
             this.form.goodDetailsLists = this.goodDetailsLists;
             console.log(this.form);
@@ -378,6 +376,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) {
@@ -394,6 +395,9 @@ export default {
                             this.getList();
                         });
                     } else {
+                        this.form.goodDetailsLists.forEach(e => {
+                            e.goodsPrice = Number(e.goodsPrice)
+                        })
                         // this.nurseStationId=this.form.nurseStationId
                         addGoodsInfo(this.form).then((response) => {
                             console.log(this.form);

src/views/system/StationDepartment/indexjs.js

@@ -267,6 +267,19 @@ 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;
+            }
             this.$refs["form"].validate((valid) => {
                 if (valid) {
                     if (this.form.id != null) {

src/views/system/diseaseInfo/index.vue

@@ -100,16 +100,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"
@@ -190,10 +182,9 @@
           >
             <el-input
               v-model="item.sort"
-              placeholder="不可输入小数点"
+              placeholder="请输入排序"
-              type="number"
+              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)}"
             />
           </el-form-item>
           <el-button
@@ -244,6 +235,7 @@
             v-model="form.sort"
             placeholder="请输入排序"
             maxlength="10"
+            oninput="value=value.replace(/[^\d]/g,'')"
           />
         </el-form-item>
       </el-form>
@@ -294,7 +286,7 @@ export default {
         diseaseName: null,
         description: null,
         sort: null,
-        diseaseCode:null,
+        diseaseCode: null,
       },
       // 表单参数
       form: {},
@@ -420,6 +412,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/nurseType/index.vue

@@ -209,9 +209,7 @@
               maxlength="50"
               style="width: 250px"
             />
-          
         </el-form-item>
-       
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -294,7 +292,6 @@ export default {
       //删除deldisease
       deldisease(index) {
       this.form.nurseTypeList.splice(index, 1);
-      console.log(this.form.nurseTypeList);
     },
     adddisease() {
       var obj = {
@@ -325,13 +322,11 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-      
         nurseTypeList:[
           {
             nurseTypeName:"",
           }
         ]
-
       };
       this.resetForm("form");
     },
@@ -369,6 +364,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/index.vue

@@ -771,7 +771,6 @@
             >{{ nurseStationName }}</el-button
           >
         </el-form-item>
-
         <el-form-item
           label="所属科室"
           label-width="120px"

src/views/system/person/indexjs.js

@@ -162,7 +162,6 @@ export default {
                 departmentName: [
                     { required: true, message: "所属科室不能为空", trigger: "blur" },
                 ],
-
                 nursePersonName: [
                     { required: true, message: "护理人姓名不能为空", trigger: "blur" },
                 ],
@@ -496,6 +495,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

@@ -267,11 +267,10 @@
         </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input
+            placeholder="请输入排序"
             v-model="form.sort"
-            placeholder="排序不可输入小数点"
+            oninput="value=value.replace(/[^\d]/g,'')"
-            type="number"
+            maxLength="10"
-            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">
@@ -350,10 +349,8 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.labelSort"
-                  placeholder="排序不可输入小数点"
+                  oninput="value=value.replace(/[^\d]/g,'')"
-                  type="number"
+                  maxLength="10"
-                  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/indexjs.js

@@ -345,7 +345,6 @@ export default {
             this.reset();
             const id = row.id || this.ids;
             getStationConsumable(id).then((response) => {
-                console.log(this.form)
                 this.form = response.data;
                 this.xgopen = true;
                 this.title = "修改护理站耗材信息";
@@ -364,10 +363,8 @@ export default {
                 this.form.consumablePrice =
                     this.form.nurseStationConsumables[0].consumablePrice;
                 this.form.sort = this.form.nurseStationConsumables[0].sort;
-            
             } else {
-                this.form.consumablePrice =
+                this.form.consumablePrice = Number(this.form.consumablePrice);
-                    Number(this.form.consumablePrice);
             }
             this.$refs["form"].validate((valid) => {
                 if (valid) {
@@ -378,9 +375,9 @@ export default {
                             this.getList();
                         });
                     } else {
-                        this.form.nurseStationConsumables.forEach(e => {
+                        this.form.nurseStationConsumables.forEach((e) => {
-                            e.consumablePrice = Number(e.consumablePrice)
+                            e.consumablePrice = Number(e.consumablePrice);
-                        })
+                        });
                         addStationConsumable(this.form).then((response) => {
                             this.$modal.msgSuccess("新增成功");
                             this.nurseStationName = "请选择所属护理站";

src/views/system/stationItem/index.vue

@@ -282,11 +282,10 @@
         </el-form-item>
         <el-form-item label="排序" prop="nurseStationItem.sort">
           <el-input
+            placeholder="请输入排序"
             v-model="form.nurseStationItem.sort"
-            placeholder="不可输入小数点"
+            oninput="value=value.replace(/[^\d]/g,'')"
-            type="number"
+            maxLength="9"
-            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
@@ -324,11 +323,12 @@
             <el-table-column property="price" label="价格" align="center">
               <template slot-scope="scope">
                 <el-input
-                  v-model.number="scope.row.price"
+
+                  v-model="scope.row.price"
                   placeholder="小数点后两位(元)"
                   type="number"
                   min="0"
-                  oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>6){value=value.slice(0,6)}"
+                  oninput="if (value.indexOf('.') > 0) { value = value.slice(0, value.indexOf('.') + 3)}  if (value.length > 6) { value = value.slice(0, 6) }"
                 ></el-input>
               </template>
             </el-table-column>
@@ -389,10 +389,8 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.consumableCount"
-                  placeholder="不可输入小数点"
+                  oninput="value=value.replace(/[^\d]/g,'')"
-                  min="0"
+                  maxLength="9"
-                  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>

src/views/system/stationItem/stationItemjs.js

@@ -453,10 +453,8 @@ export default {
             this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
             this.$refs["form"].validate((valid) => {
                 if (valid) {
-                   
                     if (this.form.nurseStationItem.id != null) {
-                       
+                        this.form.nurseStationItemPrices.forEach((e) => {
-                        this.form.nurseStationItemPrices.forEach(e => {
                             e.nurseStationItemId = this.form.nurseStationItem.id;
                         });
                         var obj = { pictureUrlList: [] };
@@ -466,25 +464,23 @@ export default {
                         if (obj.pictureUrlList.length > 0) {
                             updatePicture(obj).then((res) => { });
                         }
-                        // this.form.nurseStationItemPrices.price.forEach((e) => {
+                        this.form.nurseStationItemPrices.forEach(e => {
-                        //     e.price = Number(e.price)
+                            e.price = Number(e.price)
-                        // });
+                        })
-                       
                         updateNurseItem(this.form).then((response) => {
                             this.$modal.msgSuccess("修改成功");
                             this.open = false;
                             this.getList();
                         });
                     } else {
-                        // this.form.nurseStationItemPrices.price.forEach(e => {
+                        this.form.nurseStationItemPrices.forEach(e => {
-                        //     e.price = Number(e.price)
+                            e.price = Number(e.price)
-                        // });
+                        })
                         addNurseItem(this.form).then((response) => {
                             this.$modal.msgSuccess("新增成功");
                             this.$forceUpdate();
                             this.open = false;
                             this.getList();
-                            this.form={}
                         });
                     }
                 }