build

src/views/serviceParam/paymentChannelGrossProfit/addEditRate.vue

@@ -61,18 +61,19 @@
             </el-form-item>
           </el-form>
         </el-col>
-
-        <el-col :span="24" style="text-align: right">
-          <el-button
-            v-if="id !== '007' && !isDetail"
-            type="primary"
-            :size="'small'"
-            @click="submitForm"
-          >保 存
-          </el-button>
-          <el-button :size="'small'" @click="showModelThis = false">{{
-            id == "007" ? "关 闭" : "取 消"
-          }}</el-button>
+        <el-col :span="24" style="text-align: right;">
+          <div class="fr">
+            <el-button
+              v-if="id !== '007' && !isDetail"
+              type="primary"
+              :size="'small'"
+              @click="submitForm"
+            >保 存
+            </el-button>
+            <el-button :size="'small'" @click="showModelThis = false">{{
+              id == "007" ? "关 闭" : "取 消"
+            }}</el-button>
+          </div>
         </el-col>
       </el-row>
     </el-card>

src/views/serviceParam/paymentChannelGrossProfit/index.vue

@@ -1,23 +1,5 @@
 <template>
-           <!--   <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-              <el-button type="primary" :size="searchSize" @click="searchList">
-                刷新
-              </el-button>
-            </el-col>
-            <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-              <el-button type="warning" :size="searchSize" @click="restSearch">
-                重置
-              </el-button>
-            </el-col>
-          </el-row>
-          <el-row>
-              <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
-              <el-button type="primary" :size="searchSize" @click=" setRate({}, actionTypes.CREATE)">
-                新建
-              </el-button>
-            </el-col> -->
-
-  <div class="sort pagePadding" style="padding-right: 20px;">
+ <div class="sort pagePadding" style="padding-right: 20px;">
      <div class="table__wrapper" v-if="powers.some((i) => i == '001')">
       <ex-table
         ref="paymentChannelRef"
@@ -47,7 +29,6 @@
             <el-radio  v-model="selectedRow" :label="scope.row"><i></i></el-radio>
         </template>
 
-
         <template #table-header="{}">
           <div style="width: 100%">
               <div style="display:inline-flex;align-items: center;">
@@ -408,13 +389,11 @@ export default {
       // }       
       // companyNo:this.currentCompany
 
-
       this.loadings.paymentChannel = true;
       const { code, data } = await asyncRequest.paymentChannelList({
         ...this.parmValue.paymentChannel,
       });
 
-
       if (code === 0) {
        const { list, count } = data ?? {};
        this.datas.paymentChannel = list ?? [];

src/views/serviceParam/paymentChannelManage/addEditRate.vue

@@ -140,12 +140,10 @@ export default {
         }
       })
     },
-
     rate_change(e, key) {
       this.ruleForm[key] = e + ''
       this.$refs.ruleForm.validateField(key)
     },
-
     async companyNosearchChange(e) {
       const { id, code, label } = e
       this.ruleForm['companyNo'] = code || ''

src/views/serviceParam/paymentChannelManage/index.vue

@@ -158,7 +158,7 @@
         </el-tooltip>
       </template>
     </ex-table>
-
+    
     <no-auth v-else />
 
     <!-- 弹窗 新增/修改 -->
@@ -178,7 +178,6 @@ import asyncRequest from "@/apis/service/serviceParam/paymentChannelManage";
 import { statusList } from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
-// import companyHelper from "@/mixins/companyHelper";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import privateField from "@/mixins/privateField";
@@ -197,7 +196,6 @@ export default {
       const { btnList } = this.$store.getters;
       const tran = btnList.find((i) => i.menu_route == "paymentChannelManage") || {};
       const { action } = tran ?? {};
-      console.log(action)
       return action ?? [];
     },
   },

src/views/supplierSellOut/supplierFiling/config/rules.js

@@ -1,233 +1,232 @@
-import { hasSpace, isAddr, isChinese, isEmoticon, isMobile, isnumber, isSpecialSymbol } from "@/utils/validate";
+import { hasSpace, isAddr, isChinese, isEmoticon, isMobile, isnumber, isSpecialSymbol } from '@/utils/validate'
 
 export const addressRules = {
   receipt_quantity: [
     {
       required: true,
-      trigger: "blur",
+      trigger: 'blur',
       validator: (rule, value, callback) => {
-        if (value === "") {
-          callback(new Error("不能为空!"));
+        if (value === '') {
+          callback(new Error('不能为空!'))
         } else {
           if (!isnumber(value)) {
-            callback(new Error("仅支持整数!"));
+            callback(new Error('仅支持整数!'))
           } else {
-            callback();
+            callback()
           }
         }
-      },
-    },
+      }
+    }
   ],
 
   contactor: [
     {
       required: true,
-      trigger: "blur",
+      trigger: 'blur',
       validator: (rule, value, callback) => {
-        if (value === "") {
-          callback(new Error("联系人不能为空！"));
+        if (value === '') {
+          callback(new Error('联系人不能为空！'))
         } else {
           if (value.length < 2 || value.length > 10) {
-            callback(new Error("联系人规则为2~10位汉字！"));
+            callback(new Error('联系人规则为2~10位汉字！'))
           } else {
             if (!isChinese(value)) {
-              callback(new Error("联系人规则为2~10位汉字！"));
+              callback(new Error('联系人规则为2~10位汉字！'))
             } else if (isEmoticon(value)) {
-              callback(new Error("联系人规则为2~10位汉字！"));
+              callback(new Error('联系人规则为2~10位汉字！'))
             } else {
-              callback();
+              callback()
             }
           }
         }
       }
-    },
+    }
   ],
 
   mobile: [
     {
       required: true,
       validator: (rule, value, callback) => {
-        if (value === "") {
-          callback(new Error("手机号不能为空！"));
+        if (value === '') {
+          callback(new Error('手机号不能为空！'))
         } else {
           if (!isMobile(value)) {
-            callback(new Error("手机号格式不正确！"));
+            callback(new Error('手机号格式不正确！'))
           } else {
-            callback();
+            callback()
           }
         }
       },
-      trigger: "blur",
-    },
+      trigger: 'blur'
+    }
   ],
 
   addr_code: [
     {
-      type: "array",
+      type: 'array',
       required: false,
-      message: "收货省市区不能为空",
-      trigger: "change",
-    },
+      message: '收货省市区不能为空',
+      trigger: 'change'
+    }
   ],
-  
+
   addr: [
     {
       required: true,
-      trigger: "blur",
+      trigger: 'blur',
       validator: (rule, value, callback) => {
-        if (value === "") {
-          callback(new Error("详细地址不能为空！"));
+        if (value === '') {
+          callback(new Error('详细地址不能为空！'))
         } else {
           if (hasSpace(value)) {
-            callback(new Error("不能出现回车/换行符！"));
+            callback(new Error('不能出现回车/换行符！'))
           } else if (isSpecialSymbol(value)) {
-            callback(new Error("不能使用英文特殊字符！"));
+            callback(new Error('不能使用英文特殊字符！'))
           } else if (isAddr(value)) {
-            callback();
+            callback()
           } else {
-            callback(new Error("详细地址填写不规范！"));
+            callback(new Error('详细地址填写不规范！'))
           }
         }
       }
-    },
-  ],
-};
-
+    }
+  ]
+}
 
 export const createRules = {
-  customerCode:{
-    required:true,
-    message:'业务公司不能为空',
-    trigger:'blur'
-  },
-  companyName:{
-    required:true,
-    message:'客户名称不能为空',
-    trigger:'blur'
-  },
-  num:{
-    required:true,
-    message:'销售数量不能为空',
-    trigger:'blur'
-  },
-  is_determine_price:{
-    required:true,
-    message:'销售价不能为空',
-    trigger:'blur'
-  },
-  price:{
-    required:true,
-    message:'采购价不能为空',
-    trigger:'blur'
-  },
-  service_proportion:{
-    required:true,
-    message:'服务费比例不能为空',
-    trigger:'blur'
-  },
-  expect_service:{
-    required:true,
-    message:'期望服务费不能为空',
-    trigger:'blur'
-  },
-  brand_id:{
-    required:true,
-    message:'请选择品牌',
-    trigger:'blur'
-  },
-  preservation_day:{
-    required:true,
-    message:'有效期不能为空',
-    trigger:'blur'
-  },
-  delivery_day:{
-    required:true,
-    message:'物流时间不能为空',
-    trigger:'blur'
-  },
-  make_day:{
-    required:true,
-    message:'生产工期不能为空',
-    trigger:'blur'
-  },
-  tax:{
-    required:true,
-    message:'税点不能为空',
-    trigger:'blur'
-  },
-  unit_id:{
-    required:true,
-    message:'请选择单位',
-    trigger:'blur'
-  },
-  cat_id:{
-    required:true,
-    message:'请选择分类',
-    trigger:'blur'
-  },
-  spec_list:{
-    required:true,
-    message:'请选择规格',
-    trigger:'blur'
-  },
-  good_name:{
-    required:true,
-    message:'商品名称不能为空',
-    trigger:'blur'
-  },
-  delivery_place:{
-    required:true,
-    message:'发货地不能为空',
-    trigger:'blur'
-  },
-  origin_place:{
-    required:true,
-    message:'产地不能为空',
-    trigger:'blur'
-  },
-  weight:{
-    required:true,
-    message:'总重量不能为空',
-    trigger:'blur'
-  },
-  supply_area:{
-    required:true,
-    message:'请选择供货区域',
-    trigger:'blur'
-  },
-  pay_way:{
-    required:true,
-    message:'请选择付款方式',
-    trigger:'blur'
-  },
-  config:{
-    required:true,
-    message:'配置要求不能为空',
-    trigger:'blur'
-  },
-  other_config:{
-    required:true,
-    message:'其他配置要求不能为空',
-    trigger:'blur'
-  },
-  remark:{
-    required:true,
-    message:'采购备注不能为空',
-    trigger:'blur'
-  },
-  cost_desc:{
-    required:true,
-    message:'工艺说明不能为空',
-    trigger:'blur'
-  },
-  good_img:{
-    required:true,
-    message:'请上传商品图片',
-    trigger:'blur'
-  },
-  supplierNo:{
-    required:true,
-    message:'供应商不能为空',
-    trigger:'blur'
+  customerCode: {
+    required: true,
+    message: '业务公司不能为空',
+    trigger: 'blur'
+  },
+  companyName: {
+    required: true,
+    message: '客户名称不能为空',
+    trigger: 'blur'
+  },
+  num: {
+    required: true,
+    message: '销售数量不能为空',
+    trigger: 'blur'
+  },
+  is_determine_price: {
+    required: true,
+    message: '销售价不能为空',
+    trigger: 'blur'
+  },
+  price: {
+    required: true,
+    message: '采购价不能为空',
+    trigger: 'blur'
+  },
+  service_proportion: {
+    required: true,
+    message: '服务费比例不能为空',
+    trigger: 'blur'
+  },
+  expect_service: {
+    required: true,
+    message: '期望服务费不能为空',
+    trigger: 'blur'
+  },
+  brand_id: {
+    required: true,
+    message: '请选择品牌',
+    trigger: 'blur'
+  },
+  preservation_day: {
+    required: true,
+    message: '有效期不能为空',
+    trigger: 'blur'
+  },
+  delivery_day: {
+    required: true,
+    message: '物流时间不能为空',
+    trigger: 'blur'
+  },
+  make_day: {
+    required: true,
+    message: '生产工期不能为空',
+    trigger: 'blur'
+  },
+  tax: {
+    required: true,
+    message: '税点不能为空',
+    trigger: 'blur'
+  },
+  unit_id: {
+    required: true,
+    message: '请选择单位',
+    trigger: 'blur'
+  },
+  cat_id: {
+    required: true,
+    message: '请选择分类',
+    trigger: 'blur'
+  },
+  spec_list: {
+    required: true,
+    message: '请选择规格',
+    trigger: 'blur'
+  },
+  good_name: {
+    required: true,
+    message: '商品名称不能为空',
+    trigger: 'blur'
+  },
+  delivery_place: {
+    required: true,
+    message: '发货地不能为空',
+    trigger: 'blur'
+  },
+  origin_place: {
+    required: true,
+    message: '产地不能为空',
+    trigger: 'blur'
+  },
+  weight: {
+    required: true,
+    message: '总重量不能为空',
+    trigger: 'blur'
+  },
+  supply_area: {
+    required: true,
+    message: '请选择供货区域',
+    trigger: 'blur'
+  },
+  pay_way: {
+    required: true,
+    message: '请选择付款方式',
+    trigger: 'blur'
+  },
+  config: {
+    required: true,
+    message: '配置要求不能为空',
+    trigger: 'blur'
+  },
+  other_config: {
+    required: true,
+    message: '其他配置要求不能为空',
+    trigger: 'blur'
+  },
+  remark: {
+    required: true,
+    message: '采购备注不能为空',
+    trigger: 'blur'
+  },
+  cost_desc: {
+    required: true,
+    message: '工艺说明不能为空',
+    trigger: 'blur'
+  },
+  good_img: {
+    required: true,
+    message: '请上传商品图片',
+    trigger: 'blur'
+  },
+  supplierNo: {
+    required: true,
+    message: '供应商不能为空',
+    trigger: 'blur'
   }
 }

src/views/youzan/luckyDrawGood/index.vue

@@ -277,12 +277,6 @@ export default {
       this.parmValue = JSON.parse(back);
       console.log(this.parmValue);
       const { page, size } = this.parmValue;
-      // this.parmValue.start = start || last_start;
-      // this.parmValue.end = end || last_end;
-      // if(this.parmValue.brandid.length>0){
-      //   this.brandid = [this.parmValue.brandid] ;
-      // }
-
       this.pageInfo = {
         size: size,
         curr: page,

src/views/youzan/luckyDrawGood/weburlImport.vue

@@ -1,24 +1,24 @@
 <template>
   <el-dialog
+    v-loading="loading"
     :title="'兑换链接导入'"
     :center="true"
     align="left"
     top="8vh"
     width="1040px"
-    @close="showModelThis = false"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
-    v-loading="loading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
     append-to-body
+    @close="showModelThis = false"
   >
     <el-card style="margin-top: -20px">
-      <div class="orderImport pagePadding" v-loading="loading" style="padding-top: 0">
+      <div v-loading="loading" class="orderImport pagePadding" style="padding-top: 0">
         <div v-if="tableData && tableData.length > 0" class="tr" style="padding: 0 0 0 0">
-          <el-button @click="cancel" :size="'mini'">取消</el-button>
-          <el-button type="primary" @click="submit" :size="'mini'">提交</el-button>
+          <el-button :size="'mini'" @click="cancel">取消</el-button>
+          <el-button type="primary" :size="'mini'" @click="submit">提交</el-button>
         </div>
         <div v-else>
           <upload-excel :on-success="handleSuccess" :before-upload="beforeUpload" />
@@ -32,33 +32,32 @@
           :table="table"
           :data="tableData"
           style="margin: 15px 0 0 0"
-        >
-        </ex-table>
+        />
       </div>
     </el-card>
   </el-dialog>
 </template>
 
 <script>
-import asyncRequest from "@/apis/service/youzan/luckDrawGood";
-import resToken from "@/mixins/resToken";
-import { tHeader, filterVal } from "./columns";
-import { validURL } from "@/utils/validate";
+import asyncRequest from '@/apis/service/youzan/luckDrawGood'
+import resToken from '@/mixins/resToken'
+import { tHeader, filterVal } from './columns'
+import { validURL } from '@/utils/validate'
 export default {
+  name: 'OrderImport',
   mixins: [resToken],
-  name: "orderImport",
-  props: ["showModel"],
+  props: ['showModel'],
   data() {
     return {
       showModelThis: this.showModel,
-      code_msg: "物流单号必传，且支持纯数字或字母数字组合(9~20位)!",
+      code_msg: '物流单号必传，且支持纯数字或字母数字组合(9~20位)!',
       tHeader,
       filterVal,
       // 表格 - 参数
       table: {
         stripe: true,
         border: true,
-        "max-height": "500px",
+        'max-height': '500px'
         // _defaultHeader_: ["setcol"],
       },
       tableData: [],
@@ -66,128 +65,128 @@ export default {
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       loading: false,
       // 表格 - 列参数
-      columns: [],
-    };
+      columns: []
+    }
   },
   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: {
     async initForm() {
-      this.loading = true;
+      this.loading = true
 
-      this.columns = [];
+      this.columns = []
       tHeader.forEach((e, i) => {
         this.columns.push({
           prop: filterVal[i],
           label: e,
-          minWidth: "100px",
-        });
-      });
+          minWidth: '100px'
+        })
+      })
 
-      this.loading = false;
+      this.loading = false
     },
     beforeUpload(file) {
-      const isLt1M = file.size / 1024 < 500;
+      const isLt1M = file.size / 1024 < 500
       if (isLt1M) {
-        return true;
+        return true
       }
       this.$message({
-        message: "请不要上传大于500KB的文件.",
-        type: "warning",
-      });
-      return false;
+        message: '请不要上传大于500KB的文件.',
+        type: 'warning'
+      })
+      return false
     },
     handleSuccess({ results, header }) {
       if (!this.loading) {
-        this.loading = true;
+        this.loading = true
         if (results.length === 0) {
-          this.$message.error("表格无有效数据！");
-          this.loading = false;
-          return;
+          this.$message.error('表格无有效数据！')
+          this.loading = false
+          return
         }
 
         if (tHeader.length !== header.length) {
-          this.$message.error("表头与导入模板不匹配！");
-          this.loading = false;
-          return;
+          this.$message.error('表头与导入模板不匹配！')
+          this.loading = false
+          return
         }
-        let hederOk = true;
+        let hederOk = true
         tHeader.forEach((v1, i1) => {
-          if (v1 !== header[i1].replace(/\s*/g, "")) {
-            console.log(v1 + "----" + header[i1]);
-            hederOk = false;
+          if (v1 !== header[i1].replace(/\s*/g, '')) {
+            console.log(v1 + '----' + header[i1])
+            hederOk = false
           }
-        });
+        })
 
         if (!hederOk) {
-          this.$message.error("表头与导入模板不匹配！");
-          this.loading = false;
-          return;
+          this.$message.error('表头与导入模板不匹配！')
+          this.loading = false
+          return
         }
-        this.tableData = [];
-        let list = results;
+        this.tableData = []
+        const list = results
 
         try {
           list.forEach((obj, index) => {
-            let model = {};
-            let arr = Object.values(obj);
+            const model = {}
+            const arr = Object.values(obj)
             arr.forEach((key, ii) => {
               Object.defineProperty(model, filterVal[ii], {
-                value: key,
-              });
-            });
-            this.tableData.push(model);
+                value: key
+              })
+            })
+            this.tableData.push(model)
             // console.log(this.tableData);
-          });
+          })
         } catch (e) {
-          console.log(e);
+          console.log(e)
         }
-        this.loading = false;
+        this.loading = false
       }
     },
-    //取消
+    // 取消
     cancel() {
-      this.tableData = [];
+      this.tableData = []
     },
 
-    //提交
+    // 提交
     async submit() {
       if (!this.loading) {
-        this.loading = true;
+        this.loading = true
         if (this.tableData.length === 0) {
-          this.$message.warning("导入数据不能为空");
-          this.loading = false;
-          return;
+          this.$message.warning('导入数据不能为空')
+          this.loading = false
+          return
         }
 
-        let isUrl = true,
-          web_url = [];
+        const isUrl = true
+        const web_url = []
 
         this.tableData.forEach((key, index) => {
           // if (!validURL(key["act_good_url"])) {
           //   isUrl = false;
           // }
-          let model = {
-            act_good_id: key["act_good_id"],
-            act_good_url: key["act_good_url"],
-          };
-          web_url.push(model);
-        });
+          const model = {
+            act_good_id: key['act_good_id'],
+            act_good_url: key['act_good_url']
+          }
+          web_url.push(model)
+        })
         // if (!isUrl) {
         //   this.$message.warning("部分兑换链接不合法!");
         //   this.loading = false;
@@ -195,43 +194,43 @@ export default {
         // }
 
         const { code, data, message } = await asyncRequest.batchImport({
-          web_url,
-        });
-        this.loading = false;
+          web_url
+        })
+        this.loading = false
         if (code === 0) {
           this.$notify.success({
-            title: "兑换链接导入成功！",
-            message: "",
-          });
-          this.tableData = [];
-          this.$emit("refresh");
+            title: '兑换链接导入成功！',
+            message: ''
+          })
+          this.tableData = []
+          this.$emit('refresh')
         } else if (code >= 100 && code <= 104) {
-          await this.logout();
+          await this.logout()
         } else if (code == 1003) {
-          this.showal(data, message, "");
+          this.showal(data, message, '')
         } else if (code == 1005) {
-          this.showal(data, message, "outCode");
+          this.showal(data, message, 'outCode')
         } else if (code == 1011) {
-          this.showal(data, message, "outCode");
+          this.showal(data, message, 'outCode')
         } else {
-          this.$message.warning(message);
+          this.$message.warning(message)
         }
       }
     },
     showal(list, message, code) {
-      let htmlList = "<ul>";
+      let htmlList = '<ul>'
       list.forEach((v) => {
-        htmlList += `<li>${code !== "" ? v[code] : v}</li>`;
-      });
-      htmlList += "</ul>";
+        htmlList += `<li>${code !== '' ? v[code] : v}</li>`
+      })
+      htmlList += '</ul>'
       this.$notify({
         title: message,
         dangerouslyUseHTMLString: true,
-        message: htmlList,
-      });
-    },
-  },
-};
+        message: htmlList
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>