Ver código fonte

修改积分商城 调拨 仓库

Qukatie 7 meses atrás
pai
commit
e23040ce62

+ 6 - 1
public/index.html

@@ -21,8 +21,13 @@
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
 <!--    导入拖拽-->
   <script src="https://cdn.staticfile.org/Sortable/1.10.0-rc2/Sortable.min.js"></script>
+  <script>
+    window._AMapSecurityConfig = {
+      securityJsCode: '3d1fa066dcbd64ac5460f63c189f0634',
+    }
+  </script>
 <!--    导入高德地图-->
-  <script src="https://webapi.amap.com/maps?v=1.4.15&key=41a0c8e6cc45f8c76306900bf45a1431"></script>
+  <script src="https://webapi.amap.com/maps?v=1.4.15&key=41a0c8e6cc45f8c76306900bf45a1431&plugin=AMap.PlaceSearch"></script>
 <!--    导入腾旭地图-->
 <!--    <script src="https://map.qq.com/api/gljs?v=1.exp&key=CB2BZ-T3IWN-UPWFO-SR2Y6-4YBXQ-SGBKT"></script>-->
 <!--    <script src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script>-->

+ 63 - 14
src/views/tirePartsMall/basicData/warehouse/index.vue

@@ -6,9 +6,13 @@
       @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 264)"
       @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 264)" @search-criteria-switch="searchCriteriaSwitch"
       @tree-load="treeLoad">
-        <template slot-scope="{type,size,row,$index}" slot="menuLeft">
-            <el-button icon="el-icon-plus" type="primary" :size="size" @click="handleAdd">新增</el-button>
-        </template>
+      <template slot-scope="{type,size,row,$index}" slot="menuLeft">
+        <el-button icon="el-icon-plus" type="primary" :size="size" @click="handleAdd">新增</el-button>
+      </template>
+      <template slot-scope="{type,disabled}" slot="positionerForm">
+        <avue-input-map :params="params" placeholder="请选择地图" :disabled="disabled"
+          v-model="form.positioner"></avue-input-map>
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -23,15 +27,22 @@ import {
 import {
   customerListAll
 } from "@/api/tirePartsMall/basicData/warehouse";
-import {getUser} from "@/api/system/user";
+import { getUser } from "@/api/system/user";
 export default {
   name: "customerInformation",
   data() {
     return {
-      form: {},
+      params: {
+        zoom: 10,
+        // zoomEnable: false,
+        // dragEnable: false,
+      },
+      form: {
+        positioner: []
+      },
       option: {},
       optionBack: {
-          addBtn:false,
+        addBtn: false,
         headerAlign: "center",
         align: "center",
         border: true,
@@ -154,7 +165,7 @@ export default {
           prop: "salesCompanyId",
           search: true,
           overHidden: true,
-            disabled: true,
+          disabled: true,
           // width: 120,
           type: 'select',
           props: {
@@ -170,6 +181,20 @@ export default {
             }
           ]
         }, {
+          label: "经度",
+          prop: "longitude",
+          overHidden: true,
+        }, {
+          label: "维度",
+          prop: "dimension",
+          overHidden: true,
+        }, {
+          label: "定位器",
+          prop: "positioner",
+          overHidden: true,
+          hide: true,
+          showColumn: false,
+        }, {
           label: "备注",
           prop: "remarks",
           type: "textarea",
@@ -189,7 +214,7 @@ export default {
       },
       treeDeptId: "",
       corpTypeListCk: [],
-      flag:false,
+      flag: false,
     };
   },
   async created() {
@@ -204,9 +229,9 @@ export default {
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
-    setTimeout(()=>{
+    setTimeout(() => {
       this.flag = true
-    },200)
+    }, 200)
   },
   methods: {
     //删除列表后面的删除按钮触发触发(row, index, done)
@@ -230,6 +255,15 @@ export default {
     },
     //修改时的修改按钮点击触发
     rowUpdate(row, index, done, loading) {
+      if (row.positioner.length) {
+        row.longitude = row.positioner[0]
+        row.dimension = row.positioner[1]
+        row.address = row.positioner[2]
+      } else {
+        row.longitude = null
+        row.dimension = null
+        row.address = null
+      }
       typeSave(row).then(
         () => {
           this.$message({
@@ -248,6 +282,15 @@ export default {
     //新增修改时保存触发
     rowSave(row, done, loading) {
       console.log(row);
+      if (row.positioner.length) {
+        row.longitude = row.positioner[0]
+        row.dimension = row.positioner[1]
+        row.address = row.positioner[2]
+      } else {
+        row.longitude = null
+        row.dimension = null
+        row.address = null
+      }
       typeSave(row).then(
         res => {
           console.log(res);
@@ -267,11 +310,12 @@ export default {
       // const column = this.findObject(this.option.column, "parentId");
       // column.value = row.id;
       // column.addDisabled = true;
-        getUser(JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id).then(res=>{
-            this.form.salesCompanyName = res.data.data.deptName
-            this.form.salesCompanyId = res.data.data.deptId
-        })
 
+      getUser(JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id).then(res => {
+        this.form.salesCompanyName = res.data.data.deptName
+        this.form.salesCompanyId = res.data.data.deptId
+      })
+      this.form.positioner=[]
       this.$refs.crud.rowAdd();
     },
     //新增子项和新增触发查询所有
@@ -285,6 +329,11 @@ export default {
       }
       if (["edit", "view"].includes(type)) {
         detail(this.form.id).then(res => {
+          if (res.data.data.longitude && res.data.data.dimension && res.data.data.address) {
+            res.data.data.positioner = [Number(res.data.data.longitude), Number(res.data.data.dimension), res.data.data.address]
+          } else {
+            res.data.data.positioner = []
+          }
           this.form = res.data.data;
         });
       }

+ 4 - 4
src/views/tirePartsMall/pointsMall/listingManagement/commodity.json

@@ -61,7 +61,7 @@
         "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"
     },
     {
       "label": "类别",
@@ -75,7 +75,7 @@
         "label": "cname",
         "value": "id"
       },
-      "dicUrl": "/api/blade-sales-part/goodsType/page?corpType=SP&parentId=0",
+      "dicUrl": "/api/blade-sales-part/goodsType/page?corpType=SP&parentId=0&whetherIntegral=1",
       "rules": [
         {
           "required": true,
@@ -91,8 +91,8 @@
       "overHidden": true
     },
     {
-      "label": "规格",
-      "prop": "brandItem",
+      "label": "库存",
+      "prop": "inventory",
       "slot": true,
       "overHidden": true
     },

+ 8 - 2
src/views/tirePartsMall/pointsMall/listingManagement/index.vue

@@ -90,6 +90,9 @@
                 <el-tab-pane label="已选定数据" name="importStaging" />
               </el-tabs>
             </template>
+            <template slot="inventory" slot-scope="{row}">
+              <el-input v-model="row.inventory" size="small" :controls="false" :precision="0" style="width: 100%" />
+            </template>
             <template slot="priceOne" slot-scope="{row}">
               <el-input v-model="row.priceOne" size="small" :controls="false" :precision="0" style="width: 100%"
                 @change="selectChangefun($event, row)" @focus="selectFocusfun(row)" />
@@ -138,7 +141,7 @@
             <template slot-scope="scope" slot="menu">
               <el-button type="text" icon="el-icon-edit" size="small"
                 @click.stop="importStagList(scope.row, scope.index)" v-if="activeName == 'searchList'"
-                :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
+                :disabled="goodsListSave.findIndex(item => item.goodsId == scope.row.goodsId) !== -1">选择
               </el-button>
               <el-button type="text" icon="el-icon-delete" size="small"
                 @click.stop="removeStagList(scope.row, scope.index)" v-else>移除
@@ -384,7 +387,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1&&whetherIntegral=1',
+          dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP&enableOrNot=1&whetherIntegral=1',
           hide: true,
           filterable: true,
           disabled: true,
@@ -930,6 +933,9 @@ export default {
         whetherIntegral: '1',
         whether: 1
       }).then(res => {
+        res.data.data.records.forEach(e=>{
+          e.priceOne=e.integral
+        })
         this.goodsListShow = res.data.data.records
         this.data = res.data.data.records;
         this.pages.total = res.data.data.total

+ 6 - 6
src/views/tirePartsMall/pointsMall/pointsGoods/detailsPage.vue

@@ -76,7 +76,7 @@
             </trade-card>
             <containerTitle title="附件信息"></containerTitle>
             <c-upload :data="filesList" display deleteUrl="/api/blade-sales-part/goodsfiles/remove"
-                :enumerationValue="160.1" />
+                :enumerationValue="160.1" :disabled="form.enableOrNot == 1" />
             <el-dialog title="设置产品分类" v-dialogDrag :visible.sync="goodsTypeVisible" class="avue-dialog" width="80%"
                 append-to-body @closed="goodsTypeClosed">
                 <span>
@@ -414,11 +414,11 @@ export default {
                         prop: "inventoryAlert",
                         span: 8
                     },
-                    // {
-                    //     label: "兑换积分",
-                    //     prop: "integral",
-                    //     span: 8
-                    // },
+                    {
+                        label: "兑换积分",
+                        prop: "integral",
+                        span: 8
+                    },
                     {
                         label: "备注",
                         prop: "remarks",

+ 15 - 14
src/views/tirePartsMall/pointsMall/pointsGoods/index.vue

@@ -6,8 +6,8 @@
           <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" style="height:82vh;">
             <template slot="addBtn">
               <el-tooltip class="item" effect="dark" content="新建分类" placement="top">
-              <i class="el-icon-setting" @click="goodsTypeVisible = true"
-                style="font-size:18px;line-height: 1px;width: 20px;padding:10px;"></i>
+                <i class="el-icon-setting" @click="goodsTypeVisible = true"
+                  style="font-size:18px;line-height: 1px;width: 20px;padding:10px;"></i>
               </el-tooltip>
             </template>
           </avue-tree>
@@ -62,17 +62,18 @@
           <el-button type="text" size="small" @click.stop="rowDel(row, index)">
             删除
           </el-button> -->
-          <el-button type="text" size="small" @click.stop="rowDel(row, index)" v-if="row.status != 0" :disabled="row.enableOrNot">
-            删除
-          </el-button>
+              <el-button type="text" size="small" @click.stop="rowDel(row, index)" v-if="row.status != 0"
+                :disabled="row.enableOrNot">
+                删除
+              </el-button>
             </template>
           </avue-crud>
         </el-col>
       </el-row>
     </basic-container>
     <details-page v-if="!show" @goBack="goBack()" :detailData="detailData" />
-    <el-dialog title="设置产品分类" v-dialogDrag :visible.sync="goodsTypeVisible" class="avue-dialog" width="80%" append-to-body
-      @closed="goodsTypeClosed">
+    <el-dialog title="设置产品分类" v-dialogDrag :visible.sync="goodsTypeVisible" class="avue-dialog" width="80%"
+      append-to-body @closed="goodsTypeClosed">
       <span>
         <!--<goods-type></goods-type>-->
         <corp-type></corp-type>
@@ -102,7 +103,7 @@
 <script>
 import detailsPage from "./detailsPage";
 import { option } from "./js/optionList";
-import { getList, remove, getCorpType,synchronization } from "@/api/tirePartsMall/basicData/commodityInformation";
+import { getList, remove, getCorpType, synchronization } from "@/api/tirePartsMall/basicData/commodityInformation";
 import { getToken } from "@/util/auth";
 // import goodsType from '@/components/goodsType/index'
 import corpType from './components/index'
@@ -113,7 +114,7 @@ export default {
     return {
       goodsTypeVisible: false,
       src: '',
-      key:0,
+      key: 0,
       show: true,
       loading: false,
       search: {},
@@ -191,7 +192,7 @@ export default {
               res: "data"
             },
             tip: "请上传 .xls,.xlsx 标准格式文件",
-            action: "/api/blade-sales-part/goodsDesc/import-desc"
+            action: "/api/blade-sales-part/goodsDesc/import-desc-Points"
           }
         ]
       }
@@ -229,7 +230,7 @@ export default {
       // getAllgoods().then(res => {
       //   this.findObject(this.option.column, "cname").dicData = res.data.data
       // });
-      getCorpType({ corpType: 'SP',whetherIntegral:"1"}).then(res => {
+      getCorpType({ corpType: 'SP', whetherIntegral: "1" }).then(res => {
         this.treeData = res.data.data;
         // this.findObject(this.option2.column, "parentId").dicData = res.data.data;
       });
@@ -240,13 +241,13 @@ export default {
     },
     derivation() {
       window.open(
-        `/api/blade-sales-part/goodsDesc/export-template?${this.website.tokenHeader
+        `/api/blade-sales-part/goodsDesc/export-template-Points?${this.website.tokenHeader
         }=${getToken()}`
       );
     },
     //导出
     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];
@@ -331,7 +332,7 @@ export default {
     },
     onLoad(page, params = {}) {
       let data = this.deepClone(Object.assign(params, this.search));
-      data.whetherIntegral="1"
+      data.whetherIntegral = "1"
       this.loading = true;
       getList({
         ...data,

+ 5 - 33
src/views/tirePartsMall/pointsMall/pointsOrder/detailsPage.vue

@@ -632,11 +632,8 @@ export default {
                     label: '销售金额',
                     prop: "salesAmount",
                     disabled: true
-                }, {
-                    label: '运费',
-                    prop: "freight",
-                    disabled: true
-                }, {
+                },
+                {
                     label: '总金额',
                     prop: "totalMoney",
                     disabled: true
@@ -652,10 +649,6 @@ export default {
                     label: '来源单号',
                     prop: "srcOrdNo",
                     disabled: true
-                }, {
-                    label: '退货数量',
-                    prop: "returnsNumber",
-                    disabled: true
                 },
                 {
                     label: '备注',
@@ -804,22 +797,6 @@ export default {
                     overHidden: true,
                     hide: true,
                     width: 100
-                }, {
-                    label: '批次号',
-                    prop: 'dot',
-                    cell: true,
-                    type: "select",
-                    width: 120,
-                    disabled: true,
-                    allowCreate: true,
-                    filterable: true,
-                    dicData: [],
-                    props: {
-                        label: "dot",
-                        value: "dot"
-                    },
-                    dicUrl: "/api/blade-sales-part/stockDesc/dotList",
-                    overHidden: true,
                 },
                 // {
                 //     label: '单号',
@@ -854,13 +831,8 @@ export default {
                     overHidden: true,
                     disabled: false,
                     width: 100
-                }, {
-                    label: '规格',
-                    prop: 'pattern',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100
-                }, {
+                },
+                {
                     label: '商品描述',
                     prop: 'goodsDescription',
                     disabled: false,
@@ -1309,7 +1281,7 @@ export default {
         },
         // 获取左侧筛选
         getAllWorkDicts() {
-            getCorpTypes({whetherIntegral:'1'}).then(res => {
+            getCorpTypes({ whetherIntegral: '1' }).then(res => {
                 this.treeDataGoods = res.data.data;
             });
         },

+ 1 - 1
src/views/tirePartsMall/pointsMall/pointsOrder/index.vue

@@ -437,7 +437,7 @@
       //   this.option.searchMenuSpan = num * 8;
       //   this.option.searchMenuPosition = "right";
       // }
-      this.getWorkDicts("sales_Status").then(res => {
+      this.getWorkDicts("points_Status").then(res => {
         this.orderStatusList = res.data.data
         console.log(this.orderStatusList);
       });

+ 1 - 1
src/views/tirePartsMall/salesManagement/inboundTask/index.vue

@@ -151,7 +151,7 @@ export default {
           width: 140,
           // type: 'select',
           overHidden: true,
-          cell:true,
+          // cell:true,
           // filterable:true,
           // remote:true,
           // props: {

+ 1 - 1
src/views/tirePartsMall/salesManagement/outboundTask/index.vue

@@ -144,7 +144,7 @@ export default {
           prop: "customerName",
           search: true,
           width: 140,
-          cell:true,
+          // cell:true,
           // type: 'select',
           // overHidden: true,
           // filterable: true,

+ 83 - 32
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/detailsPage.vue

@@ -44,10 +44,20 @@
           </template>
 
           <template slot="goodsNum" slot-scope="{row}">
-            <el-input-number v-if="row.$cellEdit" v-model="row.goodsNum" size="small" :controls="false" :precision="0"
-              style="width: 100%" />
+            <el-input-number v-if="row.$cellEdit && whetherFinancing != 1" v-model="row.goodsNum" size="small"
+              :controls="false" :precision="0" style="width: 100%" @change="calculator2(row)"/>
             <span v-else>{{ row.goodsNum }}</span>
           </template>
+          <template slot="sendNumFinancing" slot-scope="{row}">
+            <el-input-number v-if="row.$cellEdit" v-model="row.sendNumFinancing" size="small" :controls="false"
+              :precision="0" style="width: 100%" @change="calculator(row)" />
+            <span v-else>{{ row.sendNumFinancing }}</span>
+          </template>
+          <template slot="sendNumHave" slot-scope="{row}">
+            <el-input-number v-if="row.$cellEdit" v-model="row.sendNumHave" size="small" :controls="false"
+              :precision="0" style="width: 100%" @change="calculator(row)" />
+            <span v-else>{{ row.sendNumHave }}</span>
+          </template>
           <template slot="dot" slot-scope="{row}">
             <!--使用allow-create属性即可通过在输入框中输入文字来创建新的条目。注意此时filterable必须为真。-->
             <!--本例还使用了default-first-option属性, 在该属性打开的情况下,按下回车就可以选中当前选项列表中的第一个选项,-->
@@ -62,7 +72,7 @@
           </template>
           <template slot="price" slot-scope="{row}">
             <el-input-number v-if="row.$cellEdit" v-model="row.price" size="small" :controls="false"
-              style="width: 100%" />
+              style="width: 100%" @change="calculator2(row)"/>
             <span v-else>{{ row.price }}</span>
           </template>
 
@@ -103,6 +113,7 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      whetherFinancing: 0,
       picihaolist: [], // 批次号数据
       tableData: [],
       // 上传附件的需要参数
@@ -282,39 +293,47 @@ 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: "inventoryFinancing",
+          width: 120,
+          disabled: true,
+          hide: true,
+          showColumn: false,
+        },
+        {
+          label: '参考库存自有',
+          prop: "inventoryHave",
+          width: 120,
+          disabled: true,
+          hide: true,
+          showColumn: false,
+        },
         {
           label: '调拨数量',
           prop: 'goodsNum',
           disabled: false,
-        }, 
-        // {
-        //   label: '融资数量',
-        //   prop: 'sendNumFinancing',
-        //   disabled: false,
-        // }, 
-        // {
-        //   label: '自有数量',
-        //   prop: 'sendNumHave',
-        //   disabled: false,
-        // }, 
+        },
+        {
+          label: '融资数量',
+          prop: 'sendNumFinancing',
+          disabled: false,
+          hide: true,
+          showColumn: false,
+        },
+        {
+          label: '自有数量',
+          prop: 'sendNumHave',
+          disabled: false,
+          hide: true,
+          showColumn: false,
+        },
         {
           label: '单价',
           prop: "price",
@@ -377,6 +396,19 @@ export default {
         this.findObject(this.optionContacts.column, "pattern").label = '规格型号1'
       }
     })
+    isProcurement({ "param": "whether.financing" }).then(res => {
+      if (res.data.data == 1) {
+        this.whetherFinancing = res.data.data
+        this.findObject(this.optionContacts.column, "inventoryFinancing").hide = false
+        this.findObject(this.optionContacts.column, "inventoryFinancing").showColumn = true
+        this.findObject(this.optionContacts.column, "inventoryHave").hide = false
+        this.findObject(this.optionContacts.column, "inventoryHave").showColumn = true
+        this.findObject(this.optionContacts.column, "sendNumFinancing").hide = false
+        this.findObject(this.optionContacts.column, "sendNumFinancing").showColumn = true
+        this.findObject(this.optionContacts.column, "sendNumHave").hide = false
+        this.findObject(this.optionContacts.column, "sendNumHave").showColumn = true
+      }
+    })
     this.key++
     if (this.detailData.id) {
       this.refresh()
@@ -702,6 +734,25 @@ export default {
 
       }
     },
+    calculator(row) {
+      if(row.sendNumFinancing>row.inventoryFinancing){
+        this.$set(row,'sendNumFinancing','0')
+        this.$message.error("融资数量不能大于参考库存融资");
+      }
+      if(row.sendNumHave>row.inventoryHave){
+        this.$set(row,'sendNumHave','0')
+        this.$message.error("自由数量不能大于参考库存自有");
+      }
+      row.goodsNum = Number(Number(row.sendNumFinancing) + Number(row.sendNumHave))
+      row.subTotalMoney = row.goodsNum * row.price
+    },
+    calculator2(row) {
+      if(row.goodsNum>row.inventory){
+        this.$set(row,'goodsNum','0')
+        this.$message.error("调拨数量不能大于库存");
+      }
+      row.subTotalMoney = row.goodsNum * row.price
+    },
     // 导入按钮事件
     tableDataHandle(arr) {
       this.tableData = arr
@@ -712,15 +763,15 @@ export default {
           price: item.price, // 单价
           goodsName: item.cname,
           goodsNum: item.goodsNum,
-          sendNumHave: item.goodsNum,
-          sendNumFinancing: item.goodsNum,
+          sendNumFinancing:this.whetherFinancing==1?item.goodsNum:0,
+          sendNumHave: '0',
           brandName: item.brandName,
           brandId: item.brandId,
           goodsNo: item.code,
           propertyName: item.specificationAndModel,
           inventory: item.inventory,
-          inventoryHave:item.inventoryHave,
-          inventoryFinancing:item.inventoryFinancing,
+          inventoryHave:this.whetherFinancing==1?item.inventoryHave:0 ,
+          inventoryFinancing: this.whetherFinancing==1?item.inventoryFinancing:0,
           pattern: item.brandItem,
           goodsDescription: item.goodsDescription,
           dot: item.dot,

+ 4 - 0
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/dialogAssembly.vue

@@ -201,6 +201,10 @@ import {getCorpTypes} from "@/api/tirePartsMall/basicData/commodityInformation";
             },
             // 商品信息价格计算
             amountChange(value,row) {
+                if(row.goodsNum>row.inventory){
+                    this.$set(row,'goodsNum','0')
+                    this.$message.error("数量不能大于库存");
+                }
                 if (value > 0) {
                     this.$refs.crud.toggleRowSelection(row,true);
                 }else {

+ 4 - 2
src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -1318,7 +1318,7 @@ export default {
         },
         // 获取左侧筛选
         getAllWorkDicts() {
-            getCorpType({ corpType: 'SP' }).then(res => {
+            getCorpType({ corpType: 'SP',whetherIntegral: '0' }).then(res => {
                 this.treeDataGoods = res.data.data;
             });
         },
@@ -1344,7 +1344,8 @@ export default {
             getList({
                 ...params,
                 current: page.currentPage,
-                size: page.pageSize
+                size: page.pageSize,
+                whetherIntegral: '0'
             }).then(res => {
                 console.log(res, 1213)
                 const data = res.data.data;
@@ -1504,6 +1505,7 @@ export default {
                 enableOrNot: 1,
                 artsVision: this.form.belongToCorpId,
                 goodsTypeId: this.treeDeptId,
+                whetherIntegral: '0',
                 ...Object.assign(params, this.SelectSearch)
             }).then(res => {
                 res.data.data.records.forEach(e => {

+ 4 - 2
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -1550,7 +1550,7 @@ export default {
         },
         // 获取左侧筛选
         getAllWorkDicts() {
-            getCorpTypes().then(res => {
+            getCorpTypes({whetherIntegral: '0'}).then(res => {
                 this.treeDataGoods = res.data.data;
             });
         },
@@ -1681,7 +1681,8 @@ export default {
             goodsPageXs({
                 customId: this.form.customerId,
                 stock: this.form.storageId,
-                enableOrNot: 1
+                enableOrNot: 1,
+                whetherIntegral: '0'
             }).then(res => {
                 const data = res.data.data;
                 this.goodsListShow = data.records;
@@ -1699,6 +1700,7 @@ export default {
                 enableOrNot: 1,
                 goodsTypeId: this.treeDeptId,
                 ...Object.assign(params, this.SelectSearch),
+                whetherIntegral: '0'
             }).then(res => {
                 const data = res.data.data;
                 this.page.total = data.total;