Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	src/api/baseurl.js

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 泉医到家护理站管理平台/开发环境
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.16.30:8080'
+VUE_APP_BASE_API = 'https://quanyidaojia.xinelu.cn'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 泉医到家护理站管理平台
 ENV = 'production'
 
 # 泉医到家护理站管理平台/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'https://quanyidaojia.xinelu.cn'

src/main.js

@@ -1,6 +1,5 @@
 import Vue from 'vue'
 
-
 import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
@@ -40,7 +39,6 @@ import VueMeta from 'vue-meta'
 import DictData from '@/components/DictData'
 
 
-
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
@@ -86,4 +84,4 @@ new Vue({
     router,
     store,
     render: h => h(App)
-})
+})

src/views/system/goodsOrder/index.vue

@@ -281,9 +281,7 @@
               v-model="orderList.compositeScore"
               style="padding-top: 7px"
               disabled
-              show-score
               text-color="#ff9900"
-              score-template="{value}"
             ></el-rate>
             <el-input v-else type="text" disabled style="width: 240px" placeholder="未评分"></el-input>
           </div>

src/views/system/order/index.vue

@@ -27,7 +27,7 @@
         />
       </el-form-item>
       <el-form-item label="订单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
           <el-option
             v-for="item in orderStatuslist"
             :key="item.value"
@@ -37,7 +37,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="订单类型" prop="orderStatus">
-        <el-select v-model="queryParams.orderType" placeholder="请选择订单状态">
+        <el-select v-model="queryParams.orderType" placeholder="请选择订单状态" clearable>
           <el-option
             v-for="item in ordertypelist"
             :key="item.value"
@@ -193,7 +193,15 @@
           <div class="text">{{query.nurseStationName}}</div>
         </el-form-item>
         <el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
-          <div class="text">{{query.compositeScore}}</div>
+          <div class="text" style="border:none">
+            <el-rate
+              v-if="query.compositeScore"
+              v-model="query.compositeScore"
+              style="padding-top: 7px"
+              disabled
+              text-color="#ff9900"
+            ></el-rate>
+          </div>
         </el-form-item>
         <el-form-item
           label="评价满意度"
@@ -209,16 +217,10 @@
           <div class="text">{{query.disablingReason}}</div>
         </el-form-item>
         <el-form-item label="健康状况" prop="diseaseName">
-          <div
-            class="text"
-            style="height:100px;line-height:26px;overflow: scroll"
-          >{{query.diseaseName}}</div>
+          <div class="textr">{{query.diseaseName}}</div>
         </el-form-item>
         <el-form-item label="服务地址" prop="serviceAddress">
-          <div
-            class="text"
-            style="height:100px;line-height:26px;overflow: scroll"
-          >{{query.serviceAddress}}</div>
+          <div class="textr">{{query.serviceAddress}}</div>
         </el-form-item>
         <el-form-item
           label="服务到岗照片"
@@ -526,9 +528,6 @@
         <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
           <div class="text">{{query.itemServeDurationUnit}}</div>
         </el-form-item>
-        <el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
-          <div class="text">{{query.compositeScore}}</div>
-        </el-form-item>
         <el-form-item
           label="评价满意度"
           prop="evaluateSatisfaction"
@@ -536,10 +535,20 @@
         >
           <div class="text">{{query.evaluateSatisfaction}}</div>
         </el-form-item>
+        <el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
+          <el-rate
+            v-if="query.compositeScore"
+            v-model="query.compositeScore"
+            style="padding-top: 7px"
+            disabled
+            text-color="#ff9900"
+          ></el-rate>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-right: 50px">
-        <el-button @click="editinnerVisible = false">取 消</el-button>
-        <el-button type="primary" @click="editsubmitForm">确 定</el-button>
+        <el-button @click="editinnerVisible = false" v-if="!lookedit">取 消</el-button>
+        <el-button type="primary" @click="editsubmitForm" v-if="!lookedit">确 定</el-button>
+        <el-button type="primary" @click="editinnerVisible = false" v-if="lookedit">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -865,11 +874,11 @@ export default {
             } else if (res.data.evaluateSatisfaction == "SATISFIED") {
               this.query.evaluateSatisfaction = "满意";
             } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
-              this.query.evaluateSatisfaction = "不满意";
+              this.query.evaluateSatisfaction = "差";
             } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") {
               this.query.evaluateSatisfaction = "非常满意";
             } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") {
-              this.query.evaluateSatisfaction = "非常不满意";
+              this.query.evaluateSatisfaction = "非常差";
             }
             this.loading = false;
             this.editinnerVisible = true;
@@ -907,11 +916,11 @@ export default {
             } else if (res.data.evaluateSatisfaction == "SATISFIED") {
               this.query.evaluateSatisfaction = "满意";
             } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
-              this.query.evaluateSatisfaction = "不满意";
+              this.query.evaluateSatisfaction = "差";
             } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") {
               this.query.evaluateSatisfaction = "非常满意";
             } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") {
-              this.query.evaluateSatisfaction = "非常不满意";
+              this.query.evaluateSatisfaction = "非常差";
             }
             this.loading = false;
             this.innerVisible4 = true;
@@ -1128,6 +1137,18 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.textr {
+  width: 250px;
+  padding-left: 15px;
+  font-size: 14px;
+  border-radius: 4px;
+  padding: 0 15px;
+  border: 1px solid #e6ebf5;
+  color: black;
+  height: 100px;
+  line-height: 26px;
+  overflow: scroll;
+}
 ::v-deep .el-dialog {
   margin-top: 30px !important;
 }