Merge branch 'feature/Feature-sales' into develop

src/store/modules/permission.js

@@ -41,6 +41,7 @@ const state = {
 
 const mutations = {
   SET_ROUTES: (state, routes) => {
+
     state.addRoutes = routes
     state.routes = constantRoutes.concat(routes)
   }

src/views/sales_policy/components/AddCondition.vue

@@ -631,12 +631,25 @@ export default {
          */
         if (this.newConditionBox.length) {
           this.conditList = res.data.records;
+            if (this.conditionBox[index].length) {
+                for (let n = 0; n < this.newConditionBox.length; n++) {
+                  for (let m = 0; m < this.newConditionBox[n].length; m++) {
+                      if (m ==index) {
+                        this.$set(this.newConditionBox[n],m,[...this.conditionBox[index],...this.newConditionBox[n][m]])
+                        console.log(this.newConditionBox,'newenewnwn');
+                      }
+                  }
+
+              }
+
+            }
+
           for (let j = 0; j < this.newConditionBox.length; j++) {
             for (let o = 0; o < this.newConditionBox[j].length; o++) {
               if (o == index) {
-                console.log(this.newConditionBox[j][o], "dier");
                 for (let i = 0; i < res.data.records.length; i++) {
                   for (let k = 0; k < this.newConditionBox[j][o].length; k++) {
+
                     if (
                       this.newConditionBox[j][o][k].id == res.data.records[i].id
                     ) {

src/views/sales_policy/components/Examine.vue

@@ -604,7 +604,6 @@ export default {
       value: "",
       detail: {},
       srcList: [],
-
       screenForm: {
         code: "",
         createBy: "",

src/views/sales_policy/policy_list.vue

@@ -402,6 +402,7 @@ export default {
 
     },
     getList() {
+
       this.listLoading = true;
       const params = {
         pageNum: this.currentPage,

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

@@ -887,7 +887,8 @@ export default {
       if (this.screenForm.factorId) {
         this.getConditionList(this.policyConditionId, this.cusIndex + 1);
       } else {
-        this.getMaterialTypeList();
+        // sProvision = true
+        this.getMaterialTypeList('sProvision');
       }
     },
     // 获取某一个比例下的数据 ,查询popType 当前 this.cusIndex+1
@@ -1057,12 +1058,13 @@ export default {
       });
     },
     // 获取政策列表
-    getMaterialTypeList() {
+    getMaterialTypeList(val) {
       getMaterialTypeList({
         pageNum: 1,
         pageSize: 10,
         policyId: this.screenForm.policyId,
         saleTypeCode: this.screenForm.saleTypeCode,
+        [val]:true
       }).then((res) => {
           for (let i = 0; i < res.data.records.length; i++) {
           res.data.records[i].qty = 1;

src/views/supply/retail/retail_list.vue

@@ -401,7 +401,10 @@
       </div>
     </div>
 
-    <EditDateDialog :isShow.sync="isShowEditDateDialog" :dateForm.sync="dateForm" />
+    <EditDateDialog
+      :isShow.sync="isShowEditDateDialog"
+      :dateForm.sync="dateForm"
+    />
 
     <RetailDetail
       :listItem="queryItem"