소스 검색

bug 修复

lilei 2 년 전
부모
커밋
782160c224
2개의 변경된 파일30개의 추가작업 그리고 36개의 파일을 삭제
  1. 1 1
      src/views/reportData/actualSalesReport/list.vue
  2. 29 35
      src/views/salesReturnManagement/receiveCheck/list.vue

+ 1 - 1
src/views/reportData/actualSalesReport/list.vue

@@ -215,7 +215,7 @@ export default {
       const arr = [
         { title: '区域', dataIndex: 'dealer.subareaNameSet', width: 120, align: 'center', customRender: function (text) { return (text && text.length > 0) ? text.join('/') : '--' } },
         { title: '省份', dataIndex: 'dealer.provinceName', width: 90, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealer.dealerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealer.dealerName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户级别', dataIndex: 'dealer.dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌',
           align: 'center',

+ 29 - 35
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -10,17 +10,17 @@
                 <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="总部销退单号">
                 <a-input id="receiveCheck-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="客户名称">
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-buyerSn" @change="custChange" />
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
+            <a-col :md="4" :sm="24">
               <a-form-item label="业务状态">
                 <v-select
                   v-model="queryParam.billStatus"
@@ -29,15 +29,12 @@
                   code="SALES_RETURN_BILL_STATUS"
                   placeholder="请选择业务状态"
                   allowClear></v-select>
-              </a-form-item></template>
+              </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>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
               </span>
             </a-col>
           </a-row>
@@ -64,19 +61,22 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-info"
-            @click="handleReceiving(record)"
-            id="receiveCheck-detail-btn">收货</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
-            @click="handleCheck(record)"
-            id="salesReturn-eexamine-btn">品检</a-button>
+          <div>
+            <a-button
+              size="small"
+              type="link"
+              class="button-info"
+              v-if="record.billStatus == 'WAIT_RECEIVE'"
+              @click="handleReceiving(record)"
+              id="receiveCheck-detail-btn">收货</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              v-if="record.billStatus == 'WAIT_CHECK'"
+              @click="handleCheck(record)"
+              id="salesReturn-eexamine-btn">品检</a-button>
+          </div>
         </template>
       </s-table>
     </a-spin>
@@ -91,7 +91,7 @@ import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { salesReturnList } from '@/api/salesReturn'
 export default {
-  name: 'BillOfLadingList',
+  name: 'ReceiveCheckList',
   mixins: [commonMixin],
   components: {
     STable,
@@ -114,16 +114,15 @@ export default {
         endAuditDate: '',
         buyerSn: undefined, //  客户名称
         salesReturnBillNo: undefined, //  总部销退单号
-        purchaseReturnBillNo: '',
-        billStatus: undefined, // 业务状态
-        shippingAddrProvinceSn: undefined,
-        salesReturnBillSource: undefined
+        billStatus: undefined // 业务状态
       },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return salesReturnList(Object.assign(parameter, this.queryParam)).then(res => {
+        return salesReturnList(Object.assign(parameter, this.queryParam, {
+          'excludeBillStatusList': ['WAIT_SUBMIT', 'WAIT_AUDIT', 'AUDIT_REJECT', 'CANCEL']
+        })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -150,9 +149,9 @@ export default {
         { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库实收数量', dataIndex: 'totalBadQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库实收数量', dataIndex: 'totalReceiveQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '良品数量', dataIndex: 'totalBackStockQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '良品数量', dataIndex: 'totalGoodQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
@@ -183,17 +182,12 @@ export default {
     },
     resetSearchForm () {
       this.$refs.rangeExamineDate.resetDate()
-      if (this.advanced) {
-        this.$refs.dealerSubareaScopeList.resetForm()
-      }
+      this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.beginAuditDate = ''
       this.queryParam.endAuditDate = ''
       this.queryParam.buyerSn = undefined
       this.queryParam.salesReturnBillNo = ''
-      this.queryParam.purchaseReturnBillNo = ''
       this.queryParam.billStatus = undefined
-      this.queryParam.salesReturnBillSource = undefined
-      this.queryParam.shippingAddrProvinceSn = undefined
       this.$refs.table.refresh(true)
     },
     pageInit () {