【修改】bug

src/api/basic_data/dealer.js

@@ -98,7 +98,7 @@ export function getDictionaries(params) {
     params,
   });
 }
-//产品品类列表
+//产品类别列表
 export function getProductCategoryList(params) {
   return request({
     url: "/product-category/list",

src/api/basic_data/material.js

@@ -253,9 +253,9 @@ export function getWalletList(params) {
 
 
 
-//产品品类
+//产品类别
 
-//产品品类列表
+//产品类别列表
 export function getProductCategoryList(params) {
   return request({
     url:'/product-category/list',
@@ -263,7 +263,7 @@ export function getProductCategoryList(params) {
     params
   })
 }
-//产品品类小类列表
+//产品类别小类列表
 export function getProductCategorySubList(params) {
   return request({
     url:'/product-category/sub-list',
@@ -271,7 +271,7 @@ export function getProductCategorySubList(params) {
     params
   })
 }
-//新增产品品类
+//新增产品类别
 export function getProductCategoryAdd(data) {
   return request({
     url:'/product-category/add',
@@ -279,7 +279,7 @@ export function getProductCategoryAdd(data) {
     data
   })
 }
-//编辑产品品类
+//编辑产品类别
 export function getProductCategoryEdit(data) {
   return request({
     url:'/product-category/edit',
@@ -295,7 +295,7 @@ export function getProductCategoryKingDeeCategoryList() {
 
   })
 }
-//新增产品品类小类
+//新增产品类别小类
 export function getProductCategoryAddSub(data) {
   return request({
     url:'/product-category/add-sub',
@@ -304,7 +304,7 @@ export function getProductCategoryAddSub(data) {
   })
 }
 
-//删除产品品类小类
+//删除产品类别小类
 export function getProductCategoryDelSub(params) {
   return request({
     url:'/product-category/del-sub',
@@ -312,7 +312,7 @@ export function getProductCategoryDelSub(params) {
     params
   })
 }
-//删除产品品类
+//删除产品类别
 export function getProductCategoryDel(params) {
   return request({
     url:'/product-category/del',

src/api/basic_data/wallet_list.js

@@ -8,7 +8,7 @@ export function getWalletList(params) {
     params,
   });
 }
-//产品品类列表
+//产品类别列表
 export function getProductCategory(params) {
   return request({
     url: "/product-category/list",

src/api/finance/finance_sum.js

@@ -8,11 +8,11 @@ export function getFinanceTotal(params) {
       params
     })
   }
-// 产品品类列表
+// 产品类别列表
 export function getProductCategoryList(params) {
     return request({
       url: '/product-category/list',
       method: 'get',
       params
     })
-  }
+  }

src/api/policy_list.js

@@ -305,7 +305,7 @@ export function getDictList(params) {
   });
 }
 
-// 产品品类
+// 产品类别
 export function getProductList(params) {
   return request({
     url: "/product-category/list",

src/views/basic_data/dealer/dealer_stock.vue

@@ -428,7 +428,7 @@ export default {
 
     //   this.oneList = res.data;
     // },
-    // //获取产品品类数据
+    // //获取产品类别数据
     // async getCategoryList() {
     //   let res = await getProductCategoryList();
     //   console.log(res);

src/views/basic_data/material/classify_list.vue

@@ -206,7 +206,7 @@ export default {
 
       this.dataList = res.data;
     },
-    //获取产品品类列表
+    //获取产品类别列表
     async getDataList(data) {
       const res = await getProductCategoryList(data);
 

src/views/basic_data/material/modify_list.vue

@@ -77,10 +77,10 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="产品品类" prop="categoryId">
+                <el-form-item label="产品类别" prop="categoryId">
                   <el-select
                   style="width:100%"
-                    placeholder="请选择产品品类"
+                    placeholder="请选择产品类别"
                     v-model="screenForm.mainId"
                   >
                     <el-option label="全部" value=""></el-option>
@@ -186,7 +186,7 @@
             ></el-table-column>
             <!-- <el-table-column
               align="left"
-              label="产品品类"
+              label="产品类别"
               prop="mainName"
               min-width="160"
               show-overflow-tooltip

src/views/basic_data/material/price_list.vue

@@ -75,10 +75,10 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品品类" prop="categoryId">
+            <el-form-item label="产品类别" prop="categoryId">
               <el-select
                 v-model="screenForm.mainId"
-                placeholder="请选择产品品类"
+                placeholder="请选择产品类别"
               >
                 <el-option label="全部" value="" />
                 <el-option
@@ -165,7 +165,7 @@
 <!--          <el-table-column type="selection" align="left" />-->
           <!-- <el-table-column
             align="left"
-            label="产品品类"
+            label="产品类别"
             prop="mainName"
             min-width="160"
             show-overflow-tooltip

src/views/basic_data/material/relation_list.vue

@@ -17,7 +17,7 @@
                 v-model="screenForm.name"
               ></el-input>
               <!--
-              <el-select placeholder="请选择产品品类" v-model="screenForm.name">
+              <el-select placeholder="请选择产品类别" v-model="screenForm.name">
               <el-option label="默认" value=""></el-option>
                 <el-option
                   v-for="item in materialLis"

src/views/basic_data/wallet/wallet_list.vue

@@ -197,7 +197,7 @@ export default {
     searchFn() {
       this.getDataList({ ...this.searchForm });
     },
-    // //获取产品品类列表
+    // //获取产品类别列表
     // async getCategoryList() {
     //   const res = await getProductCategory();
     //   this.categoryList = res.data;

src/views/deposit_commerce/deposit_list.vue

@@ -220,6 +220,13 @@
 
             </template>
             <el-col :xs="24" :sm="24" :lg="24">
+             <div class="fl">
+          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <el-radio-button label="TRADE">商用工程</el-radio-button>
+          </el-radio-group> -->
+          <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
+        </div>
               <el-form-item label="" class="fr">
                 <el-button size="mini" @click="resetScreenForm">清空</el-button>
                 <el-button size="mini" type="primary" @click="submitScreenForm"
@@ -472,6 +479,9 @@
 <script>
 import DepositListDetail from "./components/deposit_list-detail";
 import DepositApplyDeduction from "./components/deposit-apply-deduction.vue";
+import {
+  getDepositManageDate,
+} from "@/api/engin_deposit/refund_list";
 import DepositApplySurrender from "./components/deposit-apply-surrender.vue";
 import { downloadFiles, handleImport } from "@/utils/util";
 import { getList } from "@/api/engin_deposit.js";
@@ -572,6 +582,11 @@ export default {
     },
   },
   methods: {
+      //同步资料日期
+    async syncDateFn() {
+      await getDepositManageDate();
+      this.$message.success("同步资料日期成功");
+    },
     // 免扣申请
     deductionFn() {
       this.showPage = 3;

src/views/deposit_commerce/refund_list.vue

@@ -43,6 +43,11 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="机型" prop="startSpecification">
+                <!-- <div class="fanwei">
+                  <el-input v-model="searchForm.startSpecification"></el-input>
+                  <span>-</span>
+                  <el-input v-model="searchForm.endSpecification"></el-input>
+                </div> -->
                 <el-input v-model="searchForm.startSpecification" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
@@ -51,16 +56,22 @@
                 <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
               </el-form-item> -->
               <el-form-item label="特价编号" prop="startSpecialNo">
-
+                <!-- <div class="fanwei">
+                  <el-input v-model="searchForm.startSpecialNo"></el-input>
+                  <span>-</span>
+                  <el-input v-model="searchForm.endSpecialNo"></el-input>
+                </div> -->
                 <el-input v-model="searchForm.startSpecialNo" placeholder="请输入"></el-input>
-
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="厂编号" prop="startRefFactoryNo">
-
+                <!-- <div class="fanwei">
+                  <el-input v-model="searchForm.startRefFactoryNo"></el-input>
+                  <span>-</span>
+                  <el-input v-model="searchForm.endRefFactoryNo"></el-input>
+                </div> -->
                 <el-input v-model="searchForm.startRefFactoryNo" placeholder="请输入"></el-input>
-
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -72,6 +83,17 @@
                 </div>
               </el-form-item>
             </el-col>
+
+            <!-- <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="开始安装日期" prop="startInstallTime">
+                <el-date-picker class="dateStyle" v-model="searchForm.startInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结束安装日期" prop="endInstallTime">
+                <el-date-picker class="dateStyle" v-model="searchForm.endInstallTime" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
+              </el-form-item>
+            </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="区域" prop="refRegionWork">
                 <el-input v-model="searchForm.refRegionWork" placeholder="请输入"></el-input>
@@ -130,7 +152,7 @@
             <el-radio-button label="HOME">家用工程</el-radio-button>
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
-          <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
+          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
         </div>
         <div class="fr">
           <el-button type="primary" size="mini" @click="exportFn">导出</el-button>
@@ -160,25 +182,13 @@
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.refProjectName" />
-                <span>{{scope.row.refProjectName}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="机型" prop="specification" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.a}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
+              <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
                 <span>{{scope.row.customerNumber}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
+             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
@@ -190,36 +200,66 @@
                 <span>{{scope.row.refFactoryNo}}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column align="left" label="产品编码" prop="customerName" min-width="260" show-overflow-tooltip>
+             <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+              <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copyText="scope.row.refProjectName" />
+                <span>{{scope.row.refProjectName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="物料编码" prop="customerName" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="使用单位
+" prop="refUseUnit" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copyText="scope.row.refUseUnit" />
+                <span>{{scope.row.refUseUnit}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="customerName" min-width="260" show-overflow-tooltip>
+
+
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copyText="scope.row.refRegionWork" />
+                <span>{{scope.row.refRegionWork}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="customerName" min-width="260" show-overflow-tooltip>
+
+                 <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copyText="scope.row.materialNumber" />
+                <span>{{scope.row.materialNumber}}</span>
+              </template>
+            </el-table-column>
+              <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column align="left" label="产品名称" prop="materialName" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
               </template>
-            </el-table-column> -->
-            <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
             </el-table-column>
-            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column>
+
+
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="160" show-overflow-tooltip>
@@ -228,12 +268,7 @@
                 <span>{{scope.row.confirmBy}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.refRegionWork" />
-                <span>{{scope.row.refRegionWork}}</span>
-              </template>
-            </el-table-column>
+
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button type="text" class="textColor" v-if="
@@ -264,8 +299,8 @@
 <script>
 import {
   getDepositManageList,
-  getDepositManagExport,
   getDepositManageDate,
+  getDepositManagExport,
 } from "@/api/engin_deposit/refund_list";
 import { downloadFiles, handleImport } from "@/utils/util";
 import RefundListDetail from "./components/refund_list-detail.vue";
@@ -465,7 +500,7 @@ export default {
         }
         downloadFiles("/deposit-manage/export", {
           id: arr,
-          orderType: "TRADE",
+          orderType: "HOME",
         });
       } else {
         this.$errorMsg("请选择押金项");

src/views/deposit_home/deposit_list.vue

@@ -188,9 +188,16 @@
 
               </el-col>
 
-              </el-col>
+
               </template>
             <el-col :xs="24" :sm="24" :lg="24">
+    <div class="fl">
+          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+            <el-radio-button label="HOME">家用工程</el-radio-button>
+            <el-radio-button label="TRADE">商用工程</el-radio-button>
+          </el-radio-group> -->
+          <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
+        </div>
               <el-form-item label="" class="fr">
                 <el-button
                   size="mini"
@@ -443,6 +450,9 @@
 
 <script>
 import DepositListDetail from './components/deposit_list-detail'
+import {
+  getDepositManageDate,
+} from "@/api/engin_deposit/refund_list";
 import DepositApplyDeduction from './components/deposit-apply-deduction.vue'
 import DepositApplySurrender from './components/deposit-apply-surrender.vue'
 import { downloadFiles, handleImport } from '@/utils/util'
@@ -542,6 +552,11 @@ export default {
     }
   },
   methods: {
+      //同步资料日期
+    async syncDateFn() {
+      await getDepositManageDate();
+      this.$message.success("同步资料日期成功");
+    },
     // 免扣申请
     deductionFn() {
       this.showPage = 3

src/views/deposit_home/refund_list.vue

@@ -152,7 +152,7 @@
             <el-radio-button label="HOME">家用工程</el-radio-button>
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
-          <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button>
+          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
         </div>
         <div class="fr">
           <el-button type="primary" size="mini" @click="exportFn">导出</el-button>
@@ -182,25 +182,13 @@
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.refProjectName" />
-                <span>{{scope.row.refProjectName}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="机型" prop="specification" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.a}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
+              <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
                 <span>{{scope.row.customerNumber}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
+             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
@@ -212,30 +200,57 @@
                 <span>{{scope.row.refFactoryNo}}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column align="left" label="产品编码" prop="customerName" min-width="260" show-overflow-tooltip>
+             <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+              <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copyText="scope.row.refProjectName" />
+                <span>{{scope.row.refProjectName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="物料编码" prop="customerName" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="使用单位
+" prop="refUseUnit" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copyText="scope.row.refUseUnit" />
+                <span>{{scope.row.refUseUnit}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品名称" prop="customerName" min-width="260" show-overflow-tooltip>
+
+
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copyText="scope.row.refRegionWork" />
+                <span>{{scope.row.refRegionWork}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="customerName" min-width="260" show-overflow-tooltip>
+
+                 <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <CopyButton :copyText="scope.row.materialNumber" />
+                <span>{{scope.row.materialNumber}}</span>
+              </template>
+            </el-table-column>
+              <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column align="left" label="产品名称" prop="materialName" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="260" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
               </template>
-            </el-table-column> -->
+            </el-table-column>
             <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed }}
@@ -243,10 +258,8 @@
             </el-table-column>
             <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
-            </el-table-column>
-            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
-            </el-table-column>
+
+
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="160" show-overflow-tooltip>
@@ -255,12 +268,7 @@
                 <span>{{scope.row.confirmBy}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.refRegionWork" />
-                <span>{{scope.row.refRegionWork}}</span>
-              </template>
-            </el-table-column>
+
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button type="text" class="textColor" v-if="

src/views/finance/standbook_list.vue

@@ -452,9 +452,27 @@ export default {
 
     // 钱包余额页跳转过来
     if (this.$route.query && this.$route.query.status){
-      console.log('jdkfjak')
+
       this.bill = this.$route.query.status
       this.changeFn(this.bill)
+      //只有是从A进到B页面才执行
+        // 将要执行的逻辑
+        this.isShow = true;
+        this.isDisabled = true;
+        this.searchForm.customerId = this.$route.query.customerId;
+        this.changeFn(this.$route.query.customerId);
+        this.getDataList({
+          pageSize: this.pageSize,
+          pageNum: this.currentPage,
+          type: this.bill,
+          customerName: this.$route.query.customerName,
+          customerNumber: this.$route.query.customerNumber,
+        });
+        this.getAmountList({
+          type: this.bill,
+          customerName: this.$route.query.customerName,
+          customerNumber: this.$route.query.customerNumber,
+        });
     }
 
   },

src/views/finance/wallet.vue

@@ -47,7 +47,7 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" @row-dblclick="$router.push('/finance/details/standbook_list?status=COMMONLY')" :data="walletList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+        <el-table v-loading="listLoading" @row-dblclick="fnJump($event,'COMMONLY')" :data="walletList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
           <template>
             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -82,7 +82,7 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="rebateList" @row-dblclick="$router.push('/finance/details/standbook_list?status=REBATE')" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+        <el-table v-loading="listLoading" :data="rebateList" @row-dblclick="fnJump($event,'REBATE')"  element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
           <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copy-text="scope.row.customerName" />
@@ -273,6 +273,9 @@ export default {
     ...mapGetters(['customerId'])
   },
   methods: {
+    fnJump({customerId},type){
+     this.$router.push(`/finance/details/standbook_list?status=${type}&customerId=${customerId}`)
+    },
     exportCancelFn() {
       this.exportForm = {
         endCustomerId: '',

src/views/login/index.vue

@@ -399,6 +399,7 @@ $back: #333;
 .login-container {
   background: url("~@/assets/login/background.png") center center;
   background-size: cover;
+  height: 100vh;
   .el-input {
     display: inline-block;
     height: 47px;
@@ -585,6 +586,7 @@ $light_gray: #eee;
 .login-container {
   min-height: 100%;
   width: 100%;
+  height: 100vh;
   background-color: $bg;
   overflow: hidden;
   .login-form {

src/views/sales/price/commercial_list.vue

@@ -5,7 +5,7 @@
       <el-form ref="searchForm" :model="searchForm" 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="categoryId">
+            <el-form-item label="产品类别" prop="categoryId">
               <el-input v-model="searchForm.categoryId" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -198,4 +198,4 @@ export default {
   display: inline-block;
   margin-left: 10px;
 }
-</style>
+</style>

src/views/sales_policy/components/AddPolicy.vue

@@ -54,7 +54,7 @@
                 </el-form-item>
               </el-col>
               <!-- <el-col :xs="24" :ms="12" :lg="12">
-                <el-form-item label="产品品类" prop="mainId">
+                <el-form-item label="产品类别" prop="mainId">
                   <el-select
                     v-model="searchForm.mainId"
                     :disabled="dataList.length ? true : false"
@@ -766,7 +766,7 @@ export default {
       if (this.searchForm.mainId) {
         this.fang = true;
       } else {
-        this.$errorMsg("请选择产品品类");
+        this.$errorMsg("请选择产品类别");
       }
     },
     // 导入

src/views/sales_policy/components/editPolicy.vue

@@ -54,7 +54,7 @@
                 </el-form-item>
               </el-col>
               <!-- <el-col :xs="24" :ms="12" :lg="12">
-                <el-form-item label="产品品类" prop="mainId">
+                <el-form-item label="产品类别" prop="mainId">
                   <el-select
                     v-model="searchForm.mainId"
                     :disabled="dataList.length ? true : false"
@@ -741,7 +741,7 @@ export default {
       if (this.searchForm.mainId) {
         this.fang = true
       } else {
-        this.$errorMsg('请选择产品品类')
+        this.$errorMsg('请选择产品类别')
       }
     },
     // 导入

src/views/sales_policy/policy_list.vue

@@ -307,7 +307,7 @@
         />
         <!-- <el-table-column
           prop="mainName"
-          label="产品品类"
+          label="产品类别"
           align="left"
         ></el-table-column> -->
         <el-table-column

src/views/stock/reserved_stock.vue

@@ -36,7 +36,7 @@
               <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
             </el-form-item>
           </el-col>
-          
+
           <el-col :xs="24" :sm="24" :lg="12" class="tr">
             <el-form-item label="">
               <el-button @click="resetScreenForm">清空</el-button>
@@ -67,7 +67,7 @@
               <span>{{scope.row.customerName}}</span>
             </template>
           </el-table-column>
-          <el-table-column align="left" label="产品品类" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="产品类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.materialNumber" />

src/views/supply/apply/engin_list.vue

@@ -95,7 +95,7 @@
                 <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位"></el-input>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -118,13 +118,13 @@
           </div>
         </div>
         <div class="table">
-          <el-table 
-            v-loading="listLoading" 
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             @selection-change="handleSelectionChange"
             show-summary
@@ -159,7 +159,7 @@
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -236,53 +236,53 @@
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
-                  style="margin-right: 10px;" 
-                  title="确定申请吗？" 
-                  @onConfirm="handleSubmit(scope.row.id, 'WAIT')" 
+                  style="margin-right: 10px;"
+                  title="确定申请吗？"
+                  @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
-                  style="margin-right: 10px;" 
-                  title="确定撤回吗？" 
-                  @onConfirm="handleSubmit(scope.row.id, 'SAVE')" 
+                  style="margin-right: 10px;"
+                  title="确定撤回吗？"
+                  @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定弃审吗？" 
-                  @onConfirm="handleAbandon(scope.row.id)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定弃审吗？"
+                  @onConfirm="handleAbandon(scope.row.id)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
-                <el-button 
-                  type="text" 
-                  @click="toForm(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row)"
                   v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 1">
                   编辑
                 </el-button>
-                <el-button 
-                  type="text" 
-                  @click="toReturnForm(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toReturnForm(scope.row)"
                   v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 2">
                   编辑
                 </el-button>
-                <el-button 
-                  type="text" 
-                  @click="toExamine(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toExamine(scope.row)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
                   审单
                 </el-button>
-                <el-button 
-                  type="text" 
+                <el-button
+                  type="text"
                   @click="toDetail(scope.row)">
                   详情
                 </el-button>
                 <el-popconfirm
-                  style="margin-left: 10px;" 
-                  title="确定删除吗？" 
-                  @onConfirm="handleDelete(scope.row.id)" 
+                  style="margin-left: 10px;"
+                  title="确定删除吗？"
+                  @onConfirm="handleDelete(scope.row.id)"
                   v-if="$checkBtnRole('del', $route.meta.roles)">
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
@@ -307,7 +307,7 @@
     </div>
 
     <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
-    
+
     <EnginDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <EnginExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
     <EnginForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />

src/views/supply/deliver/components/sum_print.vue

@@ -116,7 +116,7 @@ export default {
 </script>
 
 <style>
-  html,body{
+ body{
     height: auto !important;
   }
 </style>
@@ -125,9 +125,10 @@ export default {
 
   .detail-container {
     width: 100%;
+    height: auto !important;
     margin-bottom: 50px;
-    font-family: "Microsoft YaHei",system-ui ,"Avenir", Helvetica, Arial, sans-serif;
-    color: #000;
+    font-family:'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+    color: #000 !important;
   }
   .top-container {
     margin-bottom: 20px;

src/views/supply/deliver/home_list.vue

@@ -80,7 +80,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -101,13 +101,13 @@
           </div>
         </div>
         <div class="table">
-          <el-table 
-            v-loading="listLoading" 
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             show-summary
             :summary-method="$getSummaries">
@@ -163,19 +163,24 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.singlePayPrice | numToFixed}}
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="价税合计" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.payAmount | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="无税金额" prop="noTotalAmount" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.noTotalAmount | numToFixed}}
+                {{scope.row.payRebateAmount | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="无税单价" prop="afterTaxPrice" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.afterTaxPrice | numToFixed}}
+                {{scope.row.totalDiscAmount | numToFixed}}
               </template>
             </el-table-column>
             <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
@@ -212,12 +217,12 @@
     <!-- 密码记录 -->
     <el-dialog title="密码记录" :visible.sync="isShowDialog" :show-close="false" width="50%" :close-on-click-modal="false">
       <div class="table" style="margin: 10px 0 20px;">
-        <el-table 
-          v-loading="dialogTable_listLoading" 
-          :data="dialogTable_dataList" 
-          element-loading-text="Loading" 
-          tooltip-effect="dark" 
-          style="width: 100%" 
+        <el-table
+          v-loading="dialogTable_listLoading"
+          :data="dialogTable_dataList"
+          element-loading-text="Loading"
+          tooltip-effect="dark"
+          style="width: 100%"
           max-height="270">
           <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
           <el-table-column align="center" prop="printPassword" label="密码"></el-table-column>
@@ -241,7 +246,7 @@
         <el-button @click="isShowDialog = false">关 闭</el-button>
       </div>
     </el-dialog>
-    
+
     <HomeDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
 
   </div>

src/views/supply/engin/commerce_list.vue

@@ -28,8 +28,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="项目类别" prop="enginName">
-                <el-input v-model="screenForm.enginName" placeholder="请输入项目类别"></el-input>
+              <el-form-item label="项目名称" prop="enginName">
+                <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -150,7 +150,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">

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

@@ -44,6 +44,10 @@
               <div class="label">行业类别</div>
               <div class="value">{{detailData.refTradeCategory}}</div>
             </el-col>
+             <el-col :span="8" class="item">
+              <div class="label">工程编号</div>
+              <div class="value">{{detailData.enginNum}}</div>
+            </el-col>
             <el-col :span="8" class="item">
               <div class="label">跨区厂编号</div>
               <div class="value">{{detailData.refFactoryNo}}</div>

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

@@ -129,7 +129,7 @@
             <el-input v-model="mainForm.greeReply" placeholder="请输入格力回复"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24" v-if="!isDealer">
+        <el-col :xs="24" :sm="24" :lg="24" >
           <el-form-item label="备注" prop="remark">
             <el-input v-model="mainForm.remark" placeholder="请输入备注"></el-input>
           </el-form-item>

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

@@ -51,7 +51,7 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="项目类别" prop="enginName">
+          <el-form-item label="项目类别"  prop="enginName">
             <el-input v-model="mainForm.enginName" placeholder="请输入项目类别" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
@@ -160,6 +160,7 @@
               v-model="mainForm.createDate"
               disabled
               type="date"
+                 :default-value="getDate()"
               value-format="yyyy-MM-dd"
               style="width: 100%;"
               placeholder="选择日期">
@@ -614,7 +615,7 @@ export default {
           if(this.isFirst) {
             this.isFirst = false;
           }else {
-            this.mainForm.salesMan = this.goodsList[0].serviceId;
+            // this.mainForm.salesMan = this.goodsList[0].serviceId;
           }
         }else {
           this.mainForm.salesMan = '';

src/views/supply/engin/engin_list.vue

@@ -144,7 +144,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目名称" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="使用单位" prop="useUnit" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="安装地址" prop="installAddress" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
@@ -178,6 +178,8 @@
                 {{scope.row.totalAmount | numToFixed}}
               </template>
             </el-table-column>
+             <el-table-column align="left" label="业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/engin/home_list.vue

@@ -164,7 +164,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">

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

@@ -434,6 +434,7 @@
               <el-date-picker
                 v-model="deliverForm.date"
                 type="date"
+                disabled
                 value-format="yyyy-MM-dd"
                 style="width: 100%"
                 placeholder="选择日期"
@@ -740,9 +741,26 @@ export default {
 
   created() {
     this.getDetail()
+     this.deliverForm.date = this.getDate()
   },
 
   methods: {
+
+      getDate() {
+      var date = new Date();
+      var seperator1 = "-";
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+          month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+          strDate = "0" + strDate;
+      }
+      var currentdate = year + seperator1 + month + seperator1 + strDate;
+      return currentdate;
+    },
     // 返回列表
     goBack() {
       this.$emit('backListFormDetail')

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

@@ -171,6 +171,7 @@
               <el-date-picker
                 v-model="deliverForm.date"
                 type="date"
+                disabled
                 value-format="yyyy-MM-dd"
                 style="width: 100%;"
                 placeholder="选择日期">
@@ -389,9 +390,26 @@ export default {
 
   created() {
     this.getDetail();
+      this.deliverForm.date = this.getDate()
   },
 
   methods: {
+      getDate() {
+      var date = new Date();
+      var seperator1 = "-";
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+          month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+          strDate = "0" + strDate;
+      }
+      var currentdate = year + seperator1 + month + seperator1 + strDate;
+      return currentdate;
+    },
+
     // 返回列表
     goBack() {
       this.$emit('backListFormDetail');