【修改】bug【修改】bug

src/views/basic_data/dealer/dealer_stock.vue

@@ -54,6 +54,12 @@
               <span>{{scope.row.customerName}}</span>
             </template>
           </el-table-column>
+          <el-table-column align="left" label="金蝶部门编号" prop="k3OrgNumber" min-width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.k3OrgNumber" />
+              <span>{{scope.row.k3OrgNumber}}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="left" label="钱包名称" prop="customerWalletName" min-width="200" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="业务员" prop="serviceName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="创建人" prop="createBy" min-width="180" show-overflow-tooltip></el-table-column>
@@ -86,12 +92,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="经销商编码" prop="">
+        <el-form-item label="经销商编码" prop="customerNumber">
           <el-input disabled v-model="addForm.customerNumber"></el-input>
           <!-- <template slot-scope="scope">
             {{ scope.row }}
           </template> -->
         </el-form-item>
+        <el-form-item label="金蝶部门编号" prop="k3OrgNumber">
+          <el-input  v-model="addForm.k3OrgNumber"></el-input>
+          <!-- <template slot-scope="scope">
+            {{ scope.row }}
+          </template> -->
+        </el-form-item>
         <el-form-item label="钱包" prop="customerWalletId">
           <el-select class="selectStyle" v-model="addForm.customerWalletId" placeholder="请选择" filterable>
             <el-option v-for="item in walletList" :key="item.customerWalletId" :label="item.customerWalletName" :value="item.customerWalletId">
@@ -218,6 +230,7 @@ export default {
         customerId: "",
         customerName: "",
         customerNumber: "",
+        k3OrgNumber:"",
         region: [],
         // oneParentId: "",
         // twoParentId: "",
@@ -384,7 +397,7 @@ export default {
         res.data.adminWebsitId3,
       ];
       this.addForm.serviceId = res.data.serviceId;
-
+      this.addForm.k3OrgNumber = res.data.k3OrgNumber
       this.dialogForm = true;
     },
     //获取业务员数据
@@ -486,7 +499,7 @@ export default {
         customerNumber: this.addForm.customerNumber,
         customerWalletId: this.addForm.customerWalletId,
         customerWalletName: data2[0].customerWalletName,
-
+        k3OrgNumber:this.addForm.k3OrgNumber,
         serviceId: this.addForm.serviceId,
         serviceName: data3[0].nickName,
       };
@@ -508,6 +521,8 @@ export default {
       this.addForm.customerName = "";
       this.addForm.customerWalletId = "";
       this.addForm.region = [];
+      this.addForm.k3OrgNumber = ''
+
       // this.addForm.oneParentId = "";
       // this.addForm.twoParentId = "";
       // this.addForm.threeParentId = "";
@@ -533,6 +548,7 @@ export default {
       this.addForm.customerNumber = "";
       this.addForm.customerWalletId = "";
       this.addForm.region = [];
+      this.addForm.k3OrgNumber = ''
       // this.addForm.oneParentId = "";
       // this.addForm.twoParentId = "";
       // this.addForm.threeParentId = "";

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -327,7 +327,7 @@
                 {{ scope.row.depositAmount | numToFixed}}
             </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="right"
               label="合同价格"
               prop="contractPrice"
@@ -342,7 +342,7 @@
 
             </template>
 
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               align="right"
               label="上交资料"

src/views/deposit_commerce/refund_list.vue

@@ -350,11 +350,11 @@
               </template>
             </el-table-column>
             <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
-            <el-table-column align="right" label="合同价格" prop="contractPrice" min-width="160" show-overflow-tooltip >
+            <!-- <el-table-column align="right" label="合同价格" prop="contractPrice" min-width="160" show-overflow-tooltip >
                 <template slot-scope="scope">
                   {{ scope.row.contractPrice | numToFixed}}
                 </template>
-              </el-table-column>
+              </el-table-column> -->
 
             <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
             <!-- <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>

src/views/finance/rebate_list.vue

@@ -73,10 +73,10 @@
           <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('del', $route.meta.roles)" class="delClass" @onConfirm="deleFn" title="确定删除吗？">
             <el-button :disabled="deleList.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="mini">批量删除</el-button>
           </el-popconfirm>
-          <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('apply', $route.meta.roles) && searchForm.examineStatus ==='SAVE'" class="delClass" @onConfirm="batchApplication" title="确定执行批量申请吗？">
+          <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('apply', $route.meta.roles) && searchForm.examineStatus ==='SAVE'" class="delClass" @onConfirm="batchApplication" title="确定执行批量审核吗？">
             <el-button :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量申请</el-button>
           </el-popconfirm>
-          <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='WAIT'" class="delClass" @onConfirm="batchAudit" title="确定执行批量申请吗？">
+          <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='WAIT'" class="delClass" @onConfirm="batchAudit" title="确定执行批量审核吗？">
             <el-button :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量审核</el-button>
           </el-popconfirm>
           <!-- <el-button @click="batchApplication" :disabled='deleList.length < 1' size="mini" type="warning" icon="el-icon-finished" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='SAVE'">批量申请</el-button> -->
@@ -223,7 +223,7 @@
                     confirmFn(
                       scope.row.rebateOrderId,
                       scope.row.customerIsConfirm,
-                      
+
                     )
                   ">{{
                     scope.row.customerIsConfirm == true && scope.row.examineStatus == 'OK_ONE' ? "编辑" : scope.row.customerIsConfirm == false?'确定':'详情'

src/views/supply/reserve/reserve_list.vue

@@ -93,7 +93,7 @@
         <div class="btn-group clearfix">
           <div class="fl flex" >
             <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
-            <ExportButton class="ml" :exUrl="'/reserve/download'" exText="下载模板"  />
+            <ExportButton class="ml" :exUrl="'/reserve/download'" exText="下载模板" :exParams="{}" />
             <ImportButton :imUrl="'/reserve/importData'" @importSuccess="getList" />
           </div>
           <div class="fr">