Merge remote-tracking branch 'origin/develop' into develop

src/api/basic_data/warehouse.js

@@ -135,7 +135,7 @@ export function updateReserve(params) {
 
 export function categoryList(params) {
   return request({
-    url: "/product-category/king-dee-category-list",
+    url: "/k3/category/list",
     method: "get",
     params,
   });

src/api/finance/standbook_list.js

@@ -24,3 +24,11 @@ export function getCustomerList(params) {
     params,
   });
 }
+// 台账列表统计
+export function getAmountCount(params) {
+  return request({
+    url: "/finance/standing/book/amountCount",
+    method: "get",
+    params,
+  });
+}

src/layout/components/Navbar.vue

@@ -11,7 +11,7 @@
     <!-- <NavMenu class="navmenu" /> -->
 
     <div class="right-menu">
-      <div class="right-menu-item hover-effect">
+      <!-- <div class="right-menu-item hover-effect">
         <el-tooltip effect="dark" content="家用工程机登录" placement="bottom">
           <i
             class="el-icon-s-platform"
@@ -19,14 +19,11 @@
             @click="toEngine"
           ></i>
         </el-tooltip>
-<!--        工程机多帐号-->
-<!--        <el-tooltip effect="dark" content="家用工程机登录" placement="bottom">-->
-<!--          <i-->
-<!--            class="el-icon-s-platform"-->
-<!--            style="font-size: 24px; line-height: 50px"-->
-<!--            @click="openEngineAccount"-->
-<!--          ></i>-->
-<!--        </el-tooltip>-->
+      </div> -->
+
+      <div class="right-menu-item hover-effect" @click="toEngine">
+        <i class="el-icon-s-platform" style="font-size: 18px;"></i>
+        <span style="font-size: 16px; margin-left: 6px;">家用工程机登录</span>
       </div>
 
       <el-badge
@@ -96,53 +93,53 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
-<!--    工程机多帐号-->
-<!--    <el-dialog-->
-<!--      title="绑定工程机系统"-->
-<!--      :visible.sync="dialogFormVisible"-->
-<!--      :modal="false"-->
-<!--      width="60%"-->
-<!--    >-->
-<!--      <el-form ref="engineForm" :model="engineForm">-->
-<!--        <el-row v-for="(row, index) in engineForm.engineList" :key="row.id" :gutter="20">-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item-->
-<!--              :label="'账号' + (index+1)"-->
-<!--              :label-width="formLabelWidth"-->
-<!--              :prop="'engineList.' + index + '.enginUserName'"-->
-<!--              :rules="{required: true, message: '请输入工程机账号', trigger: 'blur'}"-->
-<!--            >-->
-<!--              <el-input v-model="row.enginUserName" placeholder="请输入账号" autocomplete="off"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item-->
-<!--              :label="'密码' + (index+1)"-->
-<!--              :label-width="formLabelWidth"-->
-<!--              :prop="'engineList.' + index + '.enginPassword'"-->
-<!--              :rules="{required: true, message: '请输入工程机密码', trigger: 'blur'}"-->
-<!--            >-->
-<!--              <el-input v-model="row.enginPassword" placeholder="请输入密码" autocomplete="off" show-password></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <template v-if="row.adminUserId">-->
-<!--              <el-button @click="submitForm(index)">重验</el-button>-->
-<!--            </template>-->
-<!--            <template v-else>-->
-<!--              <el-button @click="submitForm(index)">验证</el-button>-->
-<!--            </template>-->
+    <!--    工程机多帐号-->
+    <!--    <el-dialog-->
+    <!--      title="绑定工程机系统"-->
+    <!--      :visible.sync="dialogFormVisible"-->
+    <!--      :modal="false"-->
+    <!--      width="60%"-->
+    <!--    >-->
+    <!--      <el-form ref="engineForm" :model="engineForm">-->
+    <!--        <el-row v-for="(row, index) in engineForm.engineList" :key="row.id" :gutter="20">-->
+    <!--          <el-col :span="8">-->
+    <!--            <el-form-item-->
+    <!--              :label="'账号' + (index+1)"-->
+    <!--              :label-width="formLabelWidth"-->
+    <!--              :prop="'engineList.' + index + '.enginUserName'"-->
+    <!--              :rules="{required: true, message: '请输入工程机账号', trigger: 'blur'}"-->
+    <!--            >-->
+    <!--              <el-input v-model="row.enginUserName" placeholder="请输入账号" autocomplete="off"></el-input>-->
+    <!--            </el-form-item>-->
+    <!--          </el-col>-->
+    <!--          <el-col :span="8">-->
+    <!--            <el-form-item-->
+    <!--              :label="'密码' + (index+1)"-->
+    <!--              :label-width="formLabelWidth"-->
+    <!--              :prop="'engineList.' + index + '.enginPassword'"-->
+    <!--              :rules="{required: true, message: '请输入工程机密码', trigger: 'blur'}"-->
+    <!--            >-->
+    <!--              <el-input v-model="row.enginPassword" placeholder="请输入密码" autocomplete="off" show-password></el-input>-->
+    <!--            </el-form-item>-->
+    <!--          </el-col>-->
+    <!--          <el-col :span="8">-->
+    <!--            <template v-if="row.adminUserId">-->
+    <!--              <el-button @click="submitForm(index)">重验</el-button>-->
+    <!--            </template>-->
+    <!--            <template v-else>-->
+    <!--              <el-button @click="submitForm(index)">验证</el-button>-->
+    <!--            </template>-->
 
-<!--            <el-button v-if="row.adminUserId" @click="toEngine(index)">打开</el-button>-->
-<!--            <el-button @click="delAccountForm(index)">删除</el-button>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--      </el-form>-->
-<!--      <div slot="footer" class="dialog-footer">-->
-<!--        <el-button @click="addRowEngine">新增账号</el-button>-->
-<!--        <el-button @click="dialogFormVisible = false">取 消</el-button>-->
-<!--      </div>-->
-<!--    </el-dialog>-->
+    <!--            <el-button v-if="row.adminUserId" @click="toEngine(index)">打开</el-button>-->
+    <!--            <el-button @click="delAccountForm(index)">删除</el-button>-->
+    <!--          </el-col>-->
+    <!--        </el-row>-->
+    <!--      </el-form>-->
+    <!--      <div slot="footer" class="dialog-footer">-->
+    <!--        <el-button @click="addRowEngine">新增账号</el-button>-->
+    <!--        <el-button @click="dialogFormVisible = false">取 消</el-button>-->
+    <!--      </div>-->
+    <!--    </el-dialog>-->
   </div>
 </template>
 
@@ -154,7 +151,11 @@ import Hamburger from "@/components/Hamburger";
 import Screenfull from "@/components/Screenfull";
 import NavMenu from "@/components/NavMenu";
 import { getNoticeListCount } from "@/api/notice";
-import {checkEngineAccount, bindEngineAccount, delEngineAccount} from "@/api/setting";
+import {
+  checkEngineAccount,
+  bindEngineAccount,
+  delEngineAccount,
+} from "@/api/setting";
 import request from "@/utils/request";
 
 export default {
@@ -178,7 +179,7 @@ export default {
         ],
       },
       formLabelWidth: "100px",
-      dialogFormVisible: false
+      dialogFormVisible: false,
     };
   },
   mounted() {
@@ -188,7 +189,7 @@ export default {
     that.tcMessage();
     this.intivalId = setInterval(function () {
       that.tcMessage();
-    }, 3000);
+    }, 5000);
     // this.timer = setInterval(function () {
     //   that.initNotice();
     // }, 3000);
@@ -252,7 +253,7 @@ export default {
       this.$router.push("/notice/index");
     },
     openEngineAccount() {
-      this.engineForm.engineList = this.userInfo.bindEnginList
+      this.engineForm.engineList = this.userInfo.bindEnginList;
       this.dialogFormVisible = true;
     },
     toEngine() {

src/styles/index.scss

@@ -234,14 +234,14 @@ div:focus {
 }
 
 .el-menu-item, .el-submenu__title {
-  height: 50px;
-  line-height: 50px;
+  height: 44px;
+  line-height: 44px;
   font-weight: 600 !important;
 }
 
 .el-submenu .el-menu-item {
-  height: 50px;
-  line-height: 50px;
+  height: 44px;
+  line-height: 44px;
 }
 
 .page-footer {

src/styles/sidebar.scss

@@ -68,8 +68,18 @@
       border: none;
       height: 100%;
       width: 100% !important;
+      // >div {
+      //   height: 40px;
+      // }
+    }
+    .el-menu-item {
+      height: 40px;
+      line-height: 40px;
+    }
+    .el-submenu__title {
+      height: 40px;
+      line-height: 40px;
     }
-
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {

src/views/basic_data/material/components/material_list-detail.vue

@@ -53,12 +53,16 @@
                   <el-input v-model="detail.specification"></el-input>
                 </el-form-item>
               </el-col>
-
               <el-col>
-                <el-form-item label="金蝶编码" size="small">
+                <el-form-item label="存货编码" size="small">
                   <el-input v-model="detail.number"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col>
+                <el-form-item label="金蝶编码" size="small">
+                  <el-input v-model="detail.oldNumber"></el-input>
+                </el-form-item>
+              </el-col>
 
               <el-col>
                 <el-form-item label="条码" size="small">

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

@@ -15,7 +15,7 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据编号">
               <el-input
-                v-model="base.billId"
+                v-model="base.updPriceBillId"
                 placeholder="系统自动生成"
                 disabled
               />
@@ -223,7 +223,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.batchPrice" />
+                  <el-input v-model="scope.row.batchPrice" placeholder="请输入批发价"/>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -235,7 +235,7 @@
               show-overflow-tooltip
             ><template slot-scope="scope">
               <el-form-item>
-                <el-input v-model="scope.row.discAmount" />
+                <el-input v-model="scope.row.discAmount" placeholder="请输入格力折扣"/>
               </el-form-item>
             </template>
             </el-table-column>
@@ -329,7 +329,7 @@
               show-overflow-tooltip
             ><template slot-scope="scope">
               <el-form-item>
-                <el-input v-model="scope.row.qty" />
+                <el-input v-model="scope.row.qty"   placeholder="请输入数量"/>
               </el-form-item>
             </template>
             </el-table-column>
@@ -371,9 +371,9 @@
                   >
                     <el-option
                       v-for="item in scope.row.walleList"
-                      :key="item.walletId"
-                      :value="item.walletId"
-                      :label="item.walletName"
+                      :key="item.walletId || item.id"
+                      :value="item.walletId || item.id"
+                      :label="item.walletName || item.name"
                     /> </el-select></template>
               </el-form-item>
             </template>
@@ -431,22 +431,25 @@
             <el-table-column
               align="center"
               label="销售类型"
-              prop="saleTypeId"
+              prop="mainId"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-select
-                    v-model="scope.row.saleTypeId"
-                    placeholder="请选择销售类型"
-                  >
-                    <el-option
-                      v-for="item in typeList"
-                      :label="item.name"
-                      :value="item.saleTypeId"
-                    />
-                  </el-select>
+
+                    <el-select
+                      v-model="scope.row.saleTypeId"
+                      placeholder="请选择销售类型"
+                      @change="handleSale($event, scope.$index, scope.row.id)"
+                    >
+                      <el-option
+                        v-for="item in typeList"
+                        :label="item.saleName"
+                        :value="item.id"
+                      />
+                    </el-select>
+
                 </el-form-item>
               </template>
             </el-table-column>
@@ -541,6 +544,32 @@
             </el-table-column>
             <el-table-column
               align="center"
+              label="返利类型"
+              prop="rebateUseRate"
+              min-width="160"
+              show-overflow-tooltip
+            ><template slot-scope="scope">
+              <el-form-item>
+                <el-select
+                  v-model="scope.row.walletRebateId"
+                  multiple
+                  :disabled="scope.row.fang"
+                  placeholder="请选择返利类型"
+                  @change="handelRebateList($event, scope.$index, scope.row)"
+                  @remove-tag="handleRemove2($event, scope.$index, scope.row)"
+                >
+                  <el-option
+                    v-for="(item, index) in scope.row.rebateList"
+                    :key="item.index"
+                    :value="item.walletRebateId"
+                    :label="item.name"
+                  />
+                </el-select>
+              </el-form-item>
+            </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
               label="生效日期"
               prop="startDate"
               min-width="160"
@@ -900,7 +929,6 @@ export default {
         saleTypeId: ''
       },
       items: [],
-      centerDialogVisible: false,
       materialLis: [],
       materialId: '',
       rebateList: [],
@@ -917,7 +945,6 @@ export default {
       startDate: '',
       userList: [],
       centerDialogVisible: false,
-
       selectData: [],
       walleList: [],
       fang: true,
@@ -981,10 +1008,11 @@ export default {
     handleRemove(e, index, row) {
       console.log(e)
       const copxyWall = JSON.parse(JSON.stringify(row.wallets))
+      if (row.wallets[0].walletId === e){
+        copxyWall.splice(0, 1)
+      }
       for (let i = 0; i < row.wallets.length; i++) {
-        if (this.wall1.includes(e) && row.wallets[i].walletId == e) {
-          console.log(454)
-
+        if (this.wall1.includes(e) && row.wallets[i].walletId  === e) {
           this.wall1.splice(i, 1)
           copxyWall.splice(i, 1)
         }
@@ -1002,11 +1030,11 @@ export default {
       this.$set(row, 'wallets', copxyWall)
     },
     handelRebateList(e, index, row) {
-      console.log(row, 'kjkj')
       const id = row.cid || row.updPriceBillId
       if (e && e.length) {
         for (let i = 0; i < e.length; i++) {
           if (!this.wall2.includes(e[e.length - 1])) {
+            console.log(44544)
             this.$set(row, 'wallets', [
               ...row.wallets,
               {
@@ -1019,6 +1047,7 @@ export default {
             ])
             this.wall2.push(e[e.length - 1])
           }
+          console.log(row.wallets)
         }
       }
     },
@@ -1063,6 +1092,9 @@ export default {
               this.dataList[j].disabled = true
             }
           }
+
+
+          console.log(this.selectData[i].wallets,'4444  ' )
           this.items.push({
             baseUnitId: '',
             batchPrice: '',
@@ -1087,7 +1119,15 @@ export default {
             saleTypeId: '',
             specification: this.selectData[i].specification,
             startDate: this.selectData[i].startDate,
-            wallets: [],
+            wallets: [
+              {
+                type: 'COMMONLY',
+                id: '',
+                updPriceBillId: this.selectData[i].baseUnitId,
+                updPriceBillItemId: this.selectData[i].baseUnitId,
+                walletId:this.selectData[i].wallets[0].id
+              }
+            ],
             rebateWallets: [],
             rebateList: [],
             walletsId:[this.selectData[i].wallets[0].id],
@@ -1149,6 +1189,41 @@ export default {
       }
     },
     async getList() {
+      const params1 = {
+        pageNum: 1,
+        pageSize: -1,
+        saleCode: '',
+        saleName: '',
+        status: ''
+      }
+      getTypeList(params1).then((res) => {
+        this.typeList = res.data.records
+      })
+      getUserList({
+        pageNum: 1,
+        pageSize: -1,
+        adminWebsitId: '',
+        isCustomer: 0,
+        roleId: '',
+        status: '',
+        userName: ''
+      }).then((res) => {
+        this.userList = res.data.records
+      })
+      this.listLoading = true
+      const params = {
+        pageNum: this.currentPage,
+        pageSize: 10 || this.pageSize,
+        keyword: this.screenForm.keyword,
+        specification: this.screenForm.specification,
+        bindMain: true
+      }
+      getMaterialList(params).then((res) => {
+        this.dataList = res.data.records
+        this.listTotal = res.data.total
+        this.listLoading = false
+      })
+
       const rebateParams = {
         pageNum: 1,
         pageSize: -1,
@@ -1165,8 +1240,7 @@ export default {
         wall.data[u].walletName = wall.data[u].name
       }
       this.walleList = wall.data
-
-      if (this.$parent.show == 5) {
+      if (this.$parent.show === 5) {
         getProductRriceDetail({ id: this.cid }).then((res) => {
           for (let i = 0; i < res.data.items.length; i++) {
             const linshi = []
@@ -1198,40 +1272,61 @@ export default {
             res.data.items[i].walletRebateId = []
             res.data.items[i].rebateWallets = []
             res.data.items[i].wallets = []
+            console.log(res.data.items[i].wallets2,'8878')
             for (let p = 0; p < res.data.items[i].wallets2.length; p++) {
-              if (res.data.items[i].wallets2[p].type == 'COMMONLY') {
+              if (res.data.items[i].wallets2[p].type === 'COMMONLY') {
                 walletIds.push(res.data.items[i].wallets2[p].walletId)
                 this.$set(res.data.items[i], 'wallets', [
                   ...res.data.items[i].wallets,
-                  res.data.items[i].wallets2[p]
+                  {
+                    type: 'COMMONLY',
+                    id: '',
+                    updPriceBillId:  res.data.items[i].updPriceBillId,
+                    updPriceBillItemId:  res.data.items[i].updPriceBillId,
+                    walletId:  res.data.items[i].wallets2[p].walletId
+                  }
                 ])
-              } else if (res.data.items[i].wallets2[p].type == 'REBATE') {
+              } else if (res.data.items[i].wallets2[p].type === 'REBATE') {
                 walletRebateIds.push(res.data.items[i].wallets2[p].walletId)
+                console.log(walletRebateIds)
                 this.$set(res.data.items[i], 'rebateWallets', [
                   ...res.data.items[i].rebateWallets,
-                  res.data.items[i].wallets2[p]
+                  {
+                    type: 'REBATE',
+                    id: '',
+                    updPriceBillId:  res.data.items[i].updPriceBillId,
+                    updPriceBillItemId:  res.data.items[i].updPriceBillId,
+                    walletId:  res.data.items[i].wallets2[p].walletId
+                  }
                 ])
               }
             }
-
             this.rebateList.forEach((k) => {
               k.saleTypes.forEach((j) => {
                 if (
                   !linshi.includes(j.saleTypeId) &&
-                  j.saleTypeId == res.data.items[i].saleTypeId
+                  j.saleTypeId === res.data.items[i].saleTypeId
                 ) {
-                  console.log(k, 998)
-
                   for (let w = 0; w < walletRebateIds.length; w++) {
-                    if (walletRebateIds[w] != k.walletRebateId) {
-                      walletRebateIds.splice(w, 1)
+                    if (walletRebateIds[w] !== k.walletRebateId) {
+                      // walletRebateIds.splice(w, 1)
                     }
                   }
-
                   rebateList.push(k)
                 }
               })
             })
+            if (this.dataList.length){
+              for (let j = 0; j < res.data.items.length; j++) {
+                for (let k = 0; k < this.dataList.length; k++) {
+                  if (res.data.items[j].materialId === this.dataList[k].id){
+                    this.dataList[k].disabled = true
+                  }
+                }
+              }
+              // console.log(this.dataList)
+            }
+
             this.$set(res.data.items[i], 'walletsId', walletIds)
             this.$set(res.data.items[i], 'walletRebateId', walletRebateIds)
             res.data.items[i].walleList = this.walleList
@@ -1244,40 +1339,7 @@ export default {
           this.listLoading = false
         })
       } else {
-        this.listLoading = true
-        const params = {
-          pageNum: this.currentPage,
-          pageSize: 10 || this.pageSize,
-          keyword: this.screenForm.keyword,
-          specification: this.screenForm.specification,
-          bindMain: true
-        }
-        getMaterialList(params).then((res) => {
-          this.dataList = res.data.records
-          this.listTotal = res.data.total
-          this.listLoading = false
-        })
-        const params1 = {
-          pageNum: 1,
-          pageSize: -1,
-          saleCode: '',
-          saleName: '',
-          status: ''
-        }
-        getTypeList(params1).then((res) => {
-          this.typeList = res.data.records
-        })
-        getUserList({
-          pageNum: 1,
-          pageSize: -1,
-          adminWebsitId: '',
-          isCustomer: 0,
-          roleId: '',
-          status: '',
-          userName: ''
-        }).then((res) => {
-          this.userList = res.data.records
-        })
+
       }
     },
     /**
@@ -1311,6 +1373,7 @@ export default {
       //     return;
       //   }
       // }
+
       const params = {
         ...this.base,
         items: this.items,
@@ -1339,6 +1402,8 @@ export default {
       //               console.log(this.items[i]);
 
       // }
+      console.log(this.items)
+      return
       handleEdit({
         ...this.base,
         items: this.items,

src/views/basic_data/material/material_list.vue

@@ -107,6 +107,12 @@
             </el-table-column>
             <el-table-column
               align="center"
+              label="金蝶编码"
+              prop="oldNumber"
+              min-width="100"
+            />
+            <el-table-column
+              align="center"
               label="是否维护商城资料"
               prop="maintainData"
               min-width="100"

src/views/basic_data/material/modify_list.vue

@@ -3,60 +3,114 @@
     <div v-if="show === 1">
       <!-- 筛选条件 -->
       <div>
-        <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="materialNumber">
-                <el-input
-                  placeholder="请输入存货编码"
-                  v-model="screenForm.materialNumber"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货名称" prop="materialName">
-                <el-input
-                  placeholder="请输入存货名称"
-                  v-model="screenForm.materialName"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="存货代码" prop="account">
-                <el-input placeholder="请输入存货代码" v-model="screenForm.account"></el-input>
-              </el-form-item>
-            </el-col> -->
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="生效日期" prop="startDate">
-                <el-date-picker
-                  v-model="screenForm.startDate"
-                  type="datetime"
-                  placeholder="请输入生效日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                >
-                </el-date-picker>
-                <!-- <el-input placeholder="请输入生效日期"  v-model="screenForm.startDate"></el-input> -->
-              </el-form-item>
-            </el-col>
+        <div>
+          <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="materialNumber">
+                  <el-input
+                    placeholder="请输入存货编码"
+                    v-model="screenForm.materialNumber"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="存货名称" prop="materialName">
+                  <el-input
+                    placeholder="请输入存货名称"
+                    v-model="screenForm.materialName"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="金蝶编码" prop="materialOldNumber">
+                  <el-input
+                    placeholder="请输入金蝶编码"
+                    v-model="screenForm.materialOldNumber"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+<!--              <el-col :xs="24" :sm="12" :lg="6">-->
+<!--                <el-form-item label="生效日期" prop="startDate">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="screenForm.startDate"-->
+<!--                    type="datetime"-->
+<!--                    placeholder="请输入生效日期"-->
+<!--                    value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  >-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+<!--              <el-col :xs="24" :sm="12" :lg="6">-->
+<!--                <el-form-item label="失效日期" prop="endDate">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="screenForm.endDate"-->
+<!--                    type="datetime"-->
+<!--                    placeholder="请输入生效日期"-->
+<!--                    value-format="yyyy-MM-dd HH:mm:ss "-->
+<!--                  >-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="销售类型" prop="saleTypeId">
+                  <el-select
+                    v-model="screenForm.saleTypeId"
+                    filterable
+                    placeholder="选择销售类型"
+                    style="width: 100%"
+                  >
+                    <el-option label="全部" value=""></el-option>
+                    <el-option
+                      v-for="item in typeList"
+                      :key="item.id"
+                      :label="item.saleName"
+                      :value="item.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品品类" prop="categoryId">
+                  <el-select
+                    placeholder="请选择产品品类"
+                    v-model="screenForm.mainId"
+                  >
+                    <el-option label="全部" value=""></el-option>
+                    <el-option
+                      v-for="item in dictList"
+                      :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="specification">
+                  <el-input
+                    placeholder="请输入规格型号"
+                    v-model="screenForm.specification"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm"
-                  >清空</el-button
-                >
-                <el-button size="small" type="primary" @click="submitScreenForm"
+              <el-col :xs="24" :sm="24" :lg="24" class="tr">
+                <el-form-item label="">
+                  <el-button size="small" @click="resetScreenForm">清空</el-button>
+                  <el-button size="small" type="primary" @click="submitScreenForm"
                   >搜索</el-button
-                >
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+                  >
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+      </div>
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix">
@@ -392,18 +446,20 @@
 </template>
 
 <script>
-import ModifyListApply from "./components/modify_list-apply.vue";
-import ModifyListApproval from "./components/modify_list-approval.vue";
-import ModifyListDetail from "./components/modify_list-detail.vue";
-import Mixin from "@/mixin/index";
+import ModifyListApply from './components/modify_list-apply.vue'
+import ModifyListApproval from './components/modify_list-approval.vue'
+import ModifyListDetail from './components/modify_list-detail.vue'
+import Mixin from '@/mixin/index'
 import {
+  getPriceSubmit,
+  getProductRricedel,
   getProductRriceDetail,
   getProductRriceList,
-  getProductRricedel,
-  getTypeList,
-  getPriceSubmit,
-} from "@/api/basic_data/material";
-import { downloadFiles } from "@/utils/util";
+  getTypeList
+} from '@/api/basic_data/material'
+import { downloadFiles } from '@/utils/util'
+import { getDictList } from '@/api/common'
+
 export default {
   mixins: [Mixin],
   data() {
@@ -438,6 +494,10 @@ export default {
         materialName: "",
         materialNumber: "",
         startDate: "",
+        materialOldNumber:'',
+        saleTypeId:'',
+        mainId:'',
+        specification:''
       },
       liDetail: {},
       detail: {},
@@ -463,6 +523,7 @@ export default {
       },
       cid:'',
       typeList: [],
+      dictList:[]
     };
   },
   components: {
@@ -490,6 +551,10 @@ export default {
     getTypeList(params).then((res) => {
       this.typeList = res.data.records;
     });
+    getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
+      this.dictList = res.data;
+      console.log(this.dictList)
+    });
   },
   methods: {
     formatterType(row) {
@@ -541,6 +606,10 @@ export default {
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
         startDate: this.screenForm.startDate,
+        materialOldNumber:this.screenForm.materialOldNumber,
+        saleTypeId:this.screenForm.saleTypeId,
+        mainId:this.screenForm.mainId,
+        specification:this.screenForm.specification
       };
       getProductRriceList(params).then((res) => {
         this.dataList = res.data.records;

src/views/basic_data/material/price_list.vue

@@ -27,27 +27,35 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="生效日期" prop="startDate">
-              <el-date-picker
-                v-model="screenForm.startDate"
-                type="datetime"
-                placeholder="请输入生效日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="失效日期" prop="endDate">
-              <el-date-picker
-                v-model="screenForm.endDate"
-                type="datetime"
-                placeholder="请输入生效日期"
-                value-format="yyyy-MM-dd HH:mm:ss "
-              >
-              </el-date-picker>
+            <el-form-item label="金蝶编码" prop="materialOldNumber">
+              <el-input
+                placeholder="请输入金蝶编码"
+                v-model="screenForm.materialOldNumber"
+              ></el-input>
             </el-form-item>
           </el-col>
+<!--          <el-col :xs="24" :sm="12" :lg="6">-->
+<!--            <el-form-item label="生效日期" prop="startDate">-->
+<!--              <el-date-picker-->
+<!--                v-model="screenForm.startDate"-->
+<!--                type="datetime"-->
+<!--                placeholder="请输入生效日期"-->
+<!--                value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :xs="24" :sm="12" :lg="6">-->
+<!--            <el-form-item label="失效日期" prop="endDate">-->
+<!--              <el-date-picker-->
+<!--                v-model="screenForm.endDate"-->
+<!--                type="datetime"-->
+<!--                placeholder="请输入生效日期"-->
+<!--                value-format="yyyy-MM-dd HH:mm:ss "-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="销售类型" prop="saleTypeId">
               <el-select
@@ -66,20 +74,21 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :xs="24" :sm="12" :lg="6">
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品品类" prop="categoryId">
               <el-select
                 placeholder="请选择产品品类"
-                v-model="screenForm.categoryId"
+                v-model="screenForm.mainId"
               >
+                <el-option label="全部" value=""></el-option>
                 <el-option
                   v-for="item in dictList"
                   :label="item.dictValue"
-                  :value="item.sysDictId"
+                  :value="item.dictCode"
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="规格型号" prop="specification">
               <el-input
@@ -314,15 +323,10 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import {
-  getProductPriceList,
-  handlePriceRevoke,
-  getProductDelete,
-  getTypeList,
-} from "@/api/basic_data/material";
-import { getDictList } from "@/api/common";
-import { downloadFiles, parseTime } from "@/utils/util";
+import Mixin from '@/mixin/index'
+import { getProductDelete, getProductPriceList, getTypeList, handlePriceRevoke } from '@/api/basic_data/material'
+import { getDictList } from '@/api/common'
+
 export default {
   mixins: [Mixin],
   data() {
@@ -332,7 +336,7 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [],
       screenForm: {
-        categoryId: "",
+        mainId: "",
         endDate: "",
         materialName: "",
         materialNumber: "",
@@ -347,6 +351,7 @@ export default {
   mounted() {
     getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
       this.dictList = res.data;
+      console.log(this.dictList)
     });
   },
   methods: {
@@ -366,7 +371,7 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        categoryId: this.screenForm.categoryId,
+        mainId: this.screenForm.mainId,
         endDate: this.screenForm.endDate,
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,

src/views/basic_data/warehouse/warehouse_book.vue

@@ -7,7 +7,7 @@
           type="primary"
           icon="el-icon-plus"
           size="small"
-          @click="dialogVisible=true"
+          @click="dialogVisible=true;type=1"
         >新增</el-button>
       </div>
     </div>
@@ -36,14 +36,14 @@
           <el-table-column
             align="center"
             label="仓库"
-            prop="stockName"
+            prop="correspondName"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
             label="预约存货类型"
-            prop="type"
+            prop="categoryName"
             min-width="160"
             show-overflow-tooltip
           />
@@ -81,9 +81,9 @@
               <el-button
                 type="text"
                 class="textColor"
-                @click="hanleEidt(scope.$index)"
+                @click="hanleEidt(scope.row.id,scope.row)"
               >编辑</el-button>
-              <el-button type="text" class="textColor" @click="hanleSave(scope.row)">保存</el-button>
+              <!--              <el-button type="text" class="textColor" @click="hanleSave(scope.row)">保存</el-button>-->
             </template>
           </el-table-column>
         </el-table>
@@ -169,6 +169,10 @@ export default {
         towerNum: [
           { required: true, message: '请输入预约台数量', trigger: 'blur' }
         ]
+      },
+      type: '',
+      editData: {
+
       }
     }
   },
@@ -177,11 +181,17 @@ export default {
     this.getCommonList()
   },
   methods: {
-    hanleEidt(i) {
-      this.dataList.forEach(e => {
-        e.isDisabled = true
-      })
-      this.dataList[i].isDisabled = false
+
+    hanleEidt(id, row) {
+      this.type = 2
+      this.dialogVisible = true
+      this.ruleForm = {
+        ...row
+      }
+      // this.dataList.forEach(e => {
+      //   e.isDisabled = true
+      // })
+      // this.dataList[i].isDisabled = false
     },
     hanleSave(row) {
       const params = {
@@ -200,21 +210,40 @@ export default {
           this.ruleForm
         )
         if (valid) {
-          updateReserve({
-            ...this.ruleForm
-          }).then(res => {
-            this.$successMsg('新增成功')
+          if (this.type === 1) {
+            addReserve({
+              ...this.ruleForm
+            }).then(res => {
+              this.$successMsg('新增成功')
+              this.getList()
+            })
+          } else {
+            updateReserve({
+              ...this.ruleForm
+            }).then(res => {
+              this.$successMsg('编辑成功')
               this.getList()
-          })
+            })
+          }
         } else {
           console.log('error submit!!')
           return false
         }
         this.dialogVisible = false
+        this.resetForm()
       })
     },
     resetForm() {
       this.$refs.ruleForm.resetFields()
+      this.ruleForm = {
+        'categoryId': '',
+        'categoryName': '',
+        'correspondId': '',
+        'correspondName': '',
+        'id': '',
+        'number': '',
+        'towerNum': ''
+      }
     },
     getList() {
       this.listLoading = true
@@ -241,9 +270,13 @@ export default {
       }).then(res => {
         this.stockList = res.data.records
       })
-      categoryList().then(res => {
+      categoryList({
+        pageNum: 1,
+        pageSize: -1,
+        keyword: ''
+      }).then(res => {
         console.log(res)
-        this.cateList = res.data
+        this.cateList = res.data.records
       })
     },
     handleStock(e) {

src/views/engin_deposit/deposit_list.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <div v-if="showPage == 1">
       <el-radio-group v-model="deduction" size="" @change="handleRadio">
-        <el-radio-button label="全部"></el-radio-button>
-        <el-radio-button label="已退押"></el-radio-button>
+        <el-radio-button label="全部" />
+        <el-radio-button label="已退押" />
       </el-radio-group>
-      <br /><br />
+      <br><br>
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -21,7 +21,7 @@
                 <el-input
                   v-model="screenForm.refEnginRecordNo"
                   placeholder="请输入"
-                ></el-input>
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -29,7 +29,7 @@
                 <el-input
                   v-model="screenForm.customerKeyword"
                   placeholder="请输入"
-                ></el-input>
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -45,7 +45,7 @@
                 <el-input
                   v-model="screenForm.refProjectName"
                   placeholder="请输入"
-                ></el-input>
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -55,8 +55,7 @@
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
-                >
-                </el-date-picker>
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -71,12 +70,15 @@
             </el-col> -->
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">
-                <el-button size="small" @click="resetScreenForm"
-                  >清空</el-button
-                >
-                <el-button size="small" type="primary" @click="submitScreenForm"
-                  >搜索</el-button
-                >
+                <el-button
+                  size="small"
+                  @click="resetScreenForm"
+                >清空</el-button>
+                <el-button
+                  size="small"
+                  type="primary"
+                  @click="submitScreenForm"
+                >搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -84,9 +86,11 @@
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix" style="display: flex">
-        <el-button type="primary" size="small" @click="hanleDownloadFiles"
-          >导出</el-button
-        >
+        <el-button
+          type="primary"
+          size="small"
+          @click="hanleDownloadFiles"
+        >导出</el-button>
         <el-upload
           v-if="$checkBtnRole('import', $route.meta.roles)"
           class="import-btn"
@@ -112,36 +116,35 @@
             @select-all="handleSelectionAllChange"
             @selection-change="handleSelectionAllChange"
           >
-            <el-table-column align="center" type="selection" width="55">
-            </el-table-column>
+            <el-table-column align="center" type="selection" width="55" />
             <el-table-column
               align="center"
               label="工程登录编码"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="使用单位"
               prop="refUseUnit"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="经销商编码"
               prop="customerId"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="经销商名称"
               prop="customerName"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <!-- <el-table-column
               align="center"
               label="是否免扣"
@@ -158,12 +161,11 @@
             >
               <template slot-scope="scope">
                 <el-tag
+                  v-if="scope.row.isRefundDeposit"
                   type="success"
                   size="small"
-                  v-if="scope.row.isRefundDeposit"
-                  >是</el-tag
-                >
-                <el-tag type="warning" size="small" v-else>否</el-tag>
+                >是</el-tag>
+                <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
             <!-- <el-table-column
@@ -179,7 +181,7 @@
               prop="depositAmount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="状态"
@@ -189,35 +191,32 @@
             >
               <template slot-scope="scope">
                 <el-tag
+                  v-if="scope.row.examineStatus == 'SAVE'"
                   type="success"
                   size="small"
-                  v-if="scope.row.examineStatus == 'SAVE'"
-                  >保存
+                >保存
                 </el-tag>
                 <el-tag
+                  v-if="scope.row.examineStatus == 'WAIT'"
                   type="warning"
                   size="small"
-                  v-if="scope.row.examineStatus == 'WAIT'"
-                  >待审核
+                >待审核
                 </el-tag>
                 <el-tag
+                  v-if="scope.row.examineStatus == 'OK'"
                   type="warning"
                   size="small"
-                  v-if="scope.row.examineStatus == 'OK'"
-                  >通过</el-tag
-                >
+                >通过</el-tag>
                 <el-tag
+                  v-if="scope.row.examineStatus == 'FAIL'"
                   type="warning"
                   size="small"
-                  v-if="scope.row.examineStatus == 'FAIL'"
-                  >不通过</el-tag
-                >
+                >不通过</el-tag>
                 <el-tag
+                  v-if="scope.row.examineStatus == 'CLOSE'"
                   type="warning"
                   size="small"
-                  v-if="scope.row.examineStatus == 'CLOSE'"
-                  >关闭</el-tag
-                >
+                >关闭</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -226,7 +225,7 @@
               prop="qty"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <!-- <el-table-column
               align="center"
               label="是否已发货"
@@ -238,7 +237,7 @@
               align="center"
               label="操作"
               min-width="160"
-               fixed="right"
+              fixed="right"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -246,18 +245,16 @@
                   type="text"
                   class="textColor"
                   @click="detailFn(scope.row)"
-                  >详情</el-button
-                >
+                >详情</el-button>
                 <el-button
-                  type="text"
-                  class="textColor"
                   v-if="
                     scope.row.examineStatus == 'SAVE' &&
-                    $checkBtnRole('apply', $route.meta.roles)
+                      $checkBtnRole('apply', $route.meta.roles)
                   "
+                  type="text"
+                  class="textColor"
                   @click="surrenderFn(scope.row)"
-                  >申请退押</el-button
-                >
+                >申请退押</el-button>
                 <!-- <el-button type="text" class="textColor" slot="reference"
                   >免扣退押</el-button
                 > -->
@@ -273,8 +270,7 @@
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
-          >
-          </el-pagination>
+          />
         </div>
       </div>
     </div>
@@ -293,12 +289,12 @@ import { getList } from '@/api/engin_deposit.js'
 import Mixin from '@/mixin'
 
 export default {
-  mixins: [Mixin],
   components: {
     DepositListDetail,
     DepositApplyDeduction,
-    DepositApplySurrender,
+    DepositApplySurrender
   },
+  mixins: [Mixin],
   data() {
     return {
       currentPage: 1, // 当前页码
@@ -306,97 +302,98 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
       screenForm: {
-        confirmName: "", //审核人
-        createName: "", //创建人
-        customerKeyword: "", //客户编码/客户名称
-        endDeliverTime: "", //发货申请日期-结束
-        enginOrderNo: "", //工程订单编号
-        enginOrderType: "", //工程订单类型
-        examineStatus: "", //状态
-        refEnginRecordNo: "", //登录单号
-        refProjectName: "", //项目名称
-        refUseUnit: "", //使用单位
-        startDeliverTime: "", //发货申请日期-开始
-      }, //搜索表单
+        confirmName: '', // 审核人
+        createName: '', // 创建人
+        customerKeyword: '', // 客户编码/客户名称
+        endDeliverTime: '', // 发货申请日期-结束
+        enginOrderNo: '', // 工程订单编号
+        enginOrderType: '', // 工程订单类型
+        examineStatus: '', // 状态
+        refEnginRecordNo: '', // 登录单号
+        refProjectName: '', // 项目名称
+        refUseUnit: '', // 使用单位
+        startDeliverTime: '' // 发货申请日期-开始
+      }, // 搜索表单
       listLoading: false, // 列表加载loading
-      deduction: "全部",
+      deduction: '全部',
       showPage: 1,
       importFileList: [],
       selectData: [],
-      baseURL: "",
-    };
+      baseURL: ''
+    }
   },
 
   methods: {
-    //免扣申请
+    // 免扣申请
     deductionFn() {
-      this.showPage = 3;
+      this.showPage = 3
     },
-    //申请退押
+    // 申请退押
     surrenderFn(row) {
-      this.depositManageId = row.depositManageId;
-      this.showPage = 4;
+      this.depositManageId = row.depositManageId
+      this.showPage = 4
     },
     detailFn(row) {
-      this.depositManageId = row.depositManageId;
-      this.refEnginRecordNo = row.refEnginRecordNo;
-      this.showPage = 2;
+      this.depositManageId = row.depositManageId
+      this.refEnginRecordNo = row.refEnginRecordNo
+      this.showPage = 2
     },
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
       const params = {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        ...this.screenForm,
-      };
+        isRefundDeposit: this.deduction !=='全部',
+        ...this.screenForm
+      }
       getList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listLoading = false;
-        this.listTotal = res.data.total;
-      });
+        this.dataList = res.data.records
+        this.listLoading = false
+        this.listTotal = res.data.total
+      })
     },
     handleRadio() {
-      this.getList();
+      this.getList()
     },
     hanleDownloadFiles() {
       if (this.selectData.length) {
-        const arr = [];
+        const arr = []
         for (let i = 0; i < this.selectData.length; i++) {
-          arr.push(this.selectData[i].depositManageId);
+          arr.push(this.selectData[i].depositManageId)
         }
-        downloadFiles("/deposit-manage/export", { id: arr });
+        downloadFiles('/deposit-manage/export', { id: arr })
       } else {
-        this.$errorMsg("请选择押金项");
+        this.$errorMsg('请选择押金项')
       }
     },
     // 导入
     async handleImport(param) {
-      this.importLoading = true;
-      const file = param.file;
-      console.log(file, 123);
-      const formData = new FormData();
-      formData.append("file", file);
+      this.importLoading = true
+      const file = param.file
+      console.log(file, 123)
+      const formData = new FormData()
+      formData.append('file', file)
       // formData.append("policyId", this.screenForm.code);
-      let result = await handleImport("deposit-manage/import", formData);
-      this.importLoading = false;
-      this.importFileList = [];
+      const result = await handleImport('deposit-manage/import', formData)
+      this.importLoading = false
+      this.importFileList = []
       if (result.code == 200) {
-        this.$alert(result.message, "导入成功", {
-          confirmButtonText: "确定",
-        });
+        this.$alert(result.message, '导入成功', {
+          confirmButtonText: '确定'
+        })
 
-        this.handletwoList();
+        this.handletwoList()
       } else {
-        this.$alert(result.message, "导入失败", {
-          confirmButtonText: "确定",
-        });
+        this.$alert(result.message, '导入失败', {
+          confirmButtonText: '确定'
+        })
       }
     },
     handleSelectionAllChange(e) {
-      this.selectData = e;
-    },
-  },
-};
+      this.selectData = e
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/finance/account_list.vue

@@ -125,6 +125,8 @@
             fit
             highlight-current-row
             stripe
+            show-summary
+            :summary-method="$getSummaries"
           >
             <el-table-column
               align="center"
@@ -167,13 +169,13 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="center"
               label="部门"
               prop=""
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="center"
               label="现金钱包类型"
@@ -203,19 +205,23 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="收付款金额"
               prop="amount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
+            >
+              <template slot-scope="scope">
+                {{ scope.row.amount | numToFixed }}
+              </template>
+            </el-table-column>
+            <!-- <el-table-column
               align="center"
               label="发货金额"
               prop=""
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="center"
               label="备注"
@@ -347,6 +353,10 @@ export default {
     //获取列表
     async getDataList(data) {
       let res = await getFinanceStandingBookList(data);
+      res.data.records.forEach((item) => {
+        item.sums1 = [];
+        item.sums2 = ["amount"];
+      });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },

src/views/finance/change_list.vue

@@ -78,6 +78,8 @@
             fit
             highlight-current-row
             stripe
+            show-summary
+            :summary-method="$getSummaries"
           >
             <el-table-column
               label="序号"
@@ -141,12 +143,16 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="返利金额"
               prop="amount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                {{ scope.row.amount | numToFixed }}
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="接收方经销商编号"
@@ -379,7 +385,9 @@ export default {
   methods: {
     //切换radio
     changeRadioGroupFn(v) {
-      console.log(v);
+      // console.log(v);
+      this.currentPage = 1;
+      this.pageSize = 10;
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: this.currentPage,
@@ -415,7 +423,11 @@ export default {
     //获取列表数据
     async getDataList(data) {
       const res = await getChangeList(data);
-      console.log(res);
+      // console.log(res);
+      res.data.records.forEach((item) => {
+        item.sums1 = [];
+        item.sums2 = ["amount"];
+      });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },

src/views/finance/components/account_list-detail.vue

@@ -112,6 +112,8 @@
           fit
           highlight-current-row
           stripe
+          show-summary
+          :summary-method="$getSummaries"
         >
           <el-table-column
             align="center"
@@ -154,13 +156,13 @@
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             label="部门"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             align="center"
             label="现金钱包类型"
@@ -190,19 +192,23 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="收付款金额"
             prop="amount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
+          >
+            <template slot-scope="scope">
+              {{ scope.row.amount | numToFixed }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column
             align="center"
             label="发货金额"
             prop=""
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             align="center"
             label="备注"
@@ -219,7 +225,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
+          :page-size="pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="listTotal"
         >
@@ -312,6 +318,10 @@ export default {
     //获取列表
     async getDataList(data) {
       let res = await getFinanceStandingBookList(data);
+      res.data.records.forEach((item) => {
+        item.sums1 = [];
+        item.sums2 = ["amount"];
+      });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },

src/views/finance/components/receivable_list-add.vue

@@ -175,6 +175,17 @@
           </el-table-column>
           <el-table-column
             align="center"
+            label="*收入部门"
+            prop="incomeDept"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.incomeDept"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             label="现金钱包"
             prop="walletId"
             min-width="160"
@@ -431,6 +442,10 @@ export default {
           this.$message.error("请输入费用承担部门");
           return v;
         }
+        if (v.incomeDept == "") {
+          this.$message.error("请输入收入部门");
+          return v;
+        }
         if (!v.customerWalletId) {
           this.$message.error("请选择现金钱包");
           return v;
@@ -501,6 +516,7 @@ export default {
         departmentId: "",
         customerWalletId: "",
         invoiceType: "",
+        incomeDept: "",
         // afterTaxAmount: "",
         // tax: "",
         totalAmount: "",

src/views/finance/components/receivable_list-approval.vue

@@ -167,6 +167,13 @@
           ></el-table-column>
           <el-table-column
             align="center"
+            label="*收入部门"
+            prop="incomeDept"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
             label="现金钱包"
             prop="customerWalletName"
             min-width="160"

src/views/finance/components/receivable_list-detail.vue

@@ -149,6 +149,13 @@
           ></el-table-column>
           <el-table-column
             align="center"
+            label="*收入部门"
+            prop="incomeDept"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
             label="现金钱包"
             prop="customerWalletName"
             min-width="160"

src/views/finance/credit_list.vue

@@ -62,6 +62,8 @@
             fit
             highlight-current-row
             stripe
+            show-summary
+            :summary-method="getSummaries"
           >
             <el-table-column
               label="序号"
@@ -85,14 +87,17 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="总信用额度"
               prop="amount"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.usedCreditAmount + scope.row.freeCreditAmount }}
+                {{
+                  (scope.row.usedCreditAmount + scope.row.freeCreditAmount)
+                    | numToFixed
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -263,6 +268,32 @@ export default {
     this.getCustomerData({ pageSize: -1, pageNum: 1 });
   },
   methods: {
+    //列表合计
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+        }
+        if (index === 3) {
+          let map1 = data.map((v) => {
+            return v.usedCreditAmount + v.freeCreditAmount;
+          });
+          sums[index] = map1
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+      });
+      return sums;
+    },
     //获取经销商列表
     async getCustomerData(data) {
       const res = await getCustomerList(data);
@@ -304,7 +335,7 @@ export default {
     //列表数据
     async getDataList(data) {
       const res = await getWalletCustomerList(data);
-      console.log(res);
+      // console.log(res);
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },

src/views/finance/finance_sum.vue

@@ -51,6 +51,8 @@
           fit
           highlight-current-row
           stripe
+          show-summary
+          :summary-method="$getSummaries"
         >
           <el-table-column
             align="center"
@@ -74,19 +76,27 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="可用信用额度"
             prop="freezeCreditAmount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              {{ scope.row.freezeCreditAmount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="已用信用额度"
             prop="usedCreditAmount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              {{ scope.row.usedCreditAmount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="更新时间"
@@ -151,6 +161,10 @@ export default {
     //获取列表数据
     async getDataList(data) {
       const res = await getFinanceTotal(data);
+      res.data.forEach((item) => {
+        item.sums1 = [];
+        item.sums2 = ["freezeCreditAmount", "usedCreditAmount"];
+      });
       this.dataList = res.data;
     },
   },

src/views/finance/rebate_form.vue

@@ -117,6 +117,8 @@
           :row-class-name="rouClassNameFn"
           @row-click="onRowClick"
           @selection-change="selectionChange"
+          show-summary
+          :summary-method="getSummaries"
         >
           <el-table-column
             align="center"
@@ -183,7 +185,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="返利总金额"
             prop="amount"
             min-width="160"
@@ -194,7 +196,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            align="center"
+            align="left"
             label="暂扣返利"
             prop="withholdAmount"
             min-width="160"
@@ -390,6 +392,48 @@ export default {
     this.searchForm.createBy = this.name;
   },
   methods: {
+    //合计
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+        }
+        if (index === 4) {
+          let map2 = data.map((v) => {
+            return v.amount;
+          });
+          sums[index] = map2
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+        if (index === 5) {
+          let map2 = data.map((v) => {
+            return v.withholdAmount;
+          });
+          sums[index] = map2
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+      });
+
+      return sums;
+    },
     //删除
     delSeletFn() {
       console.log(this.dataList);

src/views/finance/rebate_list.vue

@@ -656,6 +656,7 @@ export default {
     //切换radio获取数据
     changeRadioFn(v) {
       // console.log(111);
+
       this.currentPage = 1;
       this.getDataList({
         ...this.searchForm,

src/views/finance/receipt_list.vue

@@ -115,6 +115,8 @@
             fit
             highlight-current-row
             stripe
+            show-summary
+            :summary-method="$getSummaries"
           >
             <el-table-column
               align="center"
@@ -177,12 +179,16 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="表头·实收金额"
               prop="amount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                {{ scope.row.amount | numToFixed }}
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="收款金额"
@@ -372,7 +378,11 @@ export default {
     },
     async getDataList(data) {
       const res = await getK3ReceiptList(data);
-      console.log(res);
+      // console.log(res);
+      res.data.records.forEach((item) => {
+        item.sums1 = [];
+        item.sums2 = ["amount"];
+      });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },

src/views/finance/receivable_list.vue

@@ -133,6 +133,8 @@
             highlight-current-row
             stripe
             @selection-change="selectionChangeFn"
+            show-summary
+            :summary-method="$getSummaries"
           >
             <el-table-column align="center" type="selection" width="100">
             </el-table-column>
@@ -190,12 +192,16 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="总金额"
               prop="totalAmount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="单据状态"
@@ -402,8 +408,12 @@ export default {
     },
     //获取来列表数据
     async getDataList(data) {
-      const res = await getFinanceOtherReceList(data);
+      let res = await getFinanceOtherReceList(data);
       console.log(res);
+      res.data.records.forEach((item) => {
+        item.sums2 = ["totalAmount"];
+        item.sums1 = ["totalAmount"];
+      });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },

src/views/finance/standbook_list.vue

@@ -118,6 +118,26 @@
       </div>
     </div>
     <div v-show="bill == 'COMMONLY'">
+      <ul class="ulStyle">
+        <li>
+          预付货款:<span>{{ amountList.preCount }}</span>
+        </li>
+        <li>
+          订单占款:<span>{{ amountList.orderCOunt }}</span>
+        </li>
+        <li>
+          支付货款:<span>{{ amountList.payCount }}</span>
+        </li>
+        <li>
+          押金:<span>{{ amountList.orderDate }}</span>
+        </li>
+        <li>
+          工程保证金:<span>{{ amountList.projectCount }}</span>
+        </li>
+        <li>
+          其他暂扣款:<span>{{ amountList.otherCount }}</span>
+        </li>
+      </ul>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
@@ -129,6 +149,8 @@
             fit
             highlight-current-row
             stripe
+            show-summary
+            :summary-method="getSummaries"
           >
             <el-table-column
               label="序号"
@@ -173,7 +195,7 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="预付货款"
               prop="flag"
               min-width="160"
@@ -187,12 +209,12 @@
                       : scope.row.amountType == "OUT"
                       ? -scope.row.amount
                       : ""
-                    : "-"
+                    : "-" | numToFixed
                 }}
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="订单占款"
               prop="flag"
               min-width="160"
@@ -206,12 +228,12 @@
                       : scope.row.amountType == "OUT"
                       ? -scope.row.amount
                       : ""
-                    : "-"
+                    : "-" | numToFixed
                 }}
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="支付货款"
               prop="flag"
               min-width="160"
@@ -225,12 +247,12 @@
                       : scope.row.amountType == "OUT"
                       ? -scope.row.amount
                       : ""
-                    : "-"
+                    : "-" | numToFixed
                 }}
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="押金"
               prop="flag"
               min-width="160"
@@ -244,12 +266,12 @@
                       : scope.row.amountType == "OUT"
                       ? -scope.row.amount
                       : ""
-                    : "-"
+                    : "-" | numToFixed
                 }}
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="工程保证金"
               prop="flag"
               min-width="160"
@@ -263,12 +285,12 @@
                       : scope.row.amountType == "OUT"
                       ? -scope.row.amount
                       : ""
-                    : "-"
+                    : "-" | numToFixed
                 }}
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="其他暂扣款"
               prop="flag"
               min-width="160"
@@ -282,17 +304,21 @@
                       : scope.row.amountType == "OUT"
                       ? -scope.row.amount
                       : ""
-                    : "-"
+                    : "-" | numToFixed
                 }}
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="账户余额"
               prop="balanceAmount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                {{ scope.row.balanceAmount | numToFixed }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <!-- 分页
@@ -311,6 +337,14 @@
       </div>
     </div>
     <div v-show="bill == 'REBATE'">
+      <ul class="ulStyle">
+        <li>
+          返利支出:<span>{{ amountList.outCount }}</span>
+        </li>
+        <li>
+          返利收入:<span>{{ amountList.inCount }}</span>
+        </li>
+      </ul>
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
@@ -322,6 +356,8 @@
             fit
             highlight-current-row
             stripe
+            show-summary
+            :summary-method="getSummaries2"
           >
             <el-table-column
               label="序号"
@@ -391,57 +427,68 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="收入"
               prop="amountType"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.amountType == "IN" ? scope.row.amount : "-" }}
+                {{
+                  scope.row.amountType == "IN"
+                    ? scope.row.amount
+                    : "-" | numToFixed
+                }}
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="支出"
               prop="amountType"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.amountType == "OUT" ? scope.row.amount : "-" }}
+                {{
+                  scope.row.amountType == "OUT"
+                    ? scope.row.amount
+                    : "-" | numToFixed
+                }}
               </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="折让金额"
               prop="allowanceAmount"
               min-width="160"
               show-overflow-tooltip
             >
+              <template slot-scope="scope">
+                {{ scope.row.allowanceAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="暂扣返利"
               prop="withholdAmount"
               min-width="160"
               show-overflow-tooltip
             >
-              <!-- <template slot-scope="scope">
-                {{
-                  scope.row.amountType == "OUT"
-                    ? scope.row.amount
-                    : -scope.row.amount
-                }}
-              </template> -->
+              <template slot-scope="scope">
+                {{ scope.row.withholdAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
-              align="center"
+              align="right"
               label="结存"
               prop="balanceAmount"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                {{ scope.row.balanceAmount | numToFixed }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
@@ -482,11 +529,13 @@ import {
   getStandbookList,
   getDictList,
   getCustomerList,
+  getAmountCount,
 } from "@/api/finance/standbook_list";
 
 export default {
   data() {
     return {
+      amountList: {},
       customerList: [],
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
@@ -578,6 +627,11 @@ export default {
           customerName: vm.$route.query.customerName,
           customerNumber: vm.$route.query.customerNumber,
         });
+        vm.getAmountList({
+          type: vm.bill,
+          customerName: vm.$route.query.customerName,
+          customerNumber: vm.$route.query.customerNumber,
+        });
       } else if (vm.isCustomer) {
         vm.isDisabled = true;
         vm.searchForm.customerId = vm.$store.state.user.customerId;
@@ -588,6 +642,10 @@ export default {
           type: vm.bill,
           ...vm.isCustomerList,
         });
+        vm.getAmountList({
+          type: vm.bill,
+          ...vm.isCustomerList,
+        });
       } else {
         vm.searchForm.customerId = "";
         vm.isDisabled = false;
@@ -597,6 +655,9 @@ export default {
           type: vm.bill,
         });
         vm.getCustomerDataList();
+        vm.getAmountList({
+          type: vm.bill,
+        });
       }
     });
   },
@@ -644,35 +705,172 @@ export default {
     // this.getDataDict();
   },
   methods: {
-    // //合计
-    // getSummaries(param) {
-    //   console.log(this.$getSummaries, 333333333);
-    //   console.log(param, "param");
-    //   // const { columns, data } = param;
-    //   // const sums = [];
-    //   // columns.forEach((column, index) => {
-    //   //   if (index === 0) {
-    //   //     sums[index] = "总价";
-    //   //     return;
-    //   //   }
-    //   //   const values = data.map((item) => Number(item[column.property]));
-    //   //   if (!values.every((value) => isNaN(value))) {
-    //   //     sums[index] = values.reduce((prev, curr) => {
-    //   //       const value = Number(curr);
-    //   //       if (!isNaN(value)) {
-    //   //         return prev + curr;
-    //   //       } else {
-    //   //         return prev;
-    //   //       }
-    //   //     }, 0);
-    //   //     sums[index] += " 元";
-    //   //   } else {
-    //   //     sums[index] = "N/A";
-    //   //   }
-    //   // });
+    //
+    computedFn(data, i, sums, index) {
+      let map1 = data.map((v) => {
+        if (v.flag == i && v.amountType == "IN") {
+          return v.amount;
+        }
+        if (v.flag == i && v.amountType == "OUT") {
+          return -v.amount;
+        }
+      });
 
-    //   // return sums;
-    // },
+      let sum = map1
+        .reduce((prev, curr) => {
+          const value = Number(curr);
+          if (!isNaN(value)) {
+            return prev + curr;
+          } else {
+            return prev;
+          }
+        }, 0)
+        .toFixed(2);
+      return sum;
+    },
+    //合计
+    //返利台账列表合计
+    getSummaries2(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+        }
+        if (index === 9) {
+          let map1 = data.map((v) => {
+            if (v.amountType == "IN") {
+              return v.amount;
+            }
+          });
+          sums[index] = map1
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+        if (index === 10) {
+          let map1 = data.map((v) => {
+            if (v.amountType == "OUT") {
+              return v.amount;
+            }
+          });
+          sums[index] = map1
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+        if (index === 11) {
+          let map1 = data.map((v) => {
+            return v.allowanceAmount;
+          });
+          sums[index] = map1
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+        if (index === 12) {
+          let map1 = data.map((v) => {
+            return v.withholdAmount;
+          });
+          sums[index] = map1
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+        if (index === 13) {
+          let map1 = data.map((v) => {
+            return v.balanceAmount;
+          });
+          sums[index] = map1
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+      });
+      return sums;
+    },
+    //货款台账列表合计
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+        }
+        if (index === 6) {
+          sums[index] = this.computedFn(data, 1);
+        }
+        if (index === 7) {
+          sums[index] = this.computedFn(data, 2);
+        }
+        if (index === 8) {
+          sums[index] = this.computedFn(data, 3);
+        }
+        if (index === 9) {
+          sums[index] = this.computedFn(data, 4);
+        }
+        if (index === 10) {
+          sums[index] = this.computedFn(data, 5);
+        }
+        if (index === 11) {
+          sums[index] = this.computedFn(data, 6);
+        }
+        if (index === 12) {
+          let map2 = data.map((v) => {
+            return v.balanceAmount;
+          });
+          sums[index] = map2
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            .toFixed(2);
+        }
+      });
+
+      return sums;
+    },
+
+    //获取汇总总数
+    async getAmountList(data) {
+      let res = await getAmountCount(data);
+
+      this.amountList = res.data;
+    },
     //改变经销商
     async changeFn(v) {
       this.searchForm.customerWalletId = "";
@@ -791,6 +989,8 @@ export default {
     },
     //查询
     searchFn() {
+      this.currentPage = 1;
+      this.pageSize = 10;
       // this.customerName = null;
       // this.customerNumber = null;
       let res = this.customerList.filter((v) => {
@@ -813,6 +1013,12 @@ export default {
           customerName: this.$route.query.customerName,
           customerNumber: this.$route.query.customerNumber,
         });
+        this.getAmountList({
+          ...this.searchForm,
+          type: this.bill,
+          customerName: this.$route.query.customerName,
+          customerNumber: this.$route.query.customerNumber,
+        });
       } else if (this.isCustomer) {
         this.getDataList({
           ...this.searchForm,
@@ -821,6 +1027,11 @@ export default {
           type: this.bill,
           ...this.isCustomerList,
         });
+        this.getAmountList({
+          ...this.searchForm,
+          type: this.bill,
+          ...this.isCustomerList,
+        });
       } else {
         this.getDataList({
           ...this.searchForm,
@@ -831,6 +1042,12 @@ export default {
           pageNum: this.currentPage,
           type: this.bill,
         });
+        this.getAmountList({
+          ...this.searchForm,
+          type: this.bill,
+          customerName: this.customerName,
+          customerNumber: this.customerNumber,
+        });
       }
     },
 
@@ -864,6 +1081,13 @@ export default {
           customerName: this.$route.query.customerName,
           customerNumber: this.$route.query.customerNumber,
         });
+        this.getAmountList({
+          ...this.searchForm,
+          type: v,
+          customerId: this.$route.query.customerId,
+          customerName: this.$route.query.customerName,
+          customerNumber: this.$route.query.customerNumber,
+        });
       } else if (this.isCustomer) {
         this.changeFn(this.$store.state.user.customerId);
         this.getDataList({
@@ -873,6 +1097,11 @@ export default {
           type: v,
           ...this.isCustomerList,
         });
+        this.getAmountList({
+          ...this.searchForm,
+          type: v,
+          ...this.isCustomerList,
+        });
       } else {
         this.getDataList({
           // ...this.searchForm,
@@ -883,6 +1112,9 @@ export default {
           pageNum: this.currentPage,
           type: v,
         });
+        this.getAmountList({
+          type: v,
+        });
       }
       // this.getWalletList();
     },
@@ -903,6 +1135,20 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.ulStyle {
+  list-style: none;
+  padding: 0;
+  li {
+    display: inline-block;
+    font-weight: 700;
+    span {
+      padding-left: 6px;
+      font-weight: 400;
+    }
+    // float: right;
+    margin-right: 20px;
+  }
+}
 .moneyStyle {
   height: 130px;
   border-radius: 20px;

src/views/finance/wallet.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
-    <div class="sty" v-show="this.$route.query.id">
+    <div class="sty" v-show="show">
       <el-page-header @back="goBack"> </el-page-header>
     </div>
     <br />
     <!-- 筛选条件 -->
-    <div v-if="!isShow">
+    <div v-if="show2">
       <el-form
         ref="searchForm"
         :model="searchForm"
@@ -70,6 +70,8 @@
           fit
           highlight-current-row
           stripe
+          show-summary
+          :summary-method="$getSummaries"
         >
           <el-table-column
             align="center"
@@ -86,26 +88,38 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="余额"
             prop="amount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              {{ scope.row.amount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="可用信用额度"
             prop="freeCreditAmount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              {{ scope.row.freeCreditAmount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="已用信用额度"
             prop="usedCreditAmount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+              {{ scope.row.usedCreditAmount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="更新时间"
@@ -129,6 +143,8 @@
           fit
           highlight-current-row
           stripe
+          show-summary
+          :summary-method="$getSummaries"
         >
           <el-table-column
             align="center"
@@ -145,13 +161,16 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            align="center"
+            align="right"
             label="钱包余额"
             prop="amount"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
-
+          >
+            <template slot-scope="scope">
+              {{ scope.row.amount | numToFixed }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="更新时间"
@@ -221,6 +240,8 @@ export default {
   data() {
     return {
       isShow: JSON.parse(localStorage.getItem("supply_user")).isCustomer,
+      show: false,
+      show2: true,
       searchForm: {
         customerId: null,
       },
@@ -252,32 +273,77 @@ export default {
       },
     };
   },
-  created() {
-    // console.log(this.$route.query.id, 11, this.customerId);
-    if (this.$route.query.id) {
-      this.getDataWallet({
-        customerId: this.$route.query.id,
-        type: "COMMONLY",
-      });
-      this.getDataRebate({
-        customerId: this.$route.query.id,
-        type: "REBATE",
-      });
-    } else {
-      if (this.isShow) {
-        this.getDataWallet({
-          customerId: this.customerId,
+  beforeRouteEnter(to, from, next) {
+    // console.log(11112222);
+    // console.log(to, from, next, 898);
+    next((vm) => {
+      // 这个时候组件还没有创建，所以要通过vm来访问
+      if (
+        from.path == "/finance/details/balance_sum" &&
+        to.path == "/finance/details/wallet" &&
+        vm.$route.query.id
+      ) {
+        //只有是从A进到B页面才执行
+        // 将要执行的逻辑
+        vm.show = true;
+        vm.show2 = false;
+        vm.getDataWallet({
+          customerId: vm.$route.query.id,
           type: "COMMONLY",
         });
-        this.getDataRebate({
-          customerId: this.customerId,
+        vm.getDataRebate({
+          customerId: vm.$route.query.id,
           type: "REBATE",
         });
       } else {
-        this.$message("请选择经销商");
-        this.getCustomerDataList();
+        if (vm.isShow) {
+          vm.show2 = false;
+          vm.getDataWallet({
+            customerId: vm.customerId,
+            type: "COMMONLY",
+          });
+          vm.getDataRebate({
+            customerId: vm.customerId,
+            type: "REBATE",
+          });
+        } else {
+          vm.show = false;
+          vm.show2 = true;
+          vm.walletList = [];
+          vm.rebateList = [];
+          vm.$message("请选择经销商");
+          vm.getCustomerDataList();
+        }
       }
-    }
+    });
+  },
+
+  created() {
+    // console.log(this.$route.query.id, 11, this.customerId);
+    // if (this.$route.query.id) {
+    //   this.getDataWallet({
+    //     customerId: this.$route.query.id,
+    //     type: "COMMONLY",
+    //   });
+    //   this.getDataRebate({
+    //     customerId: this.$route.query.id,
+    //     type: "REBATE",
+    //   });
+    // } else {
+    //   if (this.isShow) {
+    //     this.getDataWallet({
+    //       customerId: this.customerId,
+    //       type: "COMMONLY",
+    //     });
+    //     this.getDataRebate({
+    //       customerId: this.customerId,
+    //       type: "REBATE",
+    //     });
+    //   } else {
+    //     this.$message("请选择经销商");
+    //     this.getCustomerDataList();
+    //   }
+    // }
   },
   computed: {
     ...mapGetters(["customerId"]),
@@ -352,10 +418,18 @@ export default {
     //
     async getDataRebate(data) {
       let res = await getWalletCustomerList(data);
+      res.data.forEach((item) => {
+        item.sums1 = [];
+        item.sums2 = ["amount"];
+      });
       this.rebateList = res.data;
     },
     async getDataWallet(data) {
       let res = await getWalletCustomerList(data);
+      res.data.forEach((item) => {
+        item.sums1 = [];
+        item.sums2 = ["amount", "freeCreditAmount", "usedCreditAmount"];
+      });
       this.walletList = res.data;
     },
   },

src/views/sales_policy/components/AddPolicy.vue

@@ -935,6 +935,7 @@ export default {
     },
     handleReset() {
       Object.assign(this.$data, this.$options.data())
+      this.getCommonApi()
     }
   },
   components: {

src/views/sales_policy/components/TabelTransfer.vue

@@ -33,7 +33,7 @@
             size="small"
           />
         </el-col>
-        <el-col style="margin-left: 10px"><el-button size="small" @click="getList">确定</el-button></el-col>
+        <el-col style="margin-left: 10px"><el-button size="small" @click="submitScreenForm">确定</el-button></el-col>
       </el-row>
     </slot>
     <el-row :gutter="20">
@@ -285,6 +285,11 @@ export default {
       this.currentPages = val
       this.getCrList()
     },
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPages = 1;
+      this.getCrList();
+    },
     // 去掉相同数据
     resArr(arr1, arr2) {
       return arr1.filter((v) => arr2.every((val) => val.id !== v.id))

src/views/sales_policy/components/editPolicy.vue

@@ -339,15 +339,15 @@
                 @click="handleSave"
               >保存</el-button>
             </div>
-<!--            <el-pagination-->
-<!--              :current-page="dcurrentPage"-->
-<!--              :page-sizes="pageSizeArr"-->
-<!--              :page-size="size"-->
-<!--              layout="total, sizes, prev, pager, next, jumper"-->
-<!--              :total="listTotal"-->
-<!--              @size-change="handleSizeChange2"-->
-<!--              @current-change="handleCurrentChange2"-->
-<!--            />-->
+            <!--            <el-pagination-->
+            <!--              :current-page="dcurrentPage"-->
+            <!--              :page-sizes="pageSizeArr"-->
+            <!--              :page-size="size"-->
+            <!--              layout="total, sizes, prev, pager, next, jumper"-->
+            <!--              :total="listTotal"-->
+            <!--              @size-change="handleSizeChange2"-->
+            <!--              @current-change="handleCurrentChange2"-->
+            <!--            />-->
           </div>
 
           <el-row>
@@ -529,8 +529,8 @@ export default {
       sleectBox: { currentPage: 1 },
       dpageSize: 10,
       dcurrentPage: 1,
-      detail:{},
-      rebateList:[]
+      detail: {},
+      rebateList: []
     }
   },
   computed: {
@@ -664,8 +664,8 @@ export default {
           }
         })
       })
-      if (rebateList.length){
-        this.$set(row,'rebateWalletIds',[...new Set([...row.rebateWalletIds,rebateList[0].walletRebateId])])
+      if (rebateList.length) {
+        this.$set(row, 'rebateWalletIds', [...new Set([...row.rebateWalletIds, rebateList[0].walletRebateId])])
       }
       this.$set(row, 'saleTypeCode', item.saleCode)
       this.$set(row, 'saleTypeName', item.saleName)
@@ -792,12 +792,11 @@ export default {
         policyId: this.searchForm.code,
         saleTypeCode: ''
       }
-
       getMaterialList(paramss)
         .then((result) => {
           result.data.records.forEach((k) => {
             k.walletIds = []
-            k.rebateWalletIds =[]
+            k.rebateWalletIds = []
             if (!k.specification) {
               k.materialNumber = k.materialId
               k.specification = k.materialId
@@ -806,9 +805,9 @@ export default {
             k.walletRelaList.forEach((l) => {
               l.id = l.walletId
               l.name = l.walletName
-              if (l.type==='REBATE'){
+              if (l.type === 'REBATE') {
                 k.rebateWalletIds = [...k.rebateWalletIds, l.walletId]
-              }else {
+              } else {
                 k.walletIds = [...k.walletIds, l.walletId]
               }
             })
@@ -950,7 +949,7 @@ export default {
       const item = this.k3List.filter((k) => {
         return k.id == e
       })[0]
-      this.$set(row,'materialNumber',item.number)
+      this.$set(row, 'materialNumber', item.number)
       this.$set(row, 'materialName', item.name)
       this.$set(row, 'specification', item.specification)
       this.$set(row, 'materialId', item.id)
@@ -958,6 +957,7 @@ export default {
     },
     handleReset() {
       Object.assign(this.$data, this.$options.data())
+      this.getCommonApi()
     }
   },
   components: {

src/views/supply/deliver/sum_list.vue

@@ -145,14 +145,15 @@
           </el-table-column>
           <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="业务员" prop="serviceName" 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="policyCode" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="政策名称" prop="policyTitle" 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="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="adminArea" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="业务区域" prop="serviceArea" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="月份" prop="month" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="项目编码" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="表头备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
     </div>

src/views/supply/engin/commerce_list.vue

@@ -146,7 +146,7 @@
                 {{scope.row.price | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="金额" prop="payAmount" min-width="100" sortable show-overflow-tooltip>
+            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="110" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.payAmount | numToFixed}}
               </template>
@@ -328,9 +328,12 @@ export default {
 
   computed: {
     exParams() {
+      let ids = this.multipleSelection.map(item => {
+        return item.enginOrderNo;
+      });
       return {
         examineStatus: this.screenForm.status.join(','),
-        enginOrderNo: this.screenForm.orderNum,
+        enginOrderNo: (ids && ids.length) ? ids.join(',') : this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
         refEnginRecordNo: this.screenForm.loginNum,
         refProjectName: this.screenForm.enginName,

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

@@ -171,7 +171,7 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" v-if="!isDealer"></el-input>
             <div v-else>{{scope.row.price}}</div>
           </template>
         </el-table-column>

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

@@ -159,14 +159,15 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.price | numToFixed }}
-            <!-- <el-input v-model="scope.row.price" size="small" type="number"></el-input> -->
+            <!-- {{ scope.row.price | numToFixed }} -->
+            <el-input v-model="scope.row.price" size="small" type="number"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="工程登录数量" prop="enginNum" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }}
+            <!-- {{ (scope.row.qty*100 - scope.row.directTransferQty*100 - scope.row.retiredQty*100) / 100 }} -->
+            <el-input v-model="scope.row.qty" size="small" type="number"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip>

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

@@ -194,7 +194,7 @@
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
+            <el-input v-model="scope.row.price" size="small" type="number" v-if="!isDealer"></el-input>
             <div v-else>{{scope.row.price}}</div>
           </template>
         </el-table-column>
@@ -209,7 +209,7 @@
             {{scope.row.price * scope.row.qty}}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="返利钱包" prop="customerWalletId2" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="返利类型" prop="customerWalletId2" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.customerWalletId2" placeholder="选择返利类型" size="small" clearable @change="changeFlWallet(scope.$index)">
               <el-option

src/views/supply/engin/home_list.vue

@@ -146,7 +146,7 @@
                 {{scope.row.price | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="金额" prop="payAmount" min-width="100" sortable show-overflow-tooltip>
+            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="110" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.payAmount | numToFixed}}
               </template>
@@ -328,9 +328,12 @@ export default {
 
   computed: {
     exParams() {
+      let ids = this.multipleSelection.map(item => {
+        return item.enginOrderNo;
+      });
       return {
         examineStatus: this.screenForm.status.join(','),
-        enginOrderNo: this.screenForm.orderNum,
+        enginOrderNo: (ids && ids.length) ? ids.join(',') : this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
         refEnginRecordNo: this.screenForm.loginNum,
         refProjectName: this.screenForm.enginName,

src/views/supply/implement/implement_list.vue

@@ -33,21 +33,13 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="下单日期" prop="date">
-                <el-date-picker
-                  v-model="screenForm.date"
-                  type="datetimerange"
-                  range-separator="至"
-                  style="width: 100%;"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期">
-                </el-date-picker>
+              <el-form-item label="业务员" prop="saleMan">
+                <el-input v-model="screenForm.saleMan" placeholder="请输入业务员"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="saleMan">
-                <el-input v-model="screenForm.saleMan" placeholder="请输入业务员"></el-input>
+              <el-form-item label="归属业务员" prop="saleMan2">
+                <el-input v-model="screenForm.saleMan2" placeholder="请输入归属业务员"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -60,8 +52,21 @@
                 <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="下单日期" prop="date">
+                <el-date-picker
+                  v-model="screenForm.date"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%;"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
             
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm">清空</el-button>
                 <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -172,6 +177,7 @@ export default {
         goodsName: '',
         date: '',
         saleMan: '',
+        saleMan2: '',
         enginName: '',
         loginNum: '',
       },
@@ -195,6 +201,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         serviceName: this.screenForm.saleMan,
+        newServiceName: this.screenForm.saleMan2,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
       }
@@ -234,6 +241,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         serviceName: this.screenForm.saleMan,
+        newServiceName: this.screenForm.saleMan2,
         projectName: this.screenForm.enginName,
         enginRecordNo: this.screenForm.orderNum,
       };

src/views/supply/pickup/components/pickup_form.vue

@@ -325,7 +325,7 @@ export default {
       this.formLoading = true;
 
       let takerName = this.pickupManList.find(o => o.id == this.mainForm.pickupMan).takerName;
-      let correspondName = this.warehouseList.find(o => o.id == this.mainForm.warehouse).name;
+      // let correspondName = this.warehouseList.find(o => o.id == this.mainForm.warehouse).name;
 
       let orderList = [];
       this.tableSelection.forEach(item => {
@@ -333,7 +333,7 @@ export default {
       });
       let params = {
         correspondId: this.mainForm.warehouse,
-        correspondName,
+        // correspondName,
         pickTime: this.mainForm.date + ' 00:00:00',
         pickStatus: Number(this.mainForm.timeSlot),
         pickType: Number(this.mainForm.pickupWay),

src/views/supply/policy/policy_list.vue

@@ -152,6 +152,7 @@
             stripe
             show-summary
             :summary-method="$getSummaries"
+            
           >
             <!-- <el-table-column
               align="center"
@@ -254,6 +255,7 @@
             <el-table-column
               align="center"
               label="总数量"
+
               prop="qty"
               min-width="100"
               show-overflow-tooltip
@@ -272,7 +274,8 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="金额"
+              label="实付金额"
+              sortable
               prop="payAmount"
               min-width="100"
               show-overflow-tooltip
@@ -302,6 +305,7 @@
             <el-table-column
               align="center"
               label="返利金额"
+              sortable
               prop="payRebateAmount"
               min-width="100"
               show-overflow-tooltip
@@ -314,6 +318,7 @@
             <el-table-column
               align="center"
               label="格力折扣"
+              sortable
               prop="totalDiscAmount"
               min-width="100"
               show-overflow-tooltip
@@ -464,7 +469,7 @@
         <div class="fr">
           <el-pagination
             :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 50]"
+            :page-sizes="[10, 20, 30, 50,500]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"

src/views/supply/purchase/components/enter_detail.vue

@@ -48,11 +48,11 @@
           show-summary
           :summary-method="$getSummaries">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="产品编号" prop="materialCode" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="产品编号" prop="materialNumber" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="uom" min-width="200" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="auxUnitQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="数量" prop="realQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="原币含税单价" prop="taxPrice" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.taxPrice | numToFixed}}

src/views/supply/purchase/enter_list.vue

@@ -76,11 +76,11 @@
             <el-table-column align="center" label="供货单位" prop="supplyName" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="approveDate" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="备注" prop="abcdRemarks" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="产品编码" prop="materialCode" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="产品名称" prop="materialName" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="规格型号" prop="uom" min-width="200" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="数量" prop="auxUnitQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="数量" prop="realQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="原币含税单价" prop="taxPrice" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.taxPrice | numToFixed}}

src/views/supply/reserve/components/reserve_form.vue

@@ -58,7 +58,7 @@
     <div class="table" style="margin-top: 20px">
       <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400" @selection-change="tableSelectionChange">
         <el-table-column align="center" type="selection" width="55"></el-table-column>
-        <el-table-column align="center" label="销售订单号" prop="orderId" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单日期" prop="orderTime" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{scope.row.orderTime | dateToDayFilter}}
@@ -89,7 +89,7 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             <div v-if="scope.row.orderId || listItem">{{scope.row.materialCode}}</div>
             <el-select 
@@ -113,9 +113,9 @@
             </el-select>
           </template>
         </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="materialOldNumber" min-width="140" 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="specification" min-width="200" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="原预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="预留数量" prop="reservedNum" min-width="100" show-overflow-tooltip>

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

@@ -269,7 +269,7 @@
           <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="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="调出仓库" prop="warehouse1" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="调出仓位" prop="position1" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="调入仓库" prop="warehouse2" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/retail/retail_list.vue

@@ -149,7 +149,12 @@
                 {{ scope.row.price | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" sortable show-overflow-tooltip>
+            <el-table-column align="right" label="订单金额" prop="totalAmount" min-width="110" sortable show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="实付金额" prop="payAmount" min-width="110" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
               </template>
@@ -393,7 +398,7 @@ export default {
       getList(params).then((res) => {
         res.data.records.forEach(item => {
           item.sums1 = ['qty', 'directTransferQty', 'hasSendQty', 'refundableQty'];
-          item.sums2 = ['price', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount'];
+          item.sums2 = ['price', 'totalAmount', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount'];
         })
         this.dataList = res.data.records;
         this.listTotal = res.data.total;

src/views/supply/return/components/return_form.vue

@@ -108,13 +108,13 @@
               <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="6" :lg="6">
+          <!-- <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="dealer" label="经销商">
-              <el-select v-model="screenForm.dealer" placeholder="请选择经销商" style="width: 100%;" filterable>
+              <el-select v-model="screenForm.dealer" placeholder="请选择经销商" style="width: 100%;" filterable clearable>
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in dealerList" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item label="">
               <el-button size="small" @click="resetScreenForm">清空</el-button>
@@ -131,6 +131,8 @@
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="发货仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialCode" 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>
@@ -325,9 +327,9 @@ export default {
       if(!this.screenForm.orderNum) {
         return this.$errorMsg('请填写发货申请单号');
       }
-      if(!this.screenForm.dealer) {
-        return this.$errorMsg('请选择经销商');
-      }
+      // if(!this.screenForm.dealer) {
+      //   return this.$errorMsg('请选择经销商');
+      // }
       this.currentPage = 1;
       this.getGoodsList();
     },