收货单对接接口

src/api/basicData/receipt.js

@@ -0,0 +1,122 @@
+import request from '@/router/axios';
+
+//收货资料列表查询
+export function customerList(data) {
+    return request({
+        url: '/api/blade-deliver-goods/reCeVing/page',
+        method: 'get',
+        params: data
+    })
+}
+//收货资料列表修改和新增
+export function typeSave(data) {
+    return request({
+        url: '/api/blade-deliver-goods/reCeVing/submit',
+        method: 'post',
+        data: data
+    })
+}
+//收货资料列表查看明细
+export function detail(data) {
+    return request({
+        url: '/api/blade-deliver-goods/reCeVing/detail?id='+data,
+        method: 'get'
+    })
+}
+//收货资料列表删除
+export function deleteDetails(data) {
+    return request({
+        url: '/api/blade-deliver-goods/reCeVing/update',
+        method: 'post',
+        data: {
+            id:data
+        }
+    })
+}
+//商品从表列表删除
+export function corpsattn(data) {
+    return request({
+        url: '/api/blade-purchase-sales/orderitems/update',
+        method: 'post',
+        data: {
+            id:data
+        }
+    })
+}
+//收货银行列表删除
+export function corpsbank(data) {
+    return request({
+        url: '/api/blade-client/corpsbank/update',
+        method: 'post',
+        data: {
+            id:data
+        }
+    })
+}
+//收货文件列表删除
+export function corpsfiles(data) {
+    return request({
+        url: '/api/blade-client/corpsfiles/update',
+        method: 'post',
+        data: {
+            id:data
+        }
+    })
+}
+//收货优势项目列表删除
+export function corpsitem(data) {
+    return request({
+        url: '/api/blade-deliver-goods/deliveryfiles/update',
+        method: 'post',
+        data: {
+            id:data
+        }
+    })
+}
+//查询收货类型主页下拉
+export function getDeptLazyTree(parentId){
+    return request({
+        url: '/api/blade-client/corpstype/lazy-tree',
+        method: 'get',
+        params: {
+            parentId
+        }
+    })
+}
+export const getDeptLazyTreeS = (parentId) => {
+    return request({
+        url: '/api/blade-client/goodstype/lazy-tree',
+        method: 'get',
+        params: {
+            parentId
+        }
+    })
+}
+
+//政策列表查看明细
+export function detailList(data) {
+    return request({
+        url: '/api/blade-mocha-item/salespolicy/detail?id='+data,
+        method: 'get'
+    })
+}
+export const getList = (current, size, params, goodsTypeId) => {
+    return request({
+        url: '/api//blade-client/goodsdesc/selectGoods',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+            goodsTypeId,
+        }
+    })
+}
+
+//查询收货类型下拉
+export function corpstypeTree() {
+    return request({
+        url: '/api/blade-client/corpstype/tree',
+        method: 'get'
+    })
+}

src/page/index/tags.vue

@@ -87,7 +87,6 @@
     },
     methods: {
       generateTitle(item) {
-        console.log('张三在此1')
         return this.$router.$avueRouter.generateTitle(
           item.label,
           (item.meta || {}).i18n

src/views/businessManagement/deliveryNotice/configuration/customerContact.json

@@ -53,7 +53,7 @@
       "rules": [
         {
           "required": false,
-          "message": "请输入编码",
+          "message": "请输入商品名称",
           "trigger": "blur"
         }
       ]

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -560,6 +560,7 @@ export default {
           delete this.tableData[item].status
           delete this.tableData[item].isDeleted
           this.$refs.crudContact.rowCellAdd(this.tableData[item]);
+          console.log(this.contactsData)
           this.$refs.crudContact.rowCell(this.tableData[item], this.contactsData.length - 1)
         }
       }

src/views/businessManagement/receipt/configuration/customerContact.json

@@ -33,7 +33,8 @@
       ]
     },{
       "label": "类别",
-      "prop": "cname",
+      "prop": "priceCategory",
+      "type": "number",
       "index": 1,
       "width":100,
       "cell": false,
@@ -45,6 +46,19 @@
         }
       ]
     },{
+      "label": "商品名称",
+      "prop": "cname",
+      "index": 2,
+      "width":100,
+      "cell": false,
+      "rules": [
+        {
+          "required": false,
+          "message": "请输入商品名称",
+          "trigger": "blur"
+        }
+      ]
+    },{
       "label": "编码",
       "prop": "code",
       "index": 2,
@@ -85,7 +99,7 @@
       ]
     },{
       "label": "包装要求",
-      "prop": "orderQuantity",
+      "prop": "packageRemarks",
       "index": 5,
       "width":100,
       "cell": true,
@@ -98,7 +112,7 @@
       ]
     },{
       "label": "采购数量",
-      "prop": "actualQuantity",
+      "prop": "purchaseQuantity",
       "index": 6,
       "width":100,
       "cell": true,
@@ -111,7 +125,7 @@
       ]
     },{
       "label": "入库数量",
-      "prop": "storageQuantity",
+      "prop": "actualQuantity",
       "index": 6,
       "width":100,
       "cell": true,
@@ -124,7 +138,7 @@
       ]
     },{
       "label": "采购金额",
-      "prop": "price",
+      "prop": "purchaseAmount",
       "index": 6,
       "width":100,
       "cell": true,
@@ -137,7 +151,7 @@
       ]
     },{
       "label": "入库金额",
-      "prop": "amount",
+      "prop": "deliveryAmount",
       "index": 6,
       "width":100,
       "cell": true,

src/views/businessManagement/receipt/configuration/mainList.json

@@ -25,79 +25,61 @@
         },
         {
             "label": "采购方式",
-            "prop": "orderNo",
+            "prop": "purchaseMode",
             "search": true,
             "index": 1,
             "width":100
         },{
-            "label": "供应商简称",
-            "prop": "morderNo",
+            "label": "供应商",
+            "prop": "corpId",
             "search": true,
             "index": 2,
             "width":100
         },{
-            "label": "单据状态",
-            "prop": "shippingAddress",
-            "search": true,
-            "index": 4,
-            "width":100
-        },{
             "label": "所属公司",
-            "prop": "arrivalAddress",
+            "prop": "salesCompany",
             "search": true,
             "index": 5,
             "width":100
         },{
             "label": "匹配订单号",
-            "prop": "paymentType",
+            "prop": "srcOrderNo",
             "search": true,
             "index": 6,
             "width":100
         },{
             "label": "仓库名称",
-            "prop": "packageRemarks",
+            "prop": "storageId",
             "search": true,
             "index": 7,
             "width":100
         },{
-            "label": "仓库类型",
-            "prop": "creditLevel",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
             "label": "入库金额",
-            "prop": "banks",
+            "prop": "deliveryAmount",
             "search": true,
             "index": 8,
             "width":100
         },{
             "label": "采购金额",
-            "prop": "requiredDeliveryDate",
+            "prop": "purchaseAmount",
             "search": true,
             "index": 8,
             "width":100
         },{
             "label": "入库数量",
-            "prop": "requiredArrivalDate",
-            "search": true,
-            "index": 8,
-            "width":100
-        },{
-            "label": "发货日期",
-            "prop": "requiredArrivalDate",
+            "prop": "totalQuantity",
             "search": true,
             "index": 8,
             "width":100
         },{
             "label": "入库日期",
-            "prop": "requiredArrivalDate",
+            "prop": "businessDate",
             "search": true,
             "index": 8,
             "width":100
         },{
             "label": "制单时间",
-            "prop": "requiredArrivalDate",
+            "prop": "updateTime",
             "search": true,
             "index": 8,
             "width":100

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -190,7 +190,7 @@
                      :disabled="tableDataCost.length !== 1">导入</el-button>
         </span>
     </el-dialog>
-    <!--    打印-->
+    <!--打印-->
     <el-dialog
         title="打印单"
         append-to-body
@@ -334,7 +334,7 @@ import {
   corpsfiles,
   corpsitem,
   getList
-} from "@/api/basicData/configuration"
+} from "@/api/basicData/receipt"
 import customerContact from "./configuration/customerContact.json"
 import advantageProject from "./configuration/advantageProject.json"
 import bankOfDeposit from "./configuration/bankOfDeposit.json"
@@ -435,7 +435,7 @@ export default {
         column: [
           {
             label: '系统编号',//发货通知(点击)
-            prop: 'orderNo',
+            prop: 'sysNo',
             rules: [
               {
                 required: true,
@@ -445,7 +445,7 @@ export default {
             ]
           }, {
             label: '采购方式',
-            prop: 'morderNo',
+            prop: 'purchaseMode',
             rules: [
               {
                 required: true,
@@ -454,18 +454,8 @@ export default {
               }
             ]
           }, {
-            label: '供应商简称',
-            prop: 'morderNo',
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
-            label: '单据状态',
-            prop: 'shippingAddress',
+            label: '供应商',
+            prop: 'corpId',
             rules: [
               {
                 required: true,
@@ -475,7 +465,7 @@ export default {
             ]
           }, {
             label: '所属公司',
-            prop: 'arrivalAddress',
+            prop: 'salesCompany',
             rules: [
               {
                 required: true,
@@ -485,7 +475,7 @@ export default {
             ]
           }, {
             label: '匹配订单号',
-            prop: 'paymentType',
+            prop: 'srcOrderNo',
             rules: [
               {
                 required: true,
@@ -495,17 +485,7 @@ export default {
             ]
           }, {
             label: '仓库名称',
-            prop: 'packageRemarks',
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
-            label: '仓库类型',
-            prop: 'packageRemarks',
+            prop: 'storageId',
             rules: [
               {
                 required: true,
@@ -515,7 +495,7 @@ export default {
             ]
           }, {
             label: '入库金额',
-            prop: 'banks',
+            prop: 'deliveryAmount',
             rules: [
               {
                 required: true,
@@ -525,8 +505,7 @@ export default {
             ]
           }, {
             label: '采购金额',
-            prop: 'requiredDeliveryDate',
-            type: 'datetime',
+            prop: 'purchaseAmount',
             rules: [
               {
                 required: true,
@@ -536,18 +515,7 @@ export default {
             ]
           },{
             label: '入库数量',
-            prop: 'requiredDeliveryDate',
-            type: 'datetime',
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
-            label: '发货日期',
-            prop: 'requiredArrivalDate',
+            prop: 'totalQuantity',
             type: 'datetime',
             rules: [
               {
@@ -558,7 +526,7 @@ export default {
             ]
           }, {
             label: '费用合计',
-            prop: 'banksAccountName',
+            prop: 'totalCost',
             rules: [
               {
                 required: false,
@@ -567,20 +535,9 @@ export default {
               }
             ]
           }, {
-            label: '费用合计',
-            type: 'datetime',
-            prop: 'creditDate',
-            rules: [
-              {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          }, {
-            label: '制单时间',
+            label: '入库日期',
+            prop: 'businessDate',
             type: 'datetime',
-            prop: 'creditDate',
             rules: [
               {
                 required: true,
@@ -607,13 +564,17 @@ export default {
       detail(id).then(res => {
         console.log(res.data.data)
         this.form = res.data.data;
-        this.contactsData = this.form.orderItemsList
-        this.advantageProjectData = this.form.orderFeesList
-        this.bankOfDepositData = this.form.orderFilesList
-        delete this.form.orderItemsList
-        delete this.form.orderFeesList
-        delete this.form.orderFilesList
+        this.contactsData = this.form.deliveryItemsList
+        this.advantageProjectData = this.form.deliveryFeesList
+        this.bankOfDepositData = this.form.deliveryFilesList
+        delete this.form.deliveryItemsList
+        delete this.form.deliveryFeesList
+        delete this.form.deliveryFilesList
       });
+    }else if (this.$route.query.form){
+      this.form = JSON.parse(this.$route.query.form);
+      this.contactsData = this.form.orderItemsList
+      delete this.form.orderItemsList
     }
   },
   watch: {
@@ -716,7 +677,11 @@ export default {
         for (let item in this.tableData) {
           console.log(this.tableData[item])
           this.tableData[item].itemId = this.tableData[item].id
+          this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
+          delete this.tableData[item].goodsTypeName
           delete this.tableData[item].id
+          delete this.tableData[item].status
+          delete this.tableData[item].isDeleted
           this.$refs.crudContact.rowCellAdd(this.tableData[item]);
           this.$refs.crudContact.rowCell(this.tableData[item], this.contactsData.length - 1)
         }
@@ -896,14 +861,13 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           //商品信息
-          this.form.orderItemsList = this.contactsData
-          this.form.orderFeesList = this.advantageProjectData
-          this.form.orderFilesList = this.bankOfDepositData
+          this.form.deliveryItemsList = this.contactsData
+          this.form.deliveryFeesList = this.advantageProjectData
+          this.form.deliveryFilesList = this.bankOfDepositData
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")
           }
           this.disabled = true
-          this.form.billType = 'CG'
           typeSave(this.form).then(res => {
             this.$message({type: "success", message: this.form.id ? "修改成功!" : "新增成功!"});
             //成功关闭此页面回到列表页

src/views/businessManagement/receipt/index.vue

@@ -47,7 +47,7 @@
 
 <script>
 import option from "./configuration/mainList.json";
-import {customerList, typeSave, deleteDetails} from "@/api/basicData/configuration"
+import {customerList, typeSave, deleteDetails} from "@/api/basicData/receipt"
 
 export default {
   name: "customerInformation",
@@ -177,7 +177,7 @@ export default {
       let queryParams = Object.assign({}, params, {
         size: page.pageSize,
         current: page.currentPage,
-        billType:'CG',
+        billType:'SH',
         corpsTypeId: this.treeDeptId
       })
       customerList(queryParams).then(res => {