build

src/views/businessReportQuery/businessFinanceReport/addEdit.vue

@@ -1,37 +1,63 @@
 <template>
-  <el-dialog v-loading="loading" :title="'修改表格需求'" :center="true" align="left" top="25vh" width="600px"
-    :close-on-click-modal="false" :visible.sync="showModelThis" element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" @close="closeModel">
+  <el-dialog
+    v-loading="loading"
+    :title="'修改表格需求'"
+    :center="true"
+    align="left"
+    top="25vh"
+    width="600px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="closeModel"
+  >
     <el-card style="margin: -20px 0 0 0">
       <el-row :gutter="10">
         <el-col :span="24">
-          <el-form ref="ruleForm" :model="ruleForm" status-icon :rules="rulesThis" label-width="90px"
-            class="demo-ruleForm">
+          <el-form
+            ref="ruleForm"
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            label-width="90px"
+            class="demo-ruleForm"
+          >
             <el-form-item label="业务表" prop="id">
               <el-select v-model="ruleForm.id" style="width: 100%" disabled placeholder="请选择业务表">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="数据时间" prop="start">
-              <period-date-picker :start="ruleForm.start" :end="ruleForm.end" :type="type" :width="'199px'"
-                :size="searchSize" @timeReturned="timeReturned($event)" />
+              <period-date-picker
+                :start="ruleForm.start"
+                :end="ruleForm.end"
+                :type="type"
+                :width="'199px'"
+                :size="searchSize"
+                @timeReturned="timeReturned($event)"
+              />
             </el-form-item>
           </el-form>
         </el-col>
         <el-col :span="12" style="text-align: right">
-          <el-alert style="width: 230px" :closable="false" :title="
-            type === '2'
-              ? '报表会在提交后开始执行！'
-              : '报表会在明天01:00开始生成'
-          " type="warning">
-          </el-alert>
+          <el-alert
+            style="width: 230px"
+            :closable="false"
+            :title="
+              type === '2'
+                ? '报表会在提交后开始执行！'
+                : '报表会在明天01:00开始生成'
+            "
+            type="warning"
+          />
         </el-col>
         <el-col :span="12" style="text-align: right">
           <el-button v-if="!isDetail" type="primary" @click="submitForm">保 存
           </el-button>
           <el-button @click="showModelThis = false">{{
-          isDetail ? "关 闭" : "取 消"
+            isDetail ? "关 闭" : "取 消"
           }}</el-button>
         </el-col>
       </el-row>
@@ -39,38 +65,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: "financeReport",
-  props: ["showModel", "sitem", "type"],
-  mixins: [resToken],
+  name: 'FinanceReport',
   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: {
@@ -78,123 +104,123 @@ 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)
         }
-      });
+      })
     },
     getDiffDay(date_1, date_2) {
       // 计算两个日期之间的差值
       let totalDays, diffDate
-      let myDate_1 = Date.parse(date_1)
-      let myDate_2 = Date.parse(date_2)
+      const myDate_1 = Date.parse(date_1)
+      const myDate_2 = Date.parse(date_2)
       // 将两个日期都转换为毫秒格式，然后做差
       diffDate = Math.abs(myDate_1 - myDate_2) // 取相差毫秒数的绝对值
       totalDays = Math.floor(diffDate / (1000 * 3600 * 24)) // 向下取整
-      return totalDays    // 相差的天数
+      return totalDays // 相差的天数
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          const model = JSON.parse(JSON.stringify(this.ruleForm));
-          const diffDays = this.getDiffDay(model.start,model.end);
-          if(diffDays > 30) return this.$message.warning('数据时间间隔不能超过30天');
-          
-          this.loading = true;
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          const diffDays = this.getDiffDay(model.start, model.end)
+          if (diffDays > 30) return this.$message.warning('数据时间间隔不能超过30天')
 
-          let res = await asyncRequest.add(model);
-          this.loading = false;
+          this.loading = true
+
+          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/serviceParam/paymentChannelGrossProfit/addEditRate.vue

@@ -43,7 +43,6 @@
                 maxlength="20"
               />
             </el-form-item>
-
             <el-form-item label="支付渠道毛利率" prop="rate" label-width="125px">
               <digital-input
                 :values="ruleForm['rate']"

src/views/serviceParam/paymentChannelGrossProfit/index.vue

@@ -290,7 +290,6 @@ export default {
       await isCategory ? this.onSearchcategorylist() : this.onSearchPaymentChannelGrossProfit()
     },
     handleSelectChange(rows){
-      console.log(rows)
       this.$refs.paymentChannelRef && this.$refs.paymentChannelRef.clearSelection();
       const selectedRow = rows.length > 0 ? rows[0] : null
       this.$refs.paymentChannelRef && selectedRow && this.$refs.paymentChannelRef.toggleRowSelection(selectedRow)
@@ -413,11 +412,6 @@ export default {
     async onSearchcategorylist(){
       if (this.loading) return;
 
-      // if (!this.currentCompany) {
-      //   this.$message.warning("请选择公司！");
-      //   return;
-      // }       
-
       this.parmValue.companyNo = this.currentCompany;
       this.loadings.category = true;
       
@@ -447,7 +441,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-        
 .table__wrapper{
   display: flex;
   width: 100%;

src/views/serviceParam/paymentChannelManage/addEditRate.vue

@@ -64,9 +64,9 @@
 
 <script>
 import asyncRequest from '@/apis/service/serviceParam/paymentChannelManage'
+import { actionTypes } from '@/utils/actionType'
 import companyHelper from '@/mixins/companyHelper'
 import resToken from '@/mixins/resToken'
-import { actionTypes } from '@/utils/actionType'
 
 export default {
   name: 'Sort',

src/views/youzan/luckyDraw/detail.vue

@@ -2,24 +2,24 @@
   <div class="activeDetail">
     <div class="activeDetail-main">
       <el-tabs v-model="activeTabs">
-        <el-tab-pane label="新建抽奖活动" name="0" v-if="queryType === 'add'">
+        <el-tab-pane v-if="queryType === 'add'" label="新建抽奖活动" name="0">
           <base-form
             v-if="newTime !== ''"
-            :type="queryType"
             :id="queryId"
-            :newTime="newTime"
+            :type="queryType"
+            :new-time="newTime"
             :sitem="sitem"
             @refresh="refresh"
           />
         </el-tab-pane>
-        <el-tab-pane label="抽奖活动编辑" name="1" v-if="queryType === 'edit'">
+        <el-tab-pane v-if="queryType === 'edit'" label="抽奖活动编辑" name="1">
           <el-collapse v-model="activeNames1" style="margin: -18px 0 0 0">
             <el-collapse-item title="抽奖活动详情" name="0">
               <base-form
                 v-if="newTime !== ''"
-                :type="queryType"
                 :id="queryId"
-                :newTime="newTime"
+                :type="queryType"
+                :new-time="newTime"
                 :sitem="sitem"
                 @refresh="refresh"
               />
@@ -27,21 +27,21 @@
             <el-collapse-item title="商品详情" name="0">
               <edit-good
                 v-if="newTime !== ''"
-                :type="queryType"
                 :id="queryId"
-                :newTime="newTime"
+                :type="queryType"
+                :new-time="newTime"
                 @refresh="refresh"
               />
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
-        <el-tab-pane label="抽奖活动详情" name="2" v-if="queryType == 'view'">
+        <el-tab-pane v-if="queryType == 'view'" label="抽奖活动详情" name="2">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
             <el-collapse-item title="抽奖活动详情" name="0">
               <show-data-table
+                v-if="status"
                 style="margin: 0; padding: 0"
                 :sitem="sitem"
-                v-if="status"
                 :columns="showColumns"
               >
                 <template slot="status">
@@ -51,7 +51,7 @@
                       (statusOptions.find((item) => item.id == sitem.status) || {})
                         .label || '--'
                     "
-                  ></el-tag>
+                  />
                 </template>
                 <template slot="time">
                   {{ sitem.startTime }}~{{ sitem.endTime }}
@@ -64,20 +64,20 @@
             <el-collapse-item title="商品详情" name="0">
               <good
                 v-if="newTime !== ''"
-                :type="queryType"
                 :id="queryId"
-                :newTime="newTime"
+                :type="queryType"
+                :new-time="newTime"
                 @refresh="refresh"
               />
             </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
-        <el-tab-pane label="审批记录" name="3" v-if="queryType == 'view'">
+        <el-tab-pane v-if="queryType == 'view'" label="审批记录" name="3">
           <process-time-line
             v-if="newTime !== ''"
-            :newTime="newTime"
+            :new-time="newTime"
             :type="'HD'"
-            :orderCode="queryId"
+            :order-code="queryId"
           />
         </el-tab-pane>
       </el-tabs>
@@ -88,23 +88,23 @@
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/youzan/luckDraw";
-import resToken from "@/mixins/resToken";
-import { mapGetters } from "vuex";
-import baseForm from "./components/add";
-import good from "./components/good";
-import editGood from "./components/editGood";
-import { showColumns, statusOptions } from "./columns";
+import asyncRequest from '@/apis/service/youzan/luckDraw'
+import resToken from '@/mixins/resToken'
+import { mapGetters } from 'vuex'
+import baseForm from './components/add'
+import good from './components/good'
+import editGood from './components/editGood'
+import { showColumns, statusOptions } from './columns'
 export default {
-  name: "activeDetail",
-  mixins: [resToken],
+  name: 'ActiveDetail',
   components: {
     baseForm,
     good,
-    editGood,
+    editGood
   },
+  mixins: [resToken],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
 
     // powers() {
     //   const tran =
@@ -123,105 +123,105 @@ export default {
   data() {
     return {
       statusList: [],
-      size: "small",
-      activeTabs: "1",
-      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-      activeNames1: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-      newTime: "",
+      size: 'small',
+      activeTabs: '1',
+      activeNames: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
+      activeNames1: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'],
+      newTime: '',
       loading: false,
-      queryId: "",
-      queryType: "",
-      status: "",
+      queryId: '',
+      queryType: '',
+      status: '',
       sitem: null,
       showColumns,
-      statusOptions,
-    };
+      statusOptions
+    }
   },
   mounted() {
-    this.initForm();
+    this.initForm()
   },
   methods: {
     async initForm() {
-      const { id, type } = this.$route.query;
-      this.queryId = id;
-      this.queryType = type;
-      this.activeTabs = type === "add" ? "0" : type === "edit" ? "1" : "2";
-      this.loading = true;
-      if (this.queryType === "add") {
-        this.sitem = {};
-        this.getNewTime();
+      const { id, type } = this.$route.query
+      this.queryId = id
+      this.queryType = type
+      this.activeTabs = type === 'add' ? '0' : type === 'edit' ? '1' : '2'
+      this.loading = true
+      if (this.queryType === 'add') {
+        this.sitem = {}
+        this.getNewTime()
       } else {
-        await this.initData();
+        await this.initData()
       }
 
-      this.loading = false;
+      this.loading = false
     },
     // 点击业务审核的保存按钮
 
     async examForm(e) {
-      console.log(e);
+      console.log(e)
       if (!this.loading) {
-        let model = {
+        const model = {
           activity_code: this.queryId,
-          status: e.state + '' === "1" ? "1" : "8",
-          remark: e.remark,
-        };
-        await this.setstatus("提交产品部门审核", model);
+          status: e.state + '' === '1' ? '1' : '8',
+          remark: e.remark
+        }
+        await this.setstatus('提交产品部门审核', model)
       }
     },
     async setstatus(detail, model) {
       await this.$confirm(`确定要${detail}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
-        .then(async () => {
-          let res = await asyncRequest.actstatus(model);
+        .then(async() => {
+          const res = await asyncRequest.actstatus(model)
           if (res && res.code === 0) {
             this.$notify.success({
-              title: "提交成功！",
-              message: "",
-            });
-            await this.initForm();
+              title: '提交成功！',
+              message: ''
+            })
+            await this.initForm()
           } 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)
           }
         })
         .catch(() => {
-          console.log("取消");
-        });
+          console.log('取消')
+        })
     },
     handleClick(row) {
-      console.log(row);
+      console.log(row)
     },
     refresh(e) {
-      this.routeReGoto("active", {});
+      this.routeReGoto('active', {})
     },
     async initData() {
-      this.loading = true;
+      this.loading = true
       const { code, message, data } = await asyncRequest.detail({
-        actCode: this.queryId,
-      });
-      this.loading = false;
+        actCode: this.queryId
+      })
+      this.loading = false
       if (code === 0) {
-        this.sitem = JSON.parse(JSON.stringify(data));
-        const { status } = this.sitem;
-        this.status = status;
-        this.getNewTime();
+        this.sitem = JSON.parse(JSON.stringify(data))
+        const { status } = this.sitem
+        this.status = status
+        this.getNewTime()
       } else if (code >= 100 && code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(message);
+        this.$message.warning(message)
       }
     },
     getNewTime() {
-      this.newTime = new Date().valueOf();
-      console.log(this.newTime);
-    },
-  },
-};
+      this.newTime = new Date().valueOf()
+      console.log(this.newTime)
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .activeDetail {