lilei 1 anno fa
parent
commit
de20d2e6d4

+ 1 - 1
src/views/salesManagement/pushOrderManagement/exportExcelModal.vue

@@ -59,7 +59,7 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       form: {
         priceType: undefined,
-        origCode: undefined
+        origCode: '0'
       },
       rules: {
         priceType: [{ required: true, message: '请选择产品售价', trigger: 'change' }],

+ 2 - 2
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -107,7 +107,7 @@ export default {
       form: {
         id: 'all',
         orderBy: undefined,
-        origCode: undefined
+        origCode: '0'
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
@@ -158,7 +158,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.form.id = 'all'
       this.form.orderBy = undefined
-      this.form.origCode = undefined
+      this.form.origCode = '0'
     },
     // 获取该销售单产品二级分类
     getTypeData (dispatchBillSn) {

+ 1 - 0
src/views/salesReturnManagement/receiveCheck/chooseProductsModal.vue

@@ -14,6 +14,7 @@
           <!-- 查询配件列表 -->
           <queryPart
             ref="partQuery"
+            :showRemark="true"
             :showReceiveQty="true"
             :isShowPrice="isShowPrice"
             :returnReasonList="returnReasonList"

+ 15 - 5
src/views/salesReturnManagement/receiveCheck/list.vue

@@ -20,6 +20,16 @@
                 <dealerSubareaScopeList ref="dealerSubareaScopeList" id="receiveCheck-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"
+                  code="SALES_RETURN_BILL_STATUS"
+                  placeholder="请选择退货类别"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="业务状态">
                 <v-select
@@ -175,19 +185,19 @@ export default {
       const arr = [
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '10%', align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '退货仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总部销退单号', scopedSlots: { customRender: 'salesReturnBillNo' }, width: '8%', align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '退货类别', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '申请退货数量', dataIndex: 'totalInitialQty', 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: '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: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(4, 0, { title: '退货仓库', dataIndex: 'warehouseName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
+        arr.splice(5, 0, { title: '退货仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       return arr
     }

+ 17 - 10
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -28,7 +28,7 @@
             :loading="loading"
             @click="openGuideModal=true"
             style="margin-right:5px;"
-            >导入产品</a-button>
+          >导入产品</a-button>
           <a-button type="primary" :loading="loading" class="button-info" @click="openModal = true">新增产品</a-button>
           <a-button type="primary" :loading="loading" class="button-error" @click="handlePlss">批量实收</a-button>
           <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys&&rowSelectionInfo.selectedRowKeys.length">已选{{ rowSelectionInfo.selectedRowKeys.length }}项</span>
@@ -83,6 +83,12 @@
               @blur="e => onCellBlurReturnReason(e, record)"></returnReason>
             <span v-else>{{ record.returnReason }}</span>
           </template>
+          <!-- 备注 -->
+          <template slot="remarks" slot-scope="text, record">
+            <div @dblclick.stop>
+              <a-input :maxLength="50" size="small" v-model="record.remarks" placeholder="请输入备注(最多50字符)"/>
+            </div>
+          </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <div>
@@ -116,8 +122,8 @@
       :buyerSn="$route.params.buyerSn"
       @close="openModal=false"
       @addProduct="addProduct"></chooseProductsModal>
-      <!-- 导入产品 -->
-      <importGuideModal :params="{salesReturnBillSn: $route.params.sn}" :openModal="openGuideModal" @close="openGuideModal=false" @ok="importOk" />
+    <!-- 导入产品 -->
+    <importGuideModal :params="{salesReturnBillSn: $route.params.sn}" :openModal="openGuideModal" @close="openGuideModal=false" @ok="importOk" />
   </div>
 </template>
 
@@ -191,12 +197,13 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productEntity.code', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '申请退货数量', dataIndex: 'initialQty', align: 'center', width: '10%', scopedSlots: { customRender: 'initialQty' } },
-        { title: '仓库实收数量', dataIndex: 'receiveQty', align: 'center', width: '10%', scopedSlots: { customRender: 'receiveQty' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '申请退货数量', dataIndex: 'initialQty', align: 'center', width: '8%', scopedSlots: { customRender: 'initialQty' } },
+        { title: '仓库实收数量', dataIndex: 'receiveQty', align: 'center', width: '8%', scopedSlots: { customRender: 'receiveQty' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '退货单价', dataIndex: 'price', align: 'center', width: '10%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货原因', dataIndex: 'returnReason', width: '25%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
+        { title: '退货原因', dataIndex: 'returnReason', width: '19%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
+        { title: '备注', dataIndex: 'remarks', width: '19%', align: 'center', scopedSlots: { customRender: 'remarks' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       return arr
@@ -212,10 +219,10 @@ export default {
       this.$router.push({ name: 'receiveCheckList' })
     },
     // 确认导入明细
-    importOk(data){
+    importOk (data) {
       this.spinning = true
-      salesReturnDetailBatchByReceive({detailList:data, salesReturnBillSn: this.orderSn}).then(res => {
-        if(res.status == 200){
+      salesReturnDetailBatchByReceive({ detailList: data, salesReturnBillSn: this.orderSn }).then(res => {
+        if (res.status == 200) {
           this.resetSearchForm()
           this.$message.info(res.message)
         }

+ 18 - 5
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -67,6 +67,12 @@
           <returnReason v-model.trim="record.returnReason"></returnReason>
         </div>
       </template>
+      <!-- 备注 -->
+      <template slot="remarks" slot-scope="text, record">
+        <div @dblclick.stop>
+          <a-input :maxLength="50" size="small" v-model="record.remarks" placeholder="请输入备注(最多50字符)"/>
+        </div>
+      </template>
       <span slot="customTitle">
         操作
         <a-popover>
@@ -111,6 +117,10 @@ export default {
     showReceiveQty: {
       type: Boolean,
       default: false
+    },
+    showRemark: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -170,11 +180,11 @@ export default {
       // this.queryParam.warehouseSn = warehouseSn
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '产品编码', dataIndex: 'code', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'code', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', width: '23%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '申请退货数量', dataIndex: 'qty', width: '9%', align: 'center', scopedSlots: { customRender: 'qty' } },
-        { title: '退货原因', dataIndex: 'returnReason', width: '10%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
+        { title: '申请退货数量', dataIndex: 'qty', width: '8%', align: 'center', scopedSlots: { customRender: 'qty' } },
+        { title: '退货原因', dataIndex: 'returnReason', width: '12%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
         { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       let i = 5
@@ -184,7 +194,10 @@ export default {
       }
       // 实收数量是否显示
       if (this.showReceiveQty) {
-        arr.splice(i, 0, { title: '仓库实收数量', dataIndex: 'receiveQty', width: '9%', align: 'center', scopedSlots: { customRender: 'receiveQty' } })
+        arr.splice(i, 0, { title: '仓库实收数量', dataIndex: 'receiveQty', width: '8%', align: 'center', scopedSlots: { customRender: 'receiveQty' } })
+      }
+      if (this.showRemark) {
+        arr.splice(i + 2, 0, { title: '备注', dataIndex: 'remarks', width: '12%', align: 'center', scopedSlots: { customRender: 'remarks' } })
       }
       this.columns = arr
       this.resetSearchForm()