修改积分商城模块 联调积分商城接口

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

@@ -90,7 +90,14 @@ export function productLaunch(data) {
     data
   })
 }
-
+//导入
+export function productLaunchPoints(data) {
+  return request({
+    url: '/api/blade-sales-part/productLaunch/productLaunchPoints',
+    method: 'post',
+    data
+  })
+}
 export function deptList() {
   return request({
     url: '/api/blade-system/dept/deptList',

src/components/iosbasic-data/searchquery.vue

@@ -12,10 +12,8 @@
                         :disabled="item[forParameter.disabled] ? item[forParameter.disabled] == disabledStatus : false">
                         <span v-if="!joinData" style="float: left">{{ item[forParameter.label] }}</span>
                         <span v-if="joinData" style="float: left">
-                           <!-- <span v-if="joinType==1">{{ item[forParameter.short] }}----{{  item[forParameter.label] }}</span> -->
                            <span>{{ item[forParameter.label] }} - {{  item[forParameter.short] }}</span>
                         </span>
-                        
                         <span v-if="desc" style="float: right; color: #8492a6; font-size: 13px">{{
                             item[forParameter.desc]}}</span>
                     </el-option>

src/enums/column-name.js

@@ -1911,6 +1911,18 @@ const columnName = [{
   },{
     code: 423,
     name: '轮胎商城-积分商城-客户积分列表页(L)'
+  },{
+    code: 424,
+    name: '轮胎商城-积分商城-积分订单列表页(L)'
+  },{
+    code: 425,
+    name: '轮胎商城-积分商城-积分订单明细(L)'
+  },{
+    code: 426,
+    name: '轮胎商城-积分商城-上架管理(L)'
+  },{
+    code: 427,
+    name: '轮胎商城-积分商城-选择产品(L)'
   }
 ]
 export const getColumnName = (key) => {

src/router/views/index.js

@@ -3744,7 +3744,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/pointsMall/pointsOrder/index',
-    name: '积分订单(L)',
+    name: '积分订单(P)',
     meta: {
       i18n: '/tirePartsMall/pointsMall/pointsOrder/index',
       keepAlive: true,
@@ -3758,7 +3758,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/pointsMall/customerPoints/index',
-    name: '积分客户(L)',
+    name: '积分客户(P)',
     meta: {
       i18n: '/tirePartsMall/pointsMall/customerPoints/index',
       keepAlive: true,
@@ -3772,7 +3772,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/pointsMall/pointsGoods/index',
-    name: '积分商品(L)',
+    name: '积分商品(P)',
     meta: {
       i18n: '/tirePartsMall/pointsMall/pointsGoods/index',
       keepAlive: true,
@@ -3786,7 +3786,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/pointsMall/RotationChart/index',
-    name: '轮播图(L)',
+    name: '轮播图(P)',
     meta: {
       i18n: '/tirePartsMall/pointsMall/RotationChart/index',
       keepAlive: true,
@@ -3800,7 +3800,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/pointsMall/listingManagement/index',
-    name: '上架管理(L)',
+    name: '上架管理(P)',
     meta: {
       i18n: '/tirePartsMall/pointsMall/listingManagement/index',
       keepAlive: true,
@@ -3814,7 +3814,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/tirePartsMall/pointsMall/brandPage/index',
-    name: '品牌管理(L)',
+    name: '品牌管理(P)',
     meta: {
       i18n: '/tirePartsMall/pointsMall/brandPage/index',
       keepAlive: true,

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -79,8 +79,7 @@
                                                                 style="color: #4c9e44;cursor: pointer;text-decoration: underline;"
                                                                 @click="applyforfun(item[0].label)">{{ item[0].label }}
                                                             </span>
-                                                            <span v-else style="color: #1e9fff">{{ item[0].label
-                                                                }}</span>
+                                                            <span v-else style="color: #1e9fff">{{ item[0].label }}</span>
                                                         </span>
                                                         <span v-if="item[0].type == 'button'"></span>
                                                         <!--<el-button v-if="item[0].type == 'button'" :disabled="detailData.seeDisabled || item[0].disabled"-->

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

@@ -520,13 +520,22 @@ export default {
             precision: 2,
           },
           {
+            label: "积分余额",
+            prop: "pointsBalance",
+            span: 8,
+            type: "number",
+            controls: false,
+            precision: 2,
+            disabled:true,
+          },
+          {
             label: "品牌",
             prop: "brandId",
             props: {
               label: 'cname',
               value: 'id'
             },
-            span: 24,
+            span: 16,
             search: true,
             dicDate: [],
             multiple: true,

src/views/tirePartsMall/basicData/listingManagement/commodity.json

@@ -152,23 +152,6 @@
         }],
         "searchValue": 0,
         "searchLabelWidth": 120
-      },
-      {
-        "label": "是否积分商品",
-        "prop": "whetherIntegral",
-        "search":true,
-        "type":"select",
-        "overHidden": true,
-        "clearable": false,
-        "dicData": [{
-          "label": "是",
-          "value": 1
-        }, {
-          "label": "否",
-          "value": 0
-        }],
-        "searchValue": 0,
-        "searchLabelWidth": 120
       }
     ]
   }

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

@@ -393,6 +393,7 @@ export default {
           },
           dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1',
           hide: true,
+          filterable:true,
           disabled: true,
           overHidden: false,
         }, {
@@ -564,7 +565,7 @@ export default {
     },
     // 导出
     outExport() {
-      let config = { params: { ...this.search } }
+      let config = { params: { ...this.search,whetherIntegral:0 } }
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
           const value = config.params[propName];
@@ -847,7 +848,7 @@ export default {
 
       productLaunch(this.goodsListSave).then(res => {
         this.dialogVisibles = !this.dialogVisibles
-
+        this.onLoad(this.page, this.search)
       })
     },
     //导入商品触发
@@ -964,7 +965,8 @@ export default {
         size: page.pageSize,
         ...Object.assign(params, search),
         // ...Object.assign(params, this.search),
-        billType: 0
+        billType: 0,
+        whetherIntegral:"0"
       }
       this.loading = true
       getList(params).then(res => {
@@ -983,6 +985,7 @@ export default {
       groundingListZero({
         whether: params.whether ? params.whether : 0,
         ...params,
+        whetherIntegral:"0"
       }).then(res => {
         this.goodsListShow = res.data.data.records
         this.data = res.data.data.records;

src/views/tirePartsMall/inventory/index.vue

@@ -165,6 +165,7 @@ export default {
             // searchProp: "brandId",
             search: true,
             overHidden: true,
+            filterable: true,
             type: 'select',
             props: {
               label: 'cname',

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

@@ -22,7 +22,7 @@
       <trade-card title="基础信息">
         <avue-form :option="optionForm" v-model="form" ref="form"></avue-form>
       </trade-card>
-      <trade-card :title="titleType==1?'规格型号1附件信息':'花纹附件信息'">
+      <trade-card title="规格附件信息">
         <c-upload basic :data="form.brandFigureList" :disabled="disabled"
           deleteUrl="/api/blade-sales-part/brandfigure/remove" :enumerationValue="338" display />
         <!-- <span style="font-size: 12px;">(图片文件像素推荐700X750，有且只允许有一张主图，其余均为副图)</span> -->
@@ -163,7 +163,7 @@ export default {
       }
       for (let item of this.form.brandFigureList) {
         if (this.form.brandFigureList.filter(e => e.figure == item.figure).length > 1) {
-          return this.$message.error('花纹名称' + item.figure + '不能重复!')
+          return this.$message.error('规格名称' + item.figure + '不能重复!')
         }
       }
       if (num > 1) {
@@ -175,7 +175,7 @@ export default {
           this.loadingBtn = true;
           this.form.type = 'PP'
           this.form.whetherIntegral="1"
-          // 把花纹数组里的全部默认0
+          // 把规格数组里的全部默认0
           for (let item of this.form.brandFigureList) {
             item.version = '0'
           }

src/views/tirePartsMall/pointsMall/listingManagement/commodity.json

@@ -1,174 +1,140 @@
-
 {
-    "align": "center",
-    "height": "auto",
-    "calcHeight": 80,
-    "stripe": true,
-    "tip": false,
-    "addBtn": false,
-    "searchShow": true,
-    "searchShowBtn": false,
-    "menu": true,
-    "viewBtn": false,
-    "editBtn": false,
-    "delBtn": false,
-    "menuWidth": 80,
-    "searchSpan": 8,
-    "searchMenuSpan": 24,
-    "searchMenuPosition": "right",
-    "border": true,
-    "index": true,
-    "selection": true,
+  "align": "center",
+  "height": "auto",
+  "calcHeight": 80,
+  "stripe": true,
+  "tip": false,
+  "addBtn": false,
+  "searchShow": true,
+  "searchShowBtn": false,
+  "menu": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "menuWidth": 80,
+  "searchSpan": 8,
+  "searchMenuSpan": 24,
+  "searchMenuPosition": "right",
+  "border": true,
+  "index": true,
+  "selection": true,
   "rowKey": "id",
-
-    "dialogClickModal": false,
-    "column": [
+  "dialogClickModal": false,
+  "column": [
+    {
+      "label": "名称",
+      "prop": "cname",
+      "slot": true,
+      "search": true,
+      "width": 100,
+      "overHidden": true,
+      "rules": [
         {
-            "label": "轮胎名称",
-            "prop": "cname",
-            "slot": true,
-            "search": true,
-            "width": 100,
-            "overHidden": true,
-            "rules": [
-              {
-                "required": true,
-                "message": " ",
-                "trigger": "blur"
-              }
-            ]
-          },
-      {
-        "label": "轮胎编码",
-        "prop": "code",
-        "search": true,
-        "width": 100,
-        "overHidden": true,
-        "rules": [
-          {
-            "required": true,
-            "message": " ",
-            "trigger": "blur"
-          }
-        ]
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "编码",
+      "prop": "code",
+      "search": true,
+      "width": 100,
+      "overHidden": true,
+      "rules": [
+        {
+          "required": true,
+          "message": " ",
+          "trigger": "blur"
+        }
+      ]
+    },
+    {
+      "label": "品牌",
+      "prop": "brandId",
+      "slot": true,
+      "overHidden": true,
+      "search": true,
+      "type": "select",
+      "props": {
+        "label": "cname",
+        "value": "id"
       },
-      {
-        "label": "品牌",
-        "prop": "brandId",
-        "slot": true,
-        "overHidden": true,
-        "search": true,
-        "type": "select",
-        "props": {
-          "label": "cname",
-          "value": "id"
-        },
-        "dicUrl": "/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1"
-
+      "dicUrl": "/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1"
+    },
+    {
+      "label": "类别",
+      "prop": "goodsTypeId",
+      "addDisabled": false,
+      "search": true,
+      "type": "select",
+      "overHidden": true,
+      "props": {
+        "res": "data.records",
+        "label": "cname",
+        "value": "id"
       },
-      {
-        "label": "轮胎类别",
-        "prop": "goodsTypeId",
-        "addDisabled": false,
-        "search":true,
-        "type":"select",
-        "overHidden": true,
-        "props":{
-          "res":"data.records",
-          "label":"cname",
-          "value":"id"
-        },
-        "dicUrl":"/api/blade-sales-part/goodsType/page?corpType=SP&parentId=0",
-        "rules": [{
+      "dicUrl": "/api/blade-sales-part/goodsType/page?corpType=SP&parentId=0",
+      "rules": [
+        {
           "required": true,
           "message": " ",
           "trigger": "click"
-        }]
-      },
-      {
-        "label": "规格",
-        "prop": "typeno",
-        "search": false,
-        "overHidden": true
-      },
-
-      {
-        "label": "花纹",
-        "prop": "brandItem",
-        "slot": true,
-        "overHidden": true
-      },
-      {
-        "label": "售价1",
-        "prop": "priceOne",
-        "slot": true,
-        "cell":false,
-        "overHidden": true,
-        "rules": [{
+        }
+      ]
+    },
+    {
+      "label": "规格",
+      "prop": "typeno",
+      "search": false,
+      "overHidden": true
+    },
+    {
+      "label": "规格",
+      "prop": "brandItem",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "积分1",
+      "prop": "priceOne",
+      "slot": true,
+      "cell": false,
+      "overHidden": true,
+      "rules": [
+        {
           "required": true,
           "message": " ",
           "trigger": "blur"
-        }]
-      },
-      {
-        "label": "售价2",
-        "prop": "priceTwo",
-        "slot": true,
-        "overHidden": true
-      },
-      {
-        "label": "售价3",
-        "prop": "priceThree",
-        "slot": true,
-        "overHidden": true
-      },
-      {
-        "label": "售价4",
-        "prop": "priceFour",
-        "slot": true,
-        "overHidden": true
-      },
-      {
-        "label": "共享公司",
-        "prop": "sharedCompany",
-        "slot": true,
-        "type":"select",
-        "cell":"true",
-        "overHidden": true
-      },
-      {
-        "label": "是否零库存上架",
-        "prop": "whether",
-        "search":true,
-        "type":"select",
-        "overHidden": true,
-        "clearable": false,
-        "dicData": [{
-          "label": "是",
-          "value": 1
-        }, {
-          "label": "否",
-          "value": 0
-        }],
-        "searchValue": 0,
-        "searchLabelWidth": 120
-      },
-      {
-        "label": "是否积分商品",
-        "prop": "whetherIntegral",
-        "search":true,
-        "type":"select",
-        "overHidden": true,
-        "clearable": false,
-        "dicData": [{
-          "label": "是",
-          "value": 1
-        }, {
-          "label": "否",
-          "value": 0
-        }],
-        "searchValue": 0,
-        "searchLabelWidth": 120
-      }
-    ]
-  }
+        }
+      ]
+    },
+    {
+      "label": "积分2",
+      "prop": "priceTwo",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "积分3",
+      "prop": "priceThree",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "积分4",
+      "prop": "priceFour",
+      "slot": true,
+      "overHidden": true
+    },
+    {
+      "label": "共享公司",
+      "prop": "sharedCompany",
+      "slot": true,
+      "type": "select",
+      "cell": "true",
+      "overHidden": true
+    }
+  ]
+}

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

@@ -12,8 +12,8 @@
             ref="crud" :key="key" @on-load="onLoad" @selection-change="selectionChange" :before-open="beforeOpen"
             @row-update="rowUpdate" @search-change="searchChange" @search-reset="resetChange"
             @refresh-change="refreshChange" @row-del="rowDel"
-            @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 273)"
-            @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 273)" :page.sync="page">
+            @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 426)"
+            @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 426)" :page.sync="page">
             <template slot="filesListForm">
               <span style="font-size: 12px;">(图片文件像素推荐700X700，有且只允许有一张主图，其余均为副图)</span>
               <c-upload :data="form.filesList" display basic deleteUrl="/api/blade-sales-part/productLaunchFiles/remove"
@@ -98,7 +98,7 @@
               <el-input v-model="row.priceTwo" size="small" @change="selectChangefun($event, row)"></el-input>
               <!-- <span v-else>{{ row.refreshChange | IntegerFormat }}</span> -->
             </template>
-            <!--花纹-->
+            <!--规格-->
             <template slot-scope="{row}" slot="brandItem">
               <!--<el-select-->
               <!--    v-model="row.brandItem"-->
@@ -152,8 +152,8 @@
         <el-button @click="dialogVisibles = false" :loading="saveLoading">取 消</el-button>
         <el-button type="primary" @click="importGoods" v-if="commodityData !== true"
           :loading="saveLoading">导入</el-button>
-        <el-button type="primary" @click="importChoice" v-if="commodityData === true" :loading="saveLoading"
-          :disabled="tableData.length !== 1">导入</el-button>
+        <!-- <el-button type="primary" @click="importChoice" v-if="commodityData === true" :loading="saveLoading"
+          :disabled="tableData.length !== 1">导入</el-button> -->
       </span>
     </el-dialog>
     <el-dialog title="添加产品" v-if="excelBox" append-to-body :visible.sync="excelBox" :close-on-click-modal="false"
@@ -208,6 +208,7 @@ import {
   getDetail,
   remove,
   productLaunch,
+  productLaunchPoints,
   deptList, listAllP, groundingListZero
 } from "@/api/tirePartsMall/basicData/listingManagement/index.js";
 import { getToken } from "@/util/auth";
@@ -339,16 +340,8 @@ export default {
           disabled: true,
           search: true,
           overHidden: true,
-        }, {
-          label: '花纹',
-          prop: 'brandItem',
-          disabled: true,
-          search: true,  // 是否搜索
-          // type: 'select',
-          // remote:true, // 是否为远程搜索
-          // dicUrl:'/api/blade-sales-part/productLaunch/list?brandItem={{key}}',   //key为当前输入值
-          overHidden: true,
-        }, {
+        },
+         {
           label: '公司',
           prop: 'salesCompanyName',
           disabled: true,
@@ -362,7 +355,7 @@ export default {
         }, {
           label: '库存',
           prop: 'inventory',
-          disabled: true,
+          // disabled: true,
           overHidden: true,
         },
         {
@@ -391,8 +384,9 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1',
+          dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1&&whetherIntegral=1',
           hide: true,
+          filterable: true,
           disabled: true,
           overHidden: false,
         }, {
@@ -402,22 +396,22 @@ export default {
           overHidden: false,
         },
         {
-          label: "售价1",
+          label: "积分1",
           prop: "priceOne",
           hide: false,
           overHidden: true,
         }, {
-          label: "售价2",
+          label: "积分2",
           prop: "priceTwo",
           hide: false,
           overHidden: true,
         }, {
-          label: "售价3",
+          label: "积分3",
           prop: "priceThree",
           hide: false,
           overHidden: true,
         }, {
-          label: "售价4",
+          label: "积分4",
           prop: "priceFour",
           hide: false,
           overHidden: true,
@@ -446,55 +440,6 @@ export default {
           overHidden: true,
           span: 24,
         }, {
-          label: "防爆",
-          prop: "explosionProof",
-          display: false,
-          search: true,
-          hide: false,
-          showColumn: true,
-          span: 8,
-          type: 'select',
-          dicData: [{
-            label: '否',
-            value: 0
-          }, {
-            label: '是',
-            value: 1
-          }],
-        }, {
-          label: "静音棉",
-          prop: "originalFactory",
-          display: false,
-          search: true,
-          hide: false,
-          showColumn: true,
-          span: 8,
-          type: 'select',
-          dicData: [{
-            label: '否',
-            value: "0"
-          }, {
-            label: '是',
-            value: "1"
-          }],
-        },
-        {
-          label: "自修补",
-          prop: "selfRecovery",
-          display: false,
-          search: true,
-          hide: false,
-          showColumn: true,
-          span: 8,
-          type: 'select',
-          dicData: [{
-            label: '否',
-            value: "0"
-          }, {
-            label: '是',
-            value: "1"
-          }],
-        }, {
           label: "商品详情",
           prop: "detailsText",
           hide: true,
@@ -509,15 +454,15 @@ export default {
     // getCorpTypes().then(res=>{
     //     this.treeData = res.data.data
     // })
-    listAllP({whetherIntegral:"1"}).then(res => {
+    listAllP({ whetherIntegral: "1" }).then(res => {
       this.treeData = res.data.data
     })
     this.onLoad(this.page, this.search)
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(273), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(426), this.optionList);
     this.optionTwo = await this.getColumnData(
-      this.getColumnName(280),
+      this.getColumnName(427),
       this.optionTwo
     );
     isProcurement({ "param": "whether.model" }).then(res => {
@@ -554,17 +499,17 @@ export default {
     // 导入
     excelBoxfun(name) {
       if (name == '名称') {
-        this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/productLaunch/import-productLaunch'
+        this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/productLaunch/import-productLaunch?whetherIntegral=1'
         this.templateUrl = '/api/blade-sales-part/productLaunch/export-productLaunch'
       } else if (name == 'code') {
-        this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/productLaunch/import-productLaunch-code'
+        this.findObject(this.excelOption.column, "excelFile").action = '/api/blade-sales-part/productLaunch/import-productLaunch-code?whetherIntegral=1'
         this.templateUrl = '/api/blade-sales-part/productLaunch/export-productLaunch-code'
       }
       this.excelBox = true
     },
     // 导出
     outExport() {
-      let config = { params: { ...this.search } }
+      let config = { params: { ...this.search, whetherIntegral: 1 } }
       if (config.params) {
         for (const propName of Object.keys(config.params)) {
           const value = config.params[propName];
@@ -667,7 +612,7 @@ export default {
     derivation() {
       window.open(
         `${this.templateUrl}?${this.website.tokenHeader
-        }=${getToken()}`
+        }=${getToken()}&whetherIntegral=1`
       );
     },
     uploadAfter(res, done, loading, column) {
@@ -828,7 +773,7 @@ export default {
         this.$message.error('请选择')
       }
       if (this.goodsListSave.some(item => item.priceOne == undefined || item.priceTwo == undefined || item.priceThree == undefined || item.priceFour == undefined)) {
-        this.$message.error('请填写所有售价');
+        this.$message.error('请填写所有积分');
       } else {
         if (this.goodsListSave.length > 0) {
           this.goodsListSaveHandle()
@@ -845,9 +790,9 @@ export default {
         // item.sharedCompany = JSON.stringify(item.sharedCompany)
       })
 
-      productLaunch(this.goodsListSave).then(res => {
+      productLaunchPoints(this.goodsListSave).then(res => {
         this.dialogVisibles = !this.dialogVisibles
-
+        this.onLoad(this.page, this.search)
       })
     },
     //导入商品触发
@@ -964,7 +909,7 @@ export default {
         ...Object.assign(params, search),
         // ...Object.assign(params, this.search),
         billType: 0,
-        whetherIntegral:"1"
+        whetherIntegral: "1"
       }
       this.loading = true
       getList(params).then(res => {
@@ -981,8 +926,9 @@ export default {
       this.loading = true
 
       groundingListZero({
-        whether: params.whether ? params.whether : 0,
         ...params,
+        whetherIntegral: '1',
+        whether: 1
       }).then(res => {
         this.goodsListShow = res.data.data.records
         this.data = res.data.data.records;
@@ -997,7 +943,7 @@ export default {
     },
     async saveGoodsColumn() {
       const inSave = await this.saveColumnData(
-        this.getColumnName(280),
+        this.getColumnName(427),
         this.optionTwo
       );
       if (inSave) {
@@ -1012,7 +958,7 @@ export default {
     async resetGoodsColumn() {
       this.optionTwo = commodity;
       const inSave = await this.delColumnData(
-        this.getColumnName(280),
+        this.getColumnName(427),
         commodity
       );
       if (inSave) {

src/views/tirePartsMall/pointsMall/pointsGoods/components/index.vue

@@ -88,6 +88,7 @@ export default {
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
       row.corpType = "SP";
+      row.whetherIntegral = '1'
       typeSave(row).then(
         () => {
           this.$message({
@@ -108,6 +109,7 @@ export default {
     rowSave(row, done, loading) {
       console.log('测试');
       row.corpType = "SP";
+      row.whetherIntegral = '1';
       typeSave(row).then(
         res => {
           this.$message({
@@ -125,7 +127,7 @@ export default {
     },
     //查询全部
     initData() {
-      customerList({corpType: "SP"}).then(res => {
+      customerList({corpType: "SP",whetherIntegral:'1'}).then(res => {
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
       });
@@ -187,6 +189,7 @@ export default {
       let values = {
         ...params,
         corpType: "SP",
+        whetherIntegral:'1',
         size: this.page.pageSize,
         current: this.page.currentPage
       };

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

@@ -138,6 +138,7 @@ export default {
             storageVisible: false,
             isWhether: false,
             form: {
+                whether:'0',
                 whetherIntegral:'1'
             },
             form2: {},
@@ -202,7 +203,7 @@ export default {
                             value: 'id',
                             disabled: 'disabled'
                         },
-                        dicUrl: '/api/blade-sales-part/brandDesc/listAllV1?type=PP&enableOrNot=1',
+                        dicUrl: '/api/blade-sales-part/brandDesc/listAllV1?type=PP&enableOrNot=1&whetherIntegral=1',
                         change: (value) => {
                             if (!value.value) return
                             brandfigureListAll({ pid: value.value }).then(res => {
@@ -414,40 +415,6 @@ export default {
                         span: 8
                     },
                     {
-                        label: "是否管理批次号",
-                        prop: "whether",
-                        labelWidth: 120,
-                        span: 8,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "是否积分商品",
-                        prop: "whetherIntegral",
-                        labelWidth: 120,
-                        span: 8,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: "兑换积分(推荐人)",
-                        prop: "referenceIntegral",
-                        labelWidth: 120,
-                        span: 8
-                    },
-                    {
-                        label: "兑换积分(业务员)",
-                        prop: "salesmanIntegral",
-                        labelWidth: 120,
-                        span: 8
-                    },
-                    {
                         label: "兑换积分",
                         prop: "integral",
                         span: 8
@@ -582,11 +549,11 @@ export default {
             //   this.goodsTypeList = res.data.data;
             //   this.findObject(this.option2.column, "parentId").dicData = res.data.data;
             // });
-            getCorpType({ corpType: "SP" }).then(res => {
+            getCorpType({ corpType: "SP",whetherIntegral:'1' }).then(res => {
                 console.log(res);
                 this.goodsTypeList = res.data.data;
             })
-            customerList({ corpType: "SP" }).then(res => {
+            customerList({ corpType: "SP",whetherIntegral:'1' }).then(res => {
                 console.log('kk', res);
                 // this.goodsTypeList = res.data.data.records;
                 this.findObject(this.option2.column, "parentId").dicData = res.data.data.records;

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

@@ -86,8 +86,8 @@
                         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts"
                             :data="form.orderItemsList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
                             @row-close="rowClose" :before-close="beforeClose" @selection-change="selectionContacts"
-                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)"
-                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)">
+                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 425)"
+                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 425)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <el-button type="primary" icon="el-icon-plus" size="small" :disabled="isAddBtn"
                                     @click="rowAdd(row)">添加商品</el-button>
@@ -422,7 +422,145 @@ export default {
             },
             templateUrl: '', // 模板url
             // 表格需要的配置
-            optionTwo: commodityxsho,
+            optionTwo: {
+                align: "center",
+                height: "auto",
+                calcHeight: 80,
+                stripe: true,
+                tip: false,
+                addBtn: false,
+                searchShow: true,
+                searchShowBtn: false,
+                menu: true,
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                menuWidth: 80,
+                searchSpan: 8,
+                searchMenuSpan: 8,
+                searchMenuPosition: "right",
+                border: true,
+                index: true,
+                selection: true,
+                dialogClickModal: false,
+                searchIcon: true,
+                searchIndex: 2,
+                column: [
+                    {
+                        label: "商品名称",
+                        prop: "cname",
+                        search: true,
+                        width: 100,
+                        overHidden: true
+                    },
+                    {
+                        label: "商品编号",
+                        prop: "code",
+                        search: true,
+                        width: 100,
+                        overHidden: true
+                    },
+                    {
+                        label: "数量",
+                        prop: "goodsNum",
+                        slot: true,
+                        overHidden: true,
+                        width: 120
+                    },
+                    {
+                        label: "单价",
+                        prop: "price",
+                        overHidden: true,
+                        slot: true,
+                        width: 120,
+                        cell: true,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "批次号",
+                        prop: "dot",
+                        cell: true,
+                        width: "150",
+                        type: "select",
+                        disabled: true,
+                        allowCreate: true,
+                        filterable: true,
+                        dicData: [],
+                        props: {
+                            "label": "dot",
+                            "value": "dot"
+                        },
+                        dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+                        overHidden: true
+                    },
+                    {
+                        label: "批次号",
+                        prop: "whether",
+                        type: "select",
+                        search: true,
+                        dicData: [{
+                            "label": "否",
+                            "value": "0"
+                        }, {
+                            "label": "是",
+                            "value": "1"
+                        }]
+                    },
+                    {
+                        label: "库存",
+                        prop: "inventory",
+                        addDisabled: false,
+                        multiple: true,
+                        overHidden: true
+                    },
+                    {
+                        label: "规格型号",
+                        prop: "specificationAndModel",
+                        width: "120",
+                        slot: true,
+                        overHidden: true,
+                        search: true
+                    },
+                    {
+                        label: "公司",
+                        prop: "salesCompanyName",
+                        slot: true,
+                        width: "120",
+                        overHidden: true
+                    },
+                    {
+                        label: "商品分类",
+                        prop: "goodsTypeName",
+                        slot: true,
+                        overHidden: true
+                    },
+                    {
+                        label: "品牌",
+                        prop: "brandName",
+                        slot: true,
+                        overHidden: true
+                    },
+                    {
+                        label: "规格",
+                        prop: "brandItem",
+                        width: "120",
+                        slot: true,
+                        overHidden: true,
+                        search: true
+                    },
+                    {
+                        label: "共享公司",
+                        prop: "sharedCompany",
+                        slot: true,
+                        width: "120",
+                        overHidden: true
+                    }
+                ]
+            },
             loading: false,
             // 商品列表数据合计
             goodsListShow: [],
@@ -537,7 +675,7 @@ export default {
                 //         if (!this.onLoad.id) {
                 //             // this.$set(this.optionContactsBack, "addBtn", true)
                 //             // this['optionContacts'] = this['optionContactsBack'];
-                //             // this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
+                //             // this.delColumnData(this.getColumnName('425'), this['optionContactsBack']);
                 //         }
                 //         if (this.$refs.form.DIC.customerId || !this.onLoad.id) {
                 //             getCustom({ id: data.value }).then(res => {
@@ -939,7 +1077,7 @@ export default {
                     disabled: false,
                     width: 100
                 }, {
-                    label: '花纹',
+                    label: '规格',
                     prop: 'pattern',
                     overHidden: true,
                     disabled: false,
@@ -1210,7 +1348,7 @@ export default {
                 })
             }
         }
-        this.optionContacts = await this.getColumnData(this.getColumnName(269.1), this.optionContactsBack);
+        this.optionContacts = await this.getColumnData(this.getColumnName(425), this.optionContactsBack);
         isProcurement({ "param": "whether.model" }).then(res => {
             if (res.data.data == 1) {
                 this.findObject(this.optionContacts.column, "pattern").label = '规格型号1'
@@ -1289,7 +1427,7 @@ export default {
             this.viewDisabled = true;
             // this.$set(this.optionContactsBack, "addBtn", false)
             // this['optionContacts'] = this['optionContactsBack'];
-            // this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
+            // this.delColumnData(this.getColumnName('425'), this['optionContactsBack']);
         }
         if (!this.detailData.id) {
             this.editButton = false
@@ -1393,7 +1531,7 @@ export default {
             //     console.log(3);
             //     // this.$set(this.optionContactsBack, "addBtn", false)
             //     this['optionContacts'] = this['optionContactsBack'];
-            //     this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
+            //     this.delColumnData(this.getColumnName('425'), this['optionContactsBack']);
             // }
             // if (!this.detailData.id) {
             //     this.form.businessSource = '内部销售'
@@ -1675,7 +1813,8 @@ export default {
             goodsPageXs({
                 customId: this.form.customerId,
                 stock: this.form.storageId,
-                enableOrNot: 1
+                enableOrNot: 1,
+                whetherIntegral: '1'
             }).then(res => {
                 const data = res.data.data;
                 this.goodsListShow = data.records;
@@ -1693,6 +1832,7 @@ export default {
                 enableOrNot: 1,
                 goodsTypeId: this.treeDeptId,
                 ...Object.assign(params, this.SelectSearch),
+                whetherIntegral: '1'
             }).then(res => {
                 const data = res.data.data;
                 this.page.total = data.total;
@@ -1994,12 +2134,12 @@ export default {
                 //     this.$set(item, 'disabled', false)
                 // })
                 // this.optionContactsBack.column.forEach(item => {
-                //     if (item.label === '规格型号' || item.label === '花纹' || item.label === '品牌' || item.label === '物料编码' || item.label === '单位' || item.label === '轮胎描述') {
+                //     if (item.label === '规格型号' || item.label === '规格' || item.label === '品牌' || item.label === '物料编码' || item.label === '单位' || item.label === '轮胎描述') {
                 //         item.disabled = true;
                 //     }
                 // })
                 // this['optionContacts'] = this['optionContactsBack'];
-                // this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
+                // this.delColumnData(this.getColumnName(425), this['optionContactsBack']);
 
 
                 // this.form.outboundRecordsList.forEach(item=>{
@@ -2541,7 +2681,7 @@ export default {
                 //         }
                 //     })
                 //     this['optionContacts'] = this['optionContactsBack'];
-                //     this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
+                //     this.delColumnData(this.getColumnName(425), this['optionContactsBack']);
                 //     this.optionContactsBack.column.forEach(item => {
                 //         if (item.prop == 'dot') {
                 //             this.$set(item, disabled, false)
@@ -2557,13 +2697,13 @@ export default {
                 //         this.$set(item, 'disabled', false)
                 //     })
                 //     this.optionContactsBack.column.forEach(item => {
-                //         if (item.label === '规格型号' || item.label === '花纹' || item.label === '品牌' || item.label === '物料编码' || item.label === '单位' || item.label === '商品描述') {
+                //         if (item.label === '规格型号' || item.label === '规格' || item.label === '品牌' || item.label === '物料编码' || item.label === '单位' || item.label === '商品描述') {
                 //             item.disabled = true;
                 //         }
                 //     })
                 //     console.log(324324);
                 //     this['optionContacts'] = this['optionContactsBack'];
-                //     this.delColumnData(this.getColumnName(269.1), this['optionContactsBack']);
+                //     this.delColumnData(this.getColumnName(425), this['optionContactsBack']);
                 // }
                 // // this.$set(this.form.orderItemsList,'goodsNum',66)
 

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

@@ -4,8 +4,8 @@
         <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
           ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
           @expand-change="expandChange" @refresh-change="refreshChange"
-          @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 269)"
-          @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 269)" :page.sync="page">
+          @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 424)"
+          @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 424)" :page.sync="page">
           <template slot-scope="{ row }" slot="status">
             <span v-for="(item, index) in orderStatusList" :key="index">
               <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
@@ -169,7 +169,7 @@
               width: 150
             },
             {
-              label: '花纹',
+              label: '规格',
               prop: 'pattern',
               overHidden: true,
               disabled: false,
@@ -499,7 +499,7 @@
       }, 100);
     },
     async created() {
-      this.option = await this.getColumnData(this.getColumnName(269), this.optionList);
+      this.option = await this.getColumnData(this.getColumnName(424), this.optionList);
       this.key++
       let i = 0;
       this.option.column.forEach(item => {

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

@@ -2312,14 +2312,14 @@ export default {
                         this.form.orderItemsList[i].subTotalMoney = Number(this.form.orderItemsList[i].goodsNum * this.form.orderItemsList[i].price) ? Number(this.form.orderItemsList[i].goodsNum * this.form.orderItemsList[i].price).toFixed(2) : 0
                         if (this.form.orderItemsList[i].pid) {
                         } else {
-                            if (this.form.orderItemsList[i].whether == '1') {
-                                if (this.form.orderItemsList[i].dot) { } else {
-                                    this.$message.warning(`销售明细序号${Number(i) + 1}的批次号不能为空`);
-                                    picihao = true
-                                    break;
-                                }
-                            } else {
-                            }
+                            // if (this.form.orderItemsList[i].whether == '1') {
+                            //     if (this.form.orderItemsList[i].dot) { } else {
+                            //         this.$message.warning(`销售明细序号${Number(i) + 1}的批次号不能为空`);
+                            //         picihao = true
+                            //         break;
+                            //     }
+                            // } else {
+                            // }
                         }
                         if (this.form.orderItemsList[i].goodsNum <= 0) {
                             this.$message.warning(`销售明细序号${Number(i) + 1}的数量不能为零`);