lilei 2 tahun lalu
induk
melakukan
49249dbcc8

+ 4 - 3
src/api/salesReturn.js

@@ -63,8 +63,9 @@ export const salesReturnPay = (params) => {
 //  销售退货 打印预览
 export const salesReturnPrint = (params) => {
   return axios.request({
-    url: `/salesReturn/print/${params.sn}/${params.priceType}`,
-    method: 'get',
+    url: `/salesReturn/print/${params.priceType}`,
+    data: params,
+    method: 'post',
     responseType: 'blob'
   })
 }
@@ -72,7 +73,7 @@ export const salesReturnPrint = (params) => {
 //  销售退货 导出
 export const salesReturnExport = (params) => {
   return axios.request({
-    url: `/salesReturn/export/${params.sn}/${params.priceType}`,
+    url: `/salesReturn/export/${params.salesReturnBillSn}/${params.priceType}`,
     method: 'get',
     responseType: 'blob'
   })

+ 1 - 1
src/views/salesReturnManagement/salesReturn/detail.vue

@@ -246,7 +246,7 @@ export default {
     // 确定打印或预览
     handleOk (objs) {
       const _this = this
-      const params = { sn: this.$route.params.sn, priceType: objs.priceType }
+      const params = { salesReturnBillSn: this.$route.params.sn, ...objs }
       _this.spinning = true
       // 导出
       if (this.nowType == 'export') {

+ 25 - 5
src/views/salesReturnManagement/salesReturn/printModal.vue

@@ -19,10 +19,23 @@
       >
         <a-form-model-item label="销售退货单号">{{ itemData&&itemData.salesReturnBillNo || '--' }}</a-form-model-item>
         <a-form-model-item label="销售退货对象">{{ itemData&&itemData.buyerName || '--' }}</a-form-model-item>
-        <a-form-model-item label="退货价格" prop="priceType">
+        <a-form-model-item label="退货价格" prop="priceType" v-if="nowType=='export'">
           <a-radio-group v-model="form.priceType">
-            <a-radio value="SALES_RETURN_AMOUNT">{{ nowType=='export' ? '导出' : '打印' }}</a-radio>
-            <a-radio value="SALES_RETURN">不{{ nowType=='export' ? '导出' : '打印' }}</a-radio>
+            <a-radio value="SALES_RETURN_AMOUNT">导出</a-radio>
+            <a-radio value="SALES_RETURN">不导出</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
+        <a-form-model-item label="退货价格" prop="priceType" v-if="nowType!='export'">
+          <a-radio-group v-model="form.priceType">
+            <a-radio value="SALES_RETURN_AMOUNT">打印</a-radio>
+            <a-radio value="SALES_RETURN">不打印</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
+        <a-form-model-item label="货架编号" prop="orderBy" v-if="nowType!='export'">
+          <a-radio-group v-model="form.orderBy">
+            <a-radio value="ASC">打印(↑升序)</a-radio>
+            <a-radio value="DESC">打印(↓降序)</a-radio>
+            <a-radio value="-1">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
       </a-form-model>
@@ -56,10 +69,12 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       form: {
-        priceType: undefined
+        priceType: undefined,
+        orderBy: undefined
       },
       rules: {
-        priceType: [{ required: true, message: '请选择退货价格', trigger: 'change' }]
+        priceType: [{ required: true, message: '请选择退货价格', trigger: 'change' }],
+        orderBy: [{ required: true, message: '请选择货架编号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -83,6 +98,11 @@ export default {
           const obj = {
             priceType: _this.form.priceType
           }
+          // 打印货位编号
+          if (_this.form.orderBy != '-1' && this.nowType != 'export') {
+            obj.orderBy = _this.form.orderBy
+            obj.priceType = obj.priceType + '_STACK_PLACE'
+          }
           _this.$emit('ok', obj)
           _this.isShow = false
         } else {