Przeglądaj źródła

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

lilei 3 lat temu
rodzic
commit
6c1528602c

BIN
src/assets/normalbtn_login.png


BIN
src/assets/selectedbtn_login.png


+ 1 - 1
src/components/GlobalHeader/GlobalHeader.vue

@@ -13,7 +13,7 @@
         <div v-else :class="['top-nav-header-index', theme]">
           <div class="header-index-wide">
             <div class="header-index-left">
-              <logo class="top-nav-header" :show-title="device !== 'mobile'"/>
+              <logo ref="logo" class="top-nav-header" :show-title="device !== 'mobile'"/>
               <s-menu v-if="device !== 'mobile'" mode="horizontal" :menu="menus" :theme="theme" />
               <a-icon v-else class="trigger" :type="collapsed ? 'menu-fold' : 'menu-unfold'" @click="toggle" />
             </div>

+ 9 - 2
src/components/UploadFile/index.vue

@@ -214,12 +214,19 @@ export default {
         return true
       }
       const isType = this.fileType.indexOf(file.type) >= 0 && file.type != ''
-      if (!isType) {
+      // 文件格式限制为.xls、.xlsx时,上传.csv文件的type为application/vnd.ms-excel,与.xls一致,无法限制,因此更改为:
+      if (!isType || file.name.indexOf('.csv')>=0) {
         if (tip != 0) {
           this.$message.error('请上传正确的格式!')
         }
-        return isType
+        return isType && !(file.name.indexOf('.csv')>=0)
       }
+      // if (!isType) {
+      //   if (tip != 0) {
+      //     this.$message.error('请上传正确的格式!')
+      //   }
+      //   return isType
+      // }
 
       // 文件大小
       const isLt2M = file.size / 1024 / 1024 < this.fileSize

+ 1 - 1
src/components/global.less

@@ -448,7 +448,7 @@ body {
   }
   &.ant-layout-sider-collapsed{
     .logo{
-      padding-left: 20px;
+      // padding-left: 20px;
     }
   }
   &.light {

+ 26 - 5
src/components/tools/Logo.vue

@@ -3,15 +3,16 @@
     <router-link :to="{name:'index'}">
       <!-- <LogoSvg alt="logo" /> -->
       <!-- <img :src="LogoSvg" /> -->
-      <!-- <img :src="logo" alt="logo" /> -->
-      <h1 v-if="showTitle">{{ title }}</h1>
+      <img :src="logo" alt="logo" height="42" class="img_box"/>
+      <!-- <h1 v-if="showTitle">{{ title }}</h1> -->
     </router-link>
   </div>
 </template>
 
 <script>
-// import LogoSvg from '@/assets/logo.png'
-
+import LogoMax from '@/assets/normalbtn_login.png'
+import LogoMin from '@/assets/selectedbtn_login.png'
+import { mapState } from 'vuex'
 export default {
   name: 'Logo',
   components: {
@@ -32,8 +33,28 @@ export default {
   data () {
     return {
       // LogoSvg: LogoSvg,
-      // logo: require(process.env.VUE_APP_LOGO) //  logo
+      // logo: LogoSvg //  logo
     }
+  },
+  computed: {
+	  ...mapState({
+		  sidebar: state => state.app.sidebar
+	  }),
+	 logo () {
+      return this.sidebar ? LogoMax : LogoMin
+	 }
   }
 }
 </script>
+<style lang="less" scoped="scoped">
+	.logo{
+		padding-right: 10px;
+		img{
+			width: auto !important;
+			height: auto !important;
+			max-width: 100%;
+			max-height: 100%;
+		}
+	}
+
+</style>

+ 5 - 9
src/views/bulkManagement/bulkReturnGoods/detailModal.vue

@@ -11,13 +11,9 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <a-card size="small" :bordered="false" class="bulkReturnGoodsDetail-cont">
         <a-descriptions size="small">
-          <a-descriptions-item label="散件退货单号" :span="3">
-            {{ (basicInfoData&&basicInfoData.sparePartsReturnNo) || '--' }}
-            <div style="display: inline-block;margin-left: 10px;">
-              <a-tag color="red" v-if="basicInfoData&&basicInfoData.stateDictValue">{{ basicInfoData.stateDictValue }}</a-tag>
-              <a-tag color="orange" v-if="basicInfoData&&basicInfoData.settleStateDictValue">{{ basicInfoData.settleStateDictValue }}</a-tag>
-            </div>
-          </a-descriptions-item>
+          <a-descriptions-item label="散件退货单号">{{ (basicInfoData&&basicInfoData.sparePartsReturnNo) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="财务状态">{{ (basicInfoData&&basicInfoData.settleStateDictValue) || '--' }}</a-descriptions-item>
           <a-descriptions-item label="供应商">{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}</a-descriptions-item>
           <a-descriptions-item label="是否抓单">{{ (basicInfoData&&basicInfoData.isGrabDictValue) || '--' }}</a-descriptions-item>
           <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
@@ -115,10 +111,10 @@ export default {
           { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
           { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', dataIndex: 'currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
           { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
           { title: '退货单价', dataIndex: 'purchaseCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '退货数量', dataIndex: 'purchaseQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+          { title: '退货数量', dataIndex: 'purchaseQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+          { title: '退货金额', dataIndex: 'purchaseAmount', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         ]
       }
       return arr

+ 6 - 6
src/views/reportData/chainCustomerReport/list.vue

@@ -15,12 +15,12 @@
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="连锁店" prop="dealerSn">
+              <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
                   placeholder="请选择连锁店"
-                  id="customerReportList-dealerSn"
+                  id="customerReportList-tenantId"
                   allowClear
-                  v-model="queryParam.dealerSn"
+                  v-model="queryParam.tenantId"
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
@@ -125,7 +125,7 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        dealerSn: undefined,
+        tenantId: undefined,
         time: [],
         beginDate: '',
         endDate: '',
@@ -138,7 +138,7 @@ export default {
       },
       productType: [],
       rules: {
-        'dealerSn': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
+        'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
         'time': [{ required: true, message: '请选择添加时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -224,7 +224,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.dealerSn = undefined
+      this.queryParam.tenantId = undefined
       this.$refs.rangeDate.resetDate()
       this.queryParam.time = []
       this.queryParam.beginDate = ''