linwenxin 9 mesi fa
parent
commit
dd8ddb91fa

+ 8 - 0
src/api/GoodsTransferPeceipt.js

@@ -107,3 +107,11 @@ export function goodsMoveQueryExistStorageGoods(params) {
     params
   })
 }
+
+export function goodsMoveQueryExistStorageGoodsNum(params) {
+  return request({
+    url: `/goods/move/query/exist/storage/goods/num`,
+    method: 'post',
+    params
+  })
+}

+ 25 - 10
src/views/auxiliaryFittings/AuxiliaryAccessoriesWarehouse/index.vue

@@ -335,6 +335,9 @@ export default {
         },
         examine: {
           btnType: 'text',
+          conditions: ({ row, index, column }) => {
+            return row.status !== 'OK'
+          },
           click: ({ row, index, column }) => {
             this.openForm('examine', row.id)
           }
@@ -416,19 +419,31 @@ export default {
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          websitGoodsMoveAdd({ ...this.formData }).then(res => {
-            websitGoodsMoveSubmit({ id: this.formData.id }).then(res => {
-              websitGoodsMoveConfirm({ id: this.formData.id, statusEnum: 'OK' }).then(res => {
-                this.$message({
-                  type: 'success',
-                  message: `审核成功!`
+          if (this.formData.status == 'WAIT') {
+            websitGoodsMoveConfirm({ id: this.formData.id, statusEnum: 'OK' }).then(res => {
+              this.$message({
+                type: 'success',
+                message: `审核成功!`
+              })
+              cancel('list')
+              this.$refs.pageRef.refreshList()
+              // 备注
+            })
+          } else {
+            websitGoodsMoveAdd({ ...this.formData }).then(res => {
+              websitGoodsMoveSubmit({ id: this.formData.id }).then(res => {
+                websitGoodsMoveConfirm({ id: this.formData.id, statusEnum: 'OK' }).then(res => {
+                  this.$message({
+                    type: 'success',
+                    message: `审核成功!`
+                  })
+                  cancel('list')
+                  this.$refs.pageRef.refreshList()
+                  // 备注
                 })
-                cancel('list')
-                this.$refs.pageRef.refreshList()
-                // 备注
               })
             })
-          })
+          }
         }
       })
     }

+ 3 - 2
src/views/auxiliaryFittings/GoodsTransferPeceipt/index.vue

@@ -67,7 +67,8 @@ import {
   goodsMoveItemDelCode,
   goodsMoveQueryExistStorageBrand,
   goodsMoveQueryExistStorageCategory,
-  goodsMoveQueryExistStorageGoods
+  goodsMoveQueryExistStorageGoods,
+  goodsMoveQueryExistStorageGoodsNum
 } from '@/api/GoodsTransferPeceipt'
 import ImageUpload from '@/components/file-upload'
 import operation_mixin from '@/components/template/operation_mixin.js'
@@ -241,7 +242,7 @@ export default {
           }
         },
         {
-          md: 6,
+          md: 12,
           isShow: true,
           name: 'slot-component',
           attributes: { placeholder: '' },

+ 19 - 4
src/views/auxiliaryFittings/GoodsTransferPeceipt/storage_goods.js

@@ -4,6 +4,7 @@ import { getClassifyList } from '@/api/goods'
 import { goodsMaterialList } from '@/api/commercialMaterial.js'
 import { goodsPurchaseItemImportCode, goodsPurchaseDetail } from '@/api/goodsPurchasedStored.js'
 import { goodsMaterialDetail } from '@/api/commercialMaterial.js'
+import { goodsMoveQueryExistStorageGoodsNum } from '@/api/GoodsTransferPeceipt'
 export default {
   data() {
     return {
@@ -172,6 +173,14 @@ export default {
                     onChange={val => {
                       this.shanchujichu(row, 3)
                       if (val) {
+                        goodsMoveQueryExistStorageGoodsNum({
+                          goodsId: val,
+                          inStorageId: this.formData.inStorageId,
+                          outStorageId: this.formData.inStorageId
+                        }).then(res => {
+                          row.inStorageQty = res.data.goodsInNum || 0
+                          row.outStorageQty = res.data.goodsOutNum || 0
+                        })
                         var data = this.goodsMaterialList
                           .filter(
                             item =>
@@ -207,6 +216,8 @@ export default {
                         row['insideQty'] = ''
                         row['outQty'] = ''
                         row['partsQty'] = ''
+                        row.inStorageQty = ''
+                        row.outStorageQty = ''
                       }
                     }}
                     filterable={true}
@@ -319,13 +330,13 @@ export default {
         {
           columnAttributes: {
             label: '配件数量',
-            prop: 'partsQty'
+            prop: 'inStorageQty'
           }
         },
         {
           columnAttributes: {
             label: '调出库存数量',
-            prop: 'qty'
+            prop: 'outStorageQty'
           }
         },
         {
@@ -506,7 +517,9 @@ export default {
               qty: '',
               insideQty: '',
               outQty: '',
-              partsQty: ''
+              partsQty: '',
+              inStorageQty: '',
+              outStorageQty: ''
             })
             this.isEditIndex = 0
           }
@@ -526,7 +539,9 @@ export default {
           qty: '',
           insideQty: '',
           outQty: '',
-          partsQty: ''
+          partsQty: '',
+          inStorageQty: '',
+          outStorageQty: ''
         })
         this.isEditIndex = 0
       }