소스 검색

Merge branch 'develop_yh23' of jianguan-web/qpls-md-html into pre-release

李磊 1 년 전
부모
커밋
4c9054d690
4개의 변경된 파일23개의 추가작업 그리고 11개의 파일을 삭제
  1. 1 1
      public/version.json
  2. 8 0
      src/api/purchase.js
  3. 12 10
      src/views/purchasingManagement/signWarehousing/edit.vue
  4. 2 0
      src/views/purchasingManagement/signWarehousing/list.vue

+ 1 - 1
public/version.json

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

+ 8 - 0
src/api/purchase.js

@@ -19,6 +19,14 @@ export const receivingQuery = (params) => {
     method: 'post'
   })
 }
+// 采购入库详情
+export const receivingFindBySn = (params) => {
+  return axios({
+    url: `/receiving/findBySn`,
+    data: params,
+    method: 'post'
+  })
+}
 // 采购入库详细列表
 export const receivingDetail = (params) => {
   return axios({

+ 12 - 10
src/views/purchasingManagement/signWarehousing/edit.vue

@@ -24,8 +24,8 @@
               </div>
               本次入库数量合计:<strong>{{ item && (item.totalRealPutQty || item.totalRealPutQty==0) ? item.totalRealPutQty : '--' }}</strong>
               <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">,
-              本次入库金额合计:<strong>{{ item && (item.totalRealPutAmount || item.totalRealPutAmount==0) ? toThousands(item.totalRealPutAmount, 2) : '--' }}</strong>
-            </div>
+                本次入库金额合计:<strong>{{ item && (item.totalRealPutAmount || item.totalRealPutAmount==0) ? toThousands(item.totalRealPutAmount, 2) : '--' }}</strong>
+              </div>
             </div>
           </div>
         </a-alert>
@@ -92,7 +92,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
-import { purchaseWriteStockIn, receivingQuery, receivingDetail } from '@/api/purchase'
+import { purchaseWriteStockIn, receivingFindBySn, receivingDetail } from '@/api/purchase'
 import { updateRealPutQty } from '@/api/receiving'
 import { purchaseUpdateWarehouse } from '@/api/purchaseDetail'
 import ProductType from '../../common/productType.js'
@@ -128,7 +128,9 @@ export default {
           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].realPutQty = data.list[i].realPutQty == undefined ? data.list[i].putQty : data.list[i].realPutQty
             data.list[i].shippedQty = data.list[i].realPutQty
+            data.list[i].realPutAmount = data.list[i].realPutAmount == undefined ? data.list[i].discountedAmount : data.list[i].realPutAmount
             const warehouseSn = data.list[i].warehouseSn || undefined
             const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
             if (warehouseSn || warehouseLocationSn) {
@@ -228,9 +230,9 @@ export default {
     //  详情
     getDetail () {
       this.spinning = true
-      receivingQuery({ receivingBillSn: this.$route.params.sn }).then(res => {
+      receivingFindBySn({ receivingBillSn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
-          this.detail = res.data
+          this.detail = [res.data]
         } else {
           this.detail = null
         }
@@ -274,17 +276,17 @@ export default {
       })
     },
     // 修改入库数量
-    changePutQty(record, bindex){
-      if(record.realPutQty == record.shippedQty){
+    changePutQty (record, bindex) {
+      if (record.realPutQty == record.shippedQty) {
         return
       }
       this.spinning = true
-      updateRealPutQty({id:record.id,realPutQty:record.realPutQty}).then(res => {
-        if(res.status == 200){
+      updateRealPutQty({ id: record.id, realPutQty: record.realPutQty }).then(res => {
+        if (res.status == 200) {
           this.$message.success(res.message)
           this.getDetail()
           this.$refs['table-' + bindex][0].refresh()
-        }else{
+        } else {
           record.realPutQty = record.shippedQty
         }
         this.spinning = false

+ 2 - 0
src/views/purchasingManagement/signWarehousing/list.vue

@@ -128,6 +128,8 @@ export default {
           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].totalRealPutQty = data.list[i].auditState == 'WAIT_PUT_WAREHOUSE' ? undefined : data.list[i].totalRealPutQty
+            data.list[i].totalRealPutAmount = data.list[i].auditState == 'WAIT_PUT_WAREHOUSE' ? undefined : data.list[i].totalRealPutAmount
           }
           this.disabled = false
           this.spinning = false