Merge remote-tracking branch 'origin/develop' into develop

src/api/policy_list.js

@@ -376,3 +376,11 @@ export function getWalletRebateSaletypeDelete(params) {
     params,
   });
 }
+//返利钱包销售类型-修改
+export function getWalletRebateSaletypeUpdate(data) {
+  return request({
+    url: "/wallet/rebate_saletype/update",
+    method: "post",
+    data,
+  });
+}

src/views/basic_data/material/components/modify_list-apply.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div>
-      <el-page-header @back="goBack" content="存货调价单"> </el-page-header>
+      <el-page-header @back="goBack" :content="!cid?'存货调价单':'编辑'"> </el-page-header>
     </div>
     <br /><br />
     <div>
@@ -343,6 +343,7 @@
                  <template v-if="!cid">
                     <el-select
                     multiple
+                    clearable
                     v-model="scope.row.walletsId"
                     @change="handelWallets($event, scope.$index, scope.row)"
                     placeholder="请选择现金钱包"
@@ -358,6 +359,7 @@
                   <template v-else>
                     <el-select
                     multiple
+                    clearable
                     v-model="scope.row.walletsId"
                     @change="handelWallets($event, scope.$index, scope.row)"
                     placeholder="请选择现金钱包"
@@ -975,7 +977,6 @@ export default {
     // xua
     handelWallets(e, index, row) {
         let id = row.cid
-        console.log(e,index,row);
 
               if (!this.wall1.includes(e[e.length-1])) {
                this.items[index].wallets.push(  {
@@ -987,7 +988,6 @@ export default {
                 })
             }
 
-
         // if ( this.items[index].wallets.length) {
         //   for (let j = 0; j < this.items[index].wallets.length; j++) {
         //     if (row.walleList[i].id !== this.items[index].wallets[j].walletId) {
@@ -1013,6 +1013,19 @@ export default {
 
     },
     handelRebateList(e, index, row) {
+
+        // let id = row.cid
+
+        //       if (!this.wall1.includes(e[e.length-1])) {
+        //        this.items[index].wallets.push(  {
+        //           type: "COMMONLY",
+        //           id: "",
+        //           updPriceBillId: id,
+        //           updPriceBillItemId: id,
+        //           walletId: e[e.length-1],
+        //         })
+        //     }
+
       for (let i = 0; i < e.length; i++) {
         if (this.items[index].wallets.length) {
           for (let j = 0; j < this.items[index].wallets.length; j++) {
@@ -1052,6 +1065,7 @@ export default {
       this.serviceId = adminCompany.roleId;
     },
     goBack() {
+      this.$parent.cid=''
       this.$parent.show = 1;
       // 更新父组件数据
       this.$parent.getList();
@@ -1172,6 +1186,7 @@ export default {
             let  rebateList= []
         getProductRriceDetail({ id:this.cid }).then((res) => {
           //  this.editData = res.data;
+
           for (let i = 0; i < res.data.items.length; i++) {
             res.data.items[i].isPublishArr= [
               {
@@ -1193,27 +1208,24 @@ export default {
                 bool: false,
               },
             ]
+            let walletIds=[]
+             res.data.items[i].walletsId = ''
+             for (let p = 0; p < res.data.items[i].wallets2.length; p++) {
+               walletIds.push(res.data.items[i].wallets2[p].walletIds)
+             }
+             this.$set(res.data.items[i],'walletsId',walletIds)
 
              rebateList = this.rebateList.filter((k) => {
               return res.data.items[i].saleTypeId === k.saleTypeId;
-
             });
-
             this.items =res.data.items
             this.base = res.data
-            // let str=[]
-            //  res.data.items[i].walletsId = ''
-            //  for (let p = 0; p < res.data.items[i].wallets2.length; p++) {
-            //    str.push(res.data.items[i].wallets2[p].walletId)
-            //  }
-            //  this.$set(res.data.items[i],'walletsId',str)
             res.data.items[i].wallets =[]
             res.data.items[i].walleList = res.data.items[i].wallets2
             res.data.items[i].rebateWallets=[]
             res.data.items[i].rebateList=rebateList
             res.data.items[i].fang = false;
-            // console.log(rebateList,'475454',i);
-            //  this.$set(this.items[i], "rebateList", rebateList);
+
           }
 
 
@@ -1287,6 +1299,7 @@ export default {
         ...this.base
       }).then(res=>{
         this.$successMsg("成功");
+        this.$parent.cid=''
          this.$parent.show = 1;
           this.$parent.getList();
       })

src/views/basic_data/material/components/modify_list-detail.vue

@@ -278,7 +278,7 @@ export default {
       saleName: "",
       status: "",
     };
-    console.log(this.detail);
+    console.log(this.detail,545454);
     getTypeList(params).then((res) => {
       this.typeList = res.data.records;
     });

src/views/basic_data/material/modify_list.vue

@@ -518,7 +518,8 @@ export default {
     detailFn(id) {
       getProductRriceDetail({ id }).then((res) => {
         this.detail = res.data;
-        this.show = 2;
+
+        this.show = 4;
       });
     },
     getList() {

src/views/sales_rebate/rebate_list.vue

@@ -8,7 +8,7 @@
         label-position="left"
       >
         <el-row :gutter="20">
-          <el-col :xs="24" :ms="6" :lg="6">
+          <!-- <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item label="" prop="mainName">
               <el-input
                 v-model="screenForm.mainName"
@@ -16,7 +16,7 @@
                 size="small"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item label="" prop="saleTypeCode">
               <el-input
@@ -102,7 +102,7 @@
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
-                @change="handleSwitch($event, scope.row.walletRebateId)"
+                @change="handleSwitch($event, scope.row.walletRebateSaleTypeId)"
                 :active-text="scope.row.status ? '已启用' : '已禁用'"
               >
               </el-switch>
@@ -253,6 +253,7 @@ import {
   getWalletRebateList,
   getWalletRebateSaletypeAdd,
   getWalletRebateSaletypeDelete,
+  getWalletRebateSaletypeUpdate,
 } from "@/api/policy_list";
 
 export default {
@@ -422,9 +423,9 @@ export default {
         this.dialogForm.rebateRate = e;
       }
     },
-    handleSwitch(e, walletRebateId) {
-      updateWallet({
-        walletRebateId,
+    handleSwitch(e, walletRebateSaleTypeId) {
+      getWalletRebateSaletypeUpdate({
+        walletRebateSaleTypeId,
         status: e,
       }).then((res) => {
         this.$successMsg("状态已更改");
@@ -434,17 +435,17 @@ export default {
     hanleEdit(item) {
       console.log(item);
       this.dialogForm = {
-        adminCompanyId: item.adminCompanyId,
-        mainId: "",
-        mainName: "",
+        // adminCompanyId: item.adminCompanyId,
+
         name: item.name,
-        rebateRate: item.rebateRate,
-        rabateSort: item.rabateSort,
-        saleTypeCode: item.saleTypeCode,
+        // rebateRate: item.rebateRate,
+        // rabateSort: item.rabateSort,
+        // saleTypeCode: item.saleTypeCode,
         saleTypeId: item.saleTypeId,
-        saleTypeName: item.saleTypeName,
+        // saleTypeName: item.saleTypeName,
         status: item.status,
         walletRebateId: item.walletRebateId,
+        walletRebateSaleTypeId: item.walletRebateSaleTypeId,
       };
       this.getDictList();
       this.dialogVisible = true;
@@ -472,6 +473,7 @@ export default {
       this.dialogVisible = true;
       this.dialogForm = {
         ...item,
+        saleTypeId: item.saleTypeName,
       };
     },
     hanelclose() {
@@ -497,7 +499,7 @@ export default {
             const upParams = {
               ...this.dialogForm,
             };
-            updateWallet(upParams).then((res) => {
+            getWalletRebateSaletypeUpdate(upParams).then((res) => {
               this.$successMsg("修改成功");
               this.hanleReset();
             });
@@ -511,11 +513,11 @@ export default {
     hanleReset() {
       this.dialogForm = {
         name: "",
-        mainId: "",
-        mainName: "",
-        saleTypeCode: "",
-        saleTypeName: "",
-        rabateRate: "",
+        // mainId: "",
+        // mainName: "",
+        // saleTypeCode: "",
+        // saleTypeName: "",
+        // rabateRate: "",
         status: true,
       };
       // this.$refs.dialogForm.resetFields()

src/views/stock/stock_list.vue

@@ -80,6 +80,7 @@
           <el-table-column align="center" label="单位" prop="baseUnitId" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="总库存数量" prop="stockQty" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="可用库数" prop="stockAdequate" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="可开单数" prop="openNumber" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="经销商预留库存" prop="reservedNum" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="经销商暂扣库存" prop="temporaryNum" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="开单未提数量" prop="num" min-width="140" show-overflow-tooltip></el-table-column>

src/views/supply/apply/components/apply_form.vue

@@ -96,7 +96,7 @@
     </div>
     
     <div class="page-footer">
-      <div class="footer" :class="classObj">
+      <div class="footer">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
@@ -115,13 +115,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="6" :lg="6">
+          <!-- <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="type" label="产品大类">
               <el-select v-model="screenForm.type" placeholder="选择产品大类" style="width: 100%" :disabled="goodsList.length > 0 || tableSelection.length > 0">
                 <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="orderNum" label="订单号">
               <el-input v-model="screenForm.orderNum" placeholder="请输入订单号"></el-input>
@@ -220,13 +220,13 @@ export default {
       warehouseList: [],
       isShowDialog: false,
       screenForm: {
-        warehouse: '',
-        type: '',
+        warehouse: [],
+        // type: '',
         orderNum: '',
       },
       currentPage: 1,
       listTotal: 0,
-      typeList: [],
+      // typeList: [],
       stockList: [],
       
       tableGoodsList: [],
@@ -234,18 +234,6 @@ export default {
     }
   },
 
-  computed: {
-    sidebar() {
-      return this.$store.state.app.sidebar
-    },
-    classObj() {
-      return {
-        hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
-    },
-  },
-
   created() {
     this.getDictList();
     this.getWarehouseList();
@@ -284,7 +272,7 @@ export default {
         //   item.orderId = item.id;
         // })
         this.goodsList = data.orders;
-        this.screenForm.type = data.mainId;
+        // this.screenForm.type = data.mainId;
       })
     },
 
@@ -299,9 +287,9 @@ export default {
     },
 
     getDictList() {
-      getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
-        this.typeList = res.data;
-      })
+      // getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
+      //   this.typeList = res.data;
+      // })
       getDictList({sysDictEnum: 'STOCK_ORDER'}).then(res => {
         this.stockList = res.data;
       })
@@ -335,7 +323,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: 10,
         correspondId: this.screenForm.warehouse,
-        mainId: this.screenForm.type,
+        // mainId: this.screenForm.type,
         id: this.screenForm.orderNum,
       }).then(res => {
         let oldGoodsList = this.goodsList;
@@ -371,15 +359,15 @@ export default {
         return this.$errorMsg('请选择仓库');
       }
       this.isShowDialog = true;
-      if(this.screenForm.warehouse && this.screenForm.type) {
+      if(this.screenForm.warehouse) {
         this.getGoodsList();
       }
     },
 
     // 提交筛选表单
     submitScreenForm() {
-      if(!this.screenForm.warehouse || !this.screenForm.type) {
-        return this.$errorMsg('请选择仓库和产品大类');
+      if(!this.screenForm.warehouse) {
+        return this.$errorMsg('请选择仓库');
       }
       this.currentPage = 1;
       this.getGoodsList();