Finish Hotfix-34

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

@@ -81,6 +81,10 @@
           <div class="label">项目类型</div>
           <div class="value">{{ detailList.refProjectName }}</div>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <div class="label">经销商名称</div>
+          <div class="value">{{ detailList.customerName }}</div>
+        </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
@@ -101,7 +105,7 @@
           <div class="label">提货日期</div>
           <div class="value">{{detailList.}}</div>
         </el-col> -->
-        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">安装时间</div>
           <div class="value">
             <el-date-picker
@@ -116,7 +120,7 @@
             >
             </el-date-picker>
           </div>
-        </el-col> -->
+        </el-col>
       </el-row>
     </div>
     <h3>货品信息</h3>

src/views/finance/wallet.vue

@@ -246,10 +246,23 @@
         :model="exportForm"
         label-width="120px"
       >
+        <el-form-item label="编码范围" prop="">
+          <div class="fanwei">
+            <el-input
+              v-model="exportForm.startCustomerId"
+              type="number"
+            ></el-input>
+            <span>——</span>
+            <el-input
+              v-model="exportForm.endCustomerId"
+              type="number"
+            ></el-input>
+          </div>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button>取 消</el-button>
-        <el-button type="primary">确 定</el-button>
+        <el-button @click="exportCancelFn">取 消</el-button>
+        <el-button type="primary" @click="exportOKFn">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -268,8 +281,11 @@ export default {
   data() {
     return {
       dialogExportForm: false,
-      exportRules: [],
-      exportForm: {},
+      exportRules: {},
+      exportForm: {
+        endCustomerId: "",
+        startCustomerId: "",
+      },
       isShow: JSON.parse(localStorage.getItem("supply_user")).isCustomer,
       show: false,
       show2: true,
@@ -380,10 +396,25 @@ export default {
     ...mapGetters(["customerId"]),
   },
   methods: {
+    exportCancelFn() {
+      this.exportForm = {
+        endCustomerId: "",
+        startCustomerId: "",
+      };
+      this.dialogExportForm = false;
+    },
+    exportOKFn() {
+      this.dialogExportForm = false;
+      this.exportForm = {
+        endCustomerId: "",
+        startCustomerId: "",
+      };
+      downloadFiles("/wallet/count/export", { ...this.exportForm });
+    },
     //导出
     exportFn() {
-      // this.dialogExportForm = true;
-      downloadFiles("/wallet/count/export");
+      this.dialogExportForm = true;
+      // downloadFiles("/wallet/count/export");
     },
     //清空
     resetFn() {
@@ -474,6 +505,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.fanwei {
+  display: flex;
+  span {
+    margin: 0 20px;
+  }
+}
 .styl {
   padding-top: 14px;
 }