Merge branch 'feature/Feature-basic_data' of https://gogs.zfire.top/zfire-front/supply-front into feature/Feature-basic_data

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/login/index.vue

@@ -446,10 +446,9 @@ $back: #333;
   }
   .el-form-item {
     border: 1px solid rgba(255, 255, 255, 0.1);
-    // background: rgba(0, 0, 0, 0.1);
     border-radius: 5px;
     color: #454545;
-    margin-bottom: 10px;
+    margin-bottom: 25px !important;
   }
 
   .el-checkbox__input {

src/views/login/index2.vue

@@ -319,10 +319,10 @@ $back: #333;
 
   .el-form-item {
     border: 1px solid rgba(255, 255, 255, 0.1);
-    // background: rgba(0, 0, 0, 0.1);
+
     border-radius: 5px;
     color: #454545;
-    margin-bottom: 10px;
+    margin-bottom: 25px !important ;
   }
 
   .el-checkbox {

src/views/sales_policy/components/AddCondition.vue

@@ -216,6 +216,16 @@
                   ></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :xs="24" :sm="8" :lg="8" :offset="0">
+                <el-form-item label="">
+                  <el-button
+                    type="primary"
+                    size="small"
+                    @click="getMaterialLists(arrIndex)"
+                    >搜索</el-button
+                  >
+                </el-form-item>
+              </el-col>
             </el-form>
           </el-header>
           <el-main height="">
@@ -390,7 +400,6 @@
 
 <script>
 import {
-  getId,
   addPoliyCondition,
   getConditionMaterialList,
   getMaterialList,
@@ -631,10 +640,23 @@ 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 (

src/views/sales_policy/components/AddPolicy.vue

@@ -568,7 +568,7 @@ export default {
           title: "",
           type: "",
           ...this.searchForm,
-          imgSrc: this.fileList[0].url || "",
+          imgSrc: this.fileList.length ? this.fileList[0].url : ""
         };
         console.log(this.fileList);
         addPoliy(params).then((res) => {

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

@@ -161,15 +161,19 @@
     </div>
     <div class="mymain-container">
       <el-table :data="dataList" border style="width: 100%">
-        <el-table-column fixed="left" label="操作" min-width="150" align="center">
+        <el-table-column
+          fixed="left"
+          label="操作"
+          min-width="150"
+          align="center"
+        >
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
-              v-if=" scope.row.examineStatus == 'SAVE'"
+              v-if="scope.row.examineStatus == 'SAVE'"
               @click="(isShow = 5), (id = scope.row.id)"
               >编辑</el-button
-
             >
             <el-button
               type="text"
@@ -390,16 +394,13 @@ export default {
   computed: mapState({
     comCode: (state) => state.sales.code,
   }),
-  watch: {},
-  created() {},
   methods: {
     hanlenewInfo() {
       console.log();
-       getId().then(res=>{
-         this.$store.commit("sales/setId",res.data);
-          this.isShow = 2;
-      })
-
+      getId().then((res) => {
+        this.$store.commit("sales/setId", res.data);
+        this.isShow = 2;
+      });
     },
     getList() {
       this.listLoading = true;
@@ -420,7 +421,6 @@ export default {
         status: this.screenForm.status,
         title: this.screenForm.title,
       };
-      console.log(params, 123);
       getList(params).then((res) => {
         this.dataList = res.data.records;
         console.log(this.dataList);
@@ -483,12 +483,6 @@ export default {
         this.$successMsg("已提交");
         this.getList();
       });
-
-      // if (e.examineStatus == "SAVE") {
-
-      // } else {
-      //   this.$errorMsg("未满足条件");
-      // }
     },
     hanleExamine(e) {
       if (e.examineStatus == "WAIT") {

src/views/supply/engin/components/commerce_form.vue

@@ -47,8 +47,8 @@
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程信息单号" prop="enginNum">
             <div style="display: flex;">
-              <el-input v-model="mainForm.enginNum" placeholder="请选择工程登录" disabled></el-input>
-              <el-button style="margin-left: 10px;" @click="openShareDetail">选择</el-button>
+              <el-input v-model="mainForm.enginNum" placeholder="请引用工程登录" disabled></el-input>
+              <el-button style="margin-left: 10px;" @click="openShareDetail">引用</el-button>
             </div>
           </el-form-item>
         </el-col>
@@ -663,7 +663,9 @@ export default {
             }
           }
 
-          this.goodsList.forEach(item => {
+          let goodsList = JSON.parse(JSON.stringify(this.goodsList));
+
+          goodsList.forEach(item => {
             delete item.rebateWallets;
             delete item.wallets;
           })
@@ -685,7 +687,7 @@ export default {
             note1: this.mainForm.greeReply || '',
             remark: this.mainForm.remark || '',
             fileNo: this.mainForm.fileNum || '',
-            items: this.goodsList,
+            items: goodsList,
           }
           if(type === 1) {
             if(this.listItem) {

src/views/supply/engin/components/home_detail.vue

@@ -157,7 +157,6 @@
           </el-table-column>
           <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="原订单数量" prop="enginNum" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>
@@ -223,7 +222,7 @@
           </el-table-column>
           <el-table-column align="center" label="单价" prop="price" 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="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="实际返利金额" prop="rebateAmount" min-width="110" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>

src/views/supply/engin/components/home_form.vue

@@ -53,8 +53,8 @@
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程登录编号" prop="loginNum">
             <div style="display: flex;">
-              <el-input v-model="mainForm.loginNum" placeholder="请选择工程登录" disabled></el-input>
-              <el-button style="margin-left: 10px;" @click="openShareDetail">选择</el-button>
+              <el-input v-model="mainForm.loginNum" placeholder="请引用工程登录" disabled></el-input>
+              <el-button style="margin-left: 10px;" @click="openShareDetail">引用</el-button>
             </div>
           </el-form-item>
         </el-col>
@@ -698,7 +698,9 @@ export default {
             }
           }
 
-          this.goodsList.forEach(item => {
+          let goodsList = JSON.parse(JSON.stringify(this.goodsList));
+
+          goodsList.forEach(item => {
             delete item.rebateWallets;
             delete item.wallets;
           })
@@ -725,7 +727,7 @@ export default {
             note1: this.mainForm.greeReply || '',
             remark: this.mainForm.remark || '',
             fileNo: this.mainForm.fileNum || '',
-            items: this.goodsList,
+            items: goodsList,
           }
           if(type === 1) {
             if(this.listItem) {

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"