From 6690717518c63c49c7b169d1c8566dbfe54cb302 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 31 Oct 2022 16:46:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/StationDepartment/index.vue |  2 ++
 src/views/system/person/index.vue            | 13 ++++++++---
 src/views/system/station/index.vue           | 24 ++++++++++++++++----
 src/views/system/stationConsumable/index.vue | 13 +++++++----
 4 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/views/system/StationDepartment/index.vue b/src/views/system/StationDepartment/index.vue
index b5e41b5..40615f9 100644
--- a/src/views/system/StationDepartment/index.vue
+++ b/src/views/system/StationDepartment/index.vue
@@ -245,6 +245,7 @@
               v-model="item.departmentName"
               placeholder="请输入科室名称"
               style="width: 250px"
+              maxlength="15"
             />
           </el-form-item>
 
@@ -325,6 +326,7 @@
             v-model="form.departmentName"
             placeholder="请输入科室名称"
             style="width: 250px"
+             maxlength="15"
           />
         </el-form-item>
         <el-form-item label="科室负责人" prop="departmentPerson">
diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 4c7553f..615b9a6 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -159,6 +159,7 @@
         label="护理站名称"
         align="center"
         prop="nurseStationName"
+        :show-overflow-tooltip="true"
       />
       <el-table-column label="科室名称" align="center" prop="departmentName" />
       <el-table-column label="编码" align="center" prop="departmentCode" />
@@ -178,7 +179,7 @@
       </el-table-column>
 
       <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="居住地址" align="center" prop="address" />
+      <el-table-column label="居住地址" align="center" prop="address" :show-overflow-tooltip="true"/>
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
 
@@ -242,6 +243,7 @@
             :prop="`nurseStationPersonList.${index}.nurseStationId`"
           >
             <el-button
+           
               type=""
               @click="clickinnerVisible(item, index)"
               v-if="item.nurseStationName == '请选择护理站名称'"
@@ -250,10 +252,12 @@
                 text-align: left;
                 height: 36px;
                 color: #c0c4cc;
+                overflow: hidden;
               "
               >{{ item.nurseStationName }}</el-button
             >
             <el-button
+         
               type=""
               @click="clickinnerVisible(item, index)"
               v-else
@@ -262,6 +266,7 @@
                 text-align: left;
                 height: 36px;
                 padding-left: -10px;
+                overflow: hidden;
               "
               >{{ item.nurseStationName }}</el-button
             >
@@ -492,6 +497,7 @@
           label="护理站名称"
           width="150"
           align="center"
+          :show-overflow-tooltip="true"
         >
         </el-table-column>
         <el-table-column
@@ -521,6 +527,7 @@
           label="护理地址"
           width="150"
           align="center"
+          :show-overflow-tooltip="true"
         >
         </el-table-column>
       </el-table>
@@ -720,14 +727,14 @@
           <template slot-scope="scope">
             <el-button
               type="primary"
-              style="width: 15px; height: 15px"
+              style="width: 15px; height: 15px;overflow: hidden;"
               v-if="departid == scope.row.departmentCode"
               circle
               @click="StationDepartmentclick(scope.row)"
             ></el-button>
             <el-button
               v-else
-              style="width: 15px; height: 15px"
+              style="width: 15px; height: 15px;overflow: hidden;"
               circle
               @click="StationDepartmentclick(scope.row)"
             ></el-button>
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index a840093..06439f5 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -201,6 +201,7 @@
         label="护理站名称"
         align="center"
         prop="nurseStationName"
+        :show-overflow-tooltip="true"
       />
       <el-table-column label="护理站类型" align="center" prop="nurseTypeName">
         <template slot-scope="scope">
@@ -214,7 +215,7 @@
           <span>{{ scope.row.sysAreaVOList[0].cityName }}-</span>
           <span>{{ scope.row.sysAreaVOList[0].streetName }}</span> -->
       </el-table-column>
-      <el-table-column label="护理站地址" align="center" prop="address" />
+      <el-table-column label="护理站地址" align="center" prop="address" :show-overflow-tooltip="true"/>
       <!-- <el-table-column
         label="护理站简介"
         align="center"
@@ -477,7 +478,7 @@
             placeholder="排序不可输入小数点"
             type="number"
             min="0"
-            oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
+            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="nurseStationDescription">
@@ -818,6 +819,8 @@ export default {
       console.log(imgUrl);
       this.form.stationIntroducePcitureUrl = imgUrl;
     },
+
+
     delnurseStationLabelList(item) {
       console.log(item);
       if (item.ids && !item.id) {
@@ -839,6 +842,7 @@ export default {
       }
       console.log(this.form.nurseStationLabelList);
     },
+
     addnurseStationLabelList() {
       if (this.looknurseStationLabel.length == 5) {
         this.$message.error("最多只能5条");
@@ -1043,7 +1047,7 @@ export default {
       const id = row.id || this.ids;
       getStation(id)
         .then((response) => {
-          this.resid = response.data.id;
+          this.resid = response.data.nurseStationList.id;
           this.form = response.data;
           if (
             !this.form.nurseStationType ||
@@ -1056,7 +1060,7 @@ export default {
           }
           // this.form.nurseStationLabelList = [];
           this.title = "修改护理站信息";
-          getSubordinateRegions(response.data.areaCode).then((res) => {
+          getSubordinateRegions(response.data.sysAreaVOList.streetCode).then((res) => {
             if (res.data) {
               this.value = String(res.data.provinceCode);
               this.value1 = res.data.cityName;
@@ -1228,3 +1232,15 @@ export default {
   },
 };
 </script>
+<style>
+::v-deep .el-table_1_column_6  is-center   is-leaf el-table__cell {
+text-overflow: -o-ellipsis-lastline;
+    overflow: hidden;
+     text-overflow: ellipsis;
+     display: -webkit-box;
+     -webkit-line-clamp: 4;
+     line-clamp: 4;
+     -webkit-box-orient: vertical;
+}
+</style>	
+
diff --git a/src/views/system/stationConsumable/index.vue b/src/views/system/stationConsumable/index.vue
index c529806..6df2529 100644
--- a/src/views/system/stationConsumable/index.vue
+++ b/src/views/system/stationConsumable/index.vue
@@ -163,6 +163,7 @@
         label="护理站名称"
         align="center"
         prop="nurseStationName"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
         label="耗材包编号"
@@ -310,6 +311,7 @@
                 text-align: left;
                 height: 36px;
                 color: #c0c4cc;
+                overflow: hidden;
               "
               @click="choicenurseStation(item, index)"
               v-if="item.nurseStationName == '请选择所属护理站'"
@@ -317,7 +319,7 @@
               {{ item.nurseStationName }}
             </el-button>
             <el-button
-              style="width: 208px; text-align: left; height: 36px"
+              style="width: 208px; text-align: left; height: 36px;overflow: hidden;"
               @click="choicenurseStation(item, index)"
               v-else
             >
@@ -332,6 +334,7 @@
             <el-input
               v-model="item.consumableDetail"
               placeholder="请输入服务项目耗材包详情"
+                maxlength="50"
             />
           </el-form-item>
           <el-form-item
@@ -355,7 +358,7 @@
               placeholder="保留小数点后两位"
               type="number"
               min="0"
-              oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>10){value=value.slice(0,10)}"
+              oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>5){value=value.slice(0,5)}"
             />
           </el-form-item>
           <el-form-item
@@ -513,6 +516,7 @@
           label="护理站名称"
           align="center"
           prop="nurseStationName"
+          :show-overflow-tooltip="true"
         />
         <el-table-column
           label="护理站编号"
@@ -522,7 +526,7 @@
         <el-table-column label="护理站经度" align="center" prop="longitude" />
         <el-table-column label="护理站纬度" align="center" prop="latitude" />
         <el-table-column label="联系电话" align="center" prop="phone" />
-        <el-table-column label="护理站地址" align="center" prop="address" />
+        <el-table-column label="护理站地址" align="center" prop="address" :show-overflow-tooltip="true"/>
         <el-table-column label="负责人" align="center" prop="dutyPerson" />
         <el-table-column label="负责人电话" align="center" prop="dutyPhone" />
       </el-table>
@@ -611,6 +615,7 @@
           label="护理站名称"
           align="center"
           prop="nurseStationName"
+          :show-overflow-tooltip="true"
         />
         <el-table-column
           label="护理站编号"
@@ -620,7 +625,7 @@
         <el-table-column label="护理站经度" align="center" prop="longitude" />
         <el-table-column label="护理站纬度" align="center" prop="latitude" />
         <el-table-column label="联系电话" align="center" prop="phone" />
-        <el-table-column label="护理站地址" align="center" prop="address" />
+        <el-table-column label="护理站地址" align="center" prop="address" :show-overflow-tooltip="true"/>
         <el-table-column label="负责人" align="center" prop="dutyPerson" />
         <el-table-column label="负责人电话" align="center" prop="dutyPhone" />
       </el-table>

From 80e5d0f4b946972fd16078a0edae3e5e23107357 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 31 Oct 2022 17:37:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=97=E6=9D=90=20=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsInfo/index.vue         | 37 +++++++++++++++-----
 src/views/system/stationAvatar/index.vue     |  4 +--
 src/views/system/stationConsumable/index.vue |  2 +-
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 29854e3..c800719 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -88,7 +88,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="商品分类名称" prop="goodsCategoryName">
+      <el-form-item label="商品分类名称" prop="goodsCategoryName" >
         <el-input
           v-model="queryParams.goodsCategoryName"
           placeholder="请输入商品分类名称"
@@ -294,12 +294,12 @@
           <el-input
             v-model="form.goodsName"
             placeholder="请输入商品名称"
-            style="width: 210px"
+            style="width: 210px; margin-left:10px"
           />
         </el-form-item>
-        <el-form-item label="护理站名称" prop="nurseStationName">
+        <el-form-item label="护理站名称" prop="nurseStationName" label-width="100">
           <el-select
-            style="width: 210px"
+            style="width: 210px;margin-left:10px"
             v-model="form.nurseStationId"
             clearable
             placeholder="请选择护理站"
@@ -313,7 +313,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品分类名称" prop="goodsCategoryName">
+        <el-form-item label="商品分类名称" prop="goodsCategoryName" label-width="100">
           <el-select
             style="width: 210px"
             v-model="form.goodsCategoryId"
@@ -338,7 +338,7 @@
           <el-select
             v-model="form.goodsPurpose"
             placeholder="请选择"
-            style="width: 210px"
+            style="width: 210px;margin-left:10px"
           >
             <el-option
               v-for="item in goods"
@@ -349,7 +349,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品度量单位" prop="goodsUnit">
+        <el-form-item label="商品度量单位" prop="goodsUnit" label-width="100">
           <el-input
             v-model="form.goodsUnit"
             placeholder="请输入商品度量单位"
@@ -523,7 +523,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品度量单位" prop="goodsUnit">
+        <el-form-item label="商品度量单位" prop="goodsUnit" >
           <el-input
             v-model="form.goodsUnit"
             placeholder="请输入商品度量单位"
@@ -703,7 +703,26 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+         goodsName: [
+          { required: true, message: "请输入商品名称", trigger: "blur" },
+        ],
+        goodsCategoryName:[
+          { required: true, message: "请选择商品分类名称", trigger: "blur" },
+        ],
+        nurseStationName:[
+          { required: true, message: "请选择护理站名称", trigger: "blur" },
+        ],
+        goodsPurpose:[
+          { required: true, message: "请选择商品用途", trigger: "blur" },
+        ],
+        goodsUnit:[
+          { required: true, message: "请输入商品度量单位", trigger: "blur" },
+        ],
+        goodsPictureUrl:[
+          { required: true, message: "请输入选择图片", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
index 672e066..a29938e 100644
--- a/src/views/system/stationAvatar/index.vue
+++ b/src/views/system/stationAvatar/index.vue
@@ -3,13 +3,13 @@
     <div
       class="user-info-head"
       @click="editCropper()"
-      style="width: 208px; height: 200px"
+      style="width: 100px; height: 100px"
     >
       <img
         v-if="options.img"
         v-bind:src="options.img"
         title="点击上传头像"
-        style="width: 208px; height: 200px; line-height: 200px"
+        style="width: 100px; height: 100px; line-height: 200px"
       />
       <i
         v-else
diff --git a/src/views/system/stationConsumable/index.vue b/src/views/system/stationConsumable/index.vue
index 6df2529..7806833 100644
--- a/src/views/system/stationConsumable/index.vue
+++ b/src/views/system/stationConsumable/index.vue
@@ -29,7 +29,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="所属护理站" prop="" v-else>
+      <el-form-item label="护理站名称" prop="" v-else>
         <el-select
           v-model="queryParams.nurseStationId"
           placeholder="请选择护理站"