修改 积分商场

src/api/tirePartsMall/basicData/commodityInformation/index.js

@@ -76,10 +76,11 @@ export const disabled = (data) => {
   })
 }
 
-export const getCorpTypes = () => {
+export const getCorpTypes = (data) => {
   return request({
     url: '/api/blade-sales-part/goodsType/tree?corpType=SP',
     method: 'get',
+    params: data
   })
 }
 

src/api/tirePartsMall/salesManagement/customerPoints.js

@@ -0,0 +1,21 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-sales-part/integraldetailPj/integralRecord',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}
+
+export const getDetail = (data) => {
+  return request({
+    url: '/api/blade-sales-part/integraldetailPj/corpPointsDetail',
+    method: 'get',
+    params: data
+  })
+}

src/api/tirePartsMall/salesManagement/saleOrder.js

@@ -110,7 +110,14 @@ export const goodsPageXs = (params) => {
     params:params
   })
 }
-
+// 销售订单添加轮胎列表
+export const goodsPagePoints = (params) => {
+  return request({
+    url: '/api/blade-sales-part/goodsDesc/goodsPagePoints',
+    method: 'get',
+    params:params
+  })
+}
 //采购订单保存
 export const inboundTask = (data) => {
   return request({
@@ -324,4 +331,20 @@ export const getAdvancePaymentBalance = (params) => {
     method: 'get',
     params: params
   })
+}
+// 确认发货
+export const confirmShipment = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/confirmShipment',
+    method: 'POST',
+    data: data
+  })
+}
+// 撤销发货
+export const cancelShipment = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/cancelShipment ',
+    method: 'POST',
+    data: data
+  })
 }

src/views/tirePartsMall/basicData/commodityInformation/detailsPage.vue

@@ -476,7 +476,7 @@ export default {
                     {
                         label: "自修补",
                         prop: "selfRecovery",
-                        span: 2,
+                        span: 4,
                         type: 'select',
                         display: true,
                         dicData: [{
@@ -523,12 +523,12 @@ export default {
                     //     labelWidth: 120,
                     //     span: 8
                     // },
-                    // {
-                    //     label: "兑换积分",
-                    //     prop: "integral",
-                    //     display: true,
-                    //     span: 8
-                    // },
+                    {
+                        label: "积分",
+                        prop: "integral",
+                        display: true,
+                        span: 8
+                    },
                     {
                         label: "备注",
                         prop: "remarks",

src/views/tirePartsMall/basicData/commodityInformation/index.vue

@@ -339,11 +339,12 @@ export default {
     },
     onLoad(page, params = {}) {
       let data = this.deepClone(Object.assign(params, this.search));
+      data.whetherIntegral='0'
       this.loading = true;
       getList({
         ...data,
         current: page.currentPage,
-        size: page.pageSize
+        size: page.pageSize,
       }).then(res => {
         console.log(123214);
         this.dataList = res.data.data.records ? res.data.data.records : [];

src/views/tirePartsMall/pointsMall/customerPoints/detailsPage.vue

@@ -14,19 +14,16 @@
             <trade-card title="记录信息">
                 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
                     <el-tab-pane label="产生明细" name="1">
-                        <avue-crud :data="form.recordRateList" :option="option1">
-                            <template slot="contractNo" slot-scope="{ row }">
-                                <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.contractNo }}</span>
-                            </template>
-                            <template slot="customsDeclarationNo" slot-scope="{ row }">
-                                <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.customsDeclarationNo }}</span>
+                        <avue-crud :data="form.integralDetailListA" :option="option1">
+                            <template slot="srcNo" slot-scope="{ row }">
+                                <span style="color: #1e9fff" @click="Jump(row, 1)">{{ row.srcNo }}</span>
                             </template>
                         </avue-crud>
                     </el-tab-pane>
                     <el-tab-pane label="使用明细" name="2">
-                        <avue-crud :data="form.recordListD" :option="option2">
-                            <template slot="account" slot-scope="{ row }">
-                                <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.account }}</span>
+                        <avue-crud :data="form.integralDetailListS" :option="option2">
+                            <template slot="srcNo" slot-scope="{ row }">
+                                <span style="color: #1e9fff" @click="Jump(row, 2)">{{ row.srcNo }}</span>
                             </template>
                         </avue-crud>
                     </el-tab-pane>
@@ -37,7 +34,7 @@
 </template>
 
 <script>
-import { getDetail } from "@/api/tradeAgency/tradeAgency";
+import { getDetail } from "@/api/tirePartsMall/salesManagement/customerPoints";
 export default {
     name: "detailsPage",
     data() {
@@ -55,19 +52,19 @@ export default {
                     },
                     {
                         label: "积分有效期",
-                        prop: "contractNo",
+                        prop: "date",
                     },
                     {
                         label: "产生积分",
-                        prop: "billNo",
+                        prop: "addPoints",
                     },
                     {
                         label: "使用积分",
-                        prop: "orderReleaseMethod",
+                        prop: "subPoints",
                     },
                     {
                         label: "余额",
-                        prop: "orderNo",
+                        prop: "pointsBalance",
                     }
                 ]
             },
@@ -79,28 +76,38 @@ export default {
                 align: 'center',
                 column: [
                     {
-                        label: '户头',
-                        prop: 'account',
+                        label: '类型',
+                        prop: 'type',
+                        overHidden: true,
+                    },
+                    {
+                        label: '来源单号',
+                        prop: 'srcNo',
+                        overHidden: true,
+                    },
+                    {
+                        label: '积分',
+                        prop: 'integral',
                         overHidden: true,
                     },
                     {
-                        label: '账号',
-                        prop: 'accountNumber',
+                        label: '商品名称',
+                        prop: 'goodsName',
                         overHidden: true,
                     },
                     {
-                        label: '银行',
-                        prop: 'bank',
+                        label: '有效期至',
+                        prop: 'validTo',
                         overHidden: true,
                     },
                     {
-                        label: '金额',
-                        prop: 'amount',
+                        label: '创建人',
+                        prop: 'createUserName',
                         overHidden: true,
                     },
                     {
-                        label: '备注',
-                        prop: 'remarks',
+                        label: '创建时间',
+                        prop: 'createTime',
                         overHidden: true,
                     }
                 ]
@@ -113,28 +120,38 @@ export default {
                 align: 'center',
                 column: [
                     {
-                        label: '开票抬头',
-                        prop: 'invoiceHeader',
+                        label: '类型',
+                        prop: 'type',
+                        overHidden: true,
+                    },
+                    {
+                        label: '来源单号',
+                        prop: 'srcNo',
                         overHidden: true,
                     },
                     {
-                        label: '开票金额',
-                        prop: 'amount',
+                        label: '积分',
+                        prop: 'integral',
                         overHidden: true,
                     },
                     {
-                        label: '税率',
-                        prop: 'taxRate',
+                        label: '商品名称',
+                        prop: 'goodsName',
                         overHidden: true,
                     },
                     {
-                        label: '开票内容',
-                        prop: 'invoiceContent',
+                        label: '有效期至',
+                        prop: 'validTo',
                         overHidden: true,
                     },
                     {
-                        label: '备注',
-                        prop: 'remarks',
+                        label: '创建人',
+                        prop: 'createUserName',
+                        overHidden: true,
+                    },
+                    {
+                        label: '创建时间',
+                        prop: 'createTime',
                         overHidden: true,
                     }
                 ]
@@ -150,6 +167,25 @@ export default {
         }
     },
     methods: {
+        Jump(row, type) {
+            if (type == 1) {
+                this.$router.push({
+                    path: "/tirePartsMall/salesManagement/saleOrder/index",
+                    query: {
+                        jumpId: row.srcId
+                    }
+                })
+            }
+            if (type == 2) {
+                this.$router.push({
+                    path: "/tirePartsMall/pointsMall/pointsOrder/index",
+                    query: {
+                        jumpId: row.srcId
+                    }
+                })
+            }
+
+        },
         getDetails(id) {
             const loading = this.$loading({
                 lock: true,
@@ -157,16 +193,8 @@ export default {
                 spinner: 'el-icon-loading',
                 background: 'rgba(255,255,255,0.7)'
             });
-            getDetail({ id: id }).then(res => {
+            getDetail({ corpId: id }).then(res => {
                 this.form = res.data.data
-                this.oldForm = this.deepClone(res.data.data)
-                this.inLock()
-                if (res.data.data.abroadConsignorId) {
-                    this.$refs.abankCode.IdGetDicData({ id: res.data.data.abroadConsignorId })
-                }
-                if (res.data.data.domesticConsigneeId) {
-                    this.$refs.dbankCode.IdGetDicData({ id: res.data.data.domesticConsigneeId })
-                }
             }).finally(() => {
                 loading.close()
             })

src/views/tirePartsMall/pointsMall/customerPoints/index.vue

@@ -8,18 +8,11 @@
                 @resetColumn="resetColumn('crud', 'option', 'optionBack', 423)"
                 @saveColumn="saveColumn('crud', 'option', 'optionBack', 423)" @on-load="onLoad">
                 <template slot="menuLeft">
-                    <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
-                    </el-button>
                     <el-button type="warning" size="small" @click="outExport">导 出
                     </el-button>
                 </template>
-                <template slot="menu" slot-scope="{ row, index }">
-                    <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
-                    <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                        :disabled="row.orderStatus != '录入'">删 除</el-button>
-                </template>
-                <template slot="contractNo" slot-scope="{ row }">
-                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.contractNo }}</span>
+                <template slot="corpName" slot-scope="{ row }">
+                    <span style="color: #1e9fff;cursor: pointer;" @click="rowEdit(row)">{{ row.corpName}}</span>
                 </template>
             </avue-crud>
         </basic-container>
@@ -28,8 +21,7 @@
 </template>
   
 <script>
-import { getList, remove} from "@/api/tradeAgency/tradeAgency";
-import { getWorkDicts } from "@/api/system/dictbiz";
+import { getList} from "@/api/tirePartsMall/salesManagement/customerPoints";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
 import dicSelect from "@/components/dicSelect/main";
@@ -51,7 +43,7 @@ export default {
             optionBack: {
                 height: 'auto',
                 calcHeight: 30,
-                menuWidth: 140,
+                menu: false,
                 tip: false,
                 searchShow: true,
                 searchMenuSpan: 18,
@@ -68,44 +60,28 @@ export default {
                 column: [
                     {
                         label: "客户名称",
-                        prop: "corpId",
-                        overHidden: true,
-                        search: true,
-                        type: 'select',
-                        filterable: true,
-                        remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
-                        props: {
-                            label: 'cnName',
-                            value: 'id',
-                            res: 'data.records'
-                        },
-                        hide: true,
-                        showColumn: false,
-                    },
-                    {
-                        label: "客户名称",
                         prop: "corpName",
+                        search: true,
                         overHidden: true,
                     },
                     {
                         label: "积分有效期",
-                        prop: "contractNo",
+                        prop: "date",
                         overHidden: true,
                     },
                     {
                         label: "产生积分",
-                        prop: "billNo",
+                        prop: "addPoints",
                         overHidden: true,
                     },
                     {
                         label: "使用积分",
-                        prop: "orderReleaseMethod",
+                        prop: "subPoints",
                         overHidden: true,
                     },
                     {
                         label: "余额",
-                        prop: "orderNo",
+                        prop: "pointsBalance",
                         overHidden: true,
                     }
                 ]
@@ -127,24 +103,10 @@ export default {
         },
         rowEdit(row) {
             this.detailData = {
-                id: row.itemId
+                id: row.corpId
             };
             this.isShow = false
         },
-        // 删除
-        rowDel(row, index) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                remove({ ids: row.itemId }).then(res => {
-                    this.onLoad(this.page, this.query);
-                    this.$message.success("成功删除");
-                })
-            })
-
-        },
         searchReset() {
             this.query = this.$options.data().query;
             this.onLoad(this.page);

src/views/tirePartsMall/pointsMall/pointsGoods/detailsPage.vue

@@ -414,12 +414,11 @@ export default {
                         prop: "inventoryAlert",
                         span: 8
                     },
-                    {
-                        label: "兑换积分",
-                        prop: "integral",
-                        span: 8
-                    },
-
+                    // {
+                    //     label: "兑换积分",
+                    //     prop: "integral",
+                    //     span: 8
+                    // },
                     {
                         label: "备注",
                         prop: "remarks",

src/views/tirePartsMall/pointsMall/pointsOrder/index.vue

@@ -286,19 +286,8 @@
               message: " ",
               trigger: "blur"
             }]
-          }, {
-            label: '仓库',
-            prop: "storageName",
-            search: true,
-            overHidden: true,
-            // remote: true,
-            type: 'select',
-            props: {
-              label: 'cname',
-              value: 'cname'
-            },
-            dicUrl: '/api/blade-sales-part/storageDesc/listAll?cname={{key}}',
-          }, {
+          }, 
+          {
             label: '行数',
             prop: "numberRows",
             overHidden: true,
@@ -328,15 +317,8 @@
             label: '已收金额',
             prop: "paymentAmountTl",
             overHidden: true,
-          }, {
-            label: '退货数量',
-            prop: "returnsNumber",
-            overHidden: true,
-          }, {
-            label: '退货金额',
-            prop: "returnsAmount",
-            overHidden: true,
-          }, {
+          }
+          , {
             label: '状态',
             prop: "status",
             search: true,
@@ -347,49 +329,7 @@
               label: "dictValue",
               value: "dictKey"
             },
-          }, {
-            label: '结算状态',
-            prop: "actualPaymentStatus",
-            searchProp: 'actualPaymentType',
-            search: true,
-            overHidden: true,
-            type: 'select',
-            dicData: [
-              {
-                label: "待收款",
-                value: 1,
-              },
-              {
-                label: "已收款",
-                value: 2,
-              },
-              {
-                label: "尾款",
-                value: 3,
-              },
-              {
-                label: "已退款",
-                value: 4,
-              }
-            ],
-  
-            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=settlement_Status",
-            // props: {
-            //   label: "dictValue",
-            //   value: "dictKey"
-            // }
-  
-          },
-          {
-            label: '退货状态',
-            prop: "returnsStatus",
-            overHidden: true,
-          },
-          {
-            label: '应结日期',
-            prop: "dueDate",
-            overHidden: true,
-          },
+          }, 
           {
             label: '业务日期',
             prop: "businesDate",
@@ -403,20 +343,7 @@
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }, {
-            label: '收费日期',
-            prop: "paymentDate",
-            searchProp: "paymentDateList",
-            type: "date",
-            overHidden: true,
-            search: true,
-            width: 100,
-            unlinkPanels: true,
-            searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
-          }, {
+          },  {
             label: "制单人",
             prop: "createUserName",
             searchProp: "createUser",
@@ -558,7 +485,7 @@
         if (JSON.stringify(this.$route.query) != "{}") {
           this.$router.$avueRouter.closeTag();
           this.$router.push({
-            path: "/tirePartsMall/salesManagement/saleOrder/index"
+            path: "/tirePartsMall/pointsMall/pointsOrder/index"
           });
         }
         this.form = {}

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -1004,8 +1004,7 @@ export default {
                         disabled: true,
                         editDisplay: false,
                         addDisplay: false
-                    }
-                    ,
+                    },
                     {
                         label: '出库金额',
                         prop: 'outGoodsTotalShipAmount',
@@ -1014,8 +1013,25 @@ export default {
                         disabled: true,
                         editDisplay: false,
                         addDisplay: false
-                    }
-                    ,
+                    },
+                    {
+                        label: '原始数量',
+                        prop: 'primaryGoodsTotalNum',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
+                    {
+                        label: '原始金额',
+                        prop: 'primaryGoodsTotalAmount',
+                        overHidden: true,
+                        width: 100,
+                        disabled: true,
+                        editDisplay: false,
+                        addDisplay: false
+                    },
                     {
                         label: '返利后单价',
                         prop: 'rebatePrice',

src/views/tirePartsMall/salesManagement/outboundWorkOrderL/detailsPage.vue

@@ -282,15 +282,40 @@ export default {
             value: "dot"
           },
           dicUrl: "/api/blade-sales-part/stockDesc/dotList",
-        }, {
+        }, 
+        {
           label: '库存数量',
           prop: "inventory",
           disabled: true,
-        }, {
+        }, 
+        // {
+        //   label: '参考库存融资',
+        //    prop: "inventoryFinancing",
+        //   width: 120,
+        //   disabled: true,
+        // }, 
+        // {
+        //   label: '参考库存自有',
+        //   prop: "inventoryHave",
+        //   width: 120,
+        //   disabled: true,
+        // },
+        {
           label: '调拨数量',
           prop: 'goodsNum',
           disabled: false,
-        }, {
+        }, 
+        // {
+        //   label: '融资数量',
+        //   prop: 'sendNumFinancing',
+        //   disabled: false,
+        // }, 
+        // {
+        //   label: '自有数量',
+        //   prop: 'sendNumHave',
+        //   disabled: false,
+        // }, 
+        {
           label: '单价',
           prop: "price",
           disabled: true,
@@ -687,11 +712,15 @@ export default {
           price: item.price, // 单价
           goodsName: item.cname,
           goodsNum: item.goodsNum,
+          sendNumHave: item.goodsNum,
+          sendNumFinancing: item.goodsNum,
           brandName: item.brandName,
           brandId: item.brandId,
           goodsNo: item.code,
           propertyName: item.specificationAndModel,
           inventory: item.inventory,
+          inventoryHave:item.inventoryHave,
+          inventoryFinancing:item.inventoryFinancing,
           pattern: item.brandItem,
           goodsDescription: item.goodsDescription,
           dot: item.dot,

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1014,33 +1014,33 @@ export default {
                     editDisplay: false,
                     addDisplay: false
                 },
-                {
-                    label: '返利后单价',
-                    prop: 'rebatePrice',
-                    overHidden: true,
-                    width: 100,
-                    disabled: true,
-                    editDisplay: false,
-                    addDisplay: false
-                },
-                {
-                    label: '返利后成本价',
-                    prop: 'rebateCostprie',
-                    overHidden: true,
-                    width: 100,
-                    disabled: true,
-                    editDisplay: false,
-                    addDisplay: false
-                },
-                {
-                    label: '返利后利润',
-                    prop: 'rebateProfit',
-                    overHidden: true,
-                    width: 100,
-                    disabled: true,
-                    editDisplay: false,
-                    addDisplay: false
-                },
+                // {
+                //     label: '返利后单价',
+                //     prop: 'rebatePrice',
+                //     overHidden: true,
+                //     width: 100,
+                //     disabled: true,
+                //     editDisplay: false,
+                //     addDisplay: false
+                // },
+                // {
+                //     label: '返利后成本价',
+                //     prop: 'rebateCostprie',
+                //     overHidden: true,
+                //     width: 100,
+                //     disabled: true,
+                //     editDisplay: false,
+                //     addDisplay: false
+                // },
+                // {
+                //     label: '返利后利润',
+                //     prop: 'rebateProfit',
+                //     overHidden: true,
+                //     width: 100,
+                //     disabled: true,
+                //     editDisplay: false,
+                //     addDisplay: false
+                // },
                 {
                     label: '退货数量',
                     prop: "returnsNumber",