Merge branch 'feature/Feature-sales' into develop

src/styles/index.scss

@@ -360,3 +360,8 @@ div:focus {
     }
   }
 }
+
+input[type=number]::-webkit-inner-spin-button, input[type=number]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}

src/views/basic_data/logistics/logistics_list.vue

@@ -5,16 +5,16 @@
       <el-form
         ref="screenForm"
         :model="screenForm"
-        label-width="70px"
+        label-width="120px"
         size="small"
         label-position="left"
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="物流公司" prop="customerTel">
+            <el-form-item label="物流公司名称" prop="customerTel">
               <el-input
                 placeholder="请输入物流公司名称"
-                v-model="screenForm.customerTel"
+                v-model="screenForm.logisticsCompany"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -22,7 +22,7 @@
             <el-form-item label="客服电话" prop="logisticsCompany">
               <el-input
                 placeholder="请输入客服电话"
-                v-model="screenForm.logisticsCompany"
+                v-model="screenForm.customerTel "
               ></el-input>
             </el-form-item>
           </el-col>

src/views/basic_data/material/category_list.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="app-container">
-    <div v-if="isShow">
+    <div >
       <!-- 筛选条件 -->
       <div>
-        <!-- <el-form label-width="70px" size="small" label-position="left">
+        <el-form  ref="screenForm"
+          :model="screenForm" label-width="70px" size="small" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="关键字" prop="account">
-                <el-input placeholder="请输入关键字"></el-input>
+              <el-form-item label="名称" prop="keyword">
+                <el-input placeholder="请输入名称" v-model="screenForm.keyword"></el-input>
               </el-form-item>
             </el-col>
-
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm"
@@ -22,7 +22,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form> -->
+        </el-form>
       </div>
       <div class="mymain-container">
         <div class="table">
@@ -131,16 +131,18 @@
             ></el-table-column>
           </el-table>
         </div>
-        <!-- 分页 -->
+       <!-- 分页 -->
         <div class="fr">
-          <!-- <el-pagination
-            :current-page="currentPage"
+          <el-pagination
+            @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
           >
-          </el-pagination> -->
+          </el-pagination>
         </div>
       </div>
     </div>
@@ -226,6 +228,10 @@ export default {
           disableDate: "",
         },
       ],
+      screenForm:{
+  keyword:""
+      }
+
     };
   },
   components: {
@@ -241,7 +247,7 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        keyword: "",
+        keyword: this.screenForm.keyword,
       };
       getCategoryList(params).then((res) => {
         this.dataList = res.data.records;

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

@@ -1,11 +1,16 @@
 <template>
   <div>
     <div>
-      <el-page-header @back="goBack" content="申请"> </el-page-header>
+      <el-page-header @back="goBack" content="存货调价单"> </el-page-header>
     </div>
     <br /><br />
     <div>
-      <el-form label-width="100px" size="small" label-position="left">
+      <el-form
+        ref="screenForm"
+        label-width="100px"
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据编号">
@@ -68,35 +73,15 @@
           </el-col>
 
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="" class="fr">
-              <el-button size="small">清空</el-button>
-              <el-button size="small" type="primary" @click="hanleSbumit"
-                >提交</el-button
-              >
-            </el-form-item>
+            <el-form-item label="" class="fr"> </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
-    <div class="btn-group clearfix">
-      <div class="fl">
-        <el-button
-          type="primary"
-          size="small"
-          @click="(centerDialogVisible = true), getMaterialList()"
-          >添加</el-button
-        >
-      </div>
-    </div>
     <div class="mymain-container">
       <!-- 列表 -->
       <div class="table">
-        <el-form
-          :model="items"
-          v-if="!detail.length"
-          size="small"
-          label-position="left"
-        >
+        <el-form v-if="!detail.length" size="small" label-position="left">
           <el-table
             v-loading="listLoading"
             :data="items"
@@ -212,7 +197,7 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="零售价"
+              label="格力折扣"
               prop="retailPrice"
               min-width="160"
               show-overflow-tooltip
@@ -224,7 +209,7 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="返利使用比例"
+              label="返利类型"
               prop="rebateUseRate"
               min-width="160"
               show-overflow-tooltip
@@ -308,7 +293,7 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="支付钱包类型"
+              label="现金钱包"
               prop="wallets"
               min-width="160"
               show-overflow-tooltip
@@ -317,7 +302,7 @@
                   <el-select
                     v-model="scope.row.isPublish"
                     @change="hanleChange"
-                    placeholder="请选择支付钱包类型"
+                    placeholder="请选择现金钱包"
                   >
                     <el-option
                       v-for="item in scope.row.rebateList"
@@ -626,7 +611,6 @@
           <el-form
             :model="form"
             ref="form"
-            :rules="rules"
             label-width="80px"
             :inline="false"
             size="normal"
@@ -651,6 +635,19 @@
         </el-dialog>
       </div>
     </div>
+    <div class="btn-group clearfix">
+      <el-button size="small">重置</el-button>
+      <el-button size="small" type="primary" @click="hanleSbumit"
+        >提交</el-button
+      >
+      <el-button
+        style="float: right"
+        type="primary"
+        size="small"
+        @click="(centerDialogVisible = true), getMaterialList()"
+        >添加</el-button
+      >
+    </div>
   </div>
 </template>
 
@@ -672,6 +669,8 @@ import { thisTypeAnnotation } from "@babel/types";
 export default {
   data() {
     return {
+      listLoading: false,
+      screenForm: {},
       base: {
         adminCompanyId: "",
         adminWebsitId: "",
@@ -694,6 +693,8 @@ export default {
       saleTypeId: "",
       remark: "",
       detail: [],
+      form: {},
+      startDate: "",
     };
   },
   mounted() {

src/views/basic_data/material/machine_list.vue

@@ -21,24 +21,27 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="型号" prop="type">
               <el-input
+                type="number"
                 placeholder="请输入型号"
-                v-model="screenForm.type"
+                v-model.number="screenForm.type"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="编码" prop="number">
               <el-input
+                type="number"
                 placeholder="请输入编码"
-                v-model="screenForm.number"
+                v-model.number="screenForm.number"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="体积" prop="volume">
               <el-input
+              type="number"
                 placeholder="请输入体积"
-                v-model="screenForm.volume"
+                v-model.number="screenForm.volume"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -280,8 +283,8 @@ import {
   getMachineEdit,
   getDistList,
   getMaterialList,
-
 } from "@/api/basic_data/material";
+import { number } from "yargs";
 export default {
   mixins: [Mixin],
   data() {
@@ -318,7 +321,6 @@ export default {
         model: "",
         volume: "",
         type: "",
-
       },
       showDialogForm: false,
       dataList: [
@@ -410,6 +412,20 @@ export default {
         volume: "",
       },
       type: null,
+      // rules: {
+      //     name: [
+      //       {  message: '请输入名称', trigger: 'blur' },
+      //     ],
+      //     number:[
+      //          {  message: '请输入编码',type:'number', trigger: 'blur' },
+      //     ],
+      //      type:[
+      //          {  message: '请输入型号',type:'number', trigger: 'blur' },
+      //     ],
+      //     volume:[
+      //       {  message: '请输入体积',type:'string', trigger: 'blur' },
+      //     ]
+      // }
     };
   },
   methods: {
@@ -422,7 +438,6 @@ export default {
         model: row.model,
         volume: row.volume,
         type: row.type,
-
       };
       this.showDialogForm = true;
     },
@@ -518,7 +533,6 @@ export default {
         outsideMachineVolume: 2,
       };
     },
-
   },
 };
 </script>

src/views/basic_data/material/material_list.vue

@@ -12,9 +12,9 @@
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="关键字" prop="keyword">
+              <el-form-item label="名称" prop="keyword">
                 <el-input
-                  placeholder="请输入关键字"
+                  placeholder="请输入名称"
                   v-model="screenForm.keyword"
                 ></el-input>
               </el-form-item>

src/views/basic_data/warehouse/warehouse_book.vue

@@ -39,24 +39,24 @@
           />
           <el-table-column
             align="center"
-            label="最大预约单量"
+            label="最大预约单量(1天)"
             prop="number"
             min-width="160"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.number" :disabled="scope.row.isDisabled"></el-input>
+              <el-input type="number" v-model.number="scope.row.number" :disabled="scope.row.isDisabled"></el-input>
             </template>
           </el-table-column>
           <el-table-column
             align="center"
-            label="最大预约台数"
+            label="最大预约台数(1天)"
             prop="towerNum"
             min-width="160"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.towerNum" :disabled="scope.row.isDisabled"></el-input>
+              <el-input type="number" v-model.number="scope.row.towerNum" :disabled="scope.row.isDisabled"></el-input>
             </template>
           </el-table-column>
 

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -42,9 +42,9 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="条件" prop="customerName">
+            <el-form-item label="经销商名称" prop="customerName">
               <el-input
-                placeholder="请输入筛选条件"
+                placeholder="请输入经销商名称"
                 v-model="screenForm.customerName"
               ></el-input>
             </el-form-item>
@@ -230,7 +230,7 @@
     <el-dialog
       title="仓库费规则配置"
       :visible.sync="showDialog"
-      width="30%"
+      width="50%"
       :show-close="false"
       :close-on-click-modal="false"
     >
@@ -263,7 +263,9 @@
             type="number"
             v-model="dialogForm.freeDay"
             class="inputStyle"
-          />天内可免费受存储管理费用. 当超过
+          />天内可免费受存储管理费用.
+          <br/>
+          当超过
           <el-input
             type="number"
             v-model="dialogForm.freeDay"

src/views/basic_data/warehouse/warehouse_list.vue

@@ -12,9 +12,9 @@
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="关键字" prop="name">
+              <el-form-item label="名称" prop="name">
                 <el-input
-                  placeholder="请输入关键字"
+                  placeholder="请输入名称"
                   v-model="screenForm.name"
                 ></el-input>
               </el-form-item>

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

@@ -114,13 +114,13 @@
         </el-row>
       </div>
     </div>
-
+<!--
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="openDeliverDialog">直调发货</el-button>
         <el-button @click="goBack">关 闭</el-button>
       </div>
-    </div>
+    </div> -->
 
     <el-dialog title="直调发货" :visible.sync="isShowDeliverDialog" width="80%">
       <el-form ref="deliverForm" :model="deliverForm" label-width="70px" size="small" label-position="left">

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

@@ -18,7 +18,7 @@
       label-position="right"
     >
       <el-row :gutter="20">
-        <el-col :xs="24" :sm="12" :lg="8">
+        <!-- <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="订单号" prop="id">
             <el-input
               v-model="mainForm.id"
@@ -26,7 +26,7 @@
               readonly
             ></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col
           :xs="24"
           :sm="12"
@@ -304,7 +304,7 @@
             >
               <el-option label="不使用" value=""></el-option>
               <el-option
-                v-for="item in xjWalletList"
+                v-for="item in comxjWalletList(scope.row.walletRelaList)"
                 :key="item.customerWalletId"
                 :label="item.name"
                 :value="item.customerWalletId"
@@ -455,6 +455,7 @@
                   placeholder="选择销售类型"
                   style="width: 100%"
                 >
+                 <el-option label="不使用" value=""></el-option>
                   <el-option
                     v-for="item in ztypeList"
                     :key="item.id"
@@ -566,24 +567,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="8" :lg="8">
-              <el-form-item>
-                <el-input
-                  v-model="screenForm.type"
-                  placeholder="产品编码"
-                  size="small"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="8" :lg="8">
-              <el-form-item>
-                <el-input
-                  v-model="screenForm.type"
-                  placeholder="产品名称"
-                  size="small"
-                ></el-input>
-              </el-form-item>
-            </el-col>
+
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="销售类型">
                 <el-select
@@ -591,6 +575,7 @@
                   placeholder="选择销售类型"
                   style="width: 100%"
                 >
+             <el-option label="不使用" value=""></el-option>
                   <el-option
                     v-for="item in ztypeList"
                     :key="item.id"
@@ -831,6 +816,22 @@ export default {
         openSidebar: this.sidebar.opened,
       };
     },
+    comxjWalletList(){
+      return (c)=>{
+          const walle =[]
+          const ovalVall = c == undefined || !c.length ? []: c
+          for (let i = 0; i < this.xjWalletList.length; i++) {
+                for (let j = 0; j < ovalVall.length; j++) {
+                    if (this.xjWalletList[i].walletRebateId ==ovalVall[j].walletId) {
+                            walle.push(this.xjWalletList[i])
+                    }
+                }
+          }
+         return  walle
+
+
+      }
+    }
   },
 
   created() {
@@ -936,7 +937,9 @@ export default {
         type: "COMMONLY",
       }).then((res) => {
         this.xjWalletList = res.data;
+
       });
+
       getWalletList({
         customerId: JSON.parse(localStorage.getItem("supply_user")).customerId,
         type: "REBATE",
@@ -1124,8 +1127,9 @@ export default {
             }
           }
         }
-        this.cusIndex = 0
+        this.cusIndex = 0;
         this.isShowDialog = false;
+        console.log(this.goodsList,'goodsList');
       } else {
         this.$errorMsg("请选择");
       }
@@ -1134,7 +1138,6 @@ export default {
     deleteItem(index) {
       this.goodsList.splice(index, 1);
     },
-
     // 修改返利钱包
     changeWallet(index) {
       if (this.goodsList[index].customerWalletId2) {
@@ -1176,7 +1179,9 @@ export default {
     clickSubmitForm() {
       this.$refs.mainForm.validate((valid) => {
         if (valid) {
+
           for (let i = 0; i < this.goodsList.length; i++) {
+                     console.log(this.goodsList[i].customerWalletId,45454554);
             if (!this.goodsList[i].customerWalletId) {
               this.$errorMsg("请选择现金钱包");
               return;
@@ -1195,6 +1200,7 @@ export default {
             type: 2, // 1:普通零售单，2:政策零售单
             retailOrderItemList: this.goodsList,
             policyId: this.screenForm.policyId,
+
           };
           if (this.listItem) {
             params.id = this.listItem.id;

src/views/supply/policy/policy_list.vue

@@ -716,16 +716,17 @@ export default {
               fixed="right"
             >
               <template slot-scope="scope">
-                <!-- <el-button
+                <el-button
                   type="text"
-                  @click="toForm(scope.row)"
+                  @click="toExamine(scope.row)"
                   v-if="scope.row.examineStatus === 'SAVE'"
                   >申请</el-button
-                > -->
+                >
                 <el-button type="text" @click="toForm(scope.row)"
                   >编辑</el-button
                 >
                 <el-popconfirm
+                v-if="scope.row.examineStatus =='WAIT'"
                   style="margin-left: 10px"
                   title="确定撤回？"
                   @onConfirm="handleCancel(scope.row.id)"
@@ -735,12 +736,8 @@ export default {
                 <el-button     style="margin-left: 10px" type="text" @click="toDetail(scope.row)"
                   >详情</el-button
                 >
-                <el-popconfirm
-                  style="margin-left: 10px"
-                  title="确定删除？"
-                  @onConfirm="handleDelete(scope.row.id)"
-                >
-                  <el-button slot="reference" type="text">删除</el-button>
+                  <el-popconfirm style="margin-left: 10px;" title="确定关闭吗？" @onConfirm="handleClose(scope.row.id)" v-if="!scope.row.closeTime" >
+                  <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>