소스 검색

bug修复

chenrui 3 년 전
부모
커밋
088b2cdf8f

+ 9 - 4
src/components/custom.less

@@ -8,7 +8,7 @@ body{
 }
 // 查询条件样式
 .table-page-search-wrapper {
-  .ant-form-inline, .ant-form {
+  .ant-form.ant-form-inline{
     .ant-form-item {
       margin-bottom: 10px;
       .ant-input,.ant-select-selection{
@@ -17,13 +17,10 @@ body{
       }
       .ant-form-item-label{
         line-height: 32px!important;
-        // line-height: 24px!important;  // 小号行距
         padding-right: 8px!important;
       }
       .ant-form-item-control{
         line-height: 31px!important;
-        // height: 24px!important;  // 小号行距
-        // line-height: 24px!important;  // 小号行距
       }
       .ant-form-item-control-wrapper{
         .ant-select-selection__rendered{
@@ -32,6 +29,14 @@ body{
       }
     }
   }
+  .form-model-con{  // a-form-model  有必选条件(因校验提示信息原因,因此边距需高于无必选条件边距)
+    .ant-form-item {
+      margin-bottom: 16px!important;
+      .ant-form-explain{
+        font-size: 12px;
+      }
+    }
+  }
   .table-page-search-submitButtons {
     margin-bottom: 10px;
   }

+ 6 - 9
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -204,15 +204,12 @@ export default {
 </script>
 <style lang="less">
   .companyCollectionPaymentList-wrap{
-    .sTable{
-      margin-top: 15px;
+    .active{
+      color: #ed1c24;
+      cursor: pointer;
+    }
+    .common{
+      color: rgba(0, 0, 0, 0.65);
     }
-	.active{
-		color: #ed1c24;
-		cursor: pointer;
-	}
-	.common{
-		color: rgba(0, 0, 0, 0.65);
-	}
   }
 </style>

+ 2 - 0
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
           id="satelliteWarehouseInventoryList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"

+ 2 - 0
src/views/reportData/chainReceivedSendStorageReport/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
           id="sendStorageReportList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"

+ 9 - 8
src/views/reportData/chainSalesDetailReport/list.vue

@@ -7,6 +7,8 @@
         <a-form-model
           id="chainSalesDetailReportList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"
@@ -14,12 +16,12 @@
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="连锁店" prop="dealerSn">
+              <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
                   placeholder="请选择连锁店"
-                  id="chainSalesDetailReportList-dealerSn"
+                  id="chainSalesDetailReportList-tenantId"
                   allowClear
-                  v-model="queryParam.dealerSn"
+                  v-model="queryParam.tenantId"
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
@@ -198,7 +200,7 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        dealerSn: undefined,
+        tenantId: undefined,
         time: [],
         beginDate: '',
         endDate: '',
@@ -223,7 +225,7 @@ export default {
         salesManName: ''
       },
       rules: {
-        'dealerSn': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
+        'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -306,7 +308,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.dealerSn = undefined
+      this.queryParam.tenantId = undefined
       this.$refs.rangeDate.resetDate()
       this.queryParam.time = []
       this.queryParam.beginDate = ''
@@ -388,11 +390,10 @@ export default {
     // 连锁店
     getLinkageGroup () {
       linkageGroupList({}).then(res => {
-        const all = [{ dealerName: '全部', dealerSn: 'all' }]
         if (res.status == 200) {
           const data = res.data || []
           if (data.length > 0) {
-            this.linkageGroupData = [...all, ...data]
+            this.linkageGroupData = data
           } else {
             this.linkageGroupData = []
           }

+ 9 - 8
src/views/reportData/chainSalesReport/list.vue

@@ -7,6 +7,8 @@
         <a-form-model
           id="chainSalesReportList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"
@@ -14,12 +16,12 @@
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="连锁店" prop="dealerSn">
+              <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
                   placeholder="请选择连锁店"
-                  id="chainSalesReportList-dealerSn"
+                  id="chainSalesReportList-tenantId"
                   allowClear
-                  v-model="queryParam.dealerSn"
+                  v-model="queryParam.tenantId"
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
@@ -144,7 +146,7 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        dealerSn: undefined,
+        tenantId: undefined,
         time: [],
         beginDate: '',
         endDate: '',
@@ -158,7 +160,7 @@ export default {
         salesManName: ''
       },
       rules: {
-        'dealerSn': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
+        'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -235,7 +237,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.dealerSn = undefined
+      this.queryParam.tenantId = undefined
       this.$refs.rangeDate.resetDate()
       this.queryParam.time = []
       this.queryParam.beginDate = ''
@@ -281,11 +283,10 @@ export default {
     // 连锁店
     getLinkageGroup () {
       linkageGroupList({}).then(res => {
-        const all = [{ dealerName: '全部', dealerSn: 'all' }]
         if (res.status == 200) {
           const data = res.data || []
           if (data.length > 0) {
-            this.linkageGroupData = [...all, ...data]
+            this.linkageGroupData = data
           } else {
             this.linkageGroupData = []
           }

+ 10 - 9
src/views/reportData/chainStockReport/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
           id="chainStockReportList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"
@@ -13,12 +15,12 @@
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="连锁店" prop="dealerSn">
+              <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
                   placeholder="请选择连锁店"
-                  id="chainStockReportList-dealerSn"
+                  id="chainStockReportList-tenantId"
                   allowClear
-                  v-model="queryParam.dealerSn"
+                  v-model="queryParam.tenantId"
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
@@ -134,7 +136,7 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        dealerSn: undefined,
+        tenantId: undefined,
         productCode: '', //  产品编码
         productName: '', //  产品名称
         productOrigCode: '', //  原厂编码
@@ -146,7 +148,7 @@ export default {
       labelCol: { span: 8 },
       wrapperCol: { span: 16 },
       rules: {
-        'dealerSn': [{ required: true, message: '请选择连锁店', trigger: 'change' }]
+        'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -164,7 +166,7 @@ export default {
         this.disabled = true
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
-        if (params.dealerSn) {
+        if (params.tenantId) {
           return reportStockList(params).then(res => {
             // 总计
             this.getCount(params)
@@ -229,7 +231,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.dealerSn = undefined
+      this.queryParam.tenantId = undefined
       this.queryParam.productCode = ''
       this.queryParam.productName = ''
       this.queryParam.productOrigCode = ''
@@ -288,11 +290,10 @@ export default {
     // 连锁店
     getLinkageGroup () {
       linkageGroupList({}).then(res => {
-        const all = [{ dealerName: '全部', dealerSn: 'all' }]
         if (res.status == 200) {
           const data = res.data || []
           if (data.length > 0) {
-            this.linkageGroupData = [...all, ...data]
+            this.linkageGroupData = data
           } else {
             this.linkageGroupData = []
           }

+ 5 - 3
src/views/reportData/customerReport/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
           id="customerReportList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"
@@ -36,21 +38,21 @@
                 <a-row>
                   <a-form-model-item label="客户所在区" :labelCol="{span: 4}" :wrapperCol="{ span: 20 }">
                     <a-col span="7">
-                      <a-form-model-item prop="provinceSn" style="margin: 0;">
+                      <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;">
+                      <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;">
+                      <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>

+ 2 - 0
src/views/reportData/receivedSendStorageReport/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
           id="receivedSendStorageReportList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"

+ 2 - 0
src/views/reportData/stockExpenditureReport/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
           id="stockExpenditureReportList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"

+ 2 - 0
src/views/reportData/stockIncomeReport/list.vue

@@ -6,6 +6,8 @@
         <a-form-model
           id="stockIncomeReportList-form"
           ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
           :model="queryParam"
           :rules="rules"
           :labelCol="labelCol"

+ 9 - 9
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -56,7 +56,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1340, y: tableHeight }"
+      :scroll="{ x: 1100, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="urgentBillNo" slot-scope="text, record">
@@ -88,15 +88,15 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: 220, align: 'center' },
-        { title: '销售单号', dataIndex: 'salesBillNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: 180, align: 'center' },
+        { title: '销售单号', dataIndex: 'salesBillNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'totalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'totalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '冲减时间', dataIndex: 'offSetTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'statusDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '总款数', dataIndex: 'totalCategory', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '冲减时间', dataIndex: 'offSetTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'statusDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {