Merge branch '最低经销价格' into allTestUrgent

# Conflicts:
#	package-lock.json

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-yos
+yos
+package-lock

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -251,7 +251,7 @@
               !scope.column.data[scope.column.columnname] &&
               scope.column.data[[scope.column.columnname]] !== 0 &&
               scope.column.columnname != 'operation' &&
-              scope.column.columnname != 'countPrice'&&
+              scope.column.columnname != 'countPrice' &&
               scope.column.columnname != 'model'
             "
           >
@@ -416,7 +416,10 @@ export default {
       this.totalPrice = this.tool.formatAmount(this.totalPrice, 2);
       this.list = res.data;
       this.total = res.total;
-      this.$refs.addProduct.doLayout();
+      try {
+         this.$refs.addProduct.doLayout();
+      } catch (error) {
+      }
       this.$emit("priceChange");
     },
     /*修改数量*/

src/HDrpManagement/salerpriceData/components/balanceDetail.vue

@@ -63,7 +63,7 @@
                   scope.column.data.county
                 }}
               </span>
-              <spna v-else>--</spna>
+              <span v-else>--</span>
             </p>
             <p v-else-if="scope.column.columnname === 'balance'">
               {{

src/components/newLayout/index.vue

@@ -108,14 +108,17 @@ export default {
         clearTimeout(this.timer);
       }
       this.timer = setTimeout(() => {
-        let size = this.$refs.menu.$refs.menuList.$el.clientHeight / 40 - 1;
-        if (this.$refs.menu.$refs.menuList.$el.clientHeight === 80) {
-          this.divTop =
-            this.$refs.menu.$refs.menuList.$el.clientHeight - 25 * size + "px";
-        } else {
-          this.divTop = 0 + "px";
+        if (this.$refs.menu) {
+          let size = this.$refs.menu.$refs.menuList.$el.clientHeight / 40 - 1;
+          if (this.$refs.menu.$refs.menuList.$el.clientHeight === 80) {
+            this.divTop =
+              this.$refs.menu.$refs.menuList.$el.clientHeight -
+              25 * size +
+              "px";
+          } else {
+            this.divTop = 0 + "px";
+          }
         }
-
         /* this.divHeight = (this.$refs.divContent.clientHeight - this.$refs.menu.$refs.menuList.$el.clientHeight + 10) + 'px'*/
         /* if (this.$refs.menu.$el.clientWidth < 1206 && Array.from(this.$refs.menu.$el.getElementsByTagName('li')).filter(item => item.className.indexOf('el-submenu') != -1).length > 8) {
           this.marginTrue = true
@@ -142,12 +145,20 @@ export default {
     },
   },
   mounted() {
-
-    if (JSON.parse(sessionStorage.getItem('active_password')) == '1' && JSON.parse(sessionStorage.getItem('password')) != '1'){
-      if (JSON.parse(sessionStorage.getItem('active_account')).usertype == 0 && JSON.parse(sessionStorage.getItem('active_account')).usertype == 1 && (JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1')){
-        this.dialogVisible = false
-      }else {
-        this.dialogVisible = true
+    if (
+      JSON.parse(sessionStorage.getItem("active_password")) == "1" &&
+      JSON.parse(sessionStorage.getItem("password")) != "1"
+    ) {
+      if (
+        JSON.parse(sessionStorage.getItem("active_account")).usertype == 0 &&
+        JSON.parse(sessionStorage.getItem("active_account")).usertype == 1 &&
+        (JSON.parse(sessionStorage.getItem("active_account")).siteid == "HY" ||
+          JSON.parse(sessionStorage.getItem("active_account")).siteid ==
+            "YOSTEST1")
+      ) {
+        this.dialogVisible = false;
+      } else {
+        this.dialogVisible = true;
       }
     }
     /*this.debouned()*/

src/components/newLayout/modules/navRight.vue

@@ -1,82 +1,98 @@
 <template>
   <div>
     <div class="nav-right">
-       <el-menu
-          :collapse="true"
-          style="background:none"
-          text-color="#fff"
-          active-text-color="#fff"
-          class="el-menu-vertical-demo">
-          <el-menu-item :index="String(index + 10)" v-for="(item,index) in menuApp" :key="index" @click="handelMenuAppClick(item,'app')">
-            <img width="20" :src="require(`@/assets/icons/${item.systemappid}.svg`)" alt="">
-            <span slot="title">{{item.meta.title}}</span>
-          </el-menu-item>
-        </el-menu>
+      <el-menu
+        :collapse="true"
+        style="background: none"
+        text-color="#fff"
+        active-text-color="#fff"
+        class="el-menu-vertical-demo"
+      >
+        <el-menu-item
+          :index="String(index + 10)"
+          v-for="(item, index) in menuApp"
+          :key="index"
+          @click="handelMenuAppClick(item, 'app')"
+        >
+          <img
+            width="20"
+            :src="require(`@/assets/icons/${item.systemappid}.svg`)"
+            alt=""
+          />
+          <span slot="title">{{ item.meta.title }}</span>
+        </el-menu-item>
+      </el-menu>
     </div>
   </div>
 </template>
 
 <script>
 export default {
-  data () {
+  data() {
     return {
-      menuApp:[],
-      modules:[],
-      system:[]
-    }
+      menuApp: [],
+      modules: [],
+      system: [],
+    };
   },
-  methods:{
-     // 查询右侧应用授权
-    async query_userauth () {
+  methods: {
+    // 查询右侧应用授权
+    async query_userauth() {
       const res = await this.$api.requested({
-        "classname": "sysmanage.develop.userauthforweb.userauth",
-        "method": "query_userauth",
-        "content": {
-          "place":2
-        }
-      })
-      this.system = res.data
-
-      this.modules = []
-      res.data.map(e=>{
-        this.modules = [...this.modules,...e.modules]
-      })
-      this.modules.map(e=>{
-        this.menuApp =[...this.menuApp,...e.apps]
-      })
+        classname: "sysmanage.develop.userauthforweb.userauth",
+        method: "query_userauth",
+        content: {
+          place: 2,
+        },
+      });
+      console.log("res", res);
+      if (res.code == 1) {
+        this.system = res.data;
+        this.modules = [];
+        res.data.map((e) => {
+          this.modules = [...this.modules, ...e.modules];
+        });
+        this.modules.map((e) => {
+          this.menuApp = [...this.menuApp, ...e.apps];
+        });
+      }
     },
-    handelMenuAppClick (app,type) {
-      this.$store.dispatch('changeDetailDrawer',false)
-      let at_modules = this.modules.filter(e=>{
-        if (e.systemmoduleid === app.systemmoduleid)
-        return e
-      })[0]
+    handelMenuAppClick(app, type) {
+      this.$store.dispatch("changeDetailDrawer", false);
+      let at_modules = this.modules.filter((e) => {
+        if (e.systemmoduleid === app.systemmoduleid) return e;
+      })[0];
 
-      let at_app = app
+      let at_app = app;
 
-      sessionStorage.setItem('active_modules',JSON.stringify(at_modules))
-      const link = ()=>{
-        this.$router.push({path:app.path})
-      }
-      this.$store.dispatch('setActiveApp',{name:app.name,app:at_app,val:'',link})
-      this.$router.push({path:app.path})
+      sessionStorage.setItem("active_modules", JSON.stringify(at_modules));
+      const link = () => {
+        this.$router.push({ path: app.path });
+      };
+      this.$store.dispatch("setActiveApp", {
+        name: app.name,
+        app: at_app,
+        val: "",
+        link,
+      });
+      this.$router.push({ path: app.path });
     },
   },
-  mounted () {
-    this.query_userauth()
-  }
-}
-
+  mounted() {
+    this.query_userauth();
+  },
+};
 </script>
 <style>
 </style>
 <style scoped>
-.nav-right{
-  position:fixed;
-  right:0;
-  top:0;
-  height:100%;
-  background:rgba(0, 0,0,.3);z-index:2000;
+.nav-right {
+  position: fixed;
+  right: 0;
+  top: 0;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.3);
+  z-index: 2000;
   z-index: 2003;
 }
 </style>

src/optionSystem/optionOrder/detail/modules/setOrder.vue

@@ -76,8 +76,11 @@
             <td class="text1" style="height: 100%;"><span>{{ Object.keys(product).length ? product.itemno||'-' : '' }}</span></td>
         </tr>
         <tr>
-            <td class="title">{{$t(product.itemno?'牌价':'预估价格')}}</td>
-            <td class="text2">￥{{ Object.keys(product).length ? tool.formatAmount(product.price,2) : 'xxxxxx' }}</td>
+            <td class="title">{{$t(product.itemno?'牌价':'最低经销价')}}</td>
+            <td class="text2">
+                ￥{{ Object.keys(product).length ? tool.formatAmount(product.price,2) : 'xxxxxx' }}
+                <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品，当前价格仅供参考')}}!</div>
+            </td>
         </tr>
     </table>
 </template>

src/optionSystem/selectOption/components/DieFa.vue

@@ -721,13 +721,14 @@
             </td>
           </tr>
           <tr>
-            <td class="title">{{ $t(product.itemno ? "牌价" : "预估价格") }}</td>
+            <td class="title">{{ $t(product.itemno ? "牌价" : "最低经销价") }}</td>
             <td class="text2">
               ￥{{
                 Object.keys(product).length
                   ? tool.formatAmount(product.price, 2)
                   : "xxxxxx"
               }}
+                <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品，当前价格仅供参考')}}!</div>
             </td>
           </tr>
         </table>

src/optionSystem/selectOption/components/setOrder.vue

@@ -245,9 +245,10 @@
         <td class="text1">{{ result.itemno || "-" }}</td>
       </tr>
       <tr>
-        <td class="title">{{ $t(result.itemno ? "牌价" : "预估价格") }}</td>
+        <td class="title">{{ $t(result.itemno ? "牌价" : "最低经销价") }}</td>
         <td class="text2">
           ￥{{ result.price ? tool.formatAmount(result.price, 2) : "xxxxxx" }}
+          <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品，当前价格仅供参考')}}!</div>
         </td>
       </tr>
     </table>
@@ -284,10 +285,12 @@ export default {
 <style scoped>
 /deep/.el-dialog__header {
   display: none;
+  
 }
 /deep/.el-dialog__body {
   padding: 5px !important;
 }
+
 .descript {
   font-size: 12px;
   color: red;

src/optionSystem/valveOption/DieFa.vue

@@ -994,7 +994,7 @@
             <td class="title" style="padding: 0" colspan="2">
           <tr class="price-tr">
             <td class="title" style="width: 120px !important">
-              {{ $t(product.itemno ? "牌价" : "预估价格") }}
+              {{ $t(product.itemno ? "牌价" : "最低经销价") }}
             </td>
             <td class="text2">
               ￥{{
@@ -1002,6 +1002,7 @@
                     ? tool.formatAmount(product.price, 2)
                     : "xxxxxx"
               }}
+              <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品，当前价格仅供参考')}}!</div>
             </td>
             <td class="title">{{$t('成本价格')}}</td>
             <td class="text2">

src/template/addProduct/index.vue

@@ -140,6 +140,13 @@ export default {
       this.total = res.total
       this.$refs.tableTemp.$refs.table.doLayout()
     },
+    doLayout(){
+      try {
+        this.$refs.tableTemp.$refs.table.doLayout()
+      } catch (error) {
+        
+      }
+    },
     /*获取品牌*/
     async queryBrands () {
       const res = await this.$api.requested({

src/views/message/index.vue

@@ -4,377 +4,410 @@
       <el-col :span="12">
         <div class="left">
           <div class="select">
-            <div >
+            <div>
               <el-button-group>
-                <el-button size="small" :type="currentItem==1?'primary':''" @click="selectFun('应用')">{{$t('应用消息')}}</el-button>
-                <el-button size="small" :type="currentItem==0?'primary':''" @click="selectFun('系统')">{{$t('系统消息')}}</el-button>
+                <el-button
+                  size="small"
+                  :type="currentItem == 1 ? 'primary' : ''"
+                  @click="selectFun('应用')"
+                  >{{ $t("应用消息") }}</el-button
+                >
+                <el-button
+                  size="small"
+                  :type="currentItem == 0 ? 'primary' : ''"
+                  @click="selectFun('系统')"
+                  >{{ $t("系统消息") }}</el-button
+                >
               </el-button-group>
-<!--              <div @click="selectFun('应用')"
+              <!--              <div @click="selectFun('应用')"
                    :style="currentItem==1 ? 'background:#3874F6;color:#ffffff;vertical-align: middle;line-height: 30px;height: 30px' : 'border:1px solid #cccccc;vertical-align: middle;line-height: 30px;height: 30px'">应用消息</div>
               <div @click="selectFun('系统')"
                    :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>-->
             </div>
             <div class="select_right">
-              <el-button @click="allRead" size="small">{{$t('全部标为已读')}}</el-button>
+              <el-button @click="allRead" size="small">{{
+                $t("全部标为已读")
+              }}</el-button>
             </div>
           </div>
           <el-row style="margin-top: 10px">
-            <el-col :span="14" >
-              <div style="margin-left: 16px;font-size: 14px">
-                {{$t('总计')}}：{{total}}
+            <el-col :span="14">
+              <div style="margin-left: 16px; font-size: 14px">
+                {{ $t("总计") }}：{{ total }}
               </div>
             </el-col>
             <el-col :span="10">
-              <div style="float: right;margin-right: 16px;">
-                  <el-switch
-                      style="z-index: 9999"
-                      v-model="isRead"
-                      :active-text="$t('只看未读')"
-                      active-value="1"
-                      inactive-value="0"
-                      @change="readChange"
-                  >
-                  </el-switch>
+              <div style="float: right; margin-right: 16px">
+                <el-switch
+                  style="z-index: 9999"
+                  v-model="isRead"
+                  :active-text="$t('只看未读')"
+                  active-value="1"
+                  inactive-value="0"
+                  @change="readChange"
+                >
+                </el-switch>
               </div>
             </el-col>
           </el-row>
 
-          <list class="list" :list="list" @messageItemClick="messageItemClick" ref="list"></list>
+          <list
+            class="list"
+            :list="list"
+            @messageItemClick="messageItemClick"
+            ref="list"
+          ></list>
 
-          <pagination  :total="total" :pageSize="param.content.pageSize"  :currentPage="param.content.pageNumber"
-                       @pageChange="pageChange">
+          <pagination
+            :total="total"
+            :pageSize="param.content.pageSize"
+            :currentPage="param.content.pageNumber"
+            @pageChange="pageChange"
+          >
           </pagination>
-
         </div>
       </el-col>
       <el-col :span="12">
         <div class="right" v-if="message">
-          <p class="title">{{message.title}}</p>
+          <p class="title">{{ message.title }}</p>
           <p class="info">
-            <span>{{$t('发布于')}}:{{message.createdate}} | {{message.name || message.type}}</span>
+            <span
+              >{{ $t("发布于") }}:{{ message.createdate }} |
+              {{ message.name || message.type }}</span
+            >
           </p>
           <div class="content-txt">
-<!--            <p class="txt">{{message.message}}</p>-->
+            <!--            <p class="txt">{{message.message}}</p>-->
             <p class="txt">
-              <span v-for="(item,index) in message.message">
-              <span v-if="index === message.message.length -1">{{$t(item)}}</span>
-              <span v-else>{{item + ';'}}<br></span>
-            </span>
+              <span v-for="(item, index) in message.message">
+                <span v-if="index === message.message.length - 1">{{
+                  $t(item)
+                }}</span>
+                <span v-else>{{ item + ";" }}<br /></span>
+              </span>
+            </p>
+            <p
+              class="link"
+              @click="goDetail"
+              v-if="currentItem == 1 && message.link"
+            >
+              {{ $t("请前往") }} {{ message.title }}>>
             </p>
-            <p class="link" @click="goDetail" v-if="currentItem == 1 && message.link">{{$t('请前往')}} {{message.title}}>></p>
           </div>
         </div>
       </el-col>
     </el-row>
-
   </div>
 </template>
 
 <script>
-import list from '@/views/message/components/list'
+import list from "@/views/message/components/list";
 
-import pagination from '@/components/pagination/Pagination1'
+import pagination from "@/components/pagination/Pagination1";
 export default {
-  name: '',
-  data () {
+  name: "",
+  data() {
     return {
       currentItem: 1,
-      isRead:'0',
+      isRead: "0",
       param: {
-        "classname": "system.message.Message",
-        "method": "queryMessage",
-        "content": {
-          "nocache": true,
-          "pageNumber": 1,
-          "pageSize": 15,
-          "isread":'',
-          "type": '',
-          "where": {
-            "isread":''
-          }
-        }
+        classname: "system.message.Message",
+        method: "queryMessage",
+        content: {
+          nocache: true,
+          pageNumber: 1,
+          pageSize: 15,
+          isread: "",
+          type: "",
+          where: {
+            isread: "",
+          },
+        },
       },
       list: [],
       total: 0,
-      message:'',
-      isAllClick: true
+      message: "",
+      isAllClick: true,
     };
   },
   components: { list, pagination },
-  computed: {
-  },
-  watch: {
-  },
-  created () {
-    this.getMessageList()
+  computed: {},
+  watch: {},
+  created() {
+    this.getMessageList();
   },
   methods: {
-    async getMessageList () {
-      this.param.content.type = this.currentItem == 0 ? '系统' : '应用'
-      let res = await this.$api.requested(this.param)
-      res.data.forEach(item => {
-        this.isCategory(item)
-      })
-      this.list = res.data
+    async getMessageList() {
+      this.param.content.type = this.currentItem == 0 ? "系统" : "应用";
+      let res = await this.$api.requested(this.param);
+      if (res.code == 1) {
+        res.data.forEach((item) => {
+          this.isCategory(item);
+        });
+        this.list = res.data;
 
-      this.list.forEach(item=>{
-        item.message = item.message.split("；")
-      })
-      this.message = ''
-      if(this.list[0]) this.messageItemClick(this.list[0])
-      this.total = res.total
+        this.list.forEach((item) => {
+          item.message = item.message.split("；");
+        });
+        this.message = "";
+        if (this.list[0]) this.messageItemClick(this.list[0]);
+        this.total = res.total;
+      }
     },
-    selectFun (data) {
-      this.message = ''
-      this.param.content.pageNumber = 1
-      this.currentItem = data == '系统' ? 0 : 1
-      this.getMessageList()
+    selectFun(data) {
+      this.message = "";
+      this.param.content.pageNumber = 1;
+      this.currentItem = data == "系统" ? 0 : 1;
+      this.getMessageList();
     },
-    pageChange (n) {
-      this.$refs.list.$refs.listScroll.scrollTop = 0
-      this.param.content.pageNumber = n
-      this.getMessageList()
+    pageChange(n) {
+      this.$refs.list.$refs.listScroll.scrollTop = 0;
+      this.param.content.pageNumber = n;
+      this.getMessageList();
     },
     async messageItemClick(data) {
       let res = await this.$api.requested({
-      "classname":"system.message.Message",
-      "method":"readMessage",
-      "content":{
-              "nocache":true,
-              "messageid":data.messageid
-          }
-        })
-      data.isread = 1
-      res.data.name = data.name
-      res.data.link = data.link
-      res.data.modules = data.modules
-      this.message = res.data
-      this.message.message = this.message.message.split("；")
+        classname: "system.message.Message",
+        method: "readMessage",
+        content: {
+          nocache: true,
+          messageid: data.messageid,
+        },
+      });
+      data.isread = 1;
+      res.data.name = data.name;
+      res.data.link = data.link;
+      res.data.modules = data.modules;
+      this.message = res.data;
+      this.message.message = this.message.message.split("；");
     },
     async allRead() {
-      if(!this.isAllClick) return
+      if (!this.isAllClick) return;
       let res = await this.$api.requested({
-      "classname":"system.message.Message",
-      "method":"readAllMessage",
-      "content":{
-        "nocache":true,
-      }
-      })
-      this.tool.showMessage(res,() => {
-        this.list.forEach(item => {
-          item.isread = 1
-        })
-        this.isAllClick = false
+        classname: "system.message.Message",
+        method: "readAllMessage",
+        content: {
+          nocache: true,
+        },
+      });
+      this.tool.showMessage(res, () => {
+        this.list.forEach((item) => {
+          item.isread = 1;
+        });
+        this.isAllClick = false;
         setTimeout(() => {
-          this.isAllClick = true
-        },5000)
-      })
+          this.isAllClick = true;
+        }, 5000);
+      });
     },
     //跳转到消息具体页面
     goDetail() {
-      sessionStorage.setItem('active_modules',JSON.stringify(this.message.modules))
-      console.log(this.message.link,'link')
-      console.log(this.message,'message')
-     /* this.$router.push(this.message.link.listPath)*/
-      if (this.message.objectname === 'sat_orderclueuploadbill'){
+      sessionStorage.setItem(
+        "active_modules",
+        JSON.stringify(this.message.modules)
+      );
+      console.log(this.message.link, "link");
+      console.log(this.message, "message");
+      /* this.$router.push(this.message.link.listPath)*/
+      if (this.message.objectname === "sat_orderclueuploadbill") {
         setTimeout(() => {
-          this.$store.dispatch('changeDetailDrawer',false)
-          let route = this.$route
+          this.$store.dispatch("changeDetailDrawer", false);
+          let route = this.$route;
 
-          this.oldRoute = {path:route.path,query:route.query}
-          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+          this.oldRoute = { path: route.path, query: route.query };
+          this.$store.dispatch("setHistoryRouter", this.oldRoute);
 
           this.$router.push({
-            path:'/clue_public',
-            query:{
-              id:this.message.objectid,
-              portrait:''
-            }
-          })
-        })
-      }else {
+            path: "/clue_public",
+            query: {
+              id: this.message.objectid,
+              portrait: "",
+            },
+          });
+        });
+      } else {
         if (this.message.link.detail) {
           setTimeout(() => {
-            this.$store.dispatch('changeDetailDrawer',true)
-            let route = this.$route
+            this.$store.dispatch("changeDetailDrawer", true);
+            let route = this.$route;
             if (route.path !== this.message.link.detail.slice(0)) {
-              this.oldRoute = {path:route.path,query:route.query}
-              this.$store.dispatch('setHistoryRouter',this.oldRoute)
+              this.oldRoute = { path: route.path, query: route.query };
+              this.$store.dispatch("setHistoryRouter", this.oldRoute);
             }
             this.$router.push({
-              path:this.message.link.detail,
-              query:{
-                id:this.message.objectid,
-                portrait:''
-              }
-            })
-          })
-        }else {
+              path: this.message.link.detail,
+              query: {
+                id: this.message.objectid,
+                portrait: "",
+              },
+            });
+          });
+        } else {
           switch (this.message.link.listPath) {
-            case '/workreport':
+            case "/workreport":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-                  break
-            case '/notice_list':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/notice_list":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/notice_mag_list':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/notice_mag_list":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/submitedit_one':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/submitedit_one":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/submitedit_more':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/submitedit_more":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/submit_mag':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/submit_mag":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_list':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_list":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archvies_mag':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archvies_mag":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_admag':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_admag":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_adlist':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_adlist":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_adclass':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_adclass":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_sc_list':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_sc_list":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
-            case '/archives_scmag':
+                path: this.message.link.listPath,
+              });
+              break;
+            case "/archives_scmag":
               this.$router.push({
-                path:this.message.link.listPath,
-              })
-              break
+                path: this.message.link.listPath,
+              });
+              break;
           }
         }
       }
-
-
     },
-    readChange(){
-      this.isRead == '1'?this.param.content.isread = 0:this.param.content.isread = ''
-      this.getMessageList()
+    readChange() {
+      this.isRead == "1"
+        ? (this.param.content.isread = 0)
+        : (this.param.content.isread = "");
+      this.getMessageList();
     },
 
     isCategory(data) {
-      JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-        item1.modules.forEach(item2 => {
-          item2.apps.forEach(item3 => {
-            if(item3.systemappid == data.systemappid) {
-              data.modules = item3
-              data.link = {listPath:item3.path,detail:item3.path_index}
-              return
+      JSON.parse(sessionStorage.getItem("module_info")).forEach((item1) => {
+        item1.modules.forEach((item2) => {
+          item2.apps.forEach((item3) => {
+            if (item3.systemappid == data.systemappid) {
+              data.modules = item3;
+              data.link = { listPath: item3.path, detail: item3.path_index };
+              return;
             }
-          })
-        })
-      })
+          });
+        });
+      });
 
-//       switch (data.objectname) {
-//         case 'sat_courseware':
-//             data.name = '商学院'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sat_sharematerial':
-//             data.name = '推广素材'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sat_notice':
-//             data.name = '通告'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sat_submitedit':
-//             data.name = '提报'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sat_orderclue':
-//             data.name = '销售线索'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//         case 'sys_attachment':
-//             data.name = '营销物料'
-//             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
-//               item1.modules.forEach(item2 => {
-//                 if(item2.systemmodulename == data.name) {
-//                   data.modules = item2
-//                   data.link = item2.apps[0].path
-//                   return
-//                 }
-//               })
-//             })
-//             break;
-//       }
-    }
+      //       switch (data.objectname) {
+      //         case 'sat_courseware':
+      //             data.name = '商学院'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sat_sharematerial':
+      //             data.name = '推广素材'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sat_notice':
+      //             data.name = '通告'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sat_submitedit':
+      //             data.name = '提报'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sat_orderclue':
+      //             data.name = '销售线索'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //         case 'sys_attachment':
+      //             data.name = '营销物料'
+      //             JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+      //               item1.modules.forEach(item2 => {
+      //                 if(item2.systemmodulename == data.name) {
+      //                   data.modules = item2
+      //                   data.link = item2.apps[0].path
+      //                   return
+      //                 }
+      //               })
+      //             })
+      //             break;
+      //       }
+    },
   },
 };
 </script>
@@ -390,12 +423,11 @@ export default {
   /*min-height: calc(100vh - 199px);
   max-height: calc(100vh - 199px);*/
   height: calc(100vh - 120px);
-
 }
 .message .left {
   position: relative;
   padding: 20px 0 60px 0;
-  box-shadow: 1px 0px 0px 1px #DDDDDD;
+  box-shadow: 1px 0px 0px 1px #dddddd;
   background: #ffffff;
   height: calc(100vh - 120px);
   /*min-height: calc(100vh - 199px);
@@ -460,9 +492,9 @@ export default {
   color: #666666;
 }
 .message .right .content-txt .link {
-  margin-top:16px;
-  color:#3874F6;
-  font-size:14px;
+  margin-top: 16px;
+  color: #3874f6;
+  font-size: 14px;
   cursor: pointer;
 }
 /* .message .right .content-txt p:last-child {
@@ -477,6 +509,6 @@ export default {
   position: absolute;
   left: 50%;
   top: 50%;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
 }
 </style>

src/views/salesData/components/balanceDetail.vue

@@ -22,7 +22,7 @@
               <span v-if="scope.column.data.province && scope.column.data.city && scope.column.data.county">
                 {{scope.column.data.province+'-'+scope.column.data.city+'-'+scope.column.data.county}}
               </span>
-              <spna v-else>--</spna>
+              <span v-else>--</span>
             </p>
             <p v-else-if="scope.column.columnname === 'balance'">
               {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}