Browse Source

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

# Conflicts:
#	public/version.json
lilei 1 year ago
parent
commit
ed7e1f97d8
100 changed files with 568 additions and 911 deletions
  1. 0 10
      public/index.html
  2. 4 0
      src/App.vue
  3. 13 0
      src/api/data.js
  4. 7 32
      src/components/Select/index.js
  5. 7 0
      src/components/global.less
  6. 1 1
      src/components/newThem.less
  7. 2 2
      src/config/router.config.js
  8. 2 1
      src/store/getters.js
  9. 15 12
      src/store/modules/app.js
  10. 22 3
      src/utils/request.js
  11. 59 0
      src/utils/util.js
  12. 10 13
      src/views/Home.vue
  13. 1 0
      src/views/allocationManagement/chainTransferIn/detail.vue
  14. 1 0
      src/views/allocationManagement/chainTransferIn/edit.vue
  15. 1 0
      src/views/allocationManagement/chainTransferOut/detail.vue
  16. 5 4
      src/views/allocationManagement/chainTransferOut/edit.vue
  17. 1 1
      src/views/allocationManagement/storeTransferOut/chooseImportModal.vue
  18. 2 1
      src/views/allocationManagement/storeTransferOut/detail.vue
  19. 4 3
      src/views/allocationManagement/storeTransferOut/edit.vue
  20. 3 2
      src/views/allocationManagement/warehouseAllocation/detail.vue
  21. 2 1
      src/views/allocationManagement/warehouseAllocation/edit.vue
  22. 1 1
      src/views/basicData/customerTypeManagement/list.vue
  23. 1 1
      src/views/bulkManagement/bulkImport/chooseImportModal.vue
  24. 1 1
      src/views/bulkManagement/bulkReturnGoods/chooseImportModal.vue
  25. 4 4
      src/views/bulkManagement/bulkReturnGoods/detailModal.vue
  26. 7 4
      src/views/bulkManagement/bulkReturnGoods/edit.vue
  27. 5 2
      src/views/bulkManagement/bulkReturnGoods/grabEdit.vue
  28. 2 2
      src/views/bulkManagement/bulkReturnGoods/list.vue
  29. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/chooseImportModal.vue
  30. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  31. 14 14
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  32. 12 12
      src/views/chainReportData/chainCallReport/detailList.vue
  33. 23 23
      src/views/chainReportData/chainCallReport/list.vue
  34. 20 100
      src/views/chainReportData/chainCustomerReport/list.vue
  35. 18 93
      src/views/chainReportData/chainSalesDetailReport/list.vue
  36. 18 93
      src/views/chainReportData/chainSalesReport/list.vue
  37. 18 18
      src/views/chainReportData/chainTransferReport/detailList.vue
  38. 11 5
      src/views/common/areaList.js
  39. 2 2
      src/views/common/commonModal.vue
  40. 18 96
      src/views/customerManagement/customerInfo/edit.vue
  41. 18 80
      src/views/customerManagement/customerInfo/list.vue
  42. 2 2
      src/views/financialManagement/companyCollectionPayment/detail.vue
  43. 2 2
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  44. 2 2
      src/views/financialManagement/companyReceivablePayable/detail.vue
  45. 2 2
      src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue
  46. 2 2
      src/views/financialManagement/companyReceivablePayableNew/detail.vue
  47. 3 5
      src/views/financialManagement/expenseManagement/list.vue
  48. 2 2
      src/views/financialManagement/fundAccountManagement/addModal.vue
  49. 1 1
      src/views/financialManagement/inventoryCheckAudit/setPriceModal.vue
  50. 1 1
      src/views/financialManagement/ledgerRecord/list.vue
  51. 1 1
      src/views/financialManagement/warehousingAudit/detail.vue
  52. 5 7
      src/views/financialManagement/warehousingAudit/list.vue
  53. 1 1
      src/views/inventoryManagement/inventoryChecking/overall.vue
  54. 2 0
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  55. 1 1
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  56. 11 11
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  57. 1 1
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  58. 9 10
      src/views/numsGoodsShelves/customerAnalysis/list.vue
  59. 2 2
      src/views/numsGoodsShelves/recallManagement/basicInfoModal.vue
  60. 2 2
      src/views/numsGoodsShelves/recallManagement/list.vue
  61. 4 6
      src/views/numsGoodsShelves/replenishmentManagement/creatReplenishmentOrder.vue
  62. 5 10
      src/views/numsGoodsShelves/settlementManagement/list.vue
  63. 3 2
      src/views/numsGoodsShelves/shelfOrder/detail.vue
  64. 2 2
      src/views/numsGoodsShelves/vinAnalysis/spList.vue
  65. 2 1
      src/views/numsGoodsShelves/withdrawalManagement/applyWithdrawal.vue
  66. 0 6
      src/views/numsGoodsShelves/withdrawalManagement/list.vue
  67. 7 48
      src/views/productManagement/priceChangeRecord/list.vue
  68. 1 1
      src/views/productManagement/productInfo/list.vue
  69. 1 1
      src/views/productManagement/productInfoJg/list.vue
  70. 2 2
      src/views/productManagement/productOnlineInfo/list.vue
  71. 1 1
      src/views/productManagement/productUniversal/list.vue
  72. 2 2
      src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue
  73. 4 4
      src/views/purchasingManagement/purchaseOrder/edit.vue
  74. 3 1
      src/views/purchasingManagement/purchaseOrder/list.vue
  75. 3 3
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  76. 2 1
      src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue
  77. 1 1
      src/views/purchasingManagement/purchaseOrderNew/detail.vue
  78. 1 1
      src/views/purchasingManagement/purchaseOrderNew/edit.vue
  79. 2 2
      src/views/purchasingManagement/purchaseOutOfStock/detailModal.vue
  80. 1 1
      src/views/purchasingManagement/purchaseReturn/detail.vue
  81. 3 3
      src/views/purchasingManagement/purchaseReturn/edit.vue
  82. 4 3
      src/views/purchasingManagement/purchaseReturnApplyForm/detail.vue
  83. 7 6
      src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue
  84. 3 2
      src/views/purchasingManagement/purchaseReturnApplyForm/list.vue
  85. 3 3
      src/views/purchasingManagement/purchaseReturnOutSync/basicInfoModal.vue
  86. 9 5
      src/views/purchasingManagement/purchaseReturnOutSync/detail.vue
  87. 5 4
      src/views/purchasingManagement/purchaseReturnOutSync/edit.vue
  88. 7 6
      src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue
  89. 3 3
      src/views/purchasingManagement/purchaseReturnOutSync/list.vue
  90. 1 1
      src/views/purchasingManagement/signWarehousing/edit.vue
  91. 1 1
      src/views/purchasingManagement/signWarehousing/stockOrderDetail.vue
  92. 13 12
      src/views/reportData/bulkReturnReport/detailList.vue
  93. 3 3
      src/views/reportData/bulkReturnReport/list.vue
  94. 8 8
      src/views/reportData/bulkWarehousingReport/detailList.vue
  95. 8 8
      src/views/reportData/bulkWarehousingReport/list.vue
  96. 13 36
      src/views/reportData/customerReport/list.vue
  97. 5 0
      src/views/reportData/customerSalesDetailsReport/list.vue
  98. 1 0
      src/views/reportData/inventoryReport/inventoryDetail.vue
  99. 1 0
      src/views/reportData/inventoryReport/inventoryOrder.vue
  100. 14 17
      src/views/reportData/inventoryReport/list.vue

+ 0 - 10
public/index.html

@@ -23,16 +23,6 @@
       }
      </script>
      <script src="./menus.js"></script>
-     <script>
-      var _hmt = _hmt || [];
-      (function() {
-        var hm = document.createElement("script");
-        hm.src = "https://hm.baidu.com/hm.js?060d7a1ce785a05c78b3d70a29020532";
-        var s = document.getElementsByTagName("script")[0]; 
-        s.parentNode.insertBefore(hm, s);
-      })();
-    </script>
-     
   </head>
   <body>
     <noscript>

+ 4 - 0
src/App.vue

@@ -26,6 +26,10 @@ export default {
   created () {
     const _this = this
     this.envtips = process.env.VUE_APP_ENVTIPS
+    
+    // 获取所有数据字典
+    this.$store.dispatch('getAllLookUp')
+    
     // 在页面加载时读取sessionStorage
     if (sessionStorage.getItem('store')) {
       const data = JSON.parse(sessionStorage.getItem('store'))

+ 13 - 0
src/api/data.js

@@ -11,6 +11,19 @@ export function login (parameter) {
   })
 }
 
+// 所有数据字典
+export const findAllLookup = params => {
+  const url = `/lookup/findAllWithItem`
+  return axios({
+    url: url,
+    data: params,
+    method: 'POST',
+    headers:{
+      'module': encodeURIComponent('数据字典查询')
+    }
+  })
+}
+
 export const listLookUp = params => {
   const url = `/lookup/queryLike`
   return axios({

+ 7 - 32
src/components/Select/index.js

@@ -1,13 +1,9 @@
 import Select from 'ant-design-vue/es/select'
-import _ from 'lodash'
-
-import { getLookUpData, listLookUp } from '@/api/data'
 
 /**
  * loopUp 组件
  * params: code loopUp的code 值
  * event: change(选中的值, 选中的对象 )
- * ref: getOptionDatas 获取所有查询的
  */
 export default {
   name: 'VSelect',
@@ -33,35 +29,15 @@ export default {
   }),
   created () {
     const _this = this
-    // console.log(_this.code, '_this.code')
-    getLookUpData({
-      pageNo: 1,
-      pageSize: 1000,
-      lookupCode: _this.code,
-      isEnable: _this.isEnable ? 1 : undefined
-    }).then(res => {
-      if (res.status == 200) {
-        // 判断是否是省仓用户
-        if (_this.$store.state.user.dealerSupplierFlag == '1') {
-          _this.dataList = res.data.list
-        } else {
-          let list = res.data.list
-          list = list.filter(item => item.dispName != '省级批发价')
-          _this.dataList = list
-        }
-      }
+    const allLookup = JSON.parse(sessionStorage.getItem('allLookup'))
+    const data = allLookup.find(item => item.code == _this.code)
+    // 判断是否是省仓用户
+    _this.dataList = _this.$store.state.user.dealerSupplierFlag == '1' ? data.itemList : data.itemList.filter(item => item.dispName != '省级批发价')
+    setTimeout(()=>{
       _this.$emit('loadDataFinish', _this.dataList)
-    })
+    },100)
   },
   methods: {
-
-    /**
-     * 获取当前所有的option 数据
-     * @returns options data
-     */
-    getOptionDatas () {
-      return _.cloneDeep(this.dataList)
-    },
     // 根据code 获取名称
     getNameByCode (code) {
       const a = this.dataList.find(item => {
@@ -69,9 +45,8 @@ export default {
       })
       return a ? a.dispName : '-'
     },
-    // 根据名称 获取code
+    // 根据名称 获取item
     getCodeByName (dispName) {
-      console.log(this.dataList)
       return this.datalist.find(item => item.dispName == dispName)
     }
   },

+ 7 - 0
src/components/global.less

@@ -634,3 +634,10 @@ body {
   }
 }
  
+//编辑页面  头部单号样式
+.head-order-number{
+  margin: 0 15px;
+  color: #666;
+  font-size: 14px;
+  font-weight: 600;
+}

+ 1 - 1
src/components/newThem.less

@@ -10,7 +10,7 @@
 @menu-item-height: 30px;
 @collapse-header-padding: 6px 8px;
 @table-padding-vertical: 5px;
-@table-padding-horizontal: 5px;
+@table-padding-horizontal: 10px;
 @border-color-base: #dedede;
 @border-color-split: #dedede;
 @input-disabled-bg: #dedede;

+ 2 - 2
src/config/router.config.js

@@ -2056,7 +2056,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'edit/:id/:sn/:supplierSn',
+                path: 'edit/:id/:sn/:supplierSn/:no',
                 name: 'bulkReturnGoodsEdit',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
                 meta: {
@@ -2067,7 +2067,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'grabEdit/:id/:sn/:supplierSn',
+                path: 'grabEdit/:id/:sn/:supplierSn/:no',
                 name: 'bulkReturnGoodsGrabEdit',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkReturnGoods/grabEdit.vue'),
                 meta: {

+ 2 - 1
src/store/getters.js

@@ -29,7 +29,8 @@ const getters = {
   printUseing: state => state.app.printUseing,
   printSettingType: state => state.app.printSettingType,
   returnReason: state => state.app.returnReason,
-  cartCount: state => state.cart.cartCount
+  cartCount: state => state.cart.cartCount,
+  cacheData: state => state.app.cacheData
 }
 
 export default getters

+ 15 - 12
src/store/modules/app.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { getLookUpData, listLookUp } from '@/api/data'
+import { getLookUpData, findAllLookup } from '@/api/data'
 import {
   SIDEBAR_TYPE,
   DEFAULT_THEME,
@@ -28,6 +28,7 @@ const app = {
     color: null,
     weak: false,
     multiTab: true,
+    appVersion:'',
     nowRoute: '', // 当前路由
     isShowVideo: false, // 是否显示视频弹窗
     isNewTab: false,
@@ -50,6 +51,8 @@ const app = {
     printDefInk: undefined, // 默认喷墨打印机
     defectiveReturnReason: [], // 不良品申请退货列表
     goodReturnReason: [], // 良品申请退货列表
+    allArea: [], // 地区数据
+    custTypeAll: [], // 客户类型
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -138,6 +141,9 @@ const app = {
     SET_printLoading: (state, val) => {
       state.printLoading = val
     },
+    SET_appVersion: (state, val) => {
+      state.appVersion = val
+    },
     SET_printDefNeedle: (state, val) => {
       state.printDefNeedle = val
       localStorage.setItem('DEFAULT_PRINT_NEEDLE',val)
@@ -248,18 +254,15 @@ const app = {
     SetWinHeight ({ commit }, val) {
       commit('SET_WIN_HEIGHT', val)
     },
-    getLookUpDataByCode({ commit }, params) {
-      getLookUpData({
-        pageNo: 1,
-        pageSize: 1000,
-        lookupCode: params.code,
-        isEnable: params.isEnable
-      }).then(res => {
-        if (res.status == 200) {
-          commit('SET_returnReason', {key: params.key, val: res.data.list})
-        }
+    getAllLookUp({ commit }, params){
+      findAllLookup({}).then(res => {
+        sessionStorage.setItem('allLookup', JSON.stringify(res.data))
+        const a = res.data.find(item => item.code == 'GOOD_PRODUCT_RETURN')
+        const b = res.data.find(item => item.code == 'DEFECTIVE_PRODUCT_RETURN')
+        commit('SET_returnReason', {key: 'goodReturnReason', val: a.itemList})
+        commit('SET_returnReason', {key: 'defectiveReturnReason', val: b.itemList})
       })
-    },
+    }
   }
 }
 

+ 22 - 3
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,14 +89,18 @@ service.interceptors.request.use(config => {
     config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
     config.headers['access-org'] = changeOrg // 当前要切换的账号 sn
   }
-  
+  // 操作系统、浏览器信息
+  config.headers['os'] = getUserOsInfo()
+  config.headers['bws'] = getBrowserType()
+  // 分辨率
+  config.headers['sdr'] = window.screen.width+'X'+window.screen.height
   // 当前页面路径
   const currentPage = router.history.current
   if(currentPage&&currentPage.meta&&config.headers['module']){
     config.headers['module'] = encodeURIComponent(currentPage.meta.title||'') + ',' +config.headers['module']
   }
-  console.log(config.url)
-  console.log(decodeURIComponent(config.headers['module']))
+  // console.log(config.url)
+  // console.log(decodeURIComponent(config.headers['module']))
   
   config.retry = 3
   config.retryDelay = 1000
@@ -145,6 +150,20 @@ service.interceptors.response.use((response) => {
     store.commit('SET_loadingStatus', false)
   }
   
+  // 检测版本号是否变更
+  if(response.config.url.indexOf('/logout')<0){
+    if(!store.state.app.appVersion){
+      if(response.data.version){
+        store.commit('SET_appVersion', response.data.version)
+      }
+    }else{
+      if(store.state.app.appVersion != response.data.version){
+        store.dispatch('getAllLookUp')
+        store.commit('SET_appVersion', response.data.version)
+      }
+    }
+  }
+  
   return response.data
 }, err)
 

+ 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) {
     }
   }
 }
+

+ 10 - 13
src/views/Home.vue

@@ -351,7 +351,7 @@ import { mapGetters, mapActions } from 'vuex'
 import ResetPwd from '@/views/user/ResetPwd.vue'
 import newProduct from '@/views/productManagement/newProduct/modal.vue'
 import { queryNewProductPage } from '@/api/product'
-import { bizStateCount, bizData, dealerData } from '@/api/data'
+import { bizStateCount, bizData, dealerData, findAllLookup } from '@/api/data'
 export default {
   name: 'Home',
   components: { ResetPwd, newProduct },
@@ -787,7 +787,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['getLookUpDataByCode']),
+    ...mapActions(['getAllLookUp','getLookUpDataByCode']),
     hasNewProduct () {
       queryNewProductPage({ pageNo: 1, pageSize: 20, onlineFalg: this.onlineFalg }).then(res => {
         if (res.status == 200) {
@@ -884,9 +884,17 @@ export default {
     }
   },
   activated () {
+    const vm = this
+    
     // 请求导航指引合计
     this.getNavCount()
     this.getMerchantData()
+    
+    // 获取所有数据字典
+    const allLookup = sessionStorage.getItem('allLookup')
+    if(!allLookup){
+      this.getAllLookUp()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
@@ -900,17 +908,6 @@ export default {
       } else {
         vm.openResetPwd = true
       }
-      // 退货原因列表
-      vm.getLookUpDataByCode({
-        code: 'GOOD_PRODUCT_RETURN',
-        key: 'goodReturnReason',
-        isEnable: 1
-      })
-      vm.getLookUpDataByCode({
-        code: 'DEFECTIVE_PRODUCT_RETURN',
-        key: 'defectiveReturnReason',
-        isEnable: 1
-      })
     })
   }
 }

+ 1 - 0
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="chainTransferInDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.allocationLinkagePutNo || '--' }}</a>
           <a-button
             v-if="isEdit&&$hasPermissions('B_allocLinkagePutEdit')"
             type="primary"

+ 1 - 0
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="chainTransferInEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.allocationLinkagePutNo || '--' }}</a>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_allocLinkagePutPrint')">

+ 1 - 0
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="chainTransferOutDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.allocationLinkageOutNo || '--' }}</a>
           <a-button
             v-if="isEdit&&$hasPermissions('B_allocLinkageOutEdit')"
             type="primary"

+ 5 - 4
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="chainTransferOutEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.allocationLinkageOutNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;">调往对象:{{ (basicInfoData&&basicInfoData.putTenantName) || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -231,7 +232,7 @@ export default {
         this.disabled = true
         // 箭冠品牌 sysFlag传1,非箭冠品牌传0。与新增时所选调出产品类型有关
         this.queryParam.sysFlag = this.basicInfoData.allocationType == 'JIANGUAN' ? '1' : '0'
-        const params = Object.assign(parameter, this.queryParam, {wasteFlag: 0})
+        const params = Object.assign(parameter, this.queryParam, { wasteFlag: 0 })
         return productQuery(params).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -274,8 +275,8 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '13%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -463,7 +464,7 @@ export default {
     },
     // 仓库下拉数据
     getWarehouseList (type) {
-      warehouseAllList({wasteFlag:0}).then(res => {
+      warehouseAllList({ wasteFlag: 0 }).then(res => {
         if (res.status == 200) {
           this.warehouseList = res.data
         } else {

+ 1 - 1
src/views/allocationManagement/storeTransferOut/chooseImportModal.vue

@@ -101,7 +101,7 @@ export default {
       nowColumns: [
         { title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '22%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productUnit', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },

+ 2 - 1
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -8,11 +8,12 @@
             <a-icon type="left" />
             返回列表
           </a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.storeCallOutNo || '--' }}</a>
           <a-button
             v-if="isEdit && $hasPermissions('B_storeCallOutEdit')"
             type="primary"
             size="small"
-            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            style="background-color: #1890ff;border: #1890ff;"
             id="storeTransferOutDetail-edit-btn"
             @click.stop="handleEdit"
           >

+ 4 - 3
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="storeTransferOutEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.storeCallOutNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;" v-if="basicInfoData">调往对象名称:{{ (basicInfoData.putPersonType=='EMPLOYEE'?basicInfoData.putPersonName:(basicInfoData.customerNameCurrent==basicInfoData.putPersonName?basicInfoData.customerNameCurrent:basicInfoData.customerNameCurrent+'('+basicInfoData.putPersonName+')')) || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -325,7 +326,7 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -398,10 +399,10 @@ export default {
       this.$refs.chooseTable.refresh(true)
     },
     // 确认导入明细
-    importOk(data){
+    importOk (data) {
       this.spinning = true
       storeCallOutDetailBatchSave(data).then(res => {
-        if(res.status == 200){
+        if (res.status == 200) {
           this.chooseResetSearchForm()
         }
         this.spinning = false

+ 3 - 2
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -5,11 +5,12 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="warehouseAllocationDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ warehouse&&warehouse.allocationWarehouseNo || '--' }}</a>
           <a-button
             v-if="warehouse&&warehouse.stateDictValue!='已完结'&&$hasPermissions('B_warehouseAllocationEdit')"
             type="primary"
             size="small"
-            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            style="background-color: #1890ff;border: #1890ff;"
             id="warehouseAllocationEdit-btn"
             @click.stop="handleEdit">
             编辑
@@ -114,7 +115,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '类别', scopedSlots: { customRender: 'productType' }, width: '14%', align: 'center' },
         { title: '数量', dataIndex: 'allocationQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 2 - 1
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="warehouseAllocationEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.allocationWarehouseNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;">调出仓库:{{ (basicInfoData&&basicInfoData.outWarehouseName) || '--' }}</span>
           <span style="margin: 0 15px;color: #666;">调入仓库:{{ (basicInfoData&&basicInfoData.putWarehouseName) || '--' }}</span>
         </template>
@@ -314,7 +315,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'productName', width: '17%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分类', scopedSlots: { customRender: 'productType' }, width: '9%', align: 'center' },

+ 1 - 1
src/views/basicData/customerTypeManagement/list.vue

@@ -6,7 +6,7 @@
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="类型名称">
+              <a-form-item label="客户类型名称">
                 <a-input id="customerTypeList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入客户类型名称"/>
               </a-form-item>
             </a-col>

+ 1 - 1
src/views/bulkManagement/bulkImport/chooseImportModal.vue

@@ -120,7 +120,7 @@ export default {
         { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', width: 100, customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商', dataIndex: 'supplierName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'left', width: 120, customRender: function (text) { return text || '--' } },
         { title: '产品一级分类', dataIndex: 'productTypeName1', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品二级分类', dataIndex: 'productTypeName2', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品三级分类', dataIndex: 'productTypeName3', width: 100, align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/chooseImportModal.vue

@@ -103,7 +103,7 @@ export default {
       nowColumns: [
         { title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '25%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productUnit', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },

+ 4 - 4
src/views/bulkManagement/bulkReturnGoods/detailModal.vue

@@ -112,8 +112,8 @@ export default {
         arr = [
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
           { title: '散件入库单号', dataIndex: 'sparePartsPurchaseNo', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品编码', dataIndex: 'productCode', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'productName', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品名称', dataIndex: 'productName', width: '24%', align: 'left', customRender: function (text) { return text || '--' } },
           { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '退货单价', dataIndex: 'purchaseCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
           { title: '退货数量', dataIndex: 'purchaseQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -122,8 +122,8 @@ export default {
       } else { // 不抓单
         arr = [
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-          { title: '产品编码', dataIndex: 'productCode', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品编码', dataIndex: 'productCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
           { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '仓位', dataIndex: 'warehouseLocationName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 7 - 4
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkReturnGoodsEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span class="head-order-number">单号:{{ $route.params.no || '' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_sparePartsRetPrint')">
@@ -246,8 +247,9 @@ export default {
       dataSource: [],
       // 表头
       columns: [
-        { title: '产品编码', dataIndex: 'productCode', width: '19%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '19%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量', dataIndex: 'currentQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -278,8 +280,9 @@ export default {
       },
       // 表头
       chooseColumns: [
-        { title: '产品编码', dataIndex: 'productCode', width: '19%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '19%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 5 - 2
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkReturnGoodsEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span class="head-order-number">单号:{{ $route.params.no || '' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_sparePartsRetPrint')">
@@ -218,10 +219,11 @@ export default {
       dataSource: [],
       // 表头
       columns: [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '散件入库单号', dataIndex: 'sparePartsPurchaseNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库时间', dataIndex: 'putStockTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '入库价格', dataIndex: 'putCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
         { title: '入库数量', dataIndex: 'putQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '已退数量', dataIndex: 'returnQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -254,7 +256,8 @@ export default {
       },
       // 表头
       chooseColumns: [
-        { title: '散件入库单号', dataIndex: 'sparePartsPurchaseNo', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '散件入库单号', dataIndex: 'sparePartsPurchaseNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },

+ 2 - 2
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -281,9 +281,9 @@ export default {
     //  编辑
     handleEdit (row) {
       if (row.isGrab == 1) {
-        this.$router.push({ name: 'bulkReturnGoodsGrabEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn } })
+        this.$router.push({ name: 'bulkReturnGoodsGrabEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn, no: row.sparePartsReturnNo } })
       } else {
-        this.$router.push({ name: 'bulkReturnGoodsEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn } })
+        this.$router.push({ name: 'bulkReturnGoodsEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn, no: row.sparePartsReturnNo } })
       }
     },
     //  详情

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/chooseImportModal.vue

@@ -122,7 +122,7 @@ export default {
       nowColumns: [
         { title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '25%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '成本价', dataIndex: 'putCost', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '数量', dataIndex: 'putQty', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库', dataIndex: 'warehouseName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -12,7 +12,7 @@
             style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
             id="bulkWarehousingOrderDetail-edit-btn"
             @click.stop="handleEdit">编辑</a-button>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '--' }}</p>
+          <span class="head-order-number">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '--' }}</span>
         </template>
         <template slot="tags">
           <a-tag color="red" v-if="basicInfoData&&basicInfoData.stateDictValue">{{ basicInfoData.stateDictValue }}</a-tag>

+ 14 - 14
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -6,7 +6,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="bulkWarehousingOrderEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style="display: inline-block;margin: 0 30px 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</p>
+          <span class="head-order-number">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</span>
           <a-button type="primary" ghost @click="isShowBisiceInfo=!isShowBisiceInfo">
             基础信息
             <a-icon :type="isShowBisiceInfo ? 'up' : 'down'"/>
@@ -48,34 +48,34 @@
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                   <a-row type="flex" :gutter="12" justify="start">
-                    <a-col flex="250px">
+                    <a-col :md="6" :sm="24">
                       <a-form-model-item label="产品编码">
                         <a-input id="bulkWarehousingOrderEdit-code" ref="searchProductCode" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col flex="350px">
+                    <a-col :md="6" :sm="24">
                       <a-form-model-item label="产品名称">
                         <a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col flex="250px">
+                    <a-col :md="6" :sm="24">
                       <a-form-model-item label="原厂编码">
                         <a-input id="bulkWarehousingOrderEdit-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
                       </a-form-model-item>
                     </a-col>
                     <template v-if="advanced">
-                      <a-col flex="250px">
+                      <a-col :md="6" :sm="24">
                         <a-form-item label="产品分类">
                           <ProductType id="productInfoList-productType" @change="changeProductType" v-model="productType"></ProductType>
                         </a-form-item>
                       </a-col>
-                      <a-col flex="250px">
+                      <a-col :md="6" :sm="24">
                         <a-form-item label="产品品牌">
                           <ProductBrand id="bulkWarehousingOrderEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                         </a-form-item>
                       </a-col>
                     </template>
-                    <a-col flex="auto" style="margin-bottom: 10px;">
+                    <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                       <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-refresh">查询</a-button>
                       <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-reset">重置</a-button>
                       <a @click="advanced=!advanced" style="margin:0 30px 0 10px">
@@ -173,23 +173,23 @@
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                   <a-row :gutter="15">
-                    <a-col :md="4" :sm="24">
+                    <a-col :md="5" :sm="24">
                       <a-form-model-item label="产品编码">
                         <a-input id="bulkWarehousingOrderEdit-code" v-model.trim="queryChooseParam.productCode" allowClear placeholder="请输入产品编码"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                    <a-col :md="5" :sm="24">
                       <a-form-model-item label="产品名称">
                         <a-input id="bulkWarehousingOrderEdit-name" v-model.trim="queryChooseParam.productName" allowClear placeholder="请输入产品名称"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+                    <a-col :md="5" :sm="24" style="margin-bottom: 10px;">
                       <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderEdit-choose-refresh">查询</a-button>
                       <a-button style="margin-left: 8px" @click="resetChooseSearchForm" :disabled="disabled" id="bulkWarehousingOrderEdit-choose-reset">重置</a-button>
                     </a-col>
-                    <a-col :md="4" :sm="24">
+                    <a-col :md="3" :sm="24">
                     </a-col>
-                    <a-col :md="8" :sm="24" style="text-align:right;">
+                    <a-col :md="6" :sm="24" style="text-align:right;">
                       <a-button
                         type="default"
                         @click="openGuideModal=true"
@@ -363,8 +363,8 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'code', width: '16%', align: 'left', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'code', width: '14%', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: '10%', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 12 - 12
src/views/chainReportData/chainCallReport/detailList.vue

@@ -34,7 +34,7 @@
                 <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="调拨产品类型">
                 <v-select
                   v-model="queryParam.allocationType"
@@ -45,28 +45,28 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="chainCallReportExport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="chainCallReportExport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="chainCallReportExport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
                 <ProductType id="chainCallReportExport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainCallReportExport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainCallReportExport-reset">重置</a-button>
             <a-button
@@ -131,11 +131,11 @@ export default {
       tableHeight: 0,
       outWareTime: [],
       queryParam: { //  查询条件
-        time:[],
+        time: [],
         auditBeginDate: '',
         auditEndDate: '',
-        outWarehouseBeginDate:'',
-        outWarehouseEndDate:'',
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
         productEntity: {
           productBrandSn: undefined, //  产品品牌
           productTypeSn1: '', //  产品一级分类
@@ -145,7 +145,7 @@ export default {
           name: '' //  产品名称
         },
         productType: undefined,
-        putTenantSn:undefined,
+        putTenantSn: undefined,
         allocationType: undefined,
         allocationLinkageOutNo: ''
       },
@@ -176,7 +176,7 @@ export default {
           return data
         })
       },
-      totalData: null, //  合计
+      totalData: null //  合计
     }
   },
   computed: {
@@ -241,7 +241,7 @@ export default {
       this.outWareTime = []
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseEndDate = ''
-      
+
       this.queryParam.allocationType = undefined
       this.queryParam.putTenantSn = undefined
       this.queryParam.allocationLinkageOutNo = ''

+ 23 - 23
src/views/chainReportData/chainCallReport/list.vue

@@ -34,19 +34,19 @@
                 <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
               </a-form-item>
             </a-col>
-             <a-col :md="4" :sm="24">
-               <a-form-item label="调拨产品类型">
-                 <v-select
-                   v-model="queryParam.allocationType"
-                   ref="allocationType"
-                   id="chainCallReportExport-allocationType"
-                   code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                   placeholder="请选择调拨产品类型"
-                   allowClear></v-select>
-               </a-form-item>
-             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调拨产品类型">
+                <v-select
+                  v-model="queryParam.allocationType"
+                  ref="allocationType"
+                  id="chainCallReportExport-allocationType"
+                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                  placeholder="请选择调拨产品类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
           </template>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainCallReportExport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainCallReportExport-reset">重置</a-button>
             <a-button
@@ -58,10 +58,10 @@
               v-if="$hasPermissions('M_chainCallReportExport')"
               class="button-warning"
               id="chainCallReportExport-export-btn">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+            <a @click="advanced=!advanced" style="margin-left: 5px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'"/>
+            </a>
           </a-col>
         </a-row>
       </a-form-model>
@@ -109,12 +109,12 @@ export default {
       tableHeight: 0,
       outWareTime: [],
       queryParam: { //  查询条件
-        time:[],
+        time: [],
         auditBeginDate: '',
         auditEndDate: '',
-        outWarehouseBeginDate:'',
-        outWarehouseEndDate:'',
-        putTenantSn:undefined,
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
+        putTenantSn: undefined,
         allocationType: undefined,
         allocationLinkageOutNo: ''
       },
@@ -145,7 +145,7 @@ export default {
           return data
         })
       },
-      totalData: null, //  合计
+      totalData: null //  合计
     }
   },
   computed: {
@@ -208,7 +208,7 @@ export default {
       this.outWareTime = []
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseEndDate = ''
-      
+
       this.queryParam.allocationType = undefined
       this.queryParam.putTenantSn = undefined
       this.queryParam.allocationLinkageOutNo = ''
@@ -234,7 +234,7 @@ export default {
           return false
         }
       })
-    },
+    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用

+ 20 - 100
src/views/chainReportData/chainCustomerReport/list.vue

@@ -35,45 +35,14 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
-                <a-cascader
-                  @change="changeProductType"
-                  change-on-select
-                  v-model="productType"
-                  expand-trigger="hover"
-                  :options="productTypeList"
-                  :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
-                  id="customerReportList-productType"
-                  placeholder="请选择产品分类"
-                  allowClear />
+                <ProductType placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="10" :sm="24">
-                <a-row>
-                  <a-form-model-item label="客户所在区" :labelCol="{span: 4}" :wrapperCol="{ span: 20 }" style="margin-bottom: 0!important;">
-                    <a-col span="7">
-                      <a-form-model-item prop="provinceSn" style="margin: 0!important;">
-                        <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
-                    </a-col>
-                    <a-col span="7" offset="1">
-                      <a-form-model-item prop="citySn" style="margin: 0!important;">
-                        <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
-                    </a-col>
-                    <a-col span="7" offset="1">
-                      <a-form-model-item prop="countySn" style="margin: 0!important;">
-                        <a-select v-model="queryParam.countySn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-model-item>
-                    </a-col>
-                  </a-form-model-item>
-                </a-row>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客户所在区">
+                  <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+                </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="客户类型">
@@ -107,7 +76,8 @@
         class="sTable"
         ref="table"
         size="small"
-        :rowKey="(record) => record.salesTargetSn"
+        :rowKey="(record) => record.no"
+        rowKeyName="no"
         :columns="columns"
         :data="loadData"
         :defaultLoadData="false"
@@ -121,12 +91,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { getArea } from '@/api/data'
+import AreaList from '@/views/common/areaList.js'
 import custType from '@/views/common/custType.js'
-import { dealerProductTypeList } from '@/api/dealerProductType'
+import ProductType from '../../common/productType.js'
 import { reportBigCustomerLinkageList, reportBigCustomerLinkageCount, linkageGroupList } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, custType },
+  components: { STable, VSelect, rangeDate, custType, AreaList, ProductType },
   mixins: [commonMixin],
   data () {
     return {
@@ -206,9 +176,9 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '连锁门店', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'salesTargetName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, sorter: true },
+        { title: '客户名称', dataIndex: 'salesTargetName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true, sorter: true },
         { title: '客户类型', dataIndex: 'customerTypeName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '交易金额', dataIndex: 'discountedAmount', width: '15%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') }, sorter: true }
       ]
@@ -220,6 +190,11 @@ export default {
     }
   },
   methods: {
+    areaChange (val) {
+      this.queryParam.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.citySn = val[1] ? val[1] : undefined
+      this.queryParam.countySn = val[2] ? val[2] : undefined
+    },
     // 合计
     getCount (params) {
       reportBigCustomerLinkageCount(params).then(res => {
@@ -262,6 +237,9 @@ export default {
       this.queryParam.countySn = undefined
       this.queryParam.customerTypeSn = undefined
       this.productType = []
+      if(this.advanced){
+        this.$refs.areaList.clearData()
+      }
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()
@@ -277,62 +255,6 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
-    //  产品分类  列表
-    getProductType () {
-      dealerProductTypeList({}).then(res => {
-        if (res.status == 200) {
-          this.productTypeList = res.data
-        } else {
-          this.productTypeList = []
-        }
-      })
-    },
-    // 获取城市列表
-    getCityList (val) {
-      this.addrCityList = []
-      this.addrDistrictList = []
-      this.queryParam.citySn = undefined
-      this.queryParam.countySn = undefined
-      if (val) {
-        this.getArea('city', val)
-      }
-    },
-    // 获取区县列表
-    getAreaList (val) {
-      this.addrDistrictList = []
-      this.queryParam.countySn = undefined
-      if (val) {
-        this.getArea('district', val)
-      }
-    },
-    //  省/市/区
-    getArea (leve, sn) {
-      let params
-      if (leve == 'province') {
-        params = { type: '2' }
-      } else {
-        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
-      }
-      getArea(params).then(res => {
-        if (res.status == 200) {
-          if (leve == 'province') {
-            this.addrProvinceList = res.data || []
-          } else if (leve == 'city') {
-            this.addrCityList = res.data || []
-          } else if (leve == 'district') {
-            this.addrDistrictList = res.data || []
-          }
-        } else {
-          if (leve == 'province') {
-            this.addrProvinceList = []
-          } else if (leve == 'city') {
-            this.addrCityList = []
-          } else if (leve == 'district') {
-            this.addrDistrictList = []
-          }
-        }
-      })
-    },
     // 连锁店
     getLinkageGroup () {
       linkageGroupList({}).then(res => {
@@ -345,8 +267,6 @@ export default {
     },
     pageInit () {
       this.getLinkageGroup()
-      this.getArea('province')
-      this.getProductType()
     }
   },
   mounted () {

+ 18 - 93
src/views/chainReportData/chainSalesDetailReport/list.vue

@@ -40,11 +40,9 @@
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户类型">
-                <a-select id="chainSalesDetailReportList-customerType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型">
-                  <a-select-option v-for="item in custTypeList" :value="item.customerTypeSn" :key="item.customerTypeSn">{{ item.name }}</a-select-option>
-                </a-select>
-              </a-form-model-item>
+              <a-form-item label="客户类型">
+                <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+              </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
@@ -101,32 +99,10 @@
                 <a-input id="chainSalesDetailReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="12" :sm="24">
-              <a-row>
-                <a-form-model-item label="客户所在区" :labelCol="{span: 4}" :wrapperCol="{ span: 20 }" style="margin-bottom: 0!important;">
-                  <a-col span="7">
-                    <a-form-model-item prop="provinceSn" style="margin: 0;">
-                      <a-select v-model="queryParam.provinceSn" @change="getCityList" placeholder="请选择省" allowClear>
-                        <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col span="7" offset="1">
-                    <a-form-model-item prop="citySn" style="margin: 0;">
-                      <a-select v-model="queryParam.citySn" @change="getAreaList" placeholder="请选择市" allowClear>
-                        <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col span="7" offset="1">
-                    <a-form-model-item prop="countySn" style="margin: 0;">
-                      <a-select v-model="queryParam.countySn" placeholder="请选择区/县" allowClear>
-                        <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                </a-form-model-item>
-              </a-row>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户所在区">
+                <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+              </a-form-item>
             </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -173,15 +149,15 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { getArea } from '@/api/data'
-import { custTypeFindAllList } from '@/api/custType'
+import AreaList from '@/views/common/areaList.js'
+import custType from '@/views/common/custType.js'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import { warehouseCascadeList } from '@/api/warehouse'
 import custList from '@/views/common/custList.vue'
 import { reportChainSalesBillDetailList, reportChainSalesBillDetailCount, linkageGroupList } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, ProductType, ProductBrand, custList },
+  components: { STable, VSelect, rangeDate, ProductType, ProductBrand, custList, AreaList, custType },
   mixins: [commonMixin],
   data () {
     return {
@@ -296,6 +272,11 @@ export default {
         }
       })
     },
+    areaChange (val) {
+      this.queryParam.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.citySn = val[1] ? val[1] : undefined
+      this.queryParam.countySn = val[2] ? val[2] : undefined
+    },
     //  创建时间  change
     dateChange (date) {
       this.queryParam.time = date
@@ -349,6 +330,9 @@ export default {
       this.queryParam.salesManName = ''
       this.productType = []
       this.$refs.custSatelliteList.resetForm()
+      if(this.advanced){
+        this.$refs.areaList.clearData()
+      }
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()
@@ -358,17 +342,6 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
-    //  获取客户类型列表
-    getCustTypeList () {
-      const _this = this
-      custTypeFindAllList().then(res => {
-        if (res.status == 200) {
-          _this.custTypeList = res.data || []
-        } else {
-          _this.custTypeList = []
-        }
-      })
-    },
     //  产品分类  change
     changeProductType (val, opt) {
       this.queryParam.productEntity.productTypeSn1 = val[0] ? val[0] : ''
@@ -418,56 +391,8 @@ export default {
         this.queryParam.warehouseLocationSn = ''
       }
     },
-    // 获取城市列表
-    getCityList (val) {
-      this.addrCityList = []
-      this.addrDistrictList = []
-      this.queryParam.citySn = undefined
-      this.queryParam.countySn = undefined
-      if (val) {
-        this.getArea('city', val)
-      }
-    },
-    // 获取区县列表
-    getAreaList (val) {
-      this.addrDistrictList = []
-      this.queryParam.countySn = undefined
-      if (val) {
-        this.getArea('district', val)
-      }
-    },
-    //  省/市/区
-    getArea (leve, sn) {
-      let params
-      if (leve == 'province') {
-        params = { type: '2' }
-      } else {
-        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
-      }
-      getArea(params).then(res => {
-        if (res.status == 200) {
-          if (leve == 'province') {
-            this.addrProvinceList = res.data || []
-          } else if (leve == 'city') {
-            this.addrCityList = res.data || []
-          } else if (leve == 'district') {
-            this.addrDistrictList = res.data || []
-          }
-        } else {
-          if (leve == 'province') {
-            this.addrProvinceList = []
-          } else if (leve == 'city') {
-            this.addrCityList = []
-          } else if (leve == 'district') {
-            this.addrDistrictList = []
-          }
-        }
-      })
-    },
     pageInit () {
       this.getLinkageGroup()
-      this.getArea('province')
-      this.getCustTypeList()
       this.getWarehouseCascade()
     }
   },

+ 18 - 93
src/views/chainReportData/chainSalesReport/list.vue

@@ -40,11 +40,9 @@
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户类型">
-                <a-select id="chainSalesReportList-salesTargetType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型">
-                  <a-select-option v-for="item in custTypeList" :value="item.customerTypeSn" :key="item.customerTypeSn">{{ item.name }}</a-select-option>
-                </a-select>
-              </a-form-model-item>
+              <a-form-item label="客户类型">
+                <custType v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型"></custType>
+              </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
@@ -67,32 +65,10 @@
                 <a-input id="chainSalesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="12" :sm="24">
-              <a-row>
-                <a-form-model-item label="客户所在区" :labelCol="{span: 4}" :wrapperCol="{ span: 20 }" style="margin-bottom: 0!important;">
-                  <a-col span="8">
-                    <a-form-model-item prop="provinceSn" style="margin: 0;">
-                      <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                        <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col span="7" offset="1">
-                    <a-form-model-item prop="citySn" style="margin: 0;">
-                      <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                        <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col span="7" offset="1">
-                    <a-form-model-item prop="countySn" style="margin: 0;">
-                      <a-select v-model="queryParam.countySn" allowClear placeholder="请选择区/县">
-                        <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                </a-form-model-item>
-              </a-row>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户所在区">
+                <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+              </a-form-item>
             </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -139,12 +115,12 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { getArea } from '@/api/data'
-import { custTypeFindAllList } from '@/api/custType'
+import AreaList from '@/views/common/areaList.js'
+import custType from '@/views/common/custType.js'
 import custList from '@/views/common/custList.vue'
 import { reportChainSalesBillList, reportChainSalesBillCount, linkageGroupList } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, custList },
+  components: { STable, VSelect, rangeDate, custList, AreaList, custType },
   mixins: [commonMixin],
   data () {
     return {
@@ -231,6 +207,11 @@ export default {
     }
   },
   methods: {
+    areaChange (val) {
+      this.queryParam.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.citySn = val[1] ? val[1] : undefined
+      this.queryParam.countySn = val[2] ? val[2] : undefined
+    },
     // 合计
     getCount (params) {
       reportChainSalesBillCount(params).then(res => {
@@ -284,6 +265,9 @@ export default {
       this.queryParam.salesBillNo = ''
       this.queryParam.salesManName = ''
       this.$refs.custSatelliteList.resetForm()
+      if(this.advanced){
+        this.$refs.areaList.clearData()
+      }
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()
@@ -293,17 +277,6 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
-    //  获取客户类型列表
-    getCustTypeList () {
-      const _this = this
-      custTypeFindAllList().then(res => {
-        if (res.status == 200) {
-          _this.custTypeList = res.data || []
-        } else {
-          _this.custTypeList = []
-        }
-      })
-    },
     // 连锁店
     getLinkageGroup () {
       linkageGroupList({}).then(res => {
@@ -319,56 +292,8 @@ export default {
         }
       })
     },
-    // 获取城市列表
-    getCityList (val) {
-      this.addrCityList = []
-      this.addrDistrictList = []
-      this.queryParam.citySn = undefined
-      this.queryParam.countySn = undefined
-      if (val) {
-        this.getArea('city', val)
-      }
-    },
-    // 获取区县列表
-    getAreaList (val) {
-      this.addrDistrictList = []
-      this.queryParam.countySn = undefined
-      if (val) {
-        this.getArea('district', val)
-      }
-    },
-    //  省/市/区
-    getArea (leve, sn) {
-      let params
-      if (leve == 'province') {
-        params = { type: '2' }
-      } else {
-        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
-      }
-      getArea(params).then(res => {
-        if (res.status == 200) {
-          if (leve == 'province') {
-            this.addrProvinceList = res.data || []
-          } else if (leve == 'city') {
-            this.addrCityList = res.data || []
-          } else if (leve == 'district') {
-            this.addrDistrictList = res.data || []
-          }
-        } else {
-          if (leve == 'province') {
-            this.addrProvinceList = []
-          } else if (leve == 'city') {
-            this.addrCityList = []
-          } else if (leve == 'district') {
-            this.addrDistrictList = []
-          }
-        }
-      })
-    },
     pageInit () {
       this.getLinkageGroup()
-      this.getArea('province')
-      this.getCustTypeList()
     }
   },
   mounted () {

+ 18 - 18
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -23,45 +23,45 @@
               <a-input id="chainTransferInReport-allocationLinkagePutNo" v-model.trim="queryParam.allocationLinkagePutNo" allowClear placeholder="请输入连锁调入单号"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="调出对象">
               <getTenantList id="chainTransferInReport-outTenantSn" state="FINISH" v-model="queryParam.outTenantSn"></getTenantList>
             </a-form-item>
           </a-col>
-          <template v-if="advanced">
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调拨产品类型">
-                <v-select
-                  v-model="queryParam.allocationType"
-                  ref="allocationType"
-                  id="chainTransferInReport-allocationType"
-                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                  placeholder="请选择调拨产品类型"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="调拨产品类型">
+              <v-select
+                v-model="queryParam.allocationType"
+                ref="allocationType"
+                id="chainTransferInReport-allocationType"
+                code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                placeholder="请选择调拨产品类型"
+                allowClear></v-select>
+            </a-form-item>
+          </a-col>
+          <template v-if="advanced"> 
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="chainTransferInReport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="chainTransferInReport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
                 <ProductType id="chainTransferInReport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
             <a-button

+ 11 - 5
src/views/common/areaList.js

@@ -73,11 +73,17 @@ const AreaList = {
     },
     //  省/市/区
     getArea () {
-      getAreaAll().then(res => {
-        if (res.status == 200) {
-          this.list = arrayToTree(res.data, 0)
-        }
-      })
+      const data = this.$store.state.app.allArea
+      if(data&&data.length){
+        this.list = data
+      }else{
+        getAreaAll().then(res => {
+          if (res.status == 200) {
+            this.list = arrayToTree(res.data, 0)
+            this.$store.state.app.allArea = this.list
+          }
+        })
+      }
     },
     clearData () {
       this.handleChange([], null)

+ 2 - 2
src/views/common/commonModal.vue

@@ -13,8 +13,8 @@
       <div class="common-main" v-html="modalHtml"></div>
       <slot></slot>
       <div class="btn-box">
-        <a-button type="default" class="button-warning" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button type="primary" class="button-info" @click="handleCommonOk">{{ okText }}</a-button>
+        <a-button type="default" size="large" class="button-warning" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
+        <a-button type="primary" size="large" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
     </a-spin>
   </a-modal>

+ 18 - 96
src/views/customerManagement/customerInfo/edit.vue

@@ -46,31 +46,8 @@
           </a-row>
           <a-row :gutter="15">
             <a-col :span="24">
-              <a-form-model-item label="客户地址" required style="margin: 0;" :labelCol="{ span: 3}" :wrapperCol="{ span: 20 }">
-                <a-row :gutter="15">
-                  <!-- 客户地址 -->
-                  <a-col span="6">
-                    <a-form-model-item prop="provinceSn">
-                      <a-select id="customerManagementEdit-provinceSn" allowClear @change="getCityList" v-model="form.provinceSn" placeholder="请选择省">
-                        <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col span="6">
-                    <a-form-model-item prop="citySn">
-                      <a-select id="customerManagementEdit-citySn" allowClear @change="getAreaList" v-model="form.citySn" placeholder="请选择市">
-                        <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                  <a-col span="6">
-                    <a-form-model-item prop="countySn">
-                      <a-select id="customerManagementEdit-countySn" allowClear @change="areaCharged" v-model="form.countySn" placeholder="请选择区/县">
-                        <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                      </a-select>
-                    </a-form-model-item>
-                  </a-col>
-                </a-row>
+              <a-form-model-item label="客户地址" prop="countySn" :labelCol="{ span: 3 }" :wrapperCol="{ span: 20 }">
+                <AreaList changeOnSelect ref="areaList" v-model="areaVal" @change="areaChange"></AreaList>
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
@@ -96,7 +73,7 @@
                 ></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :span="8">
+            <a-col :span="8" v-if="form.relationTypeDictValue">
               <!-- <a-form-model-item label="是否卫星仓客户" prop="satelliteFlag">
                 <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
               </a-form-model-item> -->
@@ -104,7 +81,7 @@
                 <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
               </a-form-model-item> -->
               <a-form-model-item label="客户关系" prop="relationTypeDictValue">
-                <span style="padding-left: 11px;">{{ form.relationTypeDictValue }}</span>
+                <span style="padding-left: 11px;">{{ form.relationTypeDictValue || '--' }}</span>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -139,12 +116,12 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
-import { getArea } from '@/api/data'
 import custType from '@/views/common/custType.js'
+import AreaList from '@/views/common/areaList.js'
 import { custSave, custFindById, settleStyleFindAllList } from '@/api/customer'
 export default {
   name: 'CustomerManagementEdit',
-  components: { STable, VSelect, custType },
+  components: { STable, VSelect, custType, AreaList },
   mixins: [commonMixin],
   props: {
     model: {
@@ -177,16 +154,14 @@ export default {
         satelliteFlag: 0, //  是否卫星仓客户
         relationTypeDictValue: undefined, // 客户关系
         customerTypeSn: undefined, //  客户类型
-
         priceType: '', //  价格类型
         settleStyleSn: undefined //  收款方式
       },
+      areaVal:[],
       rules: {
         customerName: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
         contactMobile: [{ required: false, pattern: /^\d{11}$/, message: '请输入正确的手机号', trigger: 'blur' }],
-        provinceSn: [{ required: true, message: '请选择省', trigger: 'change' }],
-        citySn: [{ required: true, message: '请选择市', trigger: 'change' }],
-        countySn: [{ required: true, message: '请选择区/县', trigger: 'change' }],
+        countySn: [{ required: true, message: '请选择客户地址', trigger: 'change' }],
         priceType: [{ required: true, message: '请选择价格类型', trigger: 'change' }],
         settleStyleSn: [{ required: true, message: '请选择收款方式', trigger: 'change' }]
       },
@@ -204,14 +179,22 @@ export default {
       str = str.replace(/[\r\n]/g, '')
       this.form.customerName = str
     },
+    areaChange (val,opts) {
+      console.log(opts)
+      this.form.provinceSn = val[0] ? val[0] : undefined
+      this.form.provinceName = opts[0] ? opts[0].name : ''
+      this.form.citySn = val[1] ? val[1] : undefined
+      this.form.cityName = opts[1] ? opts[1].name : ''
+      this.form.countySn = val[2] ? val[2] : undefined
+      this.form.countyName = opts[2] ? opts[2].name : ''
+    },
     //  获取客户信息
     getDetail () {
       custFindById({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
-          if (res.data.provinceSn) { this.getArea('city', res.data.provinceSn) }
-          if (res.data.citySn) { this.getArea('district', res.data.citySn) }
           res.data.satelliteFlag = res.data.dealerFlag
           this.form = Object.assign(this.form, res.data)
+          this.areaVal = [res.data.provinceSn,res.data.citySn,res.data.countySn]
         } else {
           this.$refs.ruleForm.resetFields()
         }
@@ -263,69 +246,8 @@ export default {
     handleBack () {
       this.$router.push({ path: '/customerManagement/customerInfo/list' })
     },
-    // 获取城市列表
-    getCityList (val) {
-      this.addrCityList = []
-      this.addrDistrictList = []
-      this.form.citySn = undefined
-      this.form.countySn = undefined
-      if (val) {
-        this.getArea('city', val)
-        this.form.provinceName = this.addrProvinceList.find(item => item.areaSn == val).name
-      } else {
-        this.form.provinceName = ''
-      }
-    },
-    // 获取区县列表
-    getAreaList (val) {
-      this.addrDistrictList = []
-      this.form.countySn = undefined
-      if (val) {
-        this.getArea('district', val)
-        this.form.cityName = this.addrCityList.find(item => item.areaSn == val).name
-      } else {
-        this.form.cityName = ''
-      }
-    },
-    // 区县变更
-    areaCharged (val) {
-      if (val) {
-        this.form.countyName = this.addrDistrictList.find(item => item.areaSn == val).name
-      } else {
-        this.form.countyName = ''
-      }
-    },
-    //  省/市/区
-    getArea (leve, sn) {
-      let params
-      if (leve == 'province') {
-        params = { type: '2' }
-      } else {
-        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
-      }
-      getArea(params).then(res => {
-        if (res.status == 200) {
-          if (leve == 'province') {
-            this.addrProvinceList = res.data || []
-          } else if (leve == 'city') {
-            this.addrCityList = res.data || []
-          } else if (leve == 'district') {
-            this.addrDistrictList = res.data || []
-          }
-        } else {
-          if (leve == 'province') {
-            this.addrProvinceList = []
-          } else if (leve == 'city') {
-            this.addrCityList = []
-          } else if (leve == 'district') {
-            this.addrDistrictList = []
-          }
-        }
-      })
-    },
     // 获取基础数据
     getBaseData () {
-      this.getArea('province') //  省市区
       this.getSettleStyleList() // 收款方式
       this.$refs.ruleForm.resetFields()
     },

+ 18 - 80
src/views/customerManagement/customerInfo/list.vue

@@ -10,12 +10,12 @@
                 <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerName" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="联系人">
                 <a-input id="customerManagementList-contactName" v-model.trim="queryParam.contactName" allowClear placeholder="请输入联系人"/>
               </a-form-item>
             </a-col>
-            <a-col :md="8" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="最后销售时间">
                 <rangeDate ref="rangeSaleDate" @change="dateSaleChange" />
               </a-form-item>
@@ -37,40 +37,17 @@
                   <v-select code="FLAG" id="customerManagementList-dealerFlag" v-model="queryParam.dealerFlag" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
               </a-col> -->
-              <a-col :md="10" :sm="24">
-                <a-row>
-                  <!-- 客户地址 -->
-                  <a-form-item label="客户地址">
-                    <a-col span="8">
-                      <a-form-item prop="provinceSn" style="margin: 0;">
-                        <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
-                          <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-item>
-                    </a-col>
-                    <a-col span="8">
-                      <a-form-item prop="citySn" style="margin: 0;">
-                        <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
-                          <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-item>
-                    </a-col>
-                    <a-col span="8">
-                      <a-form-item prop="countySn" style="margin: 0;">
-                        <a-select v-model="queryParam.countySn" allowClear placeholder="请选择区/县">
-                          <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
-                        </a-select>
-                      </a-form-item>
-                    </a-col>
-                  </a-form-item>
-                </a-row>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客户地址">
+                  <AreaList changeOnSelect ref="areaList" @change="areaChange"></AreaList>
+                </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="客户类型">
                   <custType v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型"></custType>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="启用状态">
                   <v-select code="ENABLE_FLAG" v-model="queryParam.enabledFlag" allowClear placeholder="请选择启用状态"></v-select>
                 </a-form-item>
@@ -143,8 +120,8 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { getArea } from '@/api/data'
 import { custList, custDel, updateEnableStatus } from '@/api/customer'
+import AreaList from '@/views/common/areaList.js'
 import custType from '@/views/common/custType.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
@@ -152,7 +129,7 @@ import customerManagementDetailModal from './detailModal.vue'
 import mergeCustomerModal from './mergeCustomerModal.vue'
 export default {
   name: 'CustomerManagementList',
-  components: { STable, VSelect, customerManagementDetailModal, rangeDate, custType, mergeCustomerModal },
+  components: { STable, VSelect, customerManagementDetailModal, rangeDate, AreaList, custType, mergeCustomerModal },
   mixins: [commonMixin],
   data () {
     return {
@@ -221,6 +198,11 @@ export default {
       this.queryParam.saleBeginDate = date[0] ? date[0] : ''
       this.queryParam.saleEndDate = date[1] ? date[1] : ''
     },
+    areaChange (val) {
+      this.queryParam.provinceSn = val[0] ? val[0] : undefined
+      this.queryParam.citySn = val[1] ? val[1] : undefined
+      this.queryParam.countySn = val[2] ? val[2] : undefined
+    },
     //  重置
     resetSearchForm () {
       this.$refs.rangeSaleDate.resetDate()
@@ -237,6 +219,9 @@ export default {
       this.queryParam.enabledFlag = undefined
       this.addrCityList = []
       this.addrDistrictList = []
+      if (this.advanced) {
+        this.$refs.areaList.clearData()
+      }
       this.$refs.table.refresh(true)
     },
     //  新增/编辑
@@ -313,58 +298,11 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
-    // 获取城市列表
-    getCityList (val) {
-      this.addrCityList = []
-      this.addrDistrictList = []
-      this.queryParam.citySn = undefined
-      this.queryParam.countySn = undefined
-      if (val) {
-        this.getArea('city', val)
-      }
-    },
-    // 获取区县列表
-    getAreaList (val) {
-      this.addrDistrictList = []
-      this.queryParam.countySn = undefined
-      if (val) {
-        this.getArea('district', val)
-      }
-    },
-    //  省/市/区
-    getArea (leve, sn) {
-      let params
-      if (leve == 'province') {
-        params = { type: '2' }
-      } else {
-        params = { parentId: sn, type: leve == 'city' ? '3' : '4' }
-      }
-      getArea(params).then(res => {
-        if (res.status == 200) {
-          if (leve == 'province') {
-            this.addrProvinceList = res.data || []
-          } else if (leve == 'city') {
-            this.addrCityList = res.data || []
-          } else if (leve == 'district') {
-            this.addrDistrictList = res.data || []
-          }
-        } else {
-          if (leve == 'province') {
-            this.addrProvinceList = []
-          } else if (leve == 'city') {
-            this.addrCityList = []
-          } else if (leve == 'district') {
-            this.addrDistrictList = []
-          }
-        }
-      })
-    },
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
-      this.getArea('province')
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 2 - 2
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
+          <p style=" display: inline-block;margin: 0 0 0 20px;color: #000;font-size: 14px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
@@ -141,6 +141,6 @@ export default {
 
 <style lang="less">
   .companyCollectionPaymentDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
   }
 </style>

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="collectionPayment-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
+          <p style=" display: inline-block;margin: 0 0 0 30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
           <Print :disabled="chooseLoadData.length==0||totalBalance==0" @handlePrint="handlePrint"></Print>
@@ -474,7 +474,7 @@ export default {
       height: 100%;
     }
     .collectionPayment-cont{
-      margin-top: 10px;
+      margin-top: 6px;
       .green{
         color: #19be6b;
       }

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
+          <p style=" display: inline-block;margin: 0 0 0 30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
         </template>
       </a-page-header>
       <a-card>
@@ -185,6 +185,6 @@ export default {
 
 <style lang="less">
   .companyCollectionPaymentDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
   }
 </style>

+ 2 - 2
src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue

@@ -4,7 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="collectionPayment-back" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <span style="margin-right:30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
+          <span style="margin-right:30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
           <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
@@ -494,7 +494,7 @@ export default {
       height: 100%;
     }
     .collectionPayment-cont{
-      margin-top: 10px;
+      margin-top: 6px;
       .green{
         color: #19be6b;
       }

+ 2 - 2
src/views/financialManagement/companyReceivablePayableNew/detail.vue

@@ -4,7 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <span style="margin-right: 30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
+          <span style="margin-right: 30px;color: #000;font-size: 14px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
           <a-button id="companyCollectionPaymentDetail-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
       </a-page-header>
@@ -187,6 +187,6 @@ export default {
 
 <style lang="less">
   .companyCollectionPaymentDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
   }
 </style>

+ 3 - 5
src/views/financialManagement/expenseManagement/list.vue

@@ -29,8 +29,7 @@
                   allowClear />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="4" :sm="24">
+            <a-col :md="4" :sm="24">
                 <a-form-item label="单据状态">
                   <v-select
                     v-model="queryParam.state"
@@ -41,15 +40,14 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-            </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="expenseManagementList-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="expenseManagementList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+                <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
+                </a> -->
               </span>
             </a-col>
           </a-row>

+ 2 - 2
src/views/financialManagement/fundAccountManagement/addModal.vue

@@ -43,8 +43,8 @@
             allowClear />
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" size="large" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
+          <a-button @click="isShow=false" size="large" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 1 - 1
src/views/financialManagement/inventoryCheckAudit/setPriceModal.vue

@@ -72,7 +72,7 @@ export default {
       // 表头
       columns: [
         { title: '产品编码', dataIndex: 'productCode', width: '30%', align: 'center', customRender: function (text) { return ((text || text != ' ') ? text : '--') } },
-        { title: '产品名称', dataIndex: 'productName', width: '50%', align: 'center', customRender: function (text) { return (text || '--') } },
+        { title: '产品名称', dataIndex: 'productName', width: '50%', align: 'left', customRender: function (text) { return (text || '--') } },
         { title: '成本价', scopedSlots: { customRender: 'action' }, width: '20%', align: 'center' }
       ]
     }

+ 1 - 1
src/views/financialManagement/ledgerRecord/list.vue

@@ -102,7 +102,7 @@ export default {
         { title: '分账时间', dataIndex: 'separateTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'customer.customerNameCurrent', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '关联工单号', dataIndex: 'separateBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProduct.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProduct.name', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'dealerProduct.code', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'productQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '分账金额', dataIndex: 'separateAmount', width: 120, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 1 - 1
src/views/financialManagement/warehousingAudit/detail.vue

@@ -108,7 +108,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '15%', align: 'center', scopedSlots: { customRender: 'code' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库数量', dataIndex: 'realPutQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 5 - 7
src/views/financialManagement/warehousingAudit/list.vue

@@ -5,12 +5,12 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="采购单号">
                 <a-input id="warehousingAuditList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="发货单号">
                 <a-input id="warehousingAuditList-receivingBillNo" v-model.trim="queryParam.receivingBillNo" allowClear placeholder="请输入发货单号"/>
               </a-form-item>
@@ -20,8 +20,7 @@
                 <rangeDate ref="rangeDate" :value="auditTime" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
                 <a-form-item label="入库审核状态">
                   <v-select
                     v-model="queryParam.auditState"
@@ -32,15 +31,14 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-            </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="warehousingAuditList-refresh">查询</a-button>
                 <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="warehousingAuditList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
+                <!-- <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
+                </a> -->
               </span>
             </a-col>
           </a-row>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="inventoryCheckOverallList-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span class="billno">单号:{{ basicInfoData&&basicInfoData.checkWarehouseNo }}</span>
+          <span class="head-order-number">单号:{{ basicInfoData&&basicInfoData.checkWarehouseNo }}</span>
           <a-tag color="blue">{{ basicInfoData&&basicInfoData.stateDictValue }}</a-tag>
         </template>
       </a-page-header>

+ 2 - 0
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -300,6 +300,7 @@ export default {
   computed: {
     columns () {
       const arr = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '12%' : '22%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '15%' : '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品品牌', dataIndex: 'brandName', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '9%' : '11%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -317,6 +318,7 @@ export default {
     },
     chooseColumns () {
       const arr = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '12%' : '22%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '15%' : '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品品牌', dataIndex: 'brandName', width: this.basicInfoData && this.basicInfoData.warehouseFlag == '1' ? '9%' : '11%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -70,7 +70,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '17%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '17%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库时间', dataIndex: 'putTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },

+ 11 - 11
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -12,7 +12,7 @@
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="变动类型">
                   <v-select
                     v-model="queryParam.flowType"
@@ -23,7 +23,7 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="单据类型">
                   <v-select
                     v-model="queryParam.bizType"
@@ -39,14 +39,14 @@
                   <a-input id="inventoryQueryWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单据号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="仓库">
-                  <a-select id="inventoryQueryWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
-                    <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
               <template v-if="advanced">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="仓库">
+                    <a-select id="inventoryQueryWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
+                      <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据审核时间">
                     <rangeDate ref="rangeDate" @change="dateChange" />
@@ -57,7 +57,7 @@
                     <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitNameCurrent" allowClear placeholder="请输入单位名称"/>
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="出入库状态">
                     <v-select
                       v-model="queryParam.state"
@@ -191,7 +191,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'product.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'stockBatchNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单据号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="storingLocationList-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <strong style="color: rgba(0, 0, 0);margin-left: 50px;">所属仓库:{{ $route.query.name || '--' }}</strong>
+          <span style="color: #666;margin-left: 15px;">所属仓库:{{ $route.query.name || '--' }}</span>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="storingLocationList-cont">

+ 9 - 10
src/views/numsGoodsShelves/customerAnalysis/list.vue

@@ -4,17 +4,17 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form-model layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-            <a-row :gutter="15">
+            <a-row :gutter="10">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="货架名称" prop="shelfSn">
-                  <shelfSList v-model="queryParam.shelfSn"></shelfSList>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="8" :sm="24">
                 <a-form-item label="下单时间">
-                  <rangeDate ref="orderDate" :value="orderTime" @change="orderDateChange" />
+                  <rangeDate style="width: 100%;" ref="orderDate" :value="orderTime" @change="orderDateChange" />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="货架名称" prop="shelfSn">
+                  <shelfSList style="width: 100%;" v-model="queryParam.shelfSn"></shelfSList>
+                </a-form-model-item>
+              </a-col>
               <!-- <a-col :md="6" :sm="24">
                 <a-form-item label="货架取货数量">
                   <a-input-group compact>
@@ -65,7 +65,7 @@
                   </a-form-item>
                 </a-col>
               </template> -->
-              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" id="userd-refresh">查询</a-button>
                 <a-button type="" @click="reset" style="margin-left: 10px;" id="userd-reset">重置</a-button>
                 <a-button
@@ -81,7 +81,6 @@
                 </a> -->
               </a-col>
             </a-row>
-            </a-form>
           </a-form-model></div>
         <div class="table-operator" v-if="statisticsObj">
           <a-alert type="info">
@@ -165,7 +164,7 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '货架名称', dataIndex: 'shelfName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '货架名称', dataIndex: 'shelfName', width: '30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         {
           slots: { title: 'customTitle' },
           children: [

+ 2 - 2
src/views/numsGoodsShelves/recallManagement/basicInfoModal.vue

@@ -21,8 +21,8 @@
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
-        <a-button type="primary" id="importGuide-nextStep" @click="handlerNextStep">下一步</a-button>
-        <a-button id="shelfSet-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+        <a-button size="large" type="primary" id="importGuide-nextStep" @click="handlerNextStep">下一步</a-button>
+        <a-button size="large" id="shelfSet-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
       </div>
     </a-spin>
     <!-- 新增回调单(实现新增) -->

+ 2 - 2
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -9,7 +9,7 @@
           </a-tab-pane>
         </a-tabs>
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="36">
+          <a-row :gutter="10">
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
@@ -22,7 +22,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
-                <shelfList :showAll="true" v-model="queryParam.shelfSn"></shelfList>
+                <shelfList style="width: 100%;" :showAll="true" v-model="queryParam.shelfSn"></shelfList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">

+ 4 - 6
src/views/numsGoodsShelves/replenishmentManagement/creatReplenishmentOrder.vue

@@ -7,7 +7,7 @@
     :title="modalTit"
     v-model="isShow"
     @cancel="isShow = false"
-    width="80%">
+    width="70%">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
@@ -28,15 +28,13 @@
                 <a-input id="chooseShelf-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="10" :sm="24">
+            <a-col :md="12" :sm="24">
               <a-form-model-item label="门店库存情况">
                 <a-checkbox-group :options="options" v-model="queryParam.stockStateList" @change="onStockChange" />
+                <a-button style="margin-left: 15px" type="primary" @click="$refs.table.refresh(true)" id="chooseShelf-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" id="chooseShelf-reset">重置</a-button>
               </a-form-model-item>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:right;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" id="chooseShelf-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" id="chooseShelf-reset">重置</a-button>
-            </a-col>
           </a-row>
         </a-form-model>
       </div>

+ 5 - 10
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -4,7 +4,7 @@
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row type="flex" :gutter="15">
+          <a-row type="flex" :gutter="10">
             <a-col flex="350px">
               <a-form-item label="货架名称">
                 <shelfList style="max-width:300px;" v-model="queryParam.shelfSn"></shelfList>
@@ -15,7 +15,7 @@
                 <custList ref="custList" :dealerFlag="0" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
             </a-col>
-            <a-col flex="200px">
+            <a-col flex="300px">
               <a-form-item label="结算方式">
                 <v-select code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择状态"></v-select>
               </a-form-item>
@@ -52,10 +52,10 @@
             <a-col flex="200px">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-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>
@@ -75,7 +75,7 @@
         :columns="columns"
         :data="loadData"
         :scroll="{ y:tableHeight }"
-        :defaultLoadData="true"
+        :defaultLoadData="false"
         bordered>
         <template slot="action" slot-scope="text,record">
           <a-button
@@ -289,8 +289,3 @@ export default {
 }
 </script>
 
-<style lang="less">
-  .accountManagementList-wrap{
-
-  }
-</style>

+ 3 - 2
src/views/numsGoodsShelves/shelfOrder/detail.vue

@@ -4,6 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="shelfOrderDetail-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 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">订单号:{{ detailData&&detailData.orderBillNo || '--' }}</a>
         </template>
       </a-page-header>
       <!-- 基础信息 -->
@@ -80,7 +81,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '货位号', dataIndex: 'shelfPlaceCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '15%', scopedSlots: { customRender: 'productCode' }, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', width: '40%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '40%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '结算价', dataIndex: 'settlePrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text,2) : '--') } },
         { title: '下单数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '结算金额小计', dataIndex: 'settleAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ?  _this.toThousands(text,2) : '--') } }
@@ -130,7 +131,7 @@ export default {
 <style lang="less">
   .shelfOrderDetail-wrap{
     .shelfOrderDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 2 - 2
src/views/numsGoodsShelves/vinAnalysis/spList.vue

@@ -194,8 +194,8 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'brandName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', slots: { title: 'type' }, scopedSlots: { customRender: 'type' }, width: '10%', align: 'center' },

+ 2 - 1
src/views/numsGoodsShelves/withdrawalManagement/applyWithdrawal.vue

@@ -80,7 +80,7 @@ export default {
       title: '申请提现',
       confirmLoading: false,
       spinning: false,
-      rules: { amount: [{ required: true, message: '请选择关联客户', trigger: 'blur' }] }
+      rules: { amount: [{ required: true, message: '请输入提现金额', trigger: 'blur' }] }
     }
   },
   methods: {
@@ -128,6 +128,7 @@ export default {
     // 取消
     cancel () {
       this.form.amount = ''
+      this.$refs.ruleForm.resetFields()
       this.$emit('close')
     }
   },

+ 0 - 6
src/views/numsGoodsShelves/withdrawalManagement/list.vue

@@ -180,9 +180,3 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .accountManagementList-wrap{
-
-  }
-</style>

+ 7 - 48
src/views/productManagement/priceChangeRecord/list.vue

@@ -22,30 +22,12 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="品牌">
-                <a-select
-                  placeholder="请选择"
-                  id="productChangeRecordList-productBrandSn"
-                  allowClear
-                  v-model="queryParam.productBrandSn"
-                  :showSearch="true"
-                  option-filter-prop="children"
-                  :filter-option="filterOption">
-                  <a-select-option v-for="item in productBrandList" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
-                </a-select>
+                <ProductBrand id="productChangeRecordList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品分类">
-                <a-cascader
-                  @change="changeProductType"
-                  expand-trigger="hover"
-                  change-on-select
-                  :options="productTypeList"
-                  :fieldNames="{ label: 'productTypeName', value: 'id', children: 'children' }"
-                  id="productInfoList-productType"
-                  placeholder="请选择产品分类"
-                  allowClear
-                  v-model="productType" />
+                <ProductType id="productChangeRecordList-productType" placeholder="请选择产品分类" :isDealer="false" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-item>
             </a-col>
           </template>
@@ -119,13 +101,13 @@ import moment from 'moment'
 import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { productBrandQuery } from '@/api/productBrand'
-import { productTypeQuery } from '@/api/productType'
+import ProductBrand from '@/views/common/productBrand.js'
+import ProductType from '@/views/common/productType.js'
 import { productPriceChangeList, getCurrentDealer } from '@/api/product'
 // import { downloadExcel } from '@/libs/JGPrint.js'
 export default {
   name: 'ProductPriceChangeList',
-  components: { STable, VSelect, rangeDate },
+  components: { STable, VSelect, rangeDate, ProductBrand, ProductType },
   mixins: [commonMixin],
   data () {
     return {
@@ -168,9 +150,7 @@ export default {
         })
       },
       columns: [],
-      total: 0,
-      productBrandList: [], //  品牌下拉数据
-      productTypeList: [] //  分类下拉数据
+      total: 0
     }
   },
   methods: {
@@ -185,7 +165,7 @@ export default {
       this.columns = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '变更时间', dataIndex: 'updateDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '11%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '11%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productEntity.productBrandName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '8%', align: 'center' },
@@ -293,34 +273,13 @@ export default {
       // downloadExcel(res, '价格变更记录')
       // })
     },
-    //  产品品牌  列表
-    getProductBrand () {
-      productBrandQuery({}).then(res => {
-        if (res.status == 200) {
-          this.productBrandList = res.data
-        } else {
-          this.productBrandList = []
-        }
-      })
-    },
     //  产品分类  列表
-    getProductType () {
-      productTypeQuery({}).then(res => {
-        if (res.status == 200) {
-          this.productTypeList = res.data
-        } else {
-          this.productTypeList = []
-        }
-      })
-    },
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
       this.getColumns()
-      this.getProductBrand()
-      this.getProductType()
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 1 - 1
src/views/productManagement/productInfo/list.vue

@@ -191,7 +191,7 @@ export default {
           title: '产品名称',
           dataIndex: 'name',
           width: '13%',
-          align: 'center',
+          align: 'left',
           ellipsis: true,
           customRender: function (text) {
             return text || '--'

+ 1 - 1
src/views/productManagement/productInfoJg/list.vue

@@ -272,7 +272,7 @@ export default {
       let arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', width: '16%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'origCode', width: '12%', align: 'center', customRender: function (text) { return (!text || text == ' ') ? '--' : text } }
       ]
       const cArr = [

+ 2 - 2
src/views/productManagement/productOnlineInfo/list.vue

@@ -116,7 +116,7 @@ export default {
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         isOnlinePage: '1',
-        bizType:'ONLINE'
+        bizType: 'ONLINE'
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -126,7 +126,7 @@ export default {
         { title: '上线时间', dataIndex: 'auditTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '13%', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'name', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'code', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/productManagement/productUniversal/list.vue

@@ -90,7 +90,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', align: 'center', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'product.name', align: 'left', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品状态', dataIndex: 'product.onlineFalgDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '通用产品编码', dataIndex: 'productCommonCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '通用产品名称', dataIndex: 'productCommon.name', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -41,8 +41,8 @@
           <a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{ addressVal }} >></a-button>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button size="large" type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
+          <a-button size="large" @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 4 - 4
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -156,7 +156,7 @@
                     class="button-primary"
                     :loading="addLoading"
                     @click="handleAdd(record,0)"
-                    id="purchaseOrderEdit-add-btn">添加</a-button>
+                    >添加</a-button>
                 </template>
               </s-table>
             </div>
@@ -375,7 +375,7 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', width: '23%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'name', width: '23%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
         { title: '单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '包装数', scopedSlots: { customRender: 'baozh' }, width: '5%', align: 'center' },
@@ -404,7 +404,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '15%', align: 'center' },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '24%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, width: '8%', align: 'center' },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -669,7 +669,7 @@ export default {
   .purchaseOrderEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
+    padding-bottom: 70px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: auto;

+ 3 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -16,7 +16,7 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+              <a-form-item label="供应商">
                 <a-select
                   id="purchaseOrderList-purchaseTargetSn"
                   placeholder="请选择供应商"
@@ -42,6 +42,7 @@
             <a-col :md="6" :sm="24" v-show="advanced">
               <a-form-item label="财务状态">
                 <v-select
+                style="width: 100%;"
                   v-model="queryParam.financialStatus"
                   ref="financialStatus"
                   id="purchaseOrderList-financialStatus"
@@ -53,6 +54,7 @@
             <a-col :md="6" :sm="24" v-show="advanced">
               <a-form-item label="单据来源">
                 <v-select
+                style="width: 100%;"
                   v-model="queryParam.purchaseBillSource"
                   ref="purchaseBillSource"
                   id="purchaseOrderList-purchaseBillSource"

+ 3 - 3
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -94,9 +94,9 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购单价', dataIndex: 'discountedPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
         { title: '采购数量', dataIndex: 'qty', width: '6%', align: 'center', scopedSlots: { customRender: 'origqty' } },
         { title: '本次发货数量', dataIndex: 'shippedQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 2 - 1
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -226,7 +226,8 @@ export default {
     columns () {
       const _this = this
       const arr = [
-        { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '序号', dataIndex: 'no', width: '50px', align: 'center' },
+        { title: '产品名称', dataIndex: 'name', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '150px', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
         { title: '在途数', dataIndex: 'transitQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '可用库存', dataIndex: 'currentStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/detail.vue

@@ -185,7 +185,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '10%', align: 'center', scopedSlots: { customRender: 'code' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '16%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '采购单价', dataIndex: 'discountedPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -277,7 +277,7 @@ export default {
       const arr = [
         { title: '序号', key: 'a', field: 'no', width: '5%', align: 'center', operationColumn: false },
         { title: '产品编码', key: 'b', field: 'productCode', width: '10%', align: 'center', operationColumn: false },
-        { title: '产品名称', key: 'c', field: 'productName', width: '25%', align: 'center', operationColumn: false, ellipsis: { showTitle: true } },
+        { title: '产品名称', key: 'c', field: 'productName', width: '25%', align: 'left', operationColumn: false, ellipsis: { showTitle: true } },
         { title: '原厂编码', key: 'q', field: 'productOrgCode', width: '15%', align: 'center', operationColumn: false },
         { title: '可用库存', key: 'j', field: 'currentStockQty', width: '10%', align: 'center', operationColumn: false },
         { title: '采购数量',

+ 2 - 2
src/views/purchasingManagement/purchaseOutOfStock/detailModal.vue

@@ -10,7 +10,7 @@
     :width="960">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnDetail-cont">
+      <div class="purchaseReturnDetail-cont" style="margin-bottom:10px">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
@@ -18,7 +18,7 @@
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px" v-if="objItem">
         <div class="ftext" slot="message">

+ 1 - 1
src/views/purchasingManagement/purchaseReturn/detail.vue

@@ -109,7 +109,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '采购单号', dataIndex: 'purchaseBillNo', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '售价', dataIndex: 'cost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货数量', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 3 - 3
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -227,7 +227,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '采购单号', dataIndex: 'purchaseBillNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '13%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '13%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '采购总数', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { slots: { title: 'refundableQtyTitle' }, dataIndex: 'refundableQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存数量', dataIndex: 'stock.currentStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -248,7 +248,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '采购单号', dataIndex: 'purchaseBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '采购总数', dataIndex: 'purchaseBillQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '退货数量', scopedSlots: { customRender: 'qty' }, width: '10%', align: 'center' },
         // { title: '采购价', dataIndex: 'cost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -426,7 +426,7 @@ export default {
   .purchaseReturnEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
+    padding-bottom: 72px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: auto;

+ 4 - 3
src/views/purchasingManagement/purchaseReturnApplyForm/detail.vue

@@ -5,7 +5,8 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">供应商名称:箭冠营销中心</span>
+          <span class="billno" style="margin: 0 10px;color: #666;">单号:{{ basicInfoData&&basicInfoData.purchaseReturnApplyNo }}</span>
+          <span style="margin: 0 10px;color: #666;">供应商名称:箭冠营销中心</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_purchaseReturnApplyPrint')">
@@ -111,7 +112,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', dataIndex: 'initQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总公司实收数量', dataIndex: 'receiveQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -189,7 +190,7 @@ export default {
 
 <style lang="less">
   .purchaseReturnDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
     .timeline-box{
       margin-top: 30px;
       .auxiliary-txt{

+ 7 - 6
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -5,8 +5,9 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;">供应商名称:箭冠营销中心</span>
-          <span style="margin: 0 15px;color: #666;">退货类别:{{ detailData&&detailData.goodFlagDictValue||'--' }}</span>
+          <span class="billno" style="margin: 0 10px;color: #666;">单号:{{ detailData&&detailData.purchaseReturnApplyNo }}</span>
+          <span style="margin: 0 10px;color: #666;">供应商名称:箭冠营销中心</span>
+          <span style="margin: 0 10px;color: #666;">退货类别:{{ detailData&&detailData.goodFlagDictValue||'--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_purchaseReturnApplyPrint')">
@@ -342,7 +343,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', width: this.editGoodFlag ? '20%':'30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'name', width: this.editGoodFlag ? '20%':'30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '20%', align: 'center' },
         { title: '单位', dataIndex: 'unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', scopedSlots: { customRender: 'returnQty' }, width: '10%', align: 'center' }
@@ -357,7 +358,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: this.editGoodFlag ? '20%':'30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'product.name', width: this.editGoodFlag ? '20%':'30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '17%', align: 'center' },
         { title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', scopedSlots: { customRender: 'qty' }, width: '10%', align: 'center' }
@@ -647,14 +648,14 @@ export default {
   .purchaseReturnEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
+    padding-bottom: 75px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: auto;
       height: 100%;
     }
     .purchaseReturnEdit-back, .purchaseReturnEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 3 - 2
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -32,7 +32,9 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-item label="采购退货申请单号">
                 <a-input id="purchaseReturnList-purchaseReturnApplyNo" v-model.trim="queryParam.purchaseReturnApplyNo" allowClear placeholder="请输入采购退货申请单号"/>
               </a-form-item>
@@ -49,7 +51,6 @@
                 ></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="客服审核时间">
                   <rangeDate ref="auditDate" :value="auditTime" @change="auditDateChange" />

+ 3 - 3
src/views/purchasingManagement/purchaseReturnOutSync/basicInfoModal.vue

@@ -7,7 +7,7 @@
     title="新增采购退货单"
     v-model="isShow"
     @cancel="isShow=false"
-    :width="800">
+    :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
         id="purchaseOrder-basicInfo-form"
@@ -38,8 +38,8 @@
             placeholder="请选择"></v-select>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" size="large" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
+          <a-button @click="isShow=false" size="large" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 9 - 5
src/views/purchasingManagement/purchaseReturnOutSync/detail.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a style="margin: 0 10px 0 20px;color: #666;font-size: 14px;font-weight: 600;">单号:{{ basicInfoData&&basicInfoData.purchaseReturnNo || '--' }}</a>
           <a-button
             v-if="isEdit"
             type="primary"
@@ -137,17 +138,20 @@ export default {
       // 抓单
       const _this = this
       if (_this.$route.params.grabFlag == '1') {
-        _this.columns = [{ title: '采购单号', dataIndex: 'purchaseBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        _this.columns = [
+          { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+          { title: '采购单号', dataIndex: 'purchaseBillNo', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+          { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '退货单价', dataIndex: 'cost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
           { title: '退货数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
           { title: '退货金额', scopedSlots: { customRender: 'amount' }, width: '6%', align: 'center' }]
       } else {
         _this.columns = [
-          { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+          { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+          { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+          { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
           { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '仓位', dataIndex: 'warehouseLocationName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
           { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -190,7 +194,7 @@ export default {
 
 <style lang="less">
   .purchaseReturnDetail-cont{
-    margin-bottom: 10px;
+    margin-bottom: 6px;
     .timeline-box{
       margin-top: 30px;
       .auxiliary-txt{

+ 5 - 4
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseReturnEdit-back-btn" 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.purchaseReturnNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;" v-if="detailData">供应商名称:{{ detailData.returnTargetName || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -274,8 +275,8 @@ export default {
       // 表头
       chooseColumns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '17%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -525,14 +526,14 @@ export default {
   .purchaseReturnEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
+    padding-bottom: 75px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: auto;
       height: 100%;
     }
     .purchaseReturnEdit-back, .purchaseReturnEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 7 - 6
src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="purchaseReturnEdit-back-btn" 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.purchaseReturnNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;" v-if="detailData">供应商名称:{{ detailData.returnTargetName || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -260,7 +261,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '采购单号', dataIndex: 'purchaseBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'center' },
         { title: '退货数量', scopedSlots: { customRender: 'qty' }, width: '10%', align: 'center' },
@@ -294,9 +295,9 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '13%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '采购价格', dataIndex: 'price', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '已退数量', dataIndex: 'refundableQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -500,14 +501,14 @@ export default {
   .purchaseReturnEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
+    padding-bottom: 75px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: auto;
       height: 100%;
     }
     .purchaseReturnEdit-back, .purchaseReturnEdit-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
   }
 </style>

+ 3 - 3
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -24,7 +24,8 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-item label="是否抓单">
                 <v-select
                   code="FLAG"
@@ -34,7 +35,7 @@
                   placeholder="请选择是否抓单"></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24">
               <a-form-item label="业务状态">
                 <v-select
                   v-model="queryParam.state"
@@ -46,7 +47,6 @@
                 ></v-select>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select

+ 1 - 1
src/views/purchasingManagement/signWarehousing/edit.vue

@@ -177,7 +177,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', scopedSlots: { customRender: 'code' }, width: '12%', align: 'center' },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '17%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', dataIndex: 'qty', width: '6%', align: 'center', scopedSlots: { customRender: 'origqty' } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/purchasingManagement/signWarehousing/stockOrderDetail.vue

@@ -138,7 +138,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', scopedSlots: { customRender: 'code' }, width: '15%', align: 'center' },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', width: '6%', align: 'center', scopedSlots: { customRender: 'qty' } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 13 - 12
src/views/reportData/bulkReturnReport/detailList.vue

@@ -28,27 +28,27 @@
               <a-input id="bulkInList-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入单号"/>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="供应商">
+              <supplier
+                id="bulkInList-supplierSn"
+                placeholder="请选择供应商"
+                v-model="queryParam.supplierSn"
+              ></supplier>
+            </a-form-model-item>
+          </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="供应商">
-                <supplier
-                  id="bulkInList-supplierSn"
-                  placeholder="请选择供应商"
-                  v-model="queryParam.supplierSn"
-                ></supplier>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="bulkInList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="产品名称">
                 <a-input id="bulkInList-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <ProductBrand id="bulkInList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
@@ -59,7 +59,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="bulkInList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="bulkInList-reset">重置</a-button>
             <a-button
@@ -190,6 +190,7 @@ export default {
     costColumns () {
       const _this = this
       return [
+        { title: '序号', dataIndex: 'no', width: '80px', align: 'center' },
         { title: '批次号', dataIndex: 'stockBatchNo', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '成本单价', dataIndex: 'putCost', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '数量', dataIndex: 'outQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }

+ 3 - 3
src/views/reportData/bulkReturnReport/list.vue

@@ -23,12 +23,12 @@
               <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="散件退货单号">
               <a-input id="bulkReturn-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入单号"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="供应商">
               <supplier
                 id="bulkReturn-supplierSn"
@@ -37,7 +37,7 @@
               ></supplier>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="bulkReturn-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="bulkReturn-reset">重置</a-button>
             <a-button

+ 8 - 8
src/views/reportData/bulkWarehousingReport/detailList.vue

@@ -32,14 +32,14 @@
               ></supplier>
             </a-form-model-item>
           </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="散件入库类型">
+              <a-select id="bulkInList-sparePartsType" placeholder="请选择散件入库类型" allowClear v-model="queryParam.sparePartsType">
+                <a-select-option v-for="item in sparePartsPutTypeList" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="散件入库类型">
-                <a-select id="bulkInList-sparePartsType" placeholder="请选择散件入库类型" allowClear v-model="queryParam.sparePartsType">
-                  <a-select-option v-for="item in sparePartsPutTypeList" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
-                </a-select>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
                 <a-input id="bulkInList-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
@@ -61,7 +61,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="24" :sm="24" style="text-align:center;margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="bulkInList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="bulkInList-reset">重置</a-button>
             <a-button

+ 8 - 8
src/views/reportData/bulkWarehousingReport/list.vue

@@ -13,17 +13,17 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="审核时间" prop="time">
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="散件单号">
               <a-input id="bulkIn-sparePartsPurchaseNo" v-model.trim="queryParam.sparePartsPurchaseNo" allowClear placeholder="请输入单号"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="5" :sm="24">
             <a-form-model-item label="供应商">
               <supplier
                 id="bulkIn-supplierSn"
@@ -33,7 +33,7 @@
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-model-item label="散件入库类型">
                 <a-select id="bulkIn-sparePartsType" placeholder="请选择散件入库类型" allowClear v-model="queryParam.sparePartsType">
                   <a-select-option v-for="item in sparePartsPutTypeList" :key="item.sparePartsPutTypeSn" :value="item.sparePartsPutTypeSn">{{ item.name }}</a-select-option>
@@ -41,7 +41,7 @@
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="bulkIn-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="bulkIn-reset">重置</a-button>
             <a-button
@@ -53,10 +53,10 @@
               v-if="$hasPermissions('M_bulkWarehousingReportExport')"
               class="button-warning"
               id="bulkIn-export-btn">导出</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-model>
@@ -101,7 +101,7 @@ export default {
       spinning: false,
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
-      advanced: false, // 高级搜索 展开/关闭
+      advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
         time: [],

+ 13 - 36
src/views/reportData/customerReport/list.vue

@@ -28,28 +28,19 @@
               <custType v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型"></custType>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户所在区">
-              <AreaList id="chainSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
-            </a-form-item>
-          </a-col>
           <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户所在区">
+                <AreaList id="chainSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品分类">
-                <a-cascader
-                  @change="changeProductType"
-                  change-on-select
-                  v-model="productType"
-                  expand-trigger="hover"
-                  :options="productTypeList"
-                  :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
-                  id="customerReportList-productType"
-                  placeholder="请选择产品分类"
-                  allowClear />
+                <ProductType id="chainSalesReportList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
               </a-form-model-item>
             </a-col>
           </template>
-          <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="customerReportList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="customerReportList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -96,12 +87,11 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import AreaList from '@/views/common/areaList.js'
 import custType from '@/views/common/custType.js'
-// import { getArea } from '@/api/data'
-import { dealerProductTypeList } from '@/api/dealerProductType'
+import ProductType from '@/views/common/productType.js'
 import { reportBigCustomerList, reportBigCustomerCount } from '@/api/reportData'
 export default {
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, custType, custList, AreaList },
+  components: { STable, VSelect, rangeDate, custType, custList, AreaList, ProductType },
   data () {
     return {
       spinning: false,
@@ -171,8 +161,7 @@ export default {
       totalData: null, //  合计
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
-      addrDistrictList: [], //  区下拉
-      productTypeList: [] //  分类下拉数据
+      addrDistrictList: [] //  区下拉
     }
   },
   computed: {
@@ -251,6 +240,9 @@ export default {
       this.productType = []
       this.$refs.ruleForm.resetFields()
       this.$refs.custSatelliteList.resetForm()
+      if (this.advanced) {
+        this.$refs.areaList.clearData()
+      }
       this.totalData = null
       this.$refs.table.clearTable()
     },
@@ -264,31 +256,16 @@ export default {
       this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
-    },
-    //  产品分类  列表
-    getProductType () {
-      dealerProductTypeList({}).then(res => {
-        if (res.status == 200) {
-          this.productTypeList = res.data
-        } else {
-          this.productTypeList = []
-        }
-      })
-    },
-    pageInit () {
-      this.getProductType()
     }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.pageInit()
       this.resetSearchForm()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
-      this.pageInit()
       this.resetSearchForm()
     }
   },

+ 5 - 0
src/views/reportData/customerSalesDetailsReport/list.vue

@@ -111,6 +111,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       columns: [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         {
           title: '所有品牌',
@@ -173,6 +174,10 @@ export default {
             data = res.data
             // 总计
             this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
             this.disabled = false
           }
           this.spinning = false

+ 1 - 0
src/views/reportData/inventoryReport/inventoryDetail.vue

@@ -112,6 +112,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       columns: [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '19%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 1 - 0
src/views/reportData/inventoryReport/inventoryOrder.vue

@@ -77,6 +77,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       columns: [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '盘点单号', dataIndex: 'checkWarehouseNo', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存总数量', dataIndex: 'totalStockQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存总成本', dataIndex: 'totalStockCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 14 - 17
src/views/reportData/inventoryReport/list.vue

@@ -1,16 +1,20 @@
 <template>
-  <a-card size="small" :bordered="false" class="inventoryReportList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 标签页 -->
-      <a-tabs type="card" :default-active-key="nowKey" @change="handleTabChange" class="inventoryReportList-tabs ">
+  <div class="inventoryReportList-wrap">
+    <!-- 标签页 -->
+    <div style="background-color: #fff;margin-bottom: 5px;">
+      <a-tabs :default-active-key="nowKey" @change="handleTabChange" class="inventoryReportList-tabs ">
         <a-tab-pane v-for="item in tabPaneData" :key="item.val">
           <span slot="tab">{{ item.name }}</span>
         </a-tab-pane>
       </a-tabs>
-      <inventoryOrder v-show="nowKey=='1'" @spinning="spinningFun" />
-      <inventoryDetail v-show="nowKey=='2'" @spinning="spinningFun" />
-    </a-spin>
-  </a-card>
+    </div>
+    <a-card size="small" :bordered="false" >
+      <a-spin :spinning="spinning" tip="Loading...">
+        <inventoryOrder v-show="nowKey=='1'" @spinning="spinningFun" />
+        <inventoryDetail v-show="nowKey=='2'" @spinning="spinningFun" />
+      </a-spin>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -57,15 +61,8 @@ export default {
 </script>
 <style lang="less">
 	.inventoryReportList-wrap{
-		.inventoryReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
-      height: 30px!important;
-		}
-    .inventoryReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
-      height: 30px!important;
-    }
-    .inventoryReportList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
-      line-height: 26px!important;
-      height: 30px!important;
+    .ant-tabs-bar{
+      margin:0 !important;
     }
 	}
 </style>

Some files were not shown because too many files changed in this diff