lilei 6 月之前
父節點
當前提交
d0c29c9f93

+ 4 - 0
src/components/newThem.less

@@ -31,6 +31,10 @@
 }
 .ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content thead.ve-table-header tr.ve-table-header-tr th.ve-table-header-th{
     font-weight: 900;
+    line-height: normal;
+}
+.ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content tbody.ve-table-body tr.ve-table-body-tr td.ve-table-body-td, .ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content tbody.ve-table-body tr.ve-table-expand-tr td.ve-table-body-td{
+  line-height: normal;
 }
 .ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content thead.ve-table-header .ve-table-header-tr .ve-table-header-th .ve-table-sort .ve-table-sort-icon.ve-table-sort-icon-top{
   font-size: 12px;

+ 7 - 7
src/views/salesReturnManagement/billOfLading/add.vue

@@ -137,11 +137,11 @@
               <a-form-model-item label="关联销退单" :label-col="{span:2}" :wrapper-col="{span:20}">
                 <a-button type="primary" class="button-primary" @click="openSelModal">选择销退单</a-button>
                 <div style="margin-top:10px;">
-                  <a-table
+                  <v-table
                     ref="salesReturnOrderTable"
                     :columns="columns"
-                    :scroll="{ y: 400 }"
-                    :pagination="false"
+                    :scroll="{ y: 300 }"
+                    :showPagination="false"
                     :data-source="chooseData"
                     bordered>
                     <!-- 编号 -->
@@ -163,7 +163,7 @@
                         删除
                       </a-button>
                     </template>
-                  </a-table>
+                  </v-table>
                 </div>
               </a-form-model-item>
             </a-col>
@@ -204,7 +204,7 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { STable, VSelect, SelectInput, Upload } from '@/components'
+import { VTable, VSelect, SelectInput, Upload } from '@/components'
 import { pickUpSave, pickUpSubmit, pickUpDetail, pickUpDetailQueryList } from '@/api/pickUp'
 import selectXtModal from './selectXtModal.vue'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
@@ -216,7 +216,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 export default {
   name: 'ProductInfoEdit',
   mixins: [commonMixin],
-  components: { VSelect, SelectInput, Upload, STable, employee, dealerSubareaScopeList, chooseDepartUserModal, selectXtModal, logisticsCompany, logisticsPoint, chooseWarehouse },
+  components: { VSelect, SelectInput, Upload, VTable, employee, dealerSubareaScopeList, chooseDepartUserModal, selectXtModal, logisticsCompany, logisticsPoint, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -259,7 +259,7 @@ export default {
       },
       chooseData: [],
       columns: [
-        { title: '序号', scopedSlots: { customRender: 'no' }, width: '8%', align: 'center' },
+        { title: '序号', scopedSlots: { customRender: 'no' }, width: '4%', align: 'center' },
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnNo' }, width: '15%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 16 - 3
src/views/salesReturnManagement/billOfLading/selectXtModal.vue

@@ -25,6 +25,17 @@
                   <dealerSubareaScopeList ref="dealerSubareaScopeList" id="billOfLadingEdit-buyerSn" @change="custChange" />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.billStatus"
+                    ref="billStatus"
+                    id="billOfLadingEdit-billStatus"
+                    code="SALES_RETURN_BILL_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
@@ -105,7 +116,8 @@ export default {
       handlePlData: [],
       queryParam: {
         salesReturnBillNo: '',
-        buyerSn: undefined
+        buyerSn: undefined,
+        billStatus: undefined
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -122,7 +134,7 @@ export default {
         this.disabled = true
         this.spinning = true
         this.queryParam.warehouseSn = this.warehouseSn
-        return salesReturnList(Object.assign(parameter, this.queryParam),1).then(res => {
+        return salesReturnList(Object.assign(parameter, this.queryParam), 1).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -177,7 +189,8 @@ export default {
     resetSearchForm () {
       this.queryParam = {
         salesReturnBillNo: '',
-        buyerSn: undefined
+        buyerSn: undefined,
+        billStatus: undefined
       }
       this.orginData = []
       this.$nextTick(() => {