浏览代码

开单退货单

chenrui 2 年之前
父节点
当前提交
97ab0040fb

+ 1 - 1
src/api/reportData.js

@@ -207,7 +207,7 @@ export const salesSlipExport = (params) => {
 // 开单退货单 导出
 export const returnSlipExport = (params) => {
   return axios({
-    url: 'report/salesReturnBillReport/returnBillExportExcel',
+    url: 'report/salesReturnBillReport/reportExport',
     data: params,
     method: 'post',
     responseType: 'blob'

+ 3 - 3
src/views/allocationManagement/transferOut/dsModal.vue

@@ -43,10 +43,10 @@
           </a-form-model-item>
           <a-form-model-item label="发货说明">
             <a-input
-              id="dealerAccountEdit-sendGoodsDesc"
+              id="dealerAccountEdit-explainInfo"
               type="textarea"
               :maxLength="630"
-              v-model.trim="form.sendGoodsDesc"
+              v-model.trim="form.explainInfo"
               placeholder="请输入发货说明"/>
           </a-form-model-item>
           <a-form-model-item label="备货打印" prop="printState">
@@ -102,7 +102,7 @@ export default {
         printState: '',
         receiverSn: '',
         receiverName: '',
-        sendGoodsDesc: ''
+        explainInfo: ''
       },
       rules: {
         sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],

+ 2 - 2
src/views/allocationManagement/transferOut/list.vue

@@ -258,8 +258,8 @@ export default {
         { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '6%' },
         { title: '调往对象', dataIndex: 'targetName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--'} },
-        { title: '发货说明', dataIndex: 'remarks', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货说明', dataIndex: 'explainInfo', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },