【修改】修改bug

src/views/setting/account.vue

@@ -435,7 +435,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         adminWebsitId: this.selectDepartment ? this.selectDepartment.adminWebsitId : '',
-        keyword: this.screenForm.name
+        userName: this.screenForm.name
       };
 
       getAccountList(params).then(res => {

src/views/setting/department.vue

@@ -134,6 +134,7 @@ export default {
     getList() {
       getDepartmentList().then(res => {
         this.dataList = res.data;
+        this.listTotal = res.data.length;
       })
     },
 

src/views/stock/stock_list.vue

@@ -6,17 +6,15 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="warehouse">
-              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" @change="changeWarehouse">
-                <el-option label="全部" value=""></el-option>
-                <el-option :label="item.name" :value="item.name" v-for="(item, index) in warehouseList" :key="index"></el-option>
+              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" @change="changeWarehouse" clearable>
+                <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓位" prop="position">
-              <el-select v-model="screenForm.position" placeholder="请选择仓位">
-                <el-option label="全部" value=""></el-option>
-                <el-option :label="item.name" :value="item.name" v-for="(item, index) in positionList" :key="index"></el-option>
+              <el-select v-model="screenForm.position" placeholder="请选择仓位" clearable>
+                <el-option :label="item.name" :value="item.id" v-for="(item, index) in positionList" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -32,17 +30,15 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品大类" prop="type">
-              <el-select v-model="screenForm.type" placeholder="全部" @change="changeType">
-                <el-option label="全部" value=""></el-option>
+              <el-select v-model="screenForm.type" placeholder="请选择产品大类" @change="changeType" clearable>
                 <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品类别" prop="smallType">
-              <el-select v-model="screenForm.smallType" placeholder="全部">
-                <el-option label="全部" value=""></el-option>
-                <el-option v-for="item in smallList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
+              <el-select v-model="screenForm.smallType" placeholder="请选择产品类别" clearable>
+                <el-option v-for="item in smallList" :key="item.kingDeeCategoryId" :label="item.kingDeeCategoryName" :value="item.kingDeeCategoryId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -75,19 +71,18 @@
       </div>
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="center" label="产品大类" prop="categoryName" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品大类" prop="mainName" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品类别" prop="categoryName" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="物料代码" prop="aaa" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="物料代码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单位" prop="aaa" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单价" prop="aaa" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="单位" prop="baseUnitId" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="总库存数量" prop="stockQty" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="可用库数" prop="aaa" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="可用库数" prop="stockAdequate" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="经销商预留库存" prop="reservedNum" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="经销商暂扣库存" prop="temporaryNum" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="开单未提数量" prop="aaa" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="开单未提数量" prop="num" min-width="140" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
     </div>
@@ -140,11 +135,14 @@ export default {
   computed: {
     exParams() {
       return {
-        name: this.screenForm.warehouse,
-        materialName: this.screenForm.name,
-        materialNumber: this.screenForm.code,
+        correspondId: this.screenForm.warehouse,
+        stockId: this.screenForm.position,
+        materialName: this.screenForm.goodsName,
+        materialNumber: this.screenForm.goodsNum,
+        materialOldNumber: this.screenForm.goodsCode,
         specification: this.screenForm.model,
-        categoryName: this.screenForm.type,
+        mainNumber: this.screenForm.type,
+        categoryId: this.screenForm.smallType,
       }
     },
   },
@@ -192,14 +190,22 @@ export default {
     // 更改大类
     changeType() {
       this.screenForm.smallType = '';
-      this.getSmallList();
+      if(this.screenForm.type) {
+        this.getSmallList();
+      }else {
+        this.smallList = [];
+      }
     },
 
     // 更改仓库
     changeWarehouse() {
       this.screenForm.position = '';
-      let obj = this.warehouseList.find(o => o.name == this.screenForm.warehouse);
-      this.positionList = obj.kingDeeStocks;
+      if(this.screenForm.warehouse) {
+        let obj = this.warehouseList.find(o => o.id == this.screenForm.warehouse);
+        this.positionList = obj.kingDeeStocks;
+      }else {
+        this.positionList = [];
+      }
     },
 
     // 查询列表
@@ -209,11 +215,14 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        name: this.screenForm.warehouse,
+        correspondId: this.screenForm.warehouse,
+        stockId: this.screenForm.position,
         materialName: this.screenForm.goodsName,
         materialNumber: this.screenForm.goodsNum,
+        materialOldNumber: this.screenForm.goodsCode,
         specification: this.screenForm.model,
-        categoryName: this.screenForm.type,
+        mainNumber: this.screenForm.type,
+        categoryId: this.screenForm.smallType,
       };
       getStockList(params).then((res) => {
         this.dataList = res.data.records;

src/views/supply/retail/retail_list.vue

@@ -113,7 +113,7 @@
             <el-table-column align="center" label="出库数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></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="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="返利使用比例" prop="rebateRate" min-width="110" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <div>{{scope.row.rebateAmount}}</div>