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

# Conflicts:
#	src/views/deposit_home/components/refund_list-detail.vue

src/api/engin_deposit/refund_list.js

@@ -70,7 +70,7 @@ export function getCommonFileGetStream(params) {
 export function examineData(params) {
   return request({
     url: "/deposit-manage/bach-condition-examine-home",
-    method: "post",
+    method: "get",
     params,
   });
 }

src/api/finance/rebate_list.js

@@ -79,6 +79,14 @@ export function getRebateOrderExamineBatch(params) {
     params,
   });
 }
+// 批量复核
+export function getRebateOrderExamine2Batch(params) {
+  return request({
+    url: "/rebate/order/examine2/batch",
+    method: "post",
+    params,
+  });
+}
 // 复核前-编辑
 export function getRebateOrderAclUpdate(data) {
   return request({

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/basic_data/material/price_list.vue

@@ -150,7 +150,7 @@
         <!-- <el-button type="primary" size="mini">打印</el-button> -->
       </div>
       <div class="fl">
-        
+
         </div>
     </div>
     <div class="mymain-container">
@@ -162,11 +162,11 @@
           element-loading-text="Loading"
           border
           fit
-       
+
           :row-class-name="tableRowClassName"
           @select-all="hanleSelectAll"
           @select="hanleSelectAll"
-         
+
         >
            <el-table-column
               type="selection"
@@ -470,7 +470,7 @@ export default {
         this.listTotal = res.data.total
         this.listLoading = false
       })
-      getTypeList(params).then((res) => {
+      getTypeList({...params,pageNum:1,pageSize:-1}).then((res) => {
         this.ztypeList = res.data.records
         // console.log(this.ztypeList, "type1111");
       })
@@ -482,10 +482,15 @@ export default {
       })
     },
     handleRevokeAll() {
-      handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
+      if (this.ids.length) {
+        handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
         this.$successMsg('操作成功')
         this.getList()
       })
+      }else{
+        this.$errorMsg('请选择')
+      }
+
     },
     tableRowClassName({row, rowIndex}) {
       // || row.examineStatus=='FAIL'

src/views/basic_data/stock/customer_product_list.vue

@@ -176,7 +176,7 @@
           </el-table-column>
           <el-table-column
             align="right"
-            label="可用单数量"
+            label="可开单数量"
             prop="openNumber"
             min-width="100"
             show-overflow-tooltip

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

@@ -169,6 +169,13 @@
           </div>
 
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">备注</div>
+          <!-- <div class="value">{{ detailList.applyNote }}</div> -->
+          <div class="value">
+            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.remark" placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
@@ -320,7 +327,7 @@
                 {{ scope.row.depositAmount | numToFixed}}
             </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="right"
               label="合同价格"
               prop="contractPrice"
@@ -328,10 +335,14 @@
               show-overflow-tooltip
             >
              <template slot-scope="scope">
-              <el-input class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
+              <template v-if="detailList.examineStatus !== 'WAIT'" >
+                {{scope.row.contractPrice}}
+              </template>
+              <el-input v-else class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
+
             </template>
 
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               align="right"
               label="上交资料"

src/views/deposit_commerce/refund_list.vue

@@ -350,6 +350,12 @@
               </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 >
+                <template slot-scope="scope">
+                  {{ scope.row.contractPrice | numToFixed}}
+                </template>
+              </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>
               <template slot-scope="scope">
@@ -678,6 +684,7 @@ export default {
           "totalAmount",
           "depositAmount",
           "totalPrice",
+          "contractPrice"
         ];
       });
       this.dataList = res.data.records;

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

@@ -65,7 +65,7 @@
           <div class="label">移动电话</div>
           <div class="value">
             <el-input
-              :disabled="title == '详情'"
+              :readonly="title == '详情'"
               placeholder="请输入"
               v-model="detailList.refPhone"
             ></el-input>
@@ -119,7 +119,16 @@
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">安装时间</div>
           <div class="value">
-            <el-date-picker prefix-icon="''" placeholder="请选择安装时间" :disabled="title == '详情'" class="selectStyle" v-model="detailList.installDate" type="datetime" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              prefix-icon="''"
+              placeholder="请选择安装时间"
+              :readonly="title == '详情'"
+              class="selectStyle"
+              v-model="detailList.installDate"
+              type="datetime"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -158,22 +167,198 @@
           <div class="label">备注</div>
           <!-- <div class="value">{{ detailList.remark }}</div> -->
           <div class="value">
-            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.remark" placeholder="请输入内容"></el-input>
+            <el-input
+              :readonly="detailList.examineStatus !== 'WAIT'"
+              v-model="detailList.remark"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
         <el-col v-if="!isCustomer" :xs="24" :sm="24" :lg="16" class="item">
           <div class="label">格力内部备注</div>
           <!-- <div class="value">{{  detailList.geLiInerNote}}</div> -->
           <div class="value">
-            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.geLiInerNote" placeholder="请输入内容"></el-input>
+            <el-input
+              :readonly="detailList.examineStatus !== 'WAIT'"
+              v-model="detailList.geLiInerNote"
+              placeholder="请输入内容"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">提交保证函</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refPromiseProvide"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">跟进函备注</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refFollowAcceptRemark"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料提交日期</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-date-picker
+              prefix-icon="''"
+              placeholder="请选择安装时间"
+              class="selectStyle"
+              v-model="detailList.refDatumProvideDate"
+              type="datetime"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">大额工程</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-select
+              v-model="detailList.refIsBigAmounts"
+              v
+              clearable
+              filterable
+            >
+              <el-option label="是" value="是"> </el-option>
+              <el-option label="否" value="否"> </el-option>
+            </el-select>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">合同变更批复结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refContractResult"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">工程机转零售批复结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refToRetailResult"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料延期批复结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refDataDelayResult"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">其他附件批复结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refOtherAnnexResult"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">保证函受理状态</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refPromiseAcceptStatus"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">保证函备注</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refPromisePriceRemark"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">附件备注</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refFjShenPiRemark"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料状态</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input readonly v-model="detailList.refDatumProvide"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料审核结果</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refDatumAcceptStatus"
+            ></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">合同变更批复意见</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input readonly v-model="detailList.refContractIdea"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">工程机转零售批复意见</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input readonly v-model="detailList.refToRetailIdea"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">资料延期批复意见</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input readonly v-model="detailList.refDataDelayIdea"></el-input>
+          </div>
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">其他附件审批</div>
+          <!-- <div class="value">{{ detailList.remark }}</div> -->
+          <div class="value">
+            <el-input
+              readonly
+              v-model="detailList.refOtherAnnexIdea"
+            ></el-input>
           </div>
-
         </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
             <el-date-picker
-              :disabled="title == '详情'"
+              :readonly="title == '详情'"
               class="selectStyle"
               v-model="detailList.sendFactoryDate"
               type="datetime"
@@ -208,35 +393,32 @@
             show-summary
             :summary-method="$getSummaries"
           >
-
-
-              <template v-if="!isCustomer">
-
-                     <el-table-column
-              align="left"
-              label="厂编号"
-              prop="factoryNo"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.factoryNo" />
-                <span>{{scope.row.factoryNo}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="left"
-              label="物料编码"
-              prop="materialNumber"
-              min-width="160"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialNumber" />
-                <span>{{scope.row.materialNumber}}</span>
-              </template>
-            </el-table-column>
-              </template>
+            <template v-if="!isCustomer">
+              <el-table-column
+                align="left"
+                label="厂编号"
+                prop="factoryNo"
+                min-width="160"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <CopyButton :copyText="scope.row.factoryNo" />
+                  <span>{{ scope.row.factoryNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                align="left"
+                label="物料编码"
+                prop="materialNumber"
+                min-width="160"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <CopyButton :copyText="scope.row.materialNumber" />
+                  <span>{{ scope.row.materialNumber }}</span>
+                </template>
+              </el-table-column>
+            </template>
 
             <el-table-column
               align="left"
@@ -247,7 +429,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -259,7 +441,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -271,7 +453,7 @@
             >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -281,9 +463,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.price | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.price | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -300,8 +482,8 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed}}
-            </template>
+                {{ scope.row.totalAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -324,10 +506,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed}}
-            </template>
-
+              <template slot-scope="scope">
+                {{ scope.row.depositAmount | numToFixed }}
+              </template>
             </el-table-column>
             <el-table-column
               align="right"
@@ -336,18 +517,26 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-              <el-input class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
-            </template>
-
+              <template slot-scope="scope">
+                <template v-if="detailList.examineStatus !== 'WAIT'">
+                  {{ scope.row.contractPrice }}
+                </template>
+                <el-input
+                  v-else
+                  class="inpt"
+                  v-model="scope.row.contractPrice"
+                  size="mini"
+                  clearable
+                ></el-input>
+              </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="上交资料"
-              prop="dataQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
+            <!--            <el-table-column-->
+            <!--              align="right"-->
+            <!--              label="上交资料"-->
+            <!--              prop="dataQty"-->
+            <!--              min-width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--            />-->
             <el-table-column
               align="right"
               label="收差全额"
@@ -355,9 +544,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-             <template slot-scope="scope">
-                {{ scope.row.diffAmount | numToFixed}}
-            </template>
+              <template slot-scope="scope">
+                {{ scope.row.diffAmount | numToFixed }}
+              </template>
             </el-table-column>
           </el-table>
         </div>
@@ -365,35 +554,111 @@
     </div>
 
     <h3 class="gdzl">工程资料</h3>
-    <el-button :disabled="isDis" class="batchDownload" type="primary" size="small" @click="batchDownloadFn">批量下载</el-button>
+    <el-button
+      :readonly="isDis"
+      class="batchDownload"
+      type="primary"
+      size="small"
+      @click="batchDownloadFn"
+      >批量下载</el-button
+    >
 
     <el-divider></el-divider>
 
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="detailList.dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="资料描述" prop="dataDescribe" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="原文件名" prop="fileName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="缩略图" prop="fileUrl" min-width="160" show-overflow-tooltip>
+        <el-table
+          v-loading="listLoading"
+          :data="detailList.dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="left"
+            label="资料描述"
+            prop="dataDescribe"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="原文件名"
+            prop="fileName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="缩略图"
+            prop="fileUrl"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <el-image ref="img" :src="imageURL + scope.row.fileUrl" v-if="checkFileType(scope.row.fileUrl) == 'image'" style="width: 120px; height: 120px" fit="cover" :preview-src-list="[imageURL + scope.row.fileUrl]">
+              <el-image
+                ref="img"
+                :src="imageURL + scope.row.fileUrl"
+                v-if="checkFileType(scope.row.fileUrl) == 'image'"
+                style="width: 120px; height: 120px"
+                fit="cover"
+                :preview-src-list="[imageURL + scope.row.fileUrl]"
+              >
               </el-image>
-              <img class="file" src="@/assets/common/word.png" v-if="checkFileType(scope.row.fileUrl) == 'word'" />
-              <img class="file" src="@/assets/common/excel.png" v-if="checkFileType(scope.row.fileUrl) == 'excel'" />
-              <img class="file" src="@/assets/common/ppt.png" v-if="checkFileType(scope.row.fileUrl) == 'ppt'" />
-              <img class="file" src="@/assets/common/pdf.png" v-if="checkFileType(scope.row.fileUrl) == 'pdf'" />
-              <img v-if="checkFileType(scope.row.fileUrl) == 'file'" class="file aaa" src="@/assets/common/zip.jpeg" />
+              <img
+                class="file"
+                src="@/assets/common/word.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'word'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/excel.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'excel'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/ppt.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'ppt'"
+              />
+              <img
+                class="file"
+                src="@/assets/common/pdf.png"
+                v-if="checkFileType(scope.row.fileUrl) == 'pdf'"
+              />
+              <img
+                v-if="checkFileType(scope.row.fileUrl) == 'file'"
+                class="file aaa"
+                src="@/assets/common/zip.jpeg"
+              />
             </template>
           </el-table-column>
-          <el-table-column align="left" label="下载文件名称" prop="fileName" min-width="160" show-overflow-tooltip>
+          <el-table-column
+            align="left"
+            label="下载文件名称"
+            prop="fileName"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
               {{ "资料_" + scope.row.fileName }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
+          <el-table-column
+            align="center"
+            label="操作"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              <el-button type="text" class="textColor" @click="downLoadFn(scope.row.fileUrl,scope.row.fileName)">下载</el-button>
+              <el-button
+                type="text"
+                class="textColor"
+                @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)"
+                >下载</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -422,34 +687,88 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="detailList.checkRecordItems" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="申请人" prop="submitName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="申请说明" prop="applyNote" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="验收人" prop="checkName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="验收说明" prop="checkNote" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="审批结果" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
+        <el-table
+          v-loading="listLoading"
+          :data="detailList.checkRecordItems"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+        >
+          <el-table-column
+            align="left"
+            label="申请人"
+            prop="submitName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="申请日期"
+            prop="submitTime"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="申请说明"
+            prop="applyNote"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="验收人"
+            prop="checkName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="受理日期"
+            prop="checkDate"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="验收说明"
+            prop="checkNote"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="审批结果"
+            prop="isRefundDeposit"
+            min-width="160"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              {{scope.row.isRefundDeposit == false?'否':'是'}}
+              {{ scope.row.isRefundDeposit == false ? "否" : "是" }}
             </template>
           </el-table-column>
         </el-table>
       </div>
     </div>
 
-    <h3 v-if="
+    <h3
+      v-if="
         detailList.examineStatus == 'WAIT' ||
         detailList.examineStatus == 'FAIL' ||
         detailList.examineStatus == 'OK'
-      ">
+      "
+    >
       审批
     </h3>
-    <el-divider v-if="
+    <el-divider
+      v-if="
         detailList.examineStatus == 'WAIT' ||
         detailList.examineStatus == 'FAIL' ||
         detailList.examineStatus == 'OK'
-      "></el-divider>
+      "
+    ></el-divider>
     <div v-if="detailList.examineStatus == 'WAIT'" class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -459,7 +778,15 @@
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
           <div class="label">受理日期</div>
           <div class="value">
-            <el-date-picker disabled prefix-icon="''" class="selectStyle" type="datetime" placeholder="系统自动生成" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              readonly
+              prefix-icon="''"
+              class="selectStyle"
+              type="datetime"
+              placeholder="系统自动生成"
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -481,9 +808,12 @@
       </el-row>
     </div>
 
-    <div v-if="
+    <div
+      v-if="
         detailList.examineStatus == 'OK' || detailList.examineStatus == 'FAIL'
-      " class="diy-table-1">
+      "
+      class="diy-table-1"
+    >
       <el-row :gutter="0">
         <el-col :xs="12" :sm="12" :lg="12" class="item">
           <div class="label">验收人</div>
@@ -492,7 +822,16 @@
         <el-col :xs="12" :sm="12" :lg="12" class="item dateS">
           <div class="label">受理日期</div>
           <div class="value">
-            <el-date-picker disabled prefix-icon="''" class="selectStyle" v-model="detailList.checkDate" type="datetime" placeholder="" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+            <el-date-picker
+              readonly
+              prefix-icon="''"
+              class="selectStyle"
+              v-model="detailList.checkDate"
+              type="datetime"
+              placeholder=""
+              default-time="00:00:00"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
             </el-date-picker>
           </div>
         </el-col>
@@ -500,21 +839,28 @@
           <div class="label">是否退押</div>
           <div class="value">
             <el-radio-group v-model="detailList.isRefundDeposit">
-              <el-radio disabled :label="true">是</el-radio>
-              <el-radio disabled :label="false">否</el-radio>
+              <el-radio readonly :label="true">是</el-radio>
+              <el-radio readonly :label="false">否</el-radio>
             </el-radio-group>
           </div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item dateS">
           <div class="label">验收说明</div>
           <div class="value">
-            <el-input disabled v-model="detailList.checkNote" placeholder="请输入内容"></el-input>
+            <el-input
+              readonly
+              v-model="detailList.checkNote"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
         <el-col :xs="12" :sm="24" :lg="24" class="item dateS">
           <div class="label">审批通过后备注</div>
           <div class="value">
-            <el-input v-model="detailList.examineAfterRemark" placeholder="请输入内容"></el-input>
+            <el-input
+              v-model="detailList.examineAfterRemark"
+              placeholder="请输入内容"
+            ></el-input>
           </div>
         </el-col>
       </el-row>
@@ -524,9 +870,27 @@
     <!-- detailList.examineStatus != 'OK' || detailList.examineStatus != 'FAIL' -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button v-if="detailList.examineStatus == 'WAIT'" type="primary" size="small" @click="adoptFn">审批通过</el-button>
-        <el-button v-if="detailList.examineStatus == 'WAIT'" type="primary" size="small" @click="rejectFn">审批驳回</el-button>
-        <el-button v-if="detailList.examineStatus == 'OK'" type="primary" size="small" @click="saveFn">保存</el-button>
+        <el-button
+          v-if="detailList.examineStatus == 'WAIT'"
+          type="primary"
+          size="small"
+          @click="adoptFn"
+          >审批通过</el-button
+        >
+        <el-button
+          v-if="detailList.examineStatus == 'WAIT'"
+          type="primary"
+          size="small"
+          @click="rejectFn"
+          >审批驳回</el-button
+        >
+        <el-button
+          v-if="detailList.examineStatus == 'OK'"
+          type="primary"
+          size="small"
+          @click="saveFn"
+          >保存</el-button
+        >
       </div>
     </div>
   </div>
@@ -752,16 +1116,22 @@ export default {
       } else {
         this.isDis = false;
       }
-      let arr = []
+      let arr = [];
       res.data.items.forEach((item) => {
-        if (Number(item.qty)>0) {
-              arr.push(item)
-            }
+        if (Number(item.qty) > 0) {
+          arr.push(item);
+        }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
         item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
-        item.sums2 = ["totalAmount", "diffAmount", "price",'depositAmount','contractPrice'];
+        item.sums2 = [
+          "totalAmount",
+          "diffAmount",
+          "price",
+          "depositAmount",
+          "contractPrice",
+        ];
       });
-      res.data.items = arr
+      res.data.items = arr;
       this.detailList = res.data;
       if (
         res.data.examineStatus == "SAVE" ||
@@ -779,11 +1149,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .inpt{
-    ::v-deep .el-input__inner{
-      text-align: right ;
-
-    }
+.inpt {
+  ::v-deep .el-input__inner {
+    text-align: right;
+  }
 }
 .aaa {
   height: 64px;
@@ -810,5 +1179,4 @@ export default {
 .selectStyle {
   width: 100%;
 }
-
 </style>

src/views/deposit_home/refund_list.vue

@@ -209,7 +209,7 @@
               title="批量审核吗？"
               @onConfirm="batchExamine"  v-if="$checkBtnRole('examine', $route.meta.roles)"
             >
-              <el-button slot="reference" size="mini" type="warning" icon="el-icon-finished" >批量审批</el-button>
+              <el-button slot="reference" size="mini" type="warning" icon="el-icon-finished" >批量审核工程机已审单据</el-button>
 
             </el-popconfirm>
 
@@ -350,6 +350,12 @@
               </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 >
+                <template slot-scope="scope">
+                  {{ scope.row.contractPrice | numToFixed}}
+                </template>
+              </el-table-column>
+
             <el-table-column align="right" label="发货数量" prop="orderHasSendQty" min-width="160" show-overflow-tooltip />
             <!-- <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -543,12 +549,12 @@ export default {
     },
          // 打开 批量审批
      batchExamine() {
-      if (this.selectData.length) {
+      // if (this.selectData.length) {
         this.submitExamineForm()
         // this.isShowExamineDialog = true;
-        return
-      }
-      this.$errorMsg('请选择审核项')
+      //   return
+      // }
+      // this.$errorMsg('请选择审核项')
     },
     // 提交 批量审批
     submitExamineForm() {
@@ -716,6 +722,8 @@ export default {
           "totalAmount",
           "depositAmount",
           "totalPrice",
+          "contractPrice"
+
         ];
       });
       this.dataList = res.data.records;

src/views/finance/rebate_list.vue

@@ -76,9 +76,8 @@
           <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-button :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量审核</el-button>
-          </el-popconfirm>
+          <el-button @click="batchAudit('audit')" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='WAIT'" :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量审核</el-button>
+          <el-button @click="batchReview('review')" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='OK_ONE_AND_CONFIRM'" :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量复核</el-button>
           <!-- <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> -->
         </div>
         <div class="fr">
@@ -260,6 +259,7 @@ import {
   getRebateOrderBatchDel,
   getRebateOrderApplyBatch,
   getRebateOrderExamineBatch,
+  getRebateOrderExamine2Batch,
 } from "@/api/finance/rebate_list";
 import RebateListApply from "./components/rebate_list-apply.vue";
 import RebateListExamine from "./components/rebate_list-examine.vue";
@@ -308,6 +308,7 @@ export default {
         status: "",
         remark: "",
       },
+      state: "",
     };
   },
   computed: {
@@ -333,23 +334,39 @@ export default {
     }
   },
   methods: {
+    //批量复核
+    batchReview(value) {
+      this.state = value;
+      this.isShowExamineDialog = true;
+    },
+
     //批量审核
-    batchAudit() {
+    batchAudit(value) {
+      this.state = value;
       this.isShowExamineDialog = true;
     },
     //提交批量审核
     async submitExamineForm() {
       let res = this.deleList.toString();
+      if (this.state === "audit") {
+        await getRebateOrderExamineBatch({
+          ids: res,
+          examineStatus: this.examineForm.status,
+          examineRemark: this.examineForm.remark,
+        });
+        this.$message.success("批量审核成功");
+      } else {
+        await getRebateOrderExamine2Batch({
+          ids: res,
+          examineStatus: this.examineForm.status,
+          examineRemark: this.examineForm.remark,
+        });
+        this.$message.success("批量复核成功");
+      }
 
-      await getRebateOrderExamineBatch({
-        ids: res,
-        examineStatus: this.examineForm.status,
-        examineRemark: this.examineForm.remark,
-      });
       this.deleList = [];
       this.isShowExamineDialog = false;
       this.getDataList();
-      this.$message.success("批量审批成功");
     },
     //批量申请
     async batchApplication() {

src/views/finance/receivable_list.vue

@@ -113,6 +113,7 @@
                 {{ scope.row.totalAmount | numToFixed }}
               </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="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
@@ -274,7 +275,7 @@ export default {
     },
     selectionChangeFn(value) {
       // console.log(value);
-      const res = value.map((v) => v.id);
+      const res = value.map((v) => v.itemId);
       // console.log(res);
       this.deleList = res;
     },

src/views/sales_policy/components/TabelTransfer.vue

@@ -142,6 +142,7 @@
              <h4 style="display: inline-block; margin-right: 20px">
                   经销商上限
        </h4>
+
   <el-divider />
     </div>
     <div style="margin: 20px 0">
@@ -397,6 +398,7 @@ export default {
       this.getPolicyList();
     }
   },
+
   methods: {
     getList() {
       this.getCrList();
@@ -510,7 +512,7 @@ export default {
         });
 
 
-         
+
 
         for (let i = 0; i < result.data.length; i++) {
           result.data[i].customerNumber = result.data[i].number;

src/views/sales_policy/components/details.vue

@@ -374,7 +374,7 @@
               </el-col>
             </el-row>
             <el-divider />
-               <el-radio-group v-model="detail.flag+''">
+               <el-radio-group v-model="detail.flag">
           <el-radio label="0" :disabled="detail.flag !=0">指定经销商</el-radio>
           <el-radio label="1" :disabled="detail.flag !=1">广州经销商</el-radio>
           <el-radio label="2" :disabled="detail.flag !=2">佛山经销商</el-radio>
@@ -603,11 +603,10 @@
         ></el-col
       >
     </el-row> -->
-     <div>
-             <h4 style="display: inline-block; margin-right: 20px">
-                  经销商上限
-       </h4>
-  <el-divider />
+     <div style="dispaly:flex">
+        <h4 style="display: inline-block; margin-right: 20px">经销商上限</h4>
+        <ExportButton  style="display: inline-block; margin-right: 20px"  :exUrl="'/policy/limit/export'" :exParams="exParams" />
+        <el-divider />
     </div>
 
     <div>
@@ -863,6 +862,11 @@ export default {
         title = '详情页'
       }
       return title
+    },
+    exParams(){
+      return {
+        policyId:this.detail.code,
+      }
     }
   },
   created() {},
@@ -875,7 +879,7 @@ export default {
       this.listLoading = true
       getPolicyDetail({ policyId: this.$parent.id }).then((res) => {
         this.detail = res.data
-
+        this.detail.flag = this.detail.flag +''
         this.srcList = [this.$imageUrl + this.detail.imgSrc]
         if (this.$parent.isShow == 5 && this.detail.imgSrc) {
           this.fileList = [

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

@@ -497,7 +497,7 @@
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="proNum">
-              <el-input v-model="goodsScreenForm.proNum" placeholder="请输入产品编码"></el-input>
+              <el-input v-model="goodsScreenForm.proNum" placeholder="请输入物料编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">

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

@@ -485,8 +485,21 @@
             备注：{{ factor[0].remark }}
           </el-row>
           <el-row :gutter="20">
+            <el-col :xs="24" :sm="8" :lg="11">
+              <el-form-item label="规格型号">
+                <div style="display:flex">
+                  <el-input
+                  v-model="screenForm.specification"
+                  placeholder="请输入型号规格型号"
+                />
+                <el-button style="margin-left:10px" type="primary" size="mini" @click="handleGetPolicyList">查询</el-button>
+
+                </div>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="11">
               <el-form-item label="销售政策" class="myselect">
+
                 <el-select
                   v-model="screenForm.policyId"
                   placeholder="选择销售政策"
@@ -512,11 +525,13 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="8" :lg="11">
-              <el-form-item label="型号">
-                <el-input
-                  v-model="screenForm.specification"
-                  placeholder="请输入型号"
+              <el-form-item label="规格型号">
+                <div style="display:flex">
+                  <el-input
+                  v-model="screenForm.specifications"
+                  placeholder="请输入型号规格型号"
                 />
+                </div>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="11">
@@ -538,7 +553,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="11" class="tr">
+            <el-col :xs="22" :sm="22" :lg="22" class="tr">
               <!-- <el-button
                 type="primary"
                 size="small"
@@ -856,6 +871,7 @@ export default {
         saleTypeCode: "",
         factorId: "",
         specification: "",
+        specifications:""
       },
       currentPage: 1,
       listTotal: 0,
@@ -1139,6 +1155,7 @@ export default {
     },
     // 选择销售政策获取政策条件列表
     async handlePolicy(e) {
+      console.log(e);
       this.totalArr = [];
       this.multipleSelections = [];
       this.dataList = [];
@@ -1204,6 +1221,19 @@ export default {
       this.screenForm.policyId = data.policyId;
       this.policyConditionId = data.id;
     },
+    async handleGetPolicyList(){
+     const {data} = await policyList({
+        pageNum: 1,
+        pageSize: -1,
+        status:1,
+        customerId: JSON.parse(localStorage.getItem("supply_user")).customerId,
+     specification: this.screenForm.specifications,
+      })
+       this.policyList = data.records
+        if (data.records.length) {
+          this.handlePolicy(data.records[0].id);
+        }
+    },
     // 引用销售政策搜索
     async handlePolicyTypeList() {
       if (!this.screenForm.policyId) {
@@ -1230,9 +1260,9 @@ export default {
         pageSize: -1,
         policyConditionId,
         popType,
-        specification: this.screenForm.specification,
+         specification: this.screenForm.specifications,
         saleTypeCode: this.screenForm.saleTypeCode,
-        customerId: this.listItem ? this.listItem.customerId : "",
+        customerId:  JSON.parse(localStorage.getItem("supply_user")).customerId,
       });
 
       if (!fang) {
@@ -1302,8 +1332,8 @@ export default {
         pageSize: -1,
         policyId: this.screenForm.policyId,
         saleTypeCode: this.screenForm.saleTypeCode,
-        specification: this.screenForm.specification,
-        customerId: this.listItem ? this.listItem.customerId : "",
+         specification: this.screenForm.specifications,
+        customerId:  JSON.parse(localStorage.getItem("supply_user")).customerId,
         [val]: true,
       }).then((res) => {
         this.dataList = res.data.records;
@@ -1649,7 +1679,7 @@ export default {
       policyList({
         pageNum: 1,
         pageSize: -1,
-        customerId: this.listItem ? this.listItem.customerId : "",
+        customerId:  JSON.parse(localStorage.getItem("supply_user")).customerId,
         status: true,
       }).then((res) => {
         if (this.policyId) {

src/views/supply/price/modify_list.vue

@@ -190,7 +190,7 @@
             @select-all="hanleSelectAll"
             @select="hanleSelectAll"
             :row-class-name="tableRowClassName"
-            
+
           >
             <el-table-column
               type="selection"
@@ -841,7 +841,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  
+
   ::v-deep .el-table .warning-row {
     background:  oldlace;
   }

src/views/supply/price/price_list.vue

@@ -164,8 +164,8 @@
                 </el-popconfirm> -->
         </div>
     </div>
-           
- 
+
+
     <div class="mymain-container">
       <!-- 列表 -->
       <div class="table">
@@ -482,7 +482,7 @@ export default {
         this.listTotal = res.data.total
         this.listLoading = false
       })
-      getTypeList(params).then((res) => {
+      getTypeList({...params,pageNum:1,pageSize:-1}).then((res) => {
         this.ztypeList = res.data.records
         // console.log(this.ztypeList, "type1111");
       })

src/views/supply/reserve/reserve_list.vue

@@ -78,7 +78,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -91,8 +91,10 @@
 
       <div class="mymain-container">
         <div class="btn-group clearfix">
-          <div class="fl">
+          <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="下载模板" :exParams="{}" />
+            <ImportButton :imUrl="'/reserve/importData'" @importSuccess="getList" />
           </div>
           <div class="fr">
             <ExportButton :exUrl="'reserve/export'" :exParams="exParams" />
@@ -101,11 +103,11 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             show-summary
             :summary-method="$getSummaries">
@@ -185,9 +187,9 @@
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles)">编辑</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
                 <el-popconfirm
-                  style="margin-left: 10px;" 
-                  title="确定关闭吗？" 
-                  @onConfirm="handleClose(scope.row.itemId)" 
+                  style="margin-left: 10px;"
+                  title="确定关闭吗？"
+                  @onConfirm="handleClose(scope.row.itemId)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.status === 1">
                   <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
@@ -210,7 +212,7 @@
         </div>
       </div>
     </div>
-    
+
     <ReserveDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <ReserveForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
 
@@ -397,5 +399,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.flex{
+  display: flex;
+}
+.ml{
+  margin-left: 10px;
+}
 </style>