条件调整

src/mixin/index.js

@@ -1,3 +1,13 @@
+/*
+ * @Author: howie
+ * @Date: 2022-06-14 10:14:37
+ * @LastEditors: howie
+ * @LastEditTime: 2022-07-03 17:47:25
+ * @FilePath: \supply-front\src\mixin\index.js
+ * @Description:
+ *
+ * Copyright (c) 2022, All Rights Reserved.
+ */
 export default {
   data() {
     return {
@@ -55,7 +65,7 @@ export default {
     hanleSelectAll(selection,index) {
 
       this.ids = selection.map((k) => {
-        return k.id;
+        return k.id || k.updPriceBillId;
       });
       console.log(this.ids);
     },

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

@@ -656,7 +656,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="是否允许订货" size="small">
-                      <el-select v-model="value">
+                      <el-select v-model="value1">
                         <el-option label="是"> </el-option>
                         <el-option label="否"> </el-option>
                       </el-select>
@@ -664,9 +664,7 @@
 
             </el-col>
           </el-row>
-
-
-          <el-button >保存</el-button>
+          <!-- <el-button >保存</el-button> -->
         </div>
       </el-card>
     </el-form>
@@ -681,6 +679,11 @@ export default {
       default: {},
     },
   },
+  data() {
+    return {
+      value1:'是'
+    }
+  },
   created() {
     console.log(this.detail);
   },

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

@@ -1106,6 +1106,7 @@ export default {
         getProductRriceDetail({ id: res.data }).then((res) => {
           this.base.billId = res.data.billId;
           this.$parent.show = 1
+          this.$parent.getList()
         });
       });
     },

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

@@ -317,6 +317,8 @@ export default {
 
       getProductRriceConfirm(params).then((res) => {
         this.$successMsg("已提交审核");
+        this.$parent.show = 1
+        this.$parent.getList()
       });
     },
     resetScreenForm() {

src/views/basic_data/material/modify_list.vue

@@ -484,7 +484,9 @@ export default {
       this.show = 2;
     },
     hanleDeleteAll(id) {
+
       this.hanleDeleteAllPromise(id).then((ids) => {
+
         getProductRricedel(ids).then((res) => {
           this.$successMsg("删除成功");
           this.getList();

src/views/basic_data/material/price_list.vue

@@ -194,7 +194,6 @@
               <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"

src/views/basic_data/material/relation_list.vue

@@ -655,43 +655,62 @@ export default {
       });
     },
     editFn(id, row, index) {
+      console.log(row,'45465');
       let dateils = null;
+      this.diaLogForm= {
+        ...row,
+        items:[
+          {
+            id: "",
+            machineConfigureId: row.id,
+            parentId: "",
+            innerOutsideMachineId: row.id,
+            model: row.model,
+            name: row.name,
+            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');
             this.diaLogForm.productModel = k.specification;
             this.diaLogForm.productNumber = k.number;
-            this.diaLogForm.volume = k.volume;
+            this.diaLogForm.productVolume = k.volume;
           }
         });
 
+
         getDistList({ sysDictEnum: "MACHINE_CONFIGURE" }).then((disType) => {
-          disType.data.find((q) => {
-            if (q.dictCode == dateils.items[0].type) {
-              this.diaLogForm.type = q.dictCode;
-              this.getMachineLlist(q.dictCode);
-              this.machineList.map((l) => {
-              console.log(l.id == dateils.items[0].machineConfigureId);
-                if (l.id == dateils.items[0].machineConfigureId) {
-                  this.$set(this.diaLogForm.items, 0, {
-                    id: "",
-                    machineConfigureId: l.id,
-                    parentId: "",
-                    innerOutsideMachineId: l.id,
-                    model: l.model,
-                    name: l.name,
-                    number: l.number || "",
-                    type: l.type,
-                    volume: l.volume,
-                  });
-                  return;
-                }
-              });
-            }
-          });
+          // disType.data.find((q) => {
+          //   if (q.dictCode == dateils.items[0].type) {
+          //     this.diaLogForm.type = q.dictCode;
+          //     this.getMachineLlist(q.dictCode);
+          //     this.machineList.map((l) => {
+          //     console.log(l.id == dateils.items[0].machineConfigureId);
+          //       if (l.id == dateils.items[0].machineConfigureId) {
+          //         this.$set(this.diaLogForm.items, 0, {
+          //           id: "",
+          //           machineConfigureId: l.id,
+          //           parentId: "",
+          //           innerOutsideMachineId: l.id,
+          //           model: l.model,
+          //           name: l.name,
+          //           number: l.number || "",
+          //           type: l.type,
+          //           volume: l.volume,
+          //         });
+          //         return;
+          //       }
+          //     });
+          //   }
+          // });
 
           this.DistType = disType.data;
         });

src/views/sales_policy/components/AddCondition.vue

@@ -569,6 +569,7 @@ export default {
       console.log(index, this.arrIndex);
     },
     getMaterialLists(index) {
+
       this.arrIndex = index;
       getMaterialList({
         pageNum: this.currentPage,
@@ -576,10 +577,33 @@ export default {
         saleTypeCode: this.saleTypeCode,
         policyId: this.comCode,
       }).then((res) => {
-        this.conditList = res.data.records;
+        let arr = []
+        let datas = []
+
+                       for (let i = 0; i < res.data.records.length; i++) {
+                          for (let j = 0; j < this.conditionBox.length; j++) {
+
+                                datas = [...datas,...this.conditionBox[j]]
+                                if (datas.length) {
+                                   for (let k = 0; k < datas.length; k++) {
+                                    if (datas[k].id !== res.data.records[i].id) {
+                                        arr.push(res.data.records[i])
+                                    }
+
+                                }
+                                }else{
+                                  arr = res.data.records
+                                }
+
+
+                          }
+
+
+                       }
+
 
-        console.log(4545, this.conditList);
 
+        this.conditList = arr;
         this.listTotal = res.data.total;
       });
     },

src/views/sales_policy/components/AddPolicy.vue

@@ -268,6 +268,12 @@
               align="center"
             >
               <template slot-scope="scope">
+                                <!-- <el-button
+                  type="text"
+                  size="small"
+                  @click="isCondition=1"
+                  >编辑</el-button
+                > -->
                 <el-button
                   type="text"
                   size="small"
@@ -379,6 +385,7 @@ export default {
     this.searchForm.code = this.comCode;
   },
   created() {
+
     this.getCommonApi();
     if (this.$parent.isFlag) {
       // this.handletwoList()
@@ -393,6 +400,9 @@ export default {
     handleCondition(id, index) {
       deleteCondition({ id }).then((res) => {
         this.conditionList.splice(index, 1);
+        this.$children[9].conditionBox= [[], []]
+         this.$children[9].conditionBox.limit= ''
+          this.$children[9].conditionBox.popArr ={}
         this.$successMsg("删除成功");
       });
     },

src/views/sales_policy/components/Distributor.vue

@@ -1,5 +1,12 @@
 <template>
   <el-container>
+        <el-header height="50px" class="header">
+      <el-page-header
+        @back="$parent.isShow = 1"
+        :content=" '详情页面'"
+      >
+      </el-page-header>
+    </el-header>
     <el-header height="" class="pdt">
       <el-form
         :model="details"

src/views/supply/policy/components/retail_detail.vue

@@ -76,10 +76,10 @@
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利类型" prop="walletRebateName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="格力折扣" prop="deductAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="现金钱包" prop="walletRebateName2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/supply/policy/policy_list.vue

@@ -266,7 +266,7 @@
             <el-table-column
               align="center"
               label="出库数量"
-              prop="aaa"
+              prop="hasSendQty"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
@@ -323,12 +323,14 @@
               fixed="right"
             >
               <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  @click="toExamine(scope.row)"
+                     <el-popconfirm
                   v-if="scope.row.examineStatus === 'SAVE'"
-                  >申请</el-button
+                  style="margin-right: 10px"
+                  title="确定撤回？"
+                  @onConfirm="handleSubmit(scope.row.id)"
                 >
+                  <el-button slot="reference" type="text">提审</el-button>
+                </el-popconfirm>
                 <el-button type="text" @click="toForm(scope.row)"
                   >编辑</el-button
                 >