lilei 3 anni fa
parent
commit
37bae2497a

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1657595478136
+  "version": 1657598097048
 }

+ 12 - 1
src/api/sparePartsRet.js

@@ -46,7 +46,7 @@ export const sparePartsRetDetailCount = (params) => {
     method: 'post'
   })
 }
-//  散件退货  详情  产品(不抓单)  列表  分页
+//  采购退货  产品(不抓单)  列表  分页
 export const stockDetailProductList = (params) => {
   const url = `/stock/detail/findStockDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -57,6 +57,17 @@ export const stockDetailProductList = (params) => {
     method: 'post'
   })
 }
+// 散件退货  产品(不抓单)  列表  分页
+export const stockDetailForPurProductList = (params) => {
+  const url = `/stock/detail/findStockDetailPageForPur/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
 //  散件退货  详情  删除
 export const sparePartsRetDetailDel = (params) => {
   const url = `/sparePartsRet/detail/delete/${params.id}`

+ 1 - 1
src/config/router.config.js

@@ -1765,7 +1765,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'edit/:id/:sn',
+                path: 'edit/:id/:sn/:supplierSn',
                 name: 'bulkReturnGoodsEdit',
                 component: () => import(/* webpackChunkName: "bulkManagement" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
                 meta: {

+ 11 - 3
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -90,7 +90,14 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="link" class="button-primary" @click.stop="handleAdd(record)" id="bulkReturnGoodsEdit-add-btn">添加</a-button>
+            <a-button
+              size="small"
+              v-if="record.currentQty>0"
+              type="link"
+              class="button-primary"
+              @click.stop="handleAdd(record)"
+              id="bulkReturnGoodsEdit-add-btn">添加</a-button>
+            <span v-else>--</span>
           </template>
         </s-table>
       </a-card>
@@ -195,7 +202,7 @@ import { hdPrint } from '@/libs/JGPrint'
 import { warehouseAllList } from '@/api/warehouse'
 import {
   sparePartsRetDetailList,
-  stockDetailProductList,
+  stockDetailForPurProductList,
   sparePartsRetDetailSave,
   sparePartsRetDetailCount,
   sparePartsRetDetailDel,
@@ -231,11 +238,12 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return stockDetailProductList(Object.assign(parameter, this.queryParam)).then(res => {
+        return stockDetailForPurProductList(Object.assign(parameter, this.queryParam, { supplierSn: this.$route.params.supplierSn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
+            data.list[i].purchaseCost = data.list[i].dealerProduct.purchasePrice
           }
           this.dataSource = data.list
           this.disabled = false

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -282,7 +282,7 @@ export default {
       if (row.isGrab == 1) {
         this.$router.push({ name: 'bulkReturnGoodsGrabEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn } })
       } else {
-        this.$router.push({ name: 'bulkReturnGoodsEdit', params: { id: row.id, sn: row.sparePartsReturnSn } })
+        this.$router.push({ name: 'bulkReturnGoodsEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn } })
       }
     },
     //  详情

+ 1 - 1
vue.config.js

@@ -211,7 +211,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.102:8076/qpls-md',
+        target: 'http://192.168.0.102/qpls-md',
         // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,