Merge branch 'feature/v1/plb' into 'master'

修改bug

See merge request !7

src/store/getters.js

@@ -17,6 +17,7 @@ const getters = {
   avatar: state => state.user.avatar,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
   name: state => state.user.name,
   user: state => state.user.user,
   user: state => state.user.user,
+  cityName: state => state.user.cityName,
   introduction: state => state.user.introduction,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
   permissions: state => state.user.permissions,

src/store/modules/user.js

@@ -9,6 +9,7 @@ const user = {
     roles: [],
     roles: [],
     permissions: [],
     permissions: [],
     user: {},
     user: {},
+    cityName: "",
   },
   },
 
 
   mutations: {
   mutations: {
@@ -30,6 +31,9 @@ const user = {
     SET_USER: (state, user) => {
     SET_USER: (state, user) => {
       state.user = user;
       state.user = user;
     },
     },
+    SET_CITYNAME: (state, cityName) => {
+      state.cityName = cityName;
+    },
   },
   },
 
 
   actions: {
   actions: {
@@ -57,6 +61,7 @@ const user = {
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
         getInfo()
         getInfo()
           .then((res) => {
           .then((res) => {
+            commit("SET_CITYNAME", res.data.cityName);
             const user = res.data.user;
             const user = res.data.user;
             const avatar =
             const avatar =
               user.avatar == "" || user.avatar == null
               user.avatar == "" || user.avatar == null

src/views/index.vue

@@ -3,6 +3,14 @@
     <div class="index-content">
     <div class="index-content">
       <div class="index-content-nav">
       <div class="index-content-nav">
         <el-row :gutter="20">
         <el-row :gutter="20">
+          <el-col :span="4" v-if="user.roleId == 3">
+            <div class="index-content-nav-item">
+              <div class="index-content-nav-item-top">
+                <h3>所属城市</h3>
+              </div>
+              <h2>{{cityName ? cityName : ''}}</h2>
+            </div>
+          </el-col>
           <el-col :span="4">
           <el-col :span="4">
             <div class="index-content-nav-item">
             <div class="index-content-nav-item">
               <div class="index-content-nav-item-top">
               <div class="index-content-nav-item-top">
@@ -238,7 +246,7 @@ export default {
   name: "Index",
   name: "Index",
   mixins: [resize],
   mixins: [resize],
   computed: {
   computed: {
-    ...mapGetters(["user"]),
+    ...mapGetters(["user","cityName"]),
   },
   },
   data() {
   data() {
     return {
     return {
@@ -577,8 +585,10 @@ export default {
       }
       }
       h2 {
       h2 {
         width: 100%;
         width: 100%;
-        height: 120rpx;
-        line-height: 120rpx;
+        // height: 120px;
+        font-weight: 500;
+        font-size: 50px;
+        color: #000000;
       }
       }
     }
     }
     .el-row {
     .el-row {

src/views/operation/business/index.vue

@@ -404,7 +404,7 @@ export default {
     /** 修改按钮操作 */
     /** 修改按钮操作 */
     handleUpdate(row) {
     handleUpdate(row) {
       this.loading = true;
       this.loading = true;
-      this.hospitalsListAxios();
+      // this.hospitalsListAxios();
       this.reset();
       this.reset();
       const id = row.id || this.ids;
       const id = row.id || this.ids;
       getBusiness(id).then((response) => {
       getBusiness(id).then((response) => {

src/views/orderManagement/dbwzOrder/index.vue

@@ -636,6 +636,10 @@ export default {
     this.getList();
     this.getList();
   },
   },
   methods: {
   methods: {
+    clickSeeVisitor(row) {
+      this.openArticleInfo = true;
+      this.VisitorData = row.userVsitorVo;
+    },
     clickSeeVisitorImg(row) {
     clickSeeVisitorImg(row) {
       this.openArticleInfoImg = true;
       this.openArticleInfoImg = true;
       this.VisitorData = row;
       this.VisitorData = row;

src/views/orderManagement/order/index.vue

@@ -118,6 +118,7 @@
         align="center"
         align="center"
         prop="hname"
         prop="hname"
         key="hname"
         key="hname"
+        width="200"
         :show-overflow-tooltip="true"
         :show-overflow-tooltip="true"
       />
       />
       <el-table-column
       <el-table-column
@@ -148,7 +149,7 @@
           <span v-else>未接单</span>
           <span v-else>未接单</span>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" key="remark">
+      <el-table-column label="备注" align="center" prop="remark" key="remark" width="120">
         <template slot-scope="{ row }">
         <template slot-scope="{ row }">
           <el-button
           <el-button
             v-if="row.remark"
             v-if="row.remark"