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

src/views/basic_data/material/price_list.vue

@@ -146,22 +146,36 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="主计量单位名称"
+            label="单位"
             prop="company"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             label="数量下限"
             prop="qty"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             align="center"
-            label="返利比例"
-            prop="rebateUseRate"
+            label="返利类型"
+            prop="walletRebateName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+           <el-table-column
+            align="center"
+            label="格力折扣"
+            prop="discAmount"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+           <el-table-column
+            align="center"
+            label="现金钱包"
+            prop="walletRebateName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>

src/views/basic_data/warehouse/warehouse_site.vue

@@ -54,7 +54,8 @@
               >
                 <el-button
                   slot="reference"
-                  type="text"
+                    type="primary"
+                   size="small"
                   class="textColor el-popover-left"
                   >批量删除</el-button
                 >

src/views/sales_policy/codealer_list.vue

@@ -52,7 +52,12 @@
       <el-table :data="dataList" border style="width: 100%">
         <el-table-column prop="name" label="操作" width="120" align="center">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click=" id = scope.row.id ,isShow=false">详情</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="(id = scope.row.id), (isShow = false)"
+              >详情</el-button
+            >
           </template>
         </el-table-column>
         <el-table-column prop="status" label="状态" width="120" align="center">
@@ -77,7 +82,12 @@
           align="center"
         >
         </el-table-column>
-        <el-table-column prop="title" label="表头备注" width="200" align="center">
+        <el-table-column
+          prop="title"
+          label="表头备注"
+          width="200"
+          align="center"
+        >
         </el-table-column>
         <el-table-column
           prop="customerCount"
@@ -110,7 +120,7 @@
       </el-pagination>
     </div>
   </el-container>
-  <Distributor v-else :cid='id' />
+  <Distributor v-else :cid="id" />
 </template>
 
 <script>
@@ -146,9 +156,11 @@ export default {
       getCustomerlist(params).then((res) => {
         console.log(res);
         this.dataList = res.data.records;
+        this.listTotal = res.data.total
         this.listLoading = false;
       });
 
+
     },
   },
   components: {

src/views/sales_policy/components/AddCondition.vue

@@ -147,7 +147,7 @@
               v-for="(len, index) in conditionBoxs.length - 1"
             >
               <el-form-item :label="'配提' + (index + 1) + '比例'">
-              {{index}}
+
                 <el-input
                   size="small"
                   :readonly="!id?false:true"

src/views/sales_rebate/rebate_list.vue

@@ -192,9 +192,7 @@
           <el-form-item label="产品使用品类" prop="mainName">
             <el-input v-model="dialogForm.mainName" :readonly="true"></el-input>
           </el-form-item>
-          <el-form-item label="产品使用品类" prop="mainName">
-            <el-input v-model="dialogForm.mainName" :readonly="true"></el-input>
-          </el-form-item>
+
           <el-form-item label="返利折扣比例" prop="rebateRate">
 
            <el-input
@@ -273,14 +271,14 @@ export default {
           lable: "销售类型名称",
           widht: 160,
         },
-          {
+        {
           prop: "mainName",
           lable: "产品大类",
           widht: 160,
         },
         {
           prop: "name",
-          lable: "返利使用钱包",
+          lable: "返利类型",
           widht: 160,
         },
         {
@@ -320,11 +318,11 @@ export default {
           label: "状态",
         },
         {
-          value: true,
+          value: 1,
           label: "已启用",
         },
         {
-          value: false,
+          value: 0,
           label: "已停用",
         },
       ],

src/views/supply/policy/components/Untitled-1.json

@@ -0,0 +1,216 @@
+{
+  "code": 1,
+  "msg": "操作成功",
+  "time": 1656664932,
+  "data": [
+    {
+      "id": 413749,
+      "belong_company_id": 2,
+      "belong_company": "S9219801",
+      "websit_number": "S2106770",
+      "worker_order_no": "2220220609135011878913",
+      "order_product_id": 238993,
+      "worker_id": 32087,
+      "worker_name": "罗世奇",
+      "worker_number": "S21067700116",
+      "worker_phone": "16626205908",
+      "wxgid": 6113138,
+      "inside_code": "18899758682TT",
+      "inside_code2": "",
+      "inside_password": "",
+      "inside_password2": "",
+      "out_code": "19998875682XC",
+      "out_password": "",
+      "source": "mobile",
+      "type": "insideAndOut",
+      "inside_picture": "uploads\/signwater\/2022-06-09\/202206091351344549307779035495.png",
+      "inside2_picture": "",
+      "out_picture": "uploads\/signwater\/2022-06-09\/202206091352082964314481740076.png",
+      "machine_picture": "",
+      "other_picture": null,
+      "vacuo_picture": "",
+      "safety_picture": "",
+      "switch_picture": "",
+      "bracket": "",
+      "pipe": "",
+      "switch_flag": "",
+      "high_altitude": "",
+      "hole": "",
+      "remark": "",
+      "video": "",
+      "status": "1",
+      "temp_save_remark": "",
+      "firsttime": 1654753958,
+      "createtime": "2022-06-09 13:50:11",
+      "updatetime": "2022-06-09 13:52:38",
+      "deletetime": null,
+      "onwall_picture": "",
+      "assist_remark": "",
+      "running_water_tds": "",
+      "machine_running_tds": "",
+      "water_pressure": "",
+      "in_style": "",
+      "in_number": "",
+      "in_style2": "",
+      "in_number2": "",
+      "out_style": "",
+      "out_number": "",
+      "main_number": "101",
+      "small_number": "1104",
+      "main_id": 101,
+      "small_id": 125,
+      "series_id": 0,
+      "product_id": 633678,
+      "province": "广东省",
+      "city": "广州市",
+      "area": "天河区",
+      "street": "华景西街",
+      "lat": "23.135519",
+      "lng": "113.35693",
+      "gps_address": "广东省广州市天河区华景西街",
+      "is_sync": "0",
+      "main_area": "",
+      "tmguid": "",
+      "clearing": 0,
+      "clearing_amount": 0,
+      "clearing_time": 0,
+      "business_id": 0,
+      "sales_type": "",
+      "main_name": "家用空调",
+      "small_name": "变频挂机",
+      "series_name": "",
+      "pname": "KFR-35GW\/(35518)FNhAa-B1(WIFI)(含管) 顶(珊瑚玉)",
+      "clearing_wid": 0,
+      "clearing_wname": "",
+      "sales_wid": 0,
+      "code_index": 1,
+      "detail_id": "202206091351583465596187437781",
+      "inside_num": 1,
+      "out_num": 1,
+      "old_websit_number": "",
+      "settle_old_websit_number": "",
+      "pgguid": "98125116633360DA7593C5373F883B45",
+      "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
+      "detail_source": 1,
+      "cj_send_flag": 1,
+      "wg_send_flag": 1,
+      "pgmxid": "",
+      "push_settle_system_status": 0,
+      "push_settle_system_num": 0,
+      "operator_account": "",
+      "operator_name": "",
+      "operator_websit_number": "",
+      "operator_websit_name": "",
+      "main_responsible_number": "S21067700116",
+      "main_responsible_name": "罗世奇",
+      "main_settle_ratio": "60.00",
+      "assist_responsible_number": "S21067700117",
+      "assist_responsible_name": "邹今长",
+      "assist_settle_ratio": "40.00",
+      "reset_password_num": 0,
+      "is_install_engineer": 0,
+      "is_system_vacuum": 0,
+      "is_decode": 0,
+      "is_test": 0,
+      "order_install_detail_append": [
+        {
+          "id": 638259,
+          "belong_company_id": 2,
+          "belong_company": "S9219801",
+          "websit_number": "S2106770",
+          "worker_order_no": "2220220609135011878913",
+          "detail_id": "202206091351583465596187437781",
+          "name": "外机",
+          "type": 1,
+          "remark": "",
+          "path": "uploads\/signwater\/2022-06-09\/202206091352082964314481740076.png",
+          "append_index": 0,
+          "createtime": "2022-06-09 13:52:38",
+          "updatetime": "2022-06-09 13:52:42",
+          "pgguid": "98125116633360DA7593C5373F883B45",
+          "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
+          "gree_image_id": "1_p_220609_S2106770_6qzGGSv5q2gC8LAG8mnZ5d.png",
+          "attempts_gree": 1,
+          "fjguid": "628c6ca8e7b811ec82a700163e09459f",
+          "type_text": "out_picture",
+          "path_url": "https:\/\/aliyunoss.zfire.top\/uploads\/signwater\/2022-06-09\/202206091352082964314481740076.png?OSSAccessKeyId=LTAI4G3XTLh8G8DiTpXHpWgt&Expires=1656669600&Signature=deSwTgvsMp47pYEdPbGYvbsJcDc%3D"
+        },
+        {
+          "id": 638260,
+          "belong_company_id": 2,
+          "belong_company": "S9219801",
+          "websit_number": "S2106770",
+          "worker_order_no": "2220220609135011878913",
+          "detail_id": "202206091351583465596187437781",
+          "name": "内机",
+          "type": 0,
+          "remark": "",
+          "path": "uploads\/signwater\/2022-06-09\/202206091351344549307779035495.png",
+          "append_index": 0,
+          "createtime": "2022-06-09 13:52:38",
+          "updatetime": "2022-06-09 13:52:42",
+          "pgguid": "98125116633360DA7593C5373F883B45",
+          "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
+          "gree_image_id": "1_p_220609_S2106770_MjO5iJx~tXsChKkSM0a077.png",
+          "attempts_gree": 1,
+          "fjguid": "628ca877e7b811ec82a700163e09459f",
+          "type_text": "inside_picture",
+          "path_url": "https:\/\/aliyunoss.zfire.top\/uploads\/signwater\/2022-06-09\/202206091351344549307779035495.png?OSSAccessKeyId=LTAI4G3XTLh8G8DiTpXHpWgt&Expires=1656669600&Signature=zJLwBSkAu0OaRd%2Flwmawory9lsA%3D"
+        },
+        {
+          "id": 638261,
+          "belong_company_id": 2,
+          "belong_company": "S9219801",
+          "websit_number": "S2106770",
+          "worker_order_no": "2220220609135011878913",
+          "detail_id": "202206091351583465596187437781",
+          "name": "上墙",
+          "type": 7,
+          "remark": "",
+          "path": "uploads\/signwater\/2022-06-09\/202206091351407681921520646404.png",
+          "append_index": 0,
+          "createtime": "2022-06-09 13:52:38",
+          "updatetime": "2022-06-09 13:52:42",
+          "pgguid": "98125116633360DA7593C5373F883B45",
+          "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
+          "gree_image_id": "1_p_220609_S2106770_H6ASyn00qSSAPm~G2-vMd0.png",
+          "attempts_gree": 1,
+          "fjguid": "628cd3e0e7b811ec82a700163e09459f",
+          "type_text": "onwall_picture",
+          "path_url": "https:\/\/aliyunoss.zfire.top\/uploads\/signwater\/2022-06-09\/202206091351407681921520646404.png?OSSAccessKeyId=LTAI4G3XTLh8G8DiTpXHpWgt&Expires=1656669600&Signature=W3CtkhYhjDC%2B7Y1%2FX7est%2BrVUtQ%3D"
+        },
+        {
+          "id": 638262,
+          "belong_company_id": 2,
+          "belong_company": "S9219801",
+          "websit_number": "S2106770",
+          "worker_order_no": "2220220609135011878913",
+          "detail_id": "202206091351583465596187437781",
+          "name": "外机其它",
+          "type": 5,
+          "remark": "",
+          "path": "uploads\/signwater\/2022-06-09\/202206091352131314372691101322.png",
+          "append_index": 0,
+          "createtime": "2022-06-09 13:52:38",
+          "updatetime": "2022-06-09 13:52:42",
+          "pgguid": "98125116633360DA7593C5373F883B45",
+          "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
+          "gree_image_id": "1_p_220609_S2106770_QrCocPJTtZ0Y775pygzIb8.png",
+          "attempts_gree": 1,
+          "fjguid": "628cfc35e7b811ec82a700163e09459f",
+          "type_text": "out_other_picture",
+          "path_url": "https:\/\/aliyunoss.zfire.top\/uploads\/signwater\/2022-06-09\/202206091352131314372691101322.png?OSSAccessKeyId=LTAI4G3XTLh8G8DiTpXHpWgt&Expires=1656669600&Signature=GK6jlt8h%2F%2BNVRQS91KXCxFVYC6c%3D"
+        }
+      ],
+      "order_install_detail_code": [],
+      "type_text": "一内一外",
+      "status_text": "已采集",
+      "detail_source_text": "广佛系统",
+      "is_sync_text": "Is_sync 0",
+      "clearing_time_text": "1970-01-01 08:00:00",
+      "responsible_text": "罗世奇\/邹今长",
+      "is_system_vacuum_text": "已完成真空保存",
+      "firsttime_text": "2022-06-09 13:52:38"
+    }
+  ]
+}

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

@@ -439,11 +439,13 @@
                   <el-select
                     v-model="screenForm.policyId"
                     placeholder="选择销售政策"
+                    filterable
                     style="width: 100%"
                   >
+                  <el-option label="不使用" value=""></el-option>
                     <el-option
-                      v-for="item in policyList"
-                      :key="item.code"
+                      v-for="(item,index) in policyList"
+                      :key="index"
                       :label="item.title"
                       :value="item.code"
                     ></el-option>
@@ -462,7 +464,7 @@
                       v-for="item in ztypeList"
                       :key="item.id"
                       :label="item.saleName"
-                      :value="item.id"
+                      :value="item.saleCode"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -546,10 +548,10 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="currentPage"
-              :page-sizes="[10, 20, 30, 50]"
+              :page-sizes="[10]"
               :page-size="10"
               layout="total, sizes, prev, pager, next, jumper"
-              :total="listTotal"
+              :total="dataList.length"
             >
             </el-pagination>
           </div>
@@ -570,12 +572,12 @@
                   <el-select
                     v-model="screenForm.policyId"
                     placeholder="选择销售政策"
-                    disabled
+                    filterable
                     style="width: 100%"
                   >
                     <el-option
-                      v-for="item in policyList"
-                      :key="item.code"
+                      v-for="(item,index) in policyList"
+                      :key="index"
                       :label="item.title"
                       :value="item.code"
                     ></el-option>
@@ -587,7 +589,7 @@
                 <el-form-item label="销售类型">
                   <el-select
                     filterable
-                    v-model="screenForm.type"
+                    v-model="screenForm.saleTypeCode"
                     placeholder="选择销售类型"
                     style="width: 100%"
                   >
@@ -596,7 +598,7 @@
                       v-for="item in ztypeList"
                       :key="item.id"
                       :label="item.saleName"
-                      :value="item.id"
+                      :value="item.saleCode"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -675,10 +677,10 @@
                 @size-change="handleSizeChange"
                 @current-change="handleCurrentChange"
                 :current-page="currentPage"
-                :page-sizes="[10, 20, 30, 50]"
+                :page-sizes="[10]"
                 :page-size="10"
                 layout="total, sizes, prev, pager, next, jumper"
-                :total="listTotal"
+                :total="popDataArr[cusIndex - 1].length"
               >
               </el-pagination>
             </div>
@@ -823,6 +825,7 @@
         listLoading: false,
         popDataArr: [],
         radioObj: {},
+        step:0,
       };
     },
 
@@ -902,6 +905,7 @@
         };
         typeList(params).then((res) => {
           this.ztypeList = res.data.records;
+          console.log(this.ztypeList,'type1111');
         });
       },
       handleSelectiontAllChange(e) {
@@ -1085,7 +1089,8 @@
         if (Object.values(this.radioObj)[this.cusIndex - 1] !== "") {
           this.popArr.length >= this.cusIndex ? (this.cusIndex += 1) : "";
           const params = this.radio.split("&");
-          this.getConditionList(params[3], this.cusIndex);
+          this.step = this.cusIndex+1
+          this.getConditionList(params[3], this.step);
           return;
         } else {
           this.$errorMsg("请选择");
@@ -1109,8 +1114,9 @@
             for (let i = 0; i < this.popArr.length; i++) {
               this.$set(this.radioObj, "radio" + (i + 1), "");
             }
-            console.log(this.radioObj);
-            this.getConditionList(params[3], this.cusIndex);
+            this.step = this.cusIndex+1
+
+            this.getConditionList(params[3], this.step );
           });
         } else {
           this.$errorMsg("请选择");
@@ -1121,13 +1127,15 @@
       this.pageSize = val;
       this.currentPage = 1;
         const params = this.radio.split("&");
-       this.getConditionList(params[3], this.cusIndex);
+         this.step = this.cusIndex+1
+       this.getConditionList(params[3], this.step);
     },
     // 更改当前页
     handleCurrentChange(val) {
       this.currentPage = val;
         const params = this.radio.split("&");
-       this.getConditionList(params[3], this.cusIndex);
+         this.step = this.cusIndex+1
+       this.getConditionList(params[3], this.step);
     },
       getConditionList(policyConditionId, popType) {
         getConditionList({