Merge branch 'v3.0' into company

src/apis/service/businessReportQuery/financeReport/index.js

@@ -12,7 +12,7 @@ export default {
   // 发票数据导入
   receiptimport: (data, params) => http(api + 'receiptimport', data, 'post', params),
   // 新建业务需求表
-  add: (data, params) => http(api + 'execsave', data, 'post', params),
+  add: (data, params) => http(api + 'r_execsave', data, 'post', params),
   // 获取预约导出业务需求表
   exportList: (data, params) => http(api + 'execlist', data, 'post', params),
 

src/apis/service/reportQuery/newReport/index.js

@@ -7,5 +7,8 @@ export default {
   salestock: (data, params) => http(api + 'salestock', data, 'post', params),
   ocl: (data, params) => http(api + 'ocl', data, 'post', params),
   orderoutbk: (data, params) => http(api + 'orderoutbk', data, 'post', params),
-  sna: (data, params) => http(api + 'sna', data, 'post', params)
+  sna: (data, params) => http(api + 'sna', data, 'post', params),
+  saleexportthdata: (data, params) => http(api + 'saleexportthdata', data, 'post', params),
+  depart_list: (data, params) => http(api + 'ulist', data, 'post', params),
+  accountall: (data, params) => http(api + 'userCompanyBasicList', data, 'post', params)
 }

src/views/businessReportQuery/businessFinanceReport/addEdit.vue

@@ -65,7 +65,7 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from '@/apis/service/reportQuery/financeReport/index.js'
+import asyncRequest from '@/apis/service/businessReportQuery/financeReport/index.js'
 import resToken from '@/mixins/resToken'
 import PeriodDatePicker from './components/PeriodDatePicker'
 export default {

src/views/businessReportQuery/businessStockReport/addEdit.vue

@@ -36,8 +36,7 @@
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
-                >
-                </el-option>
+                />
               </el-select>
             </el-form-item>
             <el-form-item label="数据时间" prop="start">
@@ -62,12 +61,14 @@
                 : '报表会在明天01:00开始生成'
             "
             type="warning"
-          >
-          </el-alert>
+          />
         </el-col>
         <el-col :span="12" style="text-align: right">
-          <el-button v-if="!isDetail" type="primary" @click="submitForm"
-            >保 存
+          <el-button
+            v-if="!isDetail"
+            type="primary"
+            @click="submitForm"
+          >保 存
           </el-button>
           <el-button @click="showModelThis = false">{{
             isDetail ? "关 闭" : "取 消"
@@ -78,38 +79,38 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/reportQuery/financeReport/index.js";
-import resToken from "@/mixins/resToken";
-import PeriodDatePicker from "./components/PeriodDatePicker";
+import asyncRequest from '@/apis/service/businessReportQuery/financeReport/index.js'
+import resToken from '@/mixins/resToken'
+import PeriodDatePicker from './components/PeriodDatePicker'
 export default {
-  name: "stockReport",
-  props: ["showModel", "sitem", "type"],
-  mixins: [resToken],
+  name: 'StockReport',
   components: {
-    PeriodDatePicker,
+    PeriodDatePicker
   },
+  mixins: [resToken],
+  props: ['showModel', 'sitem', 'type'],
 
   data() {
     const validateTime = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("数据开始时间不能为空！"));
+      if (value === '') {
+        callback(new Error('数据开始时间不能为空！'))
       } else {
-        if (this.ruleForm.end === "") {
-          callback(new Error("数据结束时间不能为空！"));
+        if (this.ruleForm.end === '') {
+          callback(new Error('数据结束时间不能为空！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     return {
       options: [],
       loading: false,
-      title: "添加账号",
+      title: '添加账号',
       showModelThis: this.showModel,
       ruleForm: {
-        start: "",
-        end: "",
-        id: "",
+        start: '',
+        end: '',
+        id: ''
       },
       rulesThis: this.rules,
       rules: {
@@ -117,109 +118,109 @@ export default {
           {
             required: true,
             validator: validateTime,
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         id: [
           {
             required: true,
-            message: "请选择业务表！",
-            trigger: "change",
-          },
-        ],
-      },
-    };
+            message: '请选择业务表！',
+            trigger: 'change'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     closeModel() {
-      console.log("closeModel!!");
+      console.log('closeModel!!')
     },
     async initForm() {
-      this.loading = true;
-      this.options = [];
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
+      this.loading = true
+      this.options = []
+      this.rulesThis = this.rules
+      await this.resetForm()
+      this.loading = false
     },
     async timeReturned(e) {
-      if (e.startTime !== "") {
-        this.ruleForm.start = e.startTime;
+      if (e.startTime !== '') {
+        this.ruleForm.start = e.startTime
       } else {
-        this.ruleForm.start = "";
+        this.ruleForm.start = ''
       }
-      if (e.endTime !== "") {
-        this.ruleForm.end = e.endTime;
+      if (e.endTime !== '') {
+        this.ruleForm.end = e.endTime
       } else {
-        this.ruleForm.end = "";
+        this.ruleForm.end = ''
       }
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          const { start, end, id, name } = this.sitem;
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          const { start, end, id, name } = this.sitem
           // console.log(this.sitem);
           this.options = [
             {
               value: id,
-              label: name,
-            },
-          ];
+              label: name
+            }
+          ]
           this.ruleForm = {
-            start: "",
-            end: "",
-            id: id || "",
-          };
-          console.log(this.ruleForm);
+            start: '',
+            end: '',
+            id: id || ''
+          }
+          console.log(this.ruleForm)
         }
-      });
+      })
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          this.loading = true;
-          const model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = await asyncRequest.add(model);
-          this.loading = false;
+          this.loading = true
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          const res = await asyncRequest.add(model)
+          this.loading = false
           if (res && res.code === 0) {
             this.$notify.success({
-              title: "需求创建成功！",
-              message: "",
-            });
-            this.showModelThis = false;
+              title: '需求创建成功！',
+              message: ''
+            })
+            this.showModelThis = false
             // 刷新
-            this.$emit("refresh");
+            this.$emit('refresh')
           } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(res.message)
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
    <style lang="scss" scoped>

src/views/dataReport/columns.js

@@ -469,4 +469,108 @@ const table6 = [
   }
 ]
 
-export { table2, table3, table4, table5, table6 }
+const table7 = [
+  // {
+  //   type: "expand",
+  //   _slot_: "expand",
+  //   fixed: "left",
+  //   _noset_: true,
+  // },
+  // {
+  //   type: "selection",
+  //   fixed: "left",
+  //   _noset_: true
+  // },
+  {
+    prop: 'return_time',
+    label: '退货时间',
+    minWidth: '155px'
+  },
+  {
+    prop: 'thCode',
+    label: '退货单号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'outCode',
+    label: '发货单编码',
+    minWidth: '155px'
+  },
+  {
+    prop: 'status',
+    label: '退货单状态',
+    minWidth: '155px'
+  },
+  {
+    prop: 'apply_name',
+    label: '创建人',
+    minWidth: '155px'
+  },
+  {
+    prop: 'apply_company',
+    label: '创建人所属部门',
+    minWidth: '155px'
+  },
+  {
+    prop: 'orderCode',
+    label: '销售订单编号',
+    minWidth: '155px'
+  },
+  {
+    prop: 'addtime',
+    label: '下单日期',
+    minWidth: '155px'
+  },
+  {
+    prop: 'companyName',
+    label: '客户名称',
+    minWidth: '155px'
+  },
+  {
+    prop: 'good_name',
+    label: '产品名称',
+    minWidth: '155px'
+  },
+  {
+    prop: 'sale_price',
+    label: '单价',
+    minWidth: '155px'
+  },
+  {
+    prop: 'wsend_num',
+    label: '未发货数量',
+    minWidth: '155px'
+  },
+  {
+    prop: 'th_num',
+    label: '退货数量',
+    minWidth: '155px'
+  },
+  {
+    prop: 'th_fee',
+    label: '退货销售货款',
+    minWidth: '155px'
+  },
+  {
+    prop: 'contactor',
+    label: '发货单联系人',
+    minWidth: '155px'
+  },
+  {
+    prop: 'mobile',
+    label: '发货单联系人电话',
+    minWidth: '155px'
+  },
+  {
+    prop: 'addr',
+    label: '发货单地址',
+    minWidth: '155px'
+  },
+  {
+    prop: 'result',
+    label: '退货原因',
+    minWidth: '155px'
+  }
+]
+
+export { table2, table3, table4, table5, table6, table7 }

src/views/dataReport/table1.vue

@@ -13,18 +13,13 @@
                 @timeReturned="time"
               />
             </el-col>
-          
-            <el-col :span="4" style="width: 350px">
-              <search-supplier
-                :size="'mini'"
-                :value="parmValue.supplierNo"
-                :disabled="false"
-                :placeholder="'供应商名称'"
-                :names="parmValue.supplierName"
-                :is-detail="true"
-                :no-disabled="true"
-                @searchChange="supplierChange"
-              />
+
+            <el-col :span="4" style="width:350px">
+              <el-select v-model="parmValue.person_id" size="mini" placeholder="供应商负责人" filterable clearable  @change="
+                  searchList();
+                ">
+                <el-option v-for="depart in activeOptions" :key="depart.id" :label="depart.nickname" :value="depart.id" />
+              </el-select>
             </el-col>
           
             <el-col :span="4" style="width: 66px; float: right">
@@ -48,6 +43,21 @@
               <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
             </el-col>
           </el-row>
+
+          <el-row>
+            <el-col :span="4" style="width: 300px;margin-top:10px">
+              <search-supplier
+                :size="'mini'"
+                :value="parmValue.supplierNo"
+                :disabled="false"
+                :placeholder="'供应商名称'"
+                :names="parmValue.supplierName"
+                :is-detail="true"
+                :no-disabled="true"
+                @searchChange="supplierChange"
+              />
+            </el-col>
+          </el-row>
         </div>
         <el-table v-loading="loading" size="mini" :data="tableData" border style="margin-top:10px">
           <el-table-column prop="supplier_name" label="供应商名称" width="180px" show-overflow-tooltip />
@@ -111,6 +121,7 @@ export default {
   },
   data() {
     return {
+      activeOptions:[],
       // 选中数组
       changeList: [],
       // 全局url
@@ -119,6 +130,7 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
+        person_id:"",
         supplierNo: [],
         supplier_name: '',
         start_day: dayjs(this.getStartDate()).format('YYYY-MM-DD'), // 起始时间
@@ -141,9 +153,24 @@ export default {
     this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.searchList()
+    this.getAllActive()
   },
 
   methods: {
+    async getAllActive() {
+      const res = await asyncRequest.accountall({
+        ...this.dataForm,
+        size: 100000,
+        level: '2'
+      })
+      if (res && res.code === 0 && res.data) {
+        this.activeOptions = res.data.list
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(res.message)
+      }
+    },
     async supplierChange(e) {
       const { code, label } = e
       this.parmValue.supplierNo = code ? [code] : []
@@ -197,6 +224,7 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        person_id:"",
         supplier_name: '',
         supplierNo: [],
         start_day: dayjs().subtract(0, 'day').format('YYYY-MM-DD'),

src/views/dataReport/table3.vue

@@ -37,7 +37,7 @@
               />
             </el-col>
 
-            <el-col :span="6">
+            <el-col :span="4">
               <search-work-company
                 :value="parmValue.companyNo"
                 :placeholder="'业务公司名称'"
@@ -48,6 +48,14 @@
               />
             </el-col>
 
+            <el-col :span="4" style="margin-left:10px">
+              <el-input placeholder="产品名称" size="mini" v-model="parmValue.good_name" clearable   @change="
+                pageInfo.curr = 1;
+                parmValue.page = 1;
+                searchList();
+              "  />
+            </el-col>
+
             <el-col :span="4" style="width: 66px; float: right">
               <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
                 导出
@@ -120,6 +128,7 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
+        good_name:"",
         companyNo: '',
         start_day: '', // 起始时间
         end_day: '', // 结束时间
@@ -200,6 +209,7 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        good_name:"",
         companyNo: '',
         start_day: '', // 新建起始时间
         end_day: '', // 新建结束时间

src/views/dataReport/table5.vue

@@ -88,6 +88,28 @@
                 @searchChange="company_idsearchChange"
               />
             </el-col>
+            
+
+
+            <el-col :span="4" style="margin-left:10px;">
+              <el-select v-model="parmValue.depart_id" size="mini" placeholder="部门" filterable clearable  @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                ">
+                <el-option v-for="depart in departList" :key="depart.id" :label="depart.name" :value="depart.id" />
+              </el-select>
+            </el-col>
+
+            <el-col :span="4" style="margin-left:10px;width:350px">
+              <el-select v-model="parmValue.person_id" size="mini" placeholder="供应商负责人" filterable clearable  @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                ">
+                <el-option v-for="depart in activeOptions" :key="depart.id" :label="depart.nickname" :value="depart.id" />
+              </el-select>
+            </el-col>
           </el-row>
         </div>
       </template>
@@ -142,6 +164,7 @@ export default {
   },
   data() {
     return {
+      activeOptions:[],
       xs_order_type_options,
       xs_order_source_options,
       // 选中数组
@@ -152,6 +175,8 @@ export default {
       loading: false,
       // 请求参数集合
       parmValue: {
+        depart_id:"",
+        person_id:"",
         supplierNo: [],
         start_day: '', // 起始时间
         end_day: '', // 结束时间
@@ -190,9 +215,30 @@ export default {
     // this.parmValue.start_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     // this.parmValue.end_day = dayjs().subtract(0, 'day').format('YYYY-MM-DD')
     this.searchList()
+    this.getDepartList()
+    this.getAllActive()
   },
 
   methods: {
+    async getDepartList(){
+      const { data = {} } = await asyncRequest.depart_list()
+      const { depart = [] } = data
+      this.departList = depart;
+    },
+    async getAllActive() {
+      const res = await asyncRequest.accountall({
+        ...this.dataForm,
+        size: 100000,
+        level: '2'
+      })
+      if (res && res.code === 0 && res.data) {
+        this.activeOptions = res.data.list
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(res.message)
+      }
+    },
     async supplierChange(e) {
       const { code, label } = e
       this.parmValue.supplierNo = code ? [code] : []
@@ -247,6 +293,8 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        depart_id:"",
+        person_id:"",
         supplierNo: '',
         start_day: '', // 新建起始时间
         end_day: '', // 新建结束时间

src/views/dataReport/table6.vue

@@ -217,6 +217,7 @@ export default {
         page: 1, // 页码
         size: 15 // 每页显示条数
       },
+      departList:[],
       // 表格 - 数据集合
       tableData: [],
       xs_order_type_options,
@@ -284,6 +285,8 @@ export default {
     // 重置
     restSearch() {
       this.parmValue = {
+        depart_id:"",
+        person_id:"",
         supplier_name: '', // 要搜索的供应商名称
         creater: '', // 要搜索的采购维护人
         start_date: '', // 起始时间

src/views/dataReport/table7.vue

@@ -0,0 +1,300 @@
+<template>
+  <div style="padding:10px">
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="table7"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @selection="selection_change"
+    >
+      <template #table-header="{}">
+        <div style="width: 100%">
+          <el-row style="padding: 0 0 0 80px">
+
+            <el-col :span="6" style="width: 363px;">
+              <periodDatePickerActive
+                :start="parmValue.start_date"
+                :end="parmValue.end_date"
+                :placeholder="'退货'"
+                :width="'165px'"
+                :size="searchSize"
+                @timeReturned="time"
+              />
+            </el-col>
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button type="primary" style="margin-left:30px;" :size="searchSize" class="fr" @click="download">
+                导出
+              </el-button>
+            </el-col>
+            <el-col :span="3" style="width: 66px; float: right">
+              <el-button
+                :size="searchSize"
+                type="primary"
+                style="float: right; margin-left: 5px"
+                @click="searchList"
+              >
+                刷新
+              </el-button>
+            </el-col>
+
+          </el-row>
+          <el-row style="padding: 10px 0 0 0">
+            <!-- <el-col :span="6" style="width: 150px">
+              <el-select
+                v-model="parmValue.status"
+                :size="searchSize"
+                filterable
+                clearable
+                placeholder="退货单状态"
+                style="width: 100%"
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option label="待业务审批" value="1" />
+                <el-option label="待采购审核" value="2" />
+                <el-option label="待设置仓库" value="3" />
+                <el-option label="待客户退货" value="4" />
+                <el-option label="售后已完成" value="5" />
+                <el-option label="业务已驳回" value="6" />
+                <el-option label="采购已驳回" value="7" />
+                <el-option label="申请已取消" value="8" />
+              </el-select>
+            </el-col> -->
+
+            <el-col :span="4" style="width: 66px; float: right">
+              <el-button
+                type="warning"
+                class="fr"
+                :size="searchSize"
+                @click="restSearch"
+              >
+                重置
+              </el-button>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+
+    </ex-table>
+  </div>
+
+</template>
+<script>
+import mixinPage from '@/mixins/elPaginationHandle'
+import resToken from '@/mixins/resToken'
+import urlConfig from '@/apis/url-config'
+import asyncRequest from '@/apis/service/reportQuery/newReport'
+import periodDatePickerActive from './period-date-picker/main.vue'
+import { table7 } from './columns'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'SaleReport',
+  components: {
+    periodDatePickerActive
+  },
+  mixins: [mixinPage, resToken],
+  computed: {
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
+
+  },
+  data() {
+    return {
+      // 选中数组
+      changeList: [],
+      // 全局url
+      fileUrl: urlConfig.baseURL,
+      // loading
+      loading: false,
+      // 请求参数集合
+      parmValue: {
+        status: '', // 处理状态
+        start_date: '', // 起始时间
+        end_date: '', // 结束时间
+        // is_export:0,//是否导出0/1
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+
+      },
+      // 表格 - 数据集合
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格表头 - 列参数
+      table7: table7
+    }
+  },
+  mounted() {
+    this.searchList()
+  },
+
+  methods: {
+    // 初始化http请求
+    async searchList() {
+      if (
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+      this.loading = true
+
+      const res = await asyncRequest.saleexportthdata(this.parmValue)
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list
+        this.pageInfo.total = Number(res.data.count)
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(res.message)
+        this.tableData = []
+        this.pageInfo.total = 0
+      }
+      this.loading = false
+    },
+
+    // 重置
+    restSearch() {
+      this.parmValue = {
+        status: '', // 处理状态
+        start_date: '', // 新建起始时间
+        end_date: '', // 新建结束时间
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+        // is_export:0//是否导出0/1
+      }
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      }
+      this.searchList()
+    },
+
+    // 时间函数
+    async time(e) {
+      this.parmValue.start_date = e.startTime || ''
+      this.parmValue.end_date = e.endTime || ''
+      if (
+        (this.parmValue.start_date !== '' && this.parmValue.end_date === '') ||
+        (this.parmValue.start_date === '' && this.parmValue.end_date !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
+    },
+
+    // 选中触发函数
+    selection_change(e) {
+      const { list } = e
+      // 选中的数组集合
+      this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : []
+    },
+    // 导出文件
+    async download() {
+      // if(this.changeList.length<=0){
+      //   this.$message.warning("请选择有效数据")
+      //   return;
+      // }
+      const start_date = new Date(this.parmValue.start_date).valueOf()
+      const end_date = new Date(this.parmValue.end_date).valueOf()
+      const flag = end_date - start_date > 30 * 24 * 60 * 60 * 1000
+      if (this.parmValue.start_date != '' && this.parmValue.end_date != '') {
+        if (flag) {
+          this.$message.warning('导出文件的时间区间不能超过30天')
+          return
+        }
+      } else {
+        this.$message.warning('请选择导出文件的时间区间')
+        return
+      }
+      const model = JSON.parse(JSON.stringify(this.parmValue))
+      // model.is_export = 1;
+      if (!this.loading) {
+        this.loading = true
+        const httpType = `aplication/zip`
+        axios({
+          method: 'post',
+          url: this.fileUrl + 'admin/saleexportthdataexport',
+          responseType: 'blob',
+          data: model,
+          headers: {
+            // 'Content-Type': 'multipart/form-data',
+            // Accept: "application/vnd.ms-excel"
+            Accept: httpType
+          }
+        })
+          .then((res) => {
+            if (res && res.status === 200 && res.data) {
+              const url = window.URL.createObjectURL(
+                new Blob([res.data], {
+                  type: httpType
+                })
+              )
+              const link = document.createElement('a')
+              link.style.display = 'none'
+              link.href = url
+              const excelName = '退货明细表.zip'
+              link.setAttribute('download', excelName)
+              document.body.appendChild(link)
+              link.click()
+              link.remove()
+              window.URL.revokeObjectURL(url) // 释放掉blob对象
+              this.$message.success(`导出成功！`)
+              setTimeout(() => {
+                this.loading = false
+              }, 500)
+            } else {
+              this.$message.error(res.data.message)
+              setTimeout(() => {
+                this.loading = false
+              }, 500)
+            }
+          })
+          .catch((error) => {
+            console.log(error)
+            this.loading = false
+          })
+      }
+    }
+  }
+}
+</script>
+   <style lang="scss" scoped>
+.purchaseOrder {
+  // text-align: right;
+}
+</style>
+

src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -1,10 +1,10 @@
 
 const public_listCol = [
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
-    span: 24,
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    span: 24
   },
 
   // {
@@ -23,211 +23,204 @@ const public_listCol = [
   //   span: 7,
   // },
   {
-    prop: "company",
-    label: "业务企业名称",
-    _slot_: "company",
+    prop: 'company',
+    label: '业务企业名称',
+    _slot_: 'company'
   },
   {
-    prop: "good_img",
-    _slot_: "good_img",
-    label: "主图",
+    prop: 'good_img',
+    _slot_: 'good_img',
+    label: '主图'
   },
   {
-    prop: "good_info_img",
-    _slot_: "good_info_img",
-    label: "详情图",
+    prop: 'good_info_img',
+    _slot_: 'good_info_img',
+    label: '详情图'
   },
   {
-    prop: "cat",
-    label: "分类",
-    span: 8,
+    prop: 'cat',
+    label: '分类',
+    span: 8
   },
 
-
-
   {
-    prop: "creater",
-    label: "申请人",
-    span: 4,
+    prop: 'creater',
+    label: '申请人',
+    span: 4
   },
   {
-    prop: "platform_name",
-    label: "上线平台",
-    span: 6,
+    prop: 'platform_name',
+    label: '上线平台',
+    span: 6
   },
   {
-    prop: "online_time",
-    label: "上线时间",
-    span: 6,
+    prop: 'online_time',
+    label: '上线时间',
+    span: 6
   },
   {
-    prop: "online_reason",
-    label: "上线原因",
+    prop: 'online_reason',
+    label: '上线原因'
   },
 
   {
-    prop: "online_remark",
-    label: "上线备注",
-    span: 12,
+    prop: 'online_remark',
+    label: '上线备注',
+    span: 12
   },
   {
-    prop: "brand_name",
-    label: "品牌",
-    span: 6,
+    prop: 'brand_name',
+    label: '品牌',
+    span: 6
   },
 
-
-
   {
-    prop: "exclusive",
-    label: "专属类型",
-    _slot_: "exclusive",
-    span: 6,
+    prop: 'exclusive',
+    label: '专属类型',
+    _slot_: 'exclusive',
+    span: 6
   },
   {
-    prop: "weight",
-    label: "商品总克重",
+    prop: 'weight',
+    label: '商品总克重',
     append: 'g',
-    span: 6,
+    span: 6
   },
 
-
   {
-    prop: "packing_list",
-    label: "包装清单",
-    span: 6,
+    prop: 'packing_list',
+    label: '包装清单',
+    span: 6
   },
   {
-    prop: "packing_way",
-    label: "包装方式",
-    span: 6,
+    prop: 'packing_way',
+    label: '包装方式',
+    span: 6
   },
   {
-    prop: "packing_spec",
-    label: "装箱规格",
-    span: 6,
+    prop: 'packing_spec',
+    label: '装箱规格',
+    span: 6
   },
   {
-    prop: "packing_weight",
-    label: "装箱重量",
+    prop: 'packing_weight',
+    label: '装箱重量',
     append: 'g',
-    span: 6,
+    span: 6
   },
   {
-    prop: "packing_size",
-    label: "装箱尺寸",
-    span: 6,
+    prop: 'packing_size',
+    label: '装箱尺寸',
+    span: 6
   },
   {
-    prop: "origin_place_cn",
-    label: "产地",
-    span: 8,
+    prop: 'origin_place_cn',
+    label: '产地',
+    span: 8
   },
   {
-    prop: "unit",
-    label: "单位",
-    span: 4,
+    prop: 'unit',
+    label: '单位',
+    span: 4
   },
   {
-    prop: "good_bar",
-    label: "商品条形码",
-    span: 6,
+    prop: 'good_bar',
+    label: '商品条形码',
+    span: 6
   },
   {
-    prop: "supply_area",
-    label: "供货区域",
-    _slot_: "supply_area",
-    span: 6,
+    prop: 'supply_area',
+    label: '供货区域',
+    _slot_: 'supply_area',
+    span: 6
   },
   {
-    prop: "delivery_place_cn",
-    label: "发货地",
-    span: 8,
+    prop: 'delivery_place_cn',
+    label: '发货地',
+    span: 8
   },
   {
-    prop: "is_stock",
-    label: "是否库存品",
-    _slot_: "is_stock",
-    span: 4,
+    prop: 'is_stock',
+    label: '是否库存品',
+    _slot_: 'is_stock',
+    span: 4
   },
   {
-    prop: "exam_status",
-    label: "状态",
-    _slot_: "exam_status",
-    span: 6,
+    prop: 'exam_status',
+    label: '状态',
+    _slot_: 'exam_status',
+    span: 6
   },
   {
-    prop: "good_type",
-    label: "是否定制",
-    _slot_: "good_type",
+    prop: 'proof_id',
+    label: '凭证文件',
+    _slot_: 'proof_id',
     span: 6
   },
-
   {
-    prop: "addtime",
-    label: "创建时间",
-    span: 8,
+    prop: 'addtime',
+    label: '创建时间',
+    span: 8
   },
   {
-    prop: "tax",
-    label: "税点",
+    prop: 'tax',
+    label: '税点',
     append: '%',
-    span: 4,
+    span: 4
   },
 
   {
-    prop: "delivery_day",
-    label: "物流时间",
+    prop: 'delivery_day',
+    label: '物流时间',
     append: '天',
-    span: 4,
+    span: 4
   },
   {
-    prop: "lead_time",
-    label: "供货周期",
+    prop: 'lead_time',
+    label: '供货周期',
     append: '天',
     span: 4
   },
- 
+
   {
-    prop: "noble",
-    label: "贵金属信息",
-    _slot_: "noble",
-    span: 16,
+    prop: 'noble',
+    label: '贵金属信息',
+    _slot_: 'noble',
+    span: 16
   },
   {
-    prop: "sample_day",
-    label: "调样周期",
+    prop: 'sample_day',
+    label: '调样周期',
     append: '天',
-    span: 4,
+    span: 4
   },
   {
-    prop: "stock_moq",
-    label: "备库起订量",
-    span: 4,
+    prop: 'stock_moq',
+    label: '备库起订量',
+    span: 4
   },
   {
-    prop: "good_remark",
-    label: "商品备注",
-    span: 16,
+    prop: 'good_remark',
+    label: '商品备注',
+    span: 16
   },
-
-
   {
-    prop: "after_sales",
-    label: "售后说明",
-    span: 24,
+    prop: 'good_type',
+    label: '是否定制',
+    _slot_: 'good_type',
+    span: 24
   },
-
-
-
   {
-    prop: "craft_desc",
-    label: "工艺说明",
-    span: 24,
+    prop: 'after_sales',
+    label: '售后说明',
+    span: 24
   },
 
-
-
+  {
+    prop: 'craft_desc',
+    label: '工艺说明',
+    span: 24
+  }
 
 ]
 const purchase_listCol = [
@@ -242,69 +235,67 @@ const purchase_listCol = [
   //   span: 7,
   // },
   {
-    prop: "supplierName",
-    label: "供应商名称",
-    _slot_: "supplierName",
-    span: 12,
+    prop: 'supplierName',
+    label: '供应商名称',
+    _slot_: 'supplierName',
+    span: 12
   },
   {
-    prop: "cgd_gold_price",
-    label: "供应商采购金价",
+    prop: 'cgd_gold_price',
+    label: '供应商采购金价',
     append: '元/g',
-    span: 6,
+    span: 6
   },
 
   {
-    prop: "is_auth",
-    label: "供应商权限",
-    _slot_: "is_auth",
-    span: 6,
+    prop: 'is_auth',
+    label: '供应商权限',
+    _slot_: 'is_auth',
+    span: 6
   },
   {
-    prop: "is_step",
-    label: "启用成本阶梯",
-    _slot_: "is_step",
-    span: 4,
+    prop: 'is_step',
+    label: '启用成本阶梯',
+    _slot_: 'is_step',
+    span: 4
   },
   {
-    prop: "demo_fee",
-    label: "打样费(元)",
-    span: 5,
+    prop: 'demo_fee',
+    label: '打样费(元)',
+    span: 5
   },
   {
-    prop: "open_fee",
-    label: "开模费(元/件)",
-    span: 5,
+    prop: 'open_fee',
+    label: '开模费(元/件)',
+    span: 5
   },
 
   {
-    prop: "sample_fee",
-    label: "调样费(元)",
-    span: 5,
-  },
-  {
-    prop: "market_price",
-    label: "市场价(元)",
-    span: 5,
+    prop: 'sample_fee',
+    label: '调样费(元)',
+    span: 5
   },
- 
-  
   {
-    prop: "nakelist",
-    label: "采购起订量",
-    _slot_: "nakelist",
-    span: 24,
+    prop: 'market_price',
+    label: '市场价(元)',
+    span: 5
   },
 
+  {
+    prop: 'nakelist',
+    label: '采购起订量',
+    _slot_: 'nakelist',
+    span: 24
+  }
 
 ]
 const sale_listCol = [
   {
-    prop: "ladderlist",
-    label: "销售起订量",
-    _slot_: "ladderlist",
-    span: 24,
-  },
+    prop: 'ladderlist',
+    label: '销售起订量',
+    _slot_: 'ladderlist',
+    span: 24
+  }
 ]
 
-export { public_listCol, purchase_listCol, sale_listCol }
+export { public_listCol, purchase_listCol, sale_listCol }

src/views/goodStore/goodsOnline/detail.vue

@@ -11,6 +11,42 @@
                 :sitem="sitem"
                 :columns="public_listCol"
               >
+                <template slot="proof_id">
+                  <el-popover
+                    placement="top"
+                    width="300"
+                    trigger="hover"
+                    v-if="sitem.proof.proof_type === '1'"
+                  >
+                    <video width="275" controls class="fl">
+                      <source :src="sitem.proof.proof_url" type="video/mp4" />
+                      <source :src="sitem.proof.proof_url" type="video/avi" />
+                      您的浏览器不支持Video标签。
+                    </video>
+                    <i
+                      class="el-icon-video-camera-solid hover"
+                      style="font-size: 18px"
+                      slot="reference"
+                    ></i>
+                  </el-popover>
+
+                  <img
+                    v-else-if="sitem.proof.proof_type + '' === '2'"
+                    style="width: 23px; height: 23px"
+                    :src="sitem.proof.proof_url"
+                    class="avatar fl hover"
+                    v-viewer
+                  />
+
+                  <a
+                    v-else-if="sitem.proof.proof_type + '' === '3'"
+                    :href="sitem.proof.proof_url"
+                    download="凭证文件"
+                    >点击下载</a
+                  >
+                  <span v-else>暂无凭证</span>
+                </template>
+                
                 <template slot="good_name">
                   <img
                     v-viewer

src/views/reportQuery/purchaseReport/index.vue

@@ -25,9 +25,9 @@
         <el-tab-pane label="订单明细报表" name="table7"
           ><table7 v-if="activeName == 'table7'"></table7
         ></el-tab-pane>
-        <el-tab-pane label="售后明细报表" name="table8"
+        <!-- <el-tab-pane label="售后明细报表" name="table8"
           ><table8 v-if="activeName == 'table8'"></table8
-        ></el-tab-pane>
+        ></el-tab-pane> -->
         <el-tab-pane label="每日录入供应商报表" name="table9"
           ><table9 v-if="activeName == 'table9'"></table9
         ></el-tab-pane>

src/views/reportQuery/saleReport/index.vue

@@ -19,9 +19,9 @@
         <el-tab-pane label="未签收报表" name="table5">
           <table5 v-if="activeName == 'table5'"></table5>
         </el-tab-pane>
-        <el-tab-pane label="售后报表" name="table6">
+        <!-- <el-tab-pane label="售后报表" name="table6">
           <table6 v-if="activeName == 'table6'"></table6>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane label="产品热销排行" name="table7">
           <table7 v-if="activeName == 'table7'"></table7>
         </el-tab-pane>
@@ -33,12 +33,12 @@
         <el-tab-pane label="工差明细表" name="table11">
           <table11 v-if="activeName == 'table11'"></table11>
         </el-tab-pane>
-        <el-tab-pane label="退货明细表" name="table12">
+        <!-- <el-tab-pane label="退货明细表" name="table12">
           <table12 v-if="activeName == 'table12'"></table12>
         </el-tab-pane>
         <el-tab-pane label="售后明细表" name="table13">
           <table13 v-if="activeName == 'table13'"></table13>
-        </el-tab-pane>
+        </el-tab-pane> -->
         <el-tab-pane label="议价明细表" name="table14">
           <table14 v-if="activeName == 'table14'"></table14>
         </el-tab-pane>

src/views/reportQuery/saleReportOrder/addEdit.vue

@@ -36,8 +36,7 @@
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
-                >
-                </el-option>
+                />
               </el-select>
             </el-form-item>
             <el-form-item label="数据时间" prop="start">
@@ -62,12 +61,14 @@
                 : '报表会在明天01:00开始生成'
             "
             type="warning"
-          >
-          </el-alert>
+          />
         </el-col>
         <el-col :span="12" style="text-align: right">
-          <el-button v-if="!isDetail" type="primary" @click="submitForm"
-            >保 存
+          <el-button
+            v-if="!isDetail"
+            type="primary"
+            @click="submitForm"
+          >保 存
           </el-button>
           <el-button @click="showModelThis = false">{{
             isDetail ? "关 闭" : "取 消"
@@ -78,38 +79,38 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/reportQuery/financeReport/index.js";
-import resToken from "@/mixins/resToken";
-import PeriodDatePicker from "./components/PeriodDatePicker";
+import asyncRequest from '@/apis/service/reportQuery/financeReport/index.js'
+import resToken from '@/mixins/resToken'
+import PeriodDatePicker from './components/PeriodDatePicker'
 export default {
-  name: "saleReportOrder",
-  props: ["showModel", "sitem", "type"],
-  mixins: [resToken],
+  name: 'SaleReportOrder',
   components: {
-    PeriodDatePicker,
+    PeriodDatePicker
   },
+  mixins: [resToken],
+  props: ['showModel', 'sitem', 'type'],
 
   data() {
     const validateTime = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("数据开始时间不能为空！"));
+      if (value === '') {
+        callback(new Error('数据开始时间不能为空！'))
       } else {
-        if (this.ruleForm.end === "") {
-          callback(new Error("数据结束时间不能为空！"));
+        if (this.ruleForm.end === '') {
+          callback(new Error('数据结束时间不能为空！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     return {
       options: [],
       loading: false,
-      title: "添加账号",
+      title: '添加账号',
       showModelThis: this.showModel,
       ruleForm: {
-        start: "",
-        end: "",
-        id: "",
+        start: '',
+        end: '',
+        id: ''
       },
       rulesThis: this.rules,
       rules: {
@@ -117,109 +118,109 @@ export default {
           {
             required: true,
             validator: validateTime,
-            trigger: "change",
-          },
+            trigger: 'change'
+          }
         ],
         id: [
           {
             required: true,
-            message: "请选择业务表！",
-            trigger: "change",
-          },
-        ],
-      },
-    };
+            message: '请选择业务表！',
+            trigger: 'change'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     closeModel() {
-      console.log("closeModel!!");
+      console.log('closeModel!!')
     },
     async initForm() {
-      this.loading = true;
-      this.options = [];
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
+      this.loading = true
+      this.options = []
+      this.rulesThis = this.rules
+      await this.resetForm()
+      this.loading = false
     },
     async timeReturned(e) {
-      if (e.startTime !== "") {
-        this.ruleForm.start = e.startTime;
+      if (e.startTime !== '') {
+        this.ruleForm.start = e.startTime
       } else {
-        this.ruleForm.start = "";
+        this.ruleForm.start = ''
       }
-      if (e.endTime !== "") {
-        this.ruleForm.end = e.endTime;
+      if (e.endTime !== '') {
+        this.ruleForm.end = e.endTime
       } else {
-        this.ruleForm.end = "";
+        this.ruleForm.end = ''
       }
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          const { start, end, id, name } = this.sitem;
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          const { start, end, id, name } = this.sitem
           // console.log(this.sitem);
           this.options = [
             {
               value: id,
-              label: name,
-            },
-          ];
+              label: name
+            }
+          ]
           this.ruleForm = {
-            start: "",
-            end: "",
-            id: id || "",
-          };
-          console.log(this.ruleForm);
+            start: '',
+            end: '',
+            id: id || ''
+          }
+          console.log(this.ruleForm)
         }
-      });
+      })
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          this.loading = true;
-          const model = JSON.parse(JSON.stringify(this.ruleForm));
-          let res = await asyncRequest.add(model);
-          this.loading = false;
+          this.loading = true
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          const res = await asyncRequest.add(model)
+          this.loading = false
           if (res && res.code === 0) {
             this.$notify.success({
-              title: "需求创建成功！",
-              message: "",
-            });
-            this.showModelThis = false;
+              title: '需求创建成功！',
+              message: ''
+            })
+            this.showModelThis = false
             // 刷新
-            this.$emit("refresh");
+            this.$emit('refresh')
           } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(res.message)
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
    <style lang="scss" scoped>