Browse Source

Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

caojunjie 3 years ago
parent
commit
a39e838a9c

+ 8 - 1
src/api/basicData/configuration.js

@@ -198,4 +198,11 @@ export function repealCancel(data) {
       method: 'post',
       data: data
     })
-  }
+  }
+  export function warehouseList(data) {
+    return request({
+        url: '/api/blade-client/storagedesc/list',
+        method: 'get',
+        params: data
+    })
+}

+ 7 - 0
src/api/basicData/purchaseOrder.js

@@ -151,3 +151,10 @@ export function getGNMarketDetailsList(current,size,params) {
     }
   })
 }
+export function genfactory(data) {
+    return request({
+        url: '/api/blade-deliver-goods/reCeVing/submit',
+        method: 'post',
+        data: data
+    })
+}

+ 131 - 145
src/views/businessManagement/purchaseOrder/index.vue

@@ -1,130 +1,73 @@
 <template>
   <div>
     <basic-container v-show="isShow">
-      <avue-crud :option="option"
-                 :data="dataList"
-                 ref="crud"
-                 v-model="form"
-                 :page.sync="page"
-                 :search.sync="search"
-                 :table-loading="loading"
-                 @row-del="rowDel"
-                 :before-open="beforeOpen"
-                 :before-close="beforeClose"
-                 @search-change="searchChange"
-                 @search-reset="searchReset"
-                 @selection-change="selectionChange"
-                 @current-change="currentChange"
-                 @size-change="sizeChange"
-                 @refresh-change="refreshChange"
-                 @on-load="onLoad"
-                 @tree-load="treeLoad"
-                 @saveColumn="saveColumn"
-                 @resetColumn="resetColumn"
-                 @search-criteria-switch="searchCriteriaSwitch"
-                 :cell-style="cellStyle">
+      <avue-crud :option="option" :data="dataList" ref="crud" v-model="form" :page.sync="page" :search.sync="search"
+        :table-loading="loading" @row-del="rowDel" :before-open="beforeOpen" :before-close="beforeClose"
+        @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+        @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
+        @tree-load="treeLoad" @saveColumn="saveColumn" @resetColumn="resetColumn"
+        @search-criteria-switch="searchCriteriaSwitch" :cell-style="cellStyle">
         <template slot="menuLeft" slot-scope="{size}">
-          <el-button type="success" :size="size" icon="el-icon-copy-document" @click="copyOrder" :disabled="single">复制单据</el-button>
+          <el-button type="success" :size="size" icon="el-icon-copy-document" @click="copyOrder" :disabled="single">复制单据
+          </el-button>
           <el-button type="info" :size="size" icon="el-icon-printer">报表打印</el-button>
-          <el-button type="warning" :size="size" icon="el-icon-thumb" :disabled="multiple" @click="applyPayment">申请货款</el-button>
+          <el-button type="warning" :size="size" icon="el-icon-thumb" :disabled="multiple" @click="applyPayment">申请货款
+          </el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orgOrderNo }}</span>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
+              scope.row.orgOrderNo
+          }}</span>
         </template>
         <template slot="corpIdSearch">
-          <crop-select
-            v-model="search.corpId"
-            corpType="GYS"
-          ></crop-select>
+          <crop-select v-model="search.corpId" corpType="GYS"></crop-select>
         </template>
         <template slot-scope="scope" slot="corpId">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.strCorpName }}</span>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
+              scope.row.strCorpName
+          }}</span>
         </template>
         <template slot-scope="scope" slot="orderNo">
-          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
+              scope.row.orderNo
+          }}</span>
         </template>
         <template slot-scope="scope" slot="createUser">
           {{ scope.row.createUserName }}
         </template>
         <template slot-scope="scope" slot="createFreight">
-          {{ scope.row.createFreight == 1? '是': '否' }}
+          {{ scope.row.createFreight == 1 ? '是' : '否' }}
         </template>
         <template slot-scope="scope" slot="menu">
-          <el-button
-            type="text"
-            icon="el-icon-delete"
-            size="small"
-            @click.stop="createPlant(scope.row,scope.index)"
-            :disabled="scope.row.status > 0 || scope.row.createFreight == 1"
-          >生成工厂发货
+          <el-button type="text" icon="el-icon-delete" size="small" @click.stop="createPlant(scope.row, scope.index)"
+            :disabled="scope.row.status > 0 || scope.row.createFreight == 1">生成工厂发货
           </el-button>
-<!--          <el-button-->
-<!--            type="text"-->
-<!--            icon="el-icon-edit"-->
-<!--            size="small"-->
-<!--            @click.stop="editOpen(scope.row,scope.index)"-->
-<!--          >编辑-->
-<!--          </el-button>-->
-          <el-button
-            type="text"
-            icon="el-icon-delete"
-            size="small"
-            @click.stop="rowDel(scope.row,scope.index)"
-            :disabled="(scope.row.itemsList && scope.row.itemsList.length == 0) || scope.row.createFreight == 1"
-          >删除
+          <!--          <el-button-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            size="small"-->
+          <!--            @click.stop="editOpen(scope.row,scope.index)"-->
+          <!--          >编辑-->
+          <!--          </el-button>-->
+          <el-button type="text" icon="el-icon-delete" size="small" @click.stop="rowDel(scope.row, scope.index)"
+            :disabled="(scope.row.itemsList && scope.row.itemsList.length == 0) || scope.row.createFreight == 1">删除
           </el-button>
         </template>
       </avue-crud>
     </basic-container>
 
-    <detail-page
-      ref="detail"
-      @goBack="goBack"
-      :detailData="detailData"
-      v-if="!isShow"
-    ></detail-page>
+    <detail-page ref="detail" @goBack="goBack" :detailData="detailData" v-if="!isShow"></detail-page>
 
-    <el-dialog
-      title="账单"
-      append-to-body
-      class="el-dialogDeep"
-      :visible.sync="applyPaymentDialog"
-      width="60%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      v-dialog-drag
-    >
-      <apply-payment
-        v-if="applyPaymentDialog"
-        :billType="billType"
-        :billData="billData"
-        :arrList="applyPaymentList"
-        @choceFun="choceFun"
-      >
+    <el-dialog title="账单" append-to-body class="el-dialogDeep" :visible.sync="applyPaymentDialog" width="60%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+      <apply-payment v-if="applyPaymentDialog" :billType="billType" :billData="billData" :arrList="applyPaymentList"
+        @choceFun="choceFun">
       </apply-payment>
     </el-dialog>
-    <el-dialog
-      append-to-body
-      title="账单"
-      class="el-dialogDeep"
-      :visible.sync="financialAccountDialog"
-      width="70%"
-      :close-on-click-modal="false"
-      :destroy-on-close="true"
-      :close-on-press-escape="false"
-      v-dialog-drag
-    >
-      <financial-account
-        v-if="financialAccountDialog"
-        :billType="billType"
-        :billData="billData"
-        :checkData="financeData"
-        :arrList="applyPaymentList"
-        @choceFun="choceFun"
-        tradeType="GN"
-        @submit="feeSubmit"
-      >
+    <el-dialog append-to-body title="账单" class="el-dialogDeep" :visible.sync="financialAccountDialog" width="70%"
+      :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+      <financial-account v-if="financialAccountDialog" :billType="billType" :billData="billData"
+        :checkData="financeData" :arrList="applyPaymentList" @choceFun="choceFun" tradeType="GN" @submit="feeSubmit">
       </financial-account>
     </el-dialog>
   </div>
@@ -132,14 +75,14 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import {customerList, deleteDetails, generateShipment} from "@/api/basicData/purchaseOrder"
+import { customerList, deleteDetails, generateShipment, genfactory } from "@/api/basicData/purchaseOrder"
 import detailPage from "./detailsPageEdit";
 import { defaultDate } from "@/util/date";
 import ApplyPayment from "@/components/finance/applyPayment";
 import financialAccount from "../../../components/finance/financialAccount";
 import { gainUser } from "@/api/basicData/customerInquiry";
 import { customerList as feeList } from "@/api/basicData/basicFeesDesc";
-
+import { getCurrentDate } from "@/util/date";
 export default {
   name: "customerInformation",
   props: {
@@ -172,7 +115,7 @@ export default {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10,50,100,200,300]
+        pageSizes: [10, 50, 100, 200, 300]
       },
       // 非单个禁用
       single: true,
@@ -181,16 +124,16 @@ export default {
       selection: [],
       isShow: true,
       detailData: {},
-      billType:"申请",  //账单类型
-      billData:{},     //账单需要数据
+      billType: "申请",  //账单类型
+      billData: {},     //账单需要数据
       financeData: {
-        url:"/financialManagement/paymentRequest/index",
-        pageStatus:"this.$store.getters.pqStatus",
-        pageLabel:"付费申请",
+        url: "/financialManagement/paymentRequest/index",
+        pageStatus: "this.$store.getters.pqStatus",
+        pageLabel: "付费申请",
         checkType: 'ffsq'
       }, // 账单请核需要的路由
-      applyPaymentDialog:false,//生成账单组件
-      financialAccountDialog:false,
+      applyPaymentDialog: false,//生成账单组件
+      financialAccountDialog: false,
       applyPaymentList: [],
       feesOption: [],
     }
@@ -213,7 +156,7 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 3 !== 0){
+    if (i % 3 !== 0) {
       const num = 3 - Number(i % 3)
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
@@ -262,17 +205,17 @@ export default {
       this.$store.commit("DOMCG_IN_DETAIL");
     }
     if (this.$route.query.params) {
-      this.beforeOpenPage({id: this.$route.query.params})
+      this.beforeOpenPage({ id: this.$route.query.params })
     }
   },
   methods: {
     cellStyle() {
       return "padding:0;height:40px;";
     },
-    searchCriteriaSwitch(type){
-      if (type){
+    searchCriteriaSwitch(type) {
+      if (type) {
         this.option.height = this.option.height - 90
-      }else {
+      } else {
         this.option.height = this.option.height + 90
       }
       this.$refs.crud.getTableHeight()
@@ -291,7 +234,7 @@ export default {
           message: "操作成功!"
         });
         this.page.currentPage = 1;
-        this.onLoad(this.page, {parentId: 0});
+        this.onLoad(this.page, { parentId: 0 });
       });
     },
     //查询全部
@@ -390,14 +333,14 @@ export default {
     //点击搜索按钮触发
     searchChange(params, done) {
       if (params.requiredArrivalDate) {
-        this.$set(params, 'requiredArrivalStartDate', params.requiredArrivalDate[0]+ " " + "00:00:00")
-        this.$set(params, 'requiredArrivalEndDate', params.requiredArrivalDate[1]+ " " + "23:59:59")
-        this.$delete(params,'requiredArrivalDate')
+        this.$set(params, 'requiredArrivalStartDate', params.requiredArrivalDate[0] + " " + "00:00:00")
+        this.$set(params, 'requiredArrivalEndDate', params.requiredArrivalDate[1] + " " + "23:59:59")
+        this.$delete(params, 'requiredArrivalDate')
       }
       if (params.createTime) {
-        params.createStartTime = params.createTime[0]+ " " + "00:00:00"
-        params.createEndTime = params.createTime[1]+ " " + "23:59:59"
-        this.$delete(params,'createTime')
+        params.createStartTime = params.createTime[0] + " " + "00:00:00"
+        params.createEndTime = params.createTime[1] + " " + "23:59:59"
+        this.$delete(params, 'createTime')
       }
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
@@ -419,11 +362,11 @@ export default {
     },
     refreshChange() {
       this.page.currentPage = 1;
-      this.onLoad(this.page,this.search);
+      this.onLoad(this.page, this.search);
     },
     onLoad(page, params) {
       let data = this.gobackSearch(params)
-      let queryParams = Object.assign({tradeType: 'GN'}, data, {
+      let queryParams = Object.assign({ tradeType: 'GN' }, data, {
         size: page.pageSize,
         current: page.currentPage,
         // billType:'CG',
@@ -441,7 +384,7 @@ export default {
     //树桩列点击展开触发
     treeLoad(tree, treeNode, resolve) {
       const parentId = tree.id;
-      customerList({parentId: parentId}).then(res => {
+      customerList({ parentId: parentId }).then(res => {
         resolve(res.data.data.records);
       });
     },
@@ -450,21 +393,21 @@ export default {
       this.applyPaymentList = []
       this.single = true
       this.multiple = true
-      this.detailData=this.$options.data().detailData
+      this.detailData = this.$options.data().detailData
       this.isShow = true;
       this.onLoad(this.page, this.search);
     },
     gobackSearch(params) {
       params = Object.assign({}, this.search)
       if (params.requiredArrivalDate && params.requiredArrivalDate != '') {
-        params.requiredArrivalStartDate = params.requiredArrivalDate[0]+ " " + "00:00:00"
-        params.requiredArrivalEndDate = params.requiredArrivalDate[1]+ " " + "23:59:59"
-        this.$delete(params,'requiredArrivalDate')
+        params.requiredArrivalStartDate = params.requiredArrivalDate[0] + " " + "00:00:00"
+        params.requiredArrivalEndDate = params.requiredArrivalDate[1] + " " + "23:59:59"
+        this.$delete(params, 'requiredArrivalDate')
       }
       if (params.createTime && params.createTime != '') {
-        params.createStartTime = params.createTime[0]+ " " + "00:00:00"
-        params.createEndTime = params.createTime[1]+ " " + "23:59:59"
-        this.$delete(params,'createTime')
+        params.createStartTime = params.createTime[0] + " " + "00:00:00"
+        params.createEndTime = params.createTime[1] + " " + "23:59:59"
+        this.$delete(params, 'createTime')
       }
       return params
     },
@@ -515,7 +458,7 @@ export default {
       }
       let a = []
       this.selection.forEach(item => {
-        item.itemsList = item.itemsList? item.itemsList: [];
+        item.itemsList = item.itemsList ? item.itemsList : [];
         let amount = Number(item.debitAmount) - Number(item.settlmentAmount);
         let quantity = 0;
         item.itemsList.map(e => {
@@ -524,13 +467,13 @@ export default {
             quantity += Number(e.orderQuantity)
           }
         })
-        const price = quantity === 0? 0: Number(amount) / Number(quantity)
+        const price = quantity === 0 ? 0 : Number(amount) / Number(quantity)
         let form = {
           belongCompany: item.belongCompany,
-          srcOrderno:item.orderNo,
-          itemType:"采购",
-          corpsName:[{cname: item.strCorpName, id: item.id}],
-          corpId:item.corpId,
+          srcOrderno: item.orderNo,
+          itemType: "采购",
+          corpsName: [{ cname: item.strCorpName, id: item.id }],
+          corpId: item.corpId,
           srcParentId: item.id,
           currency: 'CNY',
           exchangeRate: '1',
@@ -539,7 +482,7 @@ export default {
           srcType: 1,
           tradeType: 'GN',
           optionType: 'GN',
-          costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
+          costType: this.feesOption.find(e => e.cname == '货款') ? this.feesOption.find(e => e.cname == '货款').id : null,
           amount,
           quantity,
           price,
@@ -576,13 +519,13 @@ export default {
       this.financialAccountDialog = true;
     },
     beforeBillData(type) {
-      if(type){ //申请货款
+      if (type) { //申请货款
         // this.billData.srcId = -1
       }
     },
     //关闭账单
-    choceFun(){
-      this.financialAccountDialog  = false
+    choceFun() {
+      this.financialAccountDialog = false
     },
     feeSubmit() {
       this.onLoad(this.page, this.search)
@@ -598,11 +541,55 @@ export default {
         orderItemIds: ids
       }
       generateShipment(data).then(res => {
-        this.$router.$avueRouter.closeTag("/businessManagement/receipt/index");
-        this.$router.push({
-          path: "/businessManagement/receipt/index",
-          query: {form: JSON.stringify(res.data.data)},
+        this.$confirm("此操作将生成工厂发货,是否继续?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          res.data.data.orgId = res.data.data.id
+          res.data.data.deliveryStatus = '录入'
+          res.data.data.salesCompany = res.data.data.belongToCorpId
+          res.data.data.totalWeight = res.data.data.cartonWeight
+          res.data.data.totalVolumn = res.data.data.cntrVolumn
+          res.data.data.deliveryAmount = 0
+          res.data.data.totalQuantity = 0
+          res.data.data.purchaseAmount = 0
+          res.data.data.orderItemsList.forEach(item => {
+            item.containerVolume = item.cntrVolumn
+            item.actualWeight = item.cartonWeight
+            item.specificationAndModel = item.itemType
+            item.orgOrderNo = res.data.data.orgOrderNo
+            item.inventoryNumber = item.storageQuantity
+            item.srcId = item.id
+            item.purchaseAmount = item.purchaseAmount
+            item.purchaseQuantity = Number(item.orderQuantity)
+            item.actualQuantity = (Number(item.orderQuantity) - Number(item.actualQuantity))
+            res.data.data.deliveryAmount = Number(res.data.data.deliveryAmount) + Number(item.deliveryAmount)
+            res.data.data.totalQuantity = Number(res.data.data.totalQuantity) + Number(item.actualQuantity)
+            res.data.data.purchaseAmount = Number(res.data.data.purchaseAmount) + Number(item.deliveryAmount)
+            res.data.data.deliveryAmount = Number(res.data.data.deliveryAmount?res.data.data.deliveryAmount:0).toFixed(2)
+            res.data.data.purchaseAmount = Number(res.data.data.purchaseAmount?res.data.data.purchaseAmount:0).toFixed(2)
+            delete item.id
+            delete item.pid
+          })
+          res.data.data.deliveryItemsList = res.data.data.orderItemsList
+          res.data.data.businessDate=getCurrentDate()
+          delete res.data.data.createTime
+          delete res.data.data.id
+          delete res.data.data.sysNo
+          delete res.data.data.orderItemsList
+          delete res.data.data.corpName
+          delete res.data.data.belongToCorpList
+          genfactory(res.data.data).then(() => {
+            this.$message.success('生成工厂发货成功')
+            this.onLoad(this.page, this.search);
+          })
         });
+        // this.$router.$avueRouter.closeTag("/businessManagement/receipt/index");
+        // this.$router.push({
+        //   path: "/businessManagement/receipt/index",
+        //   query: { form: JSON.stringify(res.data.data) },
+        // });
       })
     },
   }
@@ -610,5 +597,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>

+ 88 - 16
src/views/businessManagement/salesOrder/index.vue

@@ -105,7 +105,9 @@ import {
   deleteDetails,
   saveSell,
   detail,
-  generateShipment
+  generateShipment,
+  genClient,
+  warehouseList
 } from "@/api/basicData/configuration";
 import detailPage from "./detailsPageEdit";
 import search from "../../../page/index/search";
@@ -113,7 +115,7 @@ import { defaultDate } from "@/util/date";
 import { getToken } from "@/util/auth";
 import os from "os";
 import { gainUser } from "@/api/basicData/customerInquiry";
-
+import { getCurrentDate } from "@/util/date";
 export default {
   name: "customerInformation",
   components: {
@@ -147,7 +149,9 @@ export default {
       multiple: true,
       selection: [],
       isShow: true,
-      detailData: {}
+      detailData: {},
+      warehouseTypeOption:[],
+      warehouseList:[]
     };
   },
   async created() {
@@ -209,6 +213,12 @@ export default {
         };
       }
     });
+    this.getWorkDicts("warehouseType").then(res => {
+      this.warehouseTypeOption = res.data.data
+    })
+    warehouseList().then(res => {
+      this.warehouseList = res.data.data.records
+    })
   },
   activated() {
     setTimeout(() => {
@@ -621,21 +631,83 @@ export default {
               return this.$message.error("该单子明细为空,不能生成客户收货");
             let ids = [];
             arr.forEach(item => ids.push(item.id));
-            generateShipment({ id: row.id, orderItemIds: ids }).then(res => {
-              this.$router.$avueRouter.closeTag(
-                "/businessManagement/salesOrder/index"
-              );
-              this.$router.$avueRouter.closeTag(
-                "/businessManagement/deliveryNotice/index"
-              );
-              this.$router.push({
-                path: "/businessManagement/deliveryNotice/index",
-                query: {
-                  form: JSON.stringify(res.data.data),
-                  pageType: "Generate"
+            this.$confirm("此操作将进行客户收货,是否继续?", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+              res.data.data.orgId = res.data.data.id
+              res.data.data.deliveryStatus = '录入'
+              res.data.data.srcOrderNo = res.data.data.orgOrderNo
+              res.data.data.arrivalContact = res.data.data.corpAttn
+              res.data.data.arrivalTel = res.data.data.corpTel
+              res.data.data.totalWeight = res.data.data.cartonWeight
+              res.data.data.totalVolumn = res.data.data.cntrVolumn
+              res.data.data.deliveryItemsList = res.data.data.orderItemsList
+              res.data.data.deliveryFeesList = res.data.data.orderFeesList
+              res.data.data.salesCompany = res.data.data.belongToCorpId
+              res.data.data.deliveryAmount = 0
+              res.data.data.totalQuantity = 0
+              res.data.data.totalCost = 0
+              res.data.data.billType = 'FH'
+              res.data.data.orderItemsList.forEach(item => {
+                item.containerVolume = item.cntrVolumn
+                item.actualWeight = item.cartonWeight
+                item.specificationAndModel = item.itemType
+                item.orgOrderNo = res.data.data.orgOrderNo
+                item.srcOrderNo = res.data.data.srcOrderNo
+                item.srcId = item.id
+                item.actualQuantity = (Number(item.orderQuantity) - Number(item.actualQuantity))
+                item.arrivalQuantity = item.actualQuantity
+                item.deliveryAmount = item.amount
+                item.purchaseTotalAmount = (Number(item.purchaseAmount) * Number(item.actualQuantity))
+                item.purchaseTotalAmount = item.purchaseTotalAmount.toFixed(2)
+                item.inventoryNumber = item.storageQuantity
+                res.data.data.deliveryAmount += Number(item.deliveryAmount)
+                res.data.data.totalQuantity += Number(item.actualQuantity)
+                res.data.data.totalCost += Number(item.deliveryAmount)
+                delete item.id
+                delete item.pid
+                delete item.createTime
+                delete item.createUser
+                delete item.status
+                delete item.updateTime
+                delete item.updateUser
+              })
+              res.data.data.orderFeesList.forEach(item => {
+                delete item.createDept
+                delete item.createTime
+                delete item.createUser
+                delete item.id
+                delete item.isDeleted
+                delete item.pid
+                delete item.status
+                delete item.tenantId
+                delete item.updateTime
+                delete item.updateUser
+              })
+              this.warehouseTypeOption.forEach((item,index)=>{
+                if(index==0){
+                  res.data.data.warehouseType=item.dictValue
+                }
+              })
+              this.warehouseList.forEach((item,index)=>{
+                if(index==0){
+                  res.data.data.storageId=item.id
                 }
-              });
+              })
+              res.data.data.businessDate=getCurrentDate()
+              delete res.data.data.createTime
+              delete res.data.data.id
+              delete res.data.data.sysNo
+              delete res.data.data.corpName
+              delete res.data.data.belongToCorpList
+              genClient(res.data.data).then(() => {
+                this.$message.success('客户收货成功')
+                this.onLoad(this.page, this.search);
+              })
             });
+
           })
           .finally(() => {
             this.openFullScreen(true);