Browse Source

样式修改

lilei 1 year ago
parent
commit
08fb6bff75

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1710293321045
+  "version": 1710301523154
 }

+ 5 - 1
src/utils/request.js

@@ -5,6 +5,7 @@ import router from '@/router'
 import notification from 'ant-design-vue/es/notification'
 import modal from 'ant-design-vue/es/modal'
 import { VueAxios } from './axios'
+import { getUserOsInfo, getBrowserType} from './util'
 
 // 创建 axios 实例
 const service = axios.create({
@@ -88,7 +89,10 @@ service.interceptors.request.use(config => {
     config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
     config.headers['access-org'] = changeOrg // 当前要切换的账号 sn
   }
-  
+  // 操作系统、浏览器信息
+  config.headers['osInfo'] = getUserOsInfo()+','+getBrowserType()
+  // 分辨率
+  config.headers['dpi'] = window.screen.width+'X'+window.screen.height
   // 当前页面路径
   const currentPage = router.history.current
   if(currentPage&&currentPage.meta&&config.headers['module']){

+ 59 - 0
src/utils/util.js

@@ -1,3 +1,61 @@
+// 获取客户端操作系统信息
+export const getUserOsInfo = function () {
+  const userAgent = navigator.userAgent;
+  if (userAgent.indexOf("Windows NT 10.0") !== -1) return "Windows 10";
+  if (userAgent.indexOf("Windows NT 6.2") !== -1) return "Windows 8";
+  if (userAgent.indexOf("Windows NT 6.1") !== -1) return "Windows 7";
+  if (userAgent.indexOf("Windows NT 6.0") !== -1) return "Windows Vista";
+  if (userAgent.indexOf("Windows NT 5.1") !== -1) return "Windows XP";
+  if (userAgent.indexOf("Windows NT 5.0") !== -1) return "Windows 2000";
+  if (userAgent.indexOf("Mac") !== -1) return "Mac/iOS";
+  if (userAgent.indexOf("X11") !== -1) return "UNIX";
+  if (userAgent.indexOf("Linux") !== -1) return "Linux";
+  return "Other";
+}
+// 获取浏览器类型
+export const _mime = function (option, value) {
+  var mimeTypes = navigator.mimeTypes;
+  for (var mt in mimeTypes) {
+      if (mimeTypes[mt][option] == value) {
+          return true;
+      }
+  }
+  return false;
+}
+export const getBrowserType = function () {
+  let ua = navigator.userAgent.toLocaleLowerCase()
+  let browserType = null
+  if (ua.match(/msie/) != null || ua.match(/trident/) != null) {
+    browserType = 'IE'
+  } else if (ua.match(/firefox/) != null) {
+    browserType = 'firefox'
+  } else if (ua.match(/ucbrowser/) != null) {
+    browserType = 'UC'
+  } else if (ua.match(/opera/) != null || ua.match(/opr/) != null) {
+    browserType = 'opera'
+  } else if (ua.match(/bidubrowser/) != null) {
+    browserType = 'baidu'
+  } else if (ua.match(/metasr/) != null) {
+    browserType = 'sougou'
+  } else if (ua.match(/tencenttraveler/) != null || ua.match(/qqbrowse/) != null) {
+    browserType = 'QQ'
+  } else if (ua.match(/maxthon/) != null) {
+    browserType = 'maxthon'
+  } else if (ua.match(/chrome/) != null) {
+    var is360 = _mime('type', 'application/vnd.chromium.remoting-viewer')
+    if (is360) {
+      browserType = '360'
+    } else {
+      browserType = 'chrome'
+    }
+  } else if (ua.match(/safari/) != null) {
+    browserType = 'Safari'
+  } else {
+    browserType = 'others'
+  }
+  return browserType
+}
+
 export function timeFix () {
   const time = new Date()
   const hour = time.getHours()
@@ -174,3 +232,4 @@ export function onTextSelected ($copyText, $message) {
     }
   }
 }
+

+ 5 - 5
src/views/salesManagement/productPricing/list.vue

@@ -14,7 +14,7 @@
               <a-input id="productPricingList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="产品品牌">
               <ProductBrand id="productPricingList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
             </a-form-item>
@@ -42,20 +42,20 @@
               </a-form-item>
             </a-col>
           </template>
-          <a-col :md="8" :sm="24">
+          <a-col :md="12" :sm="24">
             <a-checkbox v-model="queryParam.putStockFlag"><span style="display: inline-block;">包含未入库产品</span></a-checkbox>
             <a-button style="margin-left: 10px" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productPricingList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productPricingList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <!-- <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
+            </a> -->
           </a-col>
         </a-row>
       </a-form>
     </div>
     <!-- 价格 -->
-    <div style="border-top: 1px solid #eee;padding: 10px 0;text-align: right;">
+    <div style="padding: 10px 0;text-align: right;">
       <a-checkbox v-model="isCostPrice" v-if="$hasPermissions('M_ShowAllCost')"><span style="display: inline-block;">成本价</span></a-checkbox>
       <!-- 特约加盟商不可见市级价 -->
       <a-checkbox v-model="isCityPrice" v-if="dealerData && dealerData.dealerLevel != 'SPECIAL'"><span style="display: inline-block;">市级价</span></a-checkbox>

+ 2 - 2
src/views/salesManagement/salesQuery/detail.vue

@@ -4,7 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }">
         <template slot="subTitle" v-if="!outBizSn">
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
-          <a style="margin: 0 15px;color: #666;font-size: 16px;font-weight: 600;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
           <a-button
             v-if="(detailData&&detailData.billStatus !== 'CANCEL' && detailData.billStatus !== 'FINISH' && detailData.billStatus != 'WAIT_OUT_WAREHOUSE')&&$hasPermissions('B_salesEdit')"
             type="primary"
@@ -308,7 +308,7 @@ export default {
 <style lang="less">
   .salesDetail-wrap{
     .salesDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 2 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <a style="margin: 0 15px;color: #666;font-size: 16px;font-weight: 600;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">单号:{{ detailData&&detailData.salesBillNo || '--' }}</a>
           <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerNameCurrent?detailData.buyerName?detailData.buyerNameCurrent==detailData.buyerName?detailData.buyerNameCurrent:detailData.buyerNameCurrent+'('+detailData.buyerName+')':detailData.buyerNameCurrent:'--' }}</span>
           <a-button
             id="salesEdit-edit-btn"
@@ -792,7 +792,7 @@ export default {
       height: 100%;
     }
     .salesEdit-cont{
-      margin-top: 10px;
+      margin-top: 6px;
     }
     .total-bar{
       display: flex;

+ 2 - 2
src/views/salesManagement/salesReturn/detail.vue

@@ -5,7 +5,7 @@
         <template slot="subTitle" v-if="!outBizSn">
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
           <span style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">退货单号:{{ detailData&&detailData.salesReturnNo||'--' }}</span>
-          <a-button type="link" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo">
+          <a-button type="link" size="small" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo">
             <a-icon :type="isShowBisiceInfo ? 'eye-invisible' : 'eye'"/> {{ isShowBisiceInfo?'隐藏':'查看' }}信息
           </a-button>
         </template>
@@ -195,7 +195,7 @@ export default {
 <style lang="less">
   .salesReturnDetail-wrap{
     .salesReturnDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 3 - 3
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -6,7 +6,7 @@
         <template slot="subTitle">
           <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">退货单号:{{ ordeDetail&&ordeDetail.salesReturnNo||'--' }}</span>
-          <a-button type="link" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo">
+          <a-button type="link" size="small" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo">
             <a-icon :type="isShowBisiceInfo ? 'eye-invisible' : 'eye'"/> {{ isShowBisiceInfo?'隐藏':'查看' }}信息
           </a-button>
           <a-button
@@ -14,7 +14,7 @@
             size="small"
             @click="handleEditCustom"
             class="button-info"
-            key="0"> <a-icon type="edit"></a-icon> 编辑</a-button>
+            key="0"> <a-icon type="edit"></a-icon> 编辑客户信息</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_salesReturnPrint')">
@@ -583,7 +583,7 @@ export default {
       height: 100%;
     }
     .pages-wrap{
-      margin-top: 10px;
+      margin-top: 6px;
       .total-bar{
         display: flex;
         align-items: center;

+ 2 - 2
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -6,7 +6,7 @@
         <template slot="subTitle">
           <a id="salesReturnGrabEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">退货单号:{{ ordeDetail&&ordeDetail.salesReturnNo||'--' }}</span>
-          <a-button type="link" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo">
+          <a-button type="link" size="small" class="button-default" @click="isShowBisiceInfo=!isShowBisiceInfo">
             <a-icon :type="isShowBisiceInfo ? 'eye-invisible' : 'eye'"/> {{ isShowBisiceInfo?'隐藏':'查看' }}信息
           </a-button>
           <a-button
@@ -567,7 +567,7 @@ export default {
       height: 100%;
     }
     .pages-wrap{
-      margin-top: 10px;
+      margin-top: 6px;
       .total-bar{
         display: flex;
         align-items: center;

+ 2 - 1
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -6,6 +6,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="urgentItemsOffsetDetail-btn-back" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">急件单号:{{ detailData&&detailData.urgentBillNo || '--' }}</a>
         </template>
       </a-page-header>
       <!-- 急件单信息 -->
@@ -221,7 +222,7 @@ export default {
       height: 100%;
     }
     .urgentItemsOffsetDetail-info-wrapper{
-      margin: 10px 0;
+      margin: 6px 0;
       .item-cont {
         margin-bottom: 10px;
         display: flex;