chenrui vor 3 Jahren
Ursprung
Commit
e4dc0a8b14

+ 22 - 0
src/api/receiving.js

@@ -74,3 +74,25 @@ export const receivingExport = params => {
     responseType: 'blob'
   })
 }
+//  签收入库 列表  有分页
+export const receivingStockList = (params) => {
+  const url = `/receiving/queryStockInPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  入库审核 列表  有分页
+export const receivingAuditList = (params) => {
+  const url = `/receiving/queryStockInAuditPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 3 - 3
src/views/financialManagement/warehousingAudit/list.vue

@@ -27,7 +27,7 @@
                     v-model="queryParam.auditState"
                     ref="auditState"
                     id="warehousingAuditList-auditState"
-                    code="RECEIVING_BILL_STATUS"
+                    code="RECEIVING_BILL_AUDIT_STATUS"
                     placeholder="请选择入库审核状态"
                     allowClear></v-select>
                 </a-form-item>
@@ -98,7 +98,7 @@ import moment from 'moment'
 import getDate from '@/libs/getDate'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { receivingList, receivingStockInAudit, receivingCount } from '@/api/receiving'
+import { receivingAuditList, receivingStockInAudit, receivingCount } from '@/api/receiving'
 export default {
   components: { STable, VSelect, rangeDate },
   data () {
@@ -137,7 +137,7 @@ export default {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
-        return receivingList(params).then(res => {
+        return receivingAuditList(params).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {

+ 1 - 1
src/views/purchasingManagement/signWarehousing/edit.vue

@@ -190,7 +190,7 @@ export default {
     //  详情
     getDetail () {
       this.spinning = true
-      receivingQuery({ purchaseBillSn: this.$route.params.sn }).then(res => {
+      receivingQuery({ receivingBillSn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detail = res.data
         } else {

+ 5 - 5
src/views/purchasingManagement/signWarehousing/list.vue

@@ -73,10 +73,10 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.auditState == 'WAIT_PUT_WAREHOUSE'&&$hasPermissions('B_purchaseReceiving')"
+            v-if="(record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_purchaseReceiving')"
             @click="handleWarehouse(record)"
           >签收入库</a-button>
-          <span v-if="!(record.auditState == 'WAIT_PUT_WAREHOUSE'&&$hasPermissions('B_purchaseReceiving'))">--</span>
+          <span v-if="!((record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_purchaseReceiving'))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -87,7 +87,7 @@
 import { STable, VSelect } from '@/components'
 import rangeDateTime from '@/views/common/rangeDateTime.vue'
 import getDate from '@/libs/getDate.js'
-import { receivingList } from '@/api/receiving'
+import { receivingStockList } from '@/api/receiving'
 export default {
   components: { STable, VSelect, rangeDateTime },
   data () {
@@ -121,7 +121,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return receivingList(Object.assign(parameter, this.queryParam)).then(res => {
+        return receivingStockList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -161,7 +161,7 @@ export default {
     },
     //  签收入库
     handleWarehouse (row) {
-      this.$router.push({ path: `/purchasingManagement/signWarehousing/edit/${row.purchaseBillSn}` })
+      this.$router.push({ path: `/purchasingManagement/signWarehousing/edit/${row.receivingBillSn}` })
     },
     pageInit () {
       const _this = this

+ 1 - 2
src/views/purchasingManagement/signWarehousing/stockOrderDetail.vue

@@ -15,9 +15,8 @@
           <!-- <Print v-if="$hasPermissions('B_purchasePrint')" :disabled="localDataSource.length==0" @handlePrint="handlePrint"></Print> -->
           <a-button
             key="1"
-            v-if="$hasPermissions('B_purchaseExportProduct') && (detail&&(detail.billStatus=='WAIT_PUT_WAREHOUSE' || detail.billStatus=='WAIT_PUT_WAREHOUSE_AUDIT' || detail.billStatus=='FINISH'))"
             type="primary"
-            class="button-info"
+            class="button-warning"
             id="signWarehousingDetail-export-btn"
             :disabled="localDataSource.length==0"
             @click="handleExportProduct()">导出Excel</a-button>