lilei 3 роки тому
батько
коміт
5c9dcad1cd

+ 1 - 1
src/api/allocateReturn.js

@@ -42,7 +42,7 @@ export const allocateReturnExcel = params => {
 // 打印
 export const allocateReturnPrint = params => {
   return axios({
-    url: `/allocateReturn/print/${params.allocateReturnSn}`,
+    url: `/allocateReturn/print/${params.allocateReturnSn}/${params.printType}`,
     method: 'get',
     responseType: 'blob'
   })

+ 1 - 1
src/views/allocationManagement/transferReturn/edit.vue

@@ -9,7 +9,7 @@
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
-          <print :params="{allocateReturnSn: $route.params.sn}" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
+          <print :params="{allocateReturnSn: $route.params.sn || outBizSn}" :basicInfoData="basicInfoData" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont">

+ 7 - 3
src/views/allocationManagement/transferReturn/printModal.vue

@@ -21,9 +21,9 @@
         <a-form-model-item label="调拨退货对象">{{ itemData&&itemData.targetName || '--' }}</a-form-model-item>
         <a-form-model-item label="产品价格" prop="priceType">
           <a-radio-group v-model="form.priceType">
-            <a-radio value="ALLOCATE_BILL_PRICE">退货价</a-radio>
-            <a-radio value="ALLOCATE_BILL_COST">成本价</a-radio>
-            <a-radio value="ALLOCATE_BILL">不打印</a-radio>
+            <a-radio value="thj">退货价</a-radio>
+            <a-radio value="cbj">成本价</a-radio>
+            <a-radio value="bdy">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
       </a-form-model>
@@ -74,6 +74,10 @@ export default {
     // 确认
     handleSave (type) {
       const _this = this
+      if (type == 0) {
+        _this.$emit('close')
+        return
+      }
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           // 确定