zhangyuewww 2 年之前
父節點
當前提交
5414006b7f

+ 2 - 0
src/api/V2/houseSelfCollect/index.js

@@ -124,4 +124,6 @@ export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
 export const API_GET_BASEID ='/qualityInspectionManagement/selectBaseId'
 export const API_GET_BASEID ='/qualityInspectionManagement/selectBaseId'
 // 换任务号
 // 换任务号
 export const API_POST_TASK_NO = `/weighingManagement/api/changeTaskNo`
 export const API_POST_TASK_NO = `/weighingManagement/api/changeTaskNo`
+// 丹东港生成入库单
+export const API_POST_DANDONG_ORDER = `/paymentManagement/api/generateOrder`
 
 

+ 3 - 0
src/model/houseSelfCollect/index.js

@@ -61,6 +61,7 @@ import {
   API_POST_SUBMIT,
   API_POST_SUBMIT,
   API_POST_CHANE_NO,
   API_POST_CHANE_NO,
   API_POST_TASK_NO,
   API_POST_TASK_NO,
+  API_POST_DANDONG_ORDER,
   API_POST_DELETE,
   API_POST_DELETE,
   API_GET_CONTRACT,
   API_GET_CONTRACT,
   API_SPONSOR_WITHDRAW,
   API_SPONSOR_WITHDRAW,
@@ -194,3 +195,5 @@ export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, er
 export const getBaseId = appRx.get(API_GET_BASEID, errorCatcher, errorHandle, filter)
 export const getBaseId = appRx.get(API_GET_BASEID, errorCatcher, errorHandle, filter)
 // 换任务号
 // 换任务号
 export const changeTaskNo = appRx.post(API_POST_TASK_NO, errorCatcher, errorHandle, filter)
 export const changeTaskNo = appRx.post(API_POST_TASK_NO, errorCatcher, errorHandle, filter)
+// 丹东港生成入库单
+export const dandongOrder = appRx.post(API_POST_DANDONG_ORDER, errorCatcher, errorHandle, filter)

+ 29 - 7
src/views/houseSelfCollect/paymentManagement.vue

@@ -74,6 +74,13 @@
           v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
           v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
         <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出
         <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出
         </ws-button>
         </ws-button>
+         <ws-button type="primary" v-show='warehouseName=="丹东港"' @click="generateClick()">生成入库单</ws-button>
+          <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
+          :on-change="importClick" :show-file-list="false"
+          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+          :auto-upload="false">
+          <ws-button type="primary">导入</ws-button>
+        </el-upload>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <!-- <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款 -->
         <!-- <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款 -->
         <!-- </ws-button> -->
         <!-- </ws-button> -->
@@ -93,18 +100,13 @@
         <!-- <el-upload :on-change="importClick" action="" :show-file-list="false" accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" :auto-upload="false"
         <!-- <el-upload :on-change="importClick" action="" :show-file-list="false" accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" :auto-upload="false"
           v-hasPermission="`acquisitionManagement.acquisitionPay.dow`"><el-button type="primary">导入</el-button>
           v-hasPermission="`acquisitionManagement.acquisitionPay.dow`"><el-button type="primary">导入</el-button>
         </el-upload> -->
         </el-upload> -->
-        <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
-          :on-change="importClick" :show-file-list="false"
-          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          :auto-upload="false">
-          <ws-button type="primary">导入</ws-button>
-        </el-upload>
         <el-link
         <el-link
           href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E6%94%B6%E8%B4%AD%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF%EF%BC%88%E6%96%B0%EF%BC%89.xlsx"
           href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E6%94%B6%E8%B4%AD%E4%BF%A1%E6%81%AF%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF%EF%BC%88%E6%96%B0%EF%BC%89.xlsx"
           style="margin-left: 8px"
           style="margin-left: 8px"
         >
         >
           <el-button type="primary">模板下载</el-button>
           <el-button type="primary">模板下载</el-button>
         </el-link>
         </el-link>
+       
       </template>
       </template>
       <template slot="right"></template>
       <template slot="right"></template>
     </BaseHeaderLayout>
     </BaseHeaderLayout>
@@ -386,7 +388,7 @@
     getpaymentexamine,
     getpaymentexamine,
     getCustomerLook,
     getCustomerLook,
     paymentCommit,
     paymentCommit,
-    getJurisdiction,
+    dandongOrder,
     invoicing,
     invoicing,
     export1,
     export1,
     settlementEdit,
     settlementEdit,
@@ -745,6 +747,26 @@
         this.printType = 1
         this.printType = 1
         this.isShowPrintType = true
         this.isShowPrintType = true
       },
       },
+      generateClick() {
+          this.$confirm(`确定生成入库单?`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+              dandongOrder({}).toPromise()
+						.then((response) => {
+              this.$notify.success({
+                  title: '成功',
+                  message: '生成入库单成功',
+                })
+                this.getList()
+						})
+          })
+          .catch(() => {
+            return false
+          })
+      },
       agreementPrint() {
       agreementPrint() {
         var arr = []
         var arr = []
         for (let i = 0; i < this.modification.length; i++) {
         for (let i = 0; i < this.modification.length; i++) {