调整

src/api/basic_data/material.js

@@ -324,3 +324,13 @@ export function getPriceSubmit(params) {
     params
   })
 }
+
+
+
+export function handlePriceRevoke(params){
+  return request({
+    url:'/product-price/revoke',
+    method: 'POST',
+    params
+  })
+}

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

@@ -1078,6 +1078,9 @@ export default {
       });
     },
     hanleSbumit() {
+
+
+
       for (let i = 0; i < this.items.length; i++) {
         this.items[i].wallets = [
           ...this.items[i].rebateWallets,

src/views/basic_data/material/price_list.vue

@@ -158,57 +158,50 @@
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
-              <el-table-column
-              align="center"
-              label="返利类型（钱包）"
-              prop="wallets"
-              min-width="200"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <template v-for="(item, index) in scope.row.wallets">
-                     <template v-if="item.type === 'REBATE'">
-
-                        <el-tag
-                  type="success"
-                  style="margin: 0 10px"
-                  size="small"
-
-                  :key="index"
-                  >
-               {{ item.walletName }}
-                </el-tag>
-                  </template
+          <el-table-column
+            align="center"
+            label="返利类型（钱包）"
+            prop="wallets"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <template v-for="(item, index) in scope.row.wallets">
+                <template v-if="item.type === 'REBATE'">
+                  <el-tag
+                    type="success"
+                    style="margin: 0 10px"
+                    size="small"
+                    :key="index"
                   >
+                    {{ item.walletName }}
+                  </el-tag>
                 </template>
-
               </template>
-            </el-table-column>
-            <el-table-column
-              align="center"
-              label="现金钱包"
-              prop="modifyPriceDepartment"
-              min-width="200"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <template  v-for="(item, index) in scope.row.wallets">
-                  <template v-if="item.type === 'COMMONLY'">
-                   <el-tag
-                  type="success"
-                  style="margin: 0 10px"
-                  size="small"
-
-                  :key="index"
-                >
-                {{ item.walletName }}
-                </el-tag>
-                    </template
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="现金钱包"
+            prop="modifyPriceDepartment"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <template v-for="(item, index) in scope.row.wallets">
+                <template v-if="item.type === 'COMMONLY'">
+                  <el-tag
+                    type="success"
+                    style="margin: 0 10px"
+                    size="small"
+                    :key="index"
                   >
+                    {{ item.walletName }}
+                  </el-tag>
                 </template>
-
               </template>
-            </el-table-column>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="生效日期"
@@ -262,6 +255,22 @@
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            fixed="right"
+            width="150"
+            label="操作"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click="handleRevoke(scope.row.id)"
+                >作废</el-button
+              >
+              <el-button type="text" size="small" @click="">删除</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <!-- 分页 -->
@@ -283,7 +292,10 @@
 
 <script>
 import Mixin from "@/mixin/index";
-import { getProductPriceList } from "@/api/basic_data/material";
+import {
+  getProductPriceList,
+  handlePriceRevoke,
+} from "@/api/basic_data/material";
 import { getDictList } from "@/api/common";
 import { downloadFiles, parseTime } from "@/utils/util";
 export default {
@@ -335,6 +347,12 @@ export default {
         this.listLoading = false;
       });
     },
+    handleRevoke(id) {
+      handlePriceRevoke({ id }).then((res) => {
+        this.$successMsg("操作成功");
+        this.getList();
+      });
+    },
   },
 };
 </script>
@@ -343,7 +361,7 @@ export default {
 ::v-deep .el-select--small {
   width: 100%;
 }
-::v-deep .el-date-editor{
+::v-deep .el-date-editor {
   width: 100%;
 }
 </style>

src/views/basic_data/material/relation_list.vue

@@ -306,7 +306,7 @@
     >
       <el-form ref="form" :model="diaLogForm" label-width="80px">
         <el-row :gutter="20">
-          <el-col :span="12" :offset="0">
+          <el-col :span="24" :offset="0">
             <el-form-item label="产品名称">
               <el-select
                 placeholder="选择名称"
@@ -331,9 +331,11 @@
               <el-input v-model="diaLogForm.productVolume"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" :offset="0">
-            <el-row>
-              <el-col :span="22" type="flex">
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24" :offset="0">
+            <el-row type="flex" justify="space-between">
+              <el-col :span="20" type="flex">
                 <el-form-item label="类型">
                   <el-select
                     v-model="diaLogForm.type"
@@ -349,14 +351,22 @@
                     </el-option>
                   </el-select> </el-form-item
               ></el-col>
-              <el-col :span="2">
+              <el-col :span="3" style="text-align: right">
                 <el-button type="primary" @click="hanleAddData"
                   >+</el-button
                 ></el-col
               >
             </el-row>
-
-            <div v-for="(item, index) in diaLogForm.items" :key="index">
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col
+            :span="12"
+            :offset="0"
+            v-for="(item, index) in diaLogForm.items"
+            :key="index"
+          >
+            <div>
               <el-form-item label="编码">
                 <el-select
                   v-model="item.number"
@@ -380,9 +390,8 @@
               </el-form-item>
               <el-form-item label="体积">
                 <el-input v-model="item.volume" placeholder=""></el-input>
-              </el-form-item>
-            </div>
-          </el-col>
+              </el-form-item></div
+          ></el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -655,11 +664,11 @@ export default {
       });
     },
     editFn(id, row, index) {
-      console.log(row,'45465');
+      console.log(row, "45465");
       let dateils = null;
-      this.diaLogForm= {
+      this.diaLogForm = {
         ...row,
-        items:[
+        items: [
           {
             id: "",
             machineConfigureId: row.id,
@@ -670,23 +679,22 @@ export default {
             number: row.number || "",
             type: row.type,
             volume: row.volume,
-          }
-        ]
-      }
+          },
+        ],
+      };
       getProductDetail({ id: id }).then((res) => {
         dateils = res.data;
         console.log(dateils);
         this.diaLogForm.materialId = dateils.materialId;
         this.materialLis.find((k) => {
           if (k.id == dateils.materialId) {
-            console.log(k,'5555');
+            console.log(k, "5555");
             this.diaLogForm.productModel = k.specification;
             this.diaLogForm.productNumber = k.number;
             this.diaLogForm.productVolume = k.volume;
           }
         });
 
-
         getDistList({ sysDictEnum: "MACHINE_CONFIGURE" }).then((disType) => {
           // disType.data.find((q) => {
           //   if (q.dictCode == dateils.items[0].type) {

src/views/sales_rebate/rebate_list.vue

@@ -315,7 +315,7 @@ export default {
       options: [
         {
           value: "",
-          label: "状态",
+          label: "全部",
         },
         {
           value: 1,

src/views/sales_rebate/salestype_list.vue

@@ -283,7 +283,7 @@ export default {
       options: [
         {
           value: "",
-          label: "状态",
+          label: "全部",
         },
         {
           value: 1,