feat

src/apis/components/search-youzan-txx-good-online-modal.js

@@ -1,9 +1,8 @@
-import http from "@/apis/axios";
-const api = "txx/";
+import http from '@/apis/axios'
+const api = 'txx/'
 export default {
   // 列表
-  list: (data, params) => http(api + "yzgoodlist", data, "post", params),
+  list: (data, params) => http(api + 'yzgoodlist', data, 'post', params),
   // 供应商列表
-  supplierList: (data, params) => http(api + "supplierlist", data, "post", params),
-
-};
+  supplierList: (data, params) => http(api + 'supplierlist', data, 'post', params)
+}

src/layout/components/company-select/index.vue

@@ -89,7 +89,7 @@ export default {
       currentCompany: state => state.user.currentCompany,
       companylist: state => state.user.companylist,
       isSupertube: state => state.user.isSupertube,
-      sourceLevel: state => state.user.sourceLeve
+      originLevel: state => state.user.originLevel
     })
   },
   data: () => ({

src/mixins/companyHelper.js

@@ -1,13 +1,13 @@
 import { mapState } from 'vuex'
 
-const state = {
-  isSupertube: state => state.user.isSupertube, // 是否超管
+const map = {
   currentCompany: (state) => state.user.currentCompany, // 当前选中的业务公司
+  isSupertube: state => state.user.isSupertube, // 是否超管
   companylist: (state) => state.user.companylist
 }
 
 const companyHelper = {
-  computed: { ...mapState(state) },
+  computed: { ...mapState(map) },
   methods: {
     /**
      * 当前公司发生改变时默认执行的方法,重置列表数据
@@ -61,8 +61,8 @@ const companyHelper = {
         // 超管公司改变后执行该方法(刷新列表页或自定义实现)
         if (isSupertube) onCompanyChange ? onCompanyChange() : onCompanyChangeInner()
       },
-      deep: true,
-      immediate: true
+      immediate: true,
+      deep: true
     }
   }
 }

src/mixins/privateField.js

@@ -6,8 +6,8 @@ const privateField = {
   },
   methods: {
     /**
-     *  @description
-     *  1 成本价 2 销售价 3 毛利率
+     * @description
+     * 1 成本价 2 销售价 3 毛利率
      * 1. 超管可以查看所有
      * 2. 供应商(originLevel === '3') 可以查看成本(type === '1)
      * 3. 业务公司(originLevel === '2') 根据角色的private_field查看
@@ -15,7 +15,6 @@ const privateField = {
     isDisplayPrivateField(type) {
       const vm = this
       const { isSupertube, originLevel, private_field } = vm
-      console.log(originLevel, private_field)
       if (isSupertube) return true
       if (originLevel === '3' && type === '1') return true
       if (originLevel === '2' && private_field && private_field.includes(type)) return true

src/store/getters.js

@@ -20,7 +20,9 @@ const getters = {
   isSupertube: state => state.user.isSupertube,
   userInfo: state => state.user.userInfo,
   roleProcess: state => state.user.roleProcess,
+  // 当前用户等级
   currentLevel: state => state.user.currentLevel,
+  // 原始用户等级
   originLevel: state => state.user.originLevel,
   currentCompany: state => state.user.currentCompany,
   companyList: state => state.user.companyList,

src/views/bigScreen/bigScreenOld/index.js

@@ -3,15 +3,15 @@
  * @param {Number} delay 延迟时间
  */
 export function debounce(fn, delay) {
-  var timer;
-  return function () {
-    var context = this;
-    var args = arguments;
-    clearTimeout(timer);
-    timer = setTimeout(function () {
-      fn.apply(context, args);
-    }, delay);
-  };
+  var timer
+  return function() {
+    var context = this
+    var args = arguments
+    clearTimeout(timer)
+    timer = setTimeout(function() {
+      fn.apply(context, args)
+    }, delay)
+  }
 }
 
 /**
@@ -19,9 +19,9 @@ export function debounce(fn, delay) {
  * @param {String} fmt 需要转换的格式 如 yyyy-MM-dd、yyyy-MM-dd HH:mm:ss
  */
 export function formatTime(time, fmt) {
-  if (!time) return '';
+  if (!time) return ''
   else {
-    const date = new Date(time);
+    const date = new Date(time)
     const o = {
       'M+': date.getMonth() + 1,
       'd+': date.getDate(),
@@ -29,13 +29,14 @@ export function formatTime(time, fmt) {
       'm+': date.getMinutes(),
       's+': date.getSeconds(),
       'q+': Math.floor((date.getMonth() + 3) / 3),
-      S: date.getMilliseconds(),
-    };
-    if (/(y+)/.test(fmt))
+      S: date.getMilliseconds()
+    }
+    if (/(y+)/.test(fmt)) {
       fmt = fmt.replace(
         RegExp.$1,
         (date.getFullYear() + '').substr(4 - RegExp.$1.length)
-      );
+      )
+    }
     for (const k in o) {
       if (new RegExp('(' + k + ')').test(fmt)) {
         fmt = fmt.replace(
@@ -43,9 +44,9 @@ export function formatTime(time, fmt) {
           RegExp.$1.length === 1
             ? o[k]
             : ('00' + o[k]).substr(('' + o[k]).length)
-        );
+        )
       }
     }
-    return fmt;
+    return fmt
   }
 }

src/views/goodStore/goodsCost/components/baseFormAddEdit.vue

@@ -30,7 +30,7 @@
                 :value="ruleForm.spec_id"
                 :disabled="sitem.isMust"
                 :size="'mini'"
-                :isDetail="false"
+                :is-detail="false"
                 :placeholder="'规格类型'"
                 @searchChange="spec_idsearchChange"
               />
@@ -42,27 +42,26 @@
                 <el-select
                   v-model="ruleForm.spec_value_id"
                   placeholder="请选择规格值"
-                  @change="spec_value_id_change"
                   style="width:100%"
                   filterable
+                  @change="spec_value_id_change"
                 >
                   <el-option
                     v-for="item in specVlist"
                     :key="item.id + item.spec_value"
                     :label="item.spec_value"
                     :value="item.id"
-                    >{{ item.spec_value }}</el-option
-                  >
+                  >{{ item.spec_value }}</el-option>
                 </el-select>
               </div>
-              <div class="no-data" v-else>暂无规格值,请添加！</div>
+              <div v-else class="no-data">暂无规格值,请添加！</div>
             </el-form-item>
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
           <el-input
-            style="width: 209px"
             v-model="sinput"
+            style="width: 209px"
             class="fl"
             :disabled="id == 'edit'"
             :size="'small'"
@@ -73,18 +72,17 @@
             style="margin: 0 0 0 10px"
             icon="el-icon-plus"
             :size="'small'"
-            @click="add_spec"
             class="fl"
-            >新增规格值</el-button
-          >
+            @click="add_spec"
+          >新增规格值</el-button>
           <el-button
             v-if="id !== 'edit'"
             :size="'small'"
             type="primary"
             @click="submitForm"
-            >保 存
+          >保 存
           </el-button>
-          <el-button @click="showModelThis = false" :size="'small'">{{
+          <el-button :size="'small'" @click="showModelThis = false">{{
             id == "edit" ? "关 闭" : "取 消"
           }}</el-button>
         </el-col>
@@ -93,70 +91,69 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/goodStore/goodsCost";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/service/goodStore/goodsCost'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "brand",
-  props: ["showModel", "index", "sitem"],
+  name: 'Brand',
   mixins: [resToken],
+  props: ['showModel', 'index', 'sitem'],
   data() {
     return {
       loading: false,
-      title: "商品规格",
-      sinput: "",
+      title: '商品规格',
+      sinput: '',
       showModelThis: this.showModel,
       specVlist: [],
       ruleForm: {},
       rulesThis: this.rules,
-
       rules: {
         spec_id: [
           {
             required: true,
-            message: "规格类型不能为空",
-            trigger: "change",
-          },
+            message: '规格类型不能为空',
+            trigger: 'change'
+          }
         ],
-        spec_value_id: [{ required: true, message: "请选择规格值", trigger: "change" }],
-      },
-    };
+        spec_value_id: [{ required: true, 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: {
     async initForm() {
-      this.loading = true;
-      this.sinput = "";
-      this.resetFormData();
-      this.rulesThis = this.rules;
-      if (this.index + "" === "-1") {
-        this.title = "添加商品规格值";
+      this.loading = true
+      this.sinput = ''
+      this.resetFormData()
+      this.rulesThis = this.rules
+      if (this.index + '' === '-1') {
+        this.title = '添加商品规格值'
       } else {
-        this.title = "修改商品规格值";
+        this.title = '修改商品规格值'
       }
-      await this.resetForm();
-      this.loading = false;
+      await this.resetForm()
+      this.loading = false
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.resetFormData();
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          this.resetFormData()
         }
-      });
+      })
     },
     async resetFormData() {
       const {
@@ -165,92 +162,92 @@ export default {
         spec_value,
         spec_value_id,
         spec_value_value,
-        isMust,
-      } = this.sitem;
+        isMust
+      } = this.sitem
       this.ruleForm = {
         index: this.index,
-        id: id || "",
-        spec_id: spec_id || "",
-        spec_value: spec_value || "",
+        id: id || '',
+        spec_id: spec_id || '',
+        spec_value: spec_value || '',
         isMust: isMust || false,
-        spec_value_id: spec_value_id || "",
-        spec_value_value: spec_value_value || "",
-      };
+        spec_value_id: spec_value_id || '',
+        spec_value_value: spec_value_value || ''
+      }
       if (spec_id) {
-        await this.getlist();
+        await this.getlist()
       }
     },
     async add_spec() {
-      const { spec_id } = this.ruleForm;
+      const { spec_id } = this.ruleForm
       if (spec_id) {
         if (this.sinput) {
           const { code, data, message } = await asyncRequest.valueadd({
             spec_id: spec_id,
-            spec_value: this.sinput,
-          });
+            spec_value: this.sinput
+          })
           if (code === 0) {
-            await this.getlist();
+            await this.getlist()
           } else if (code >= 100 && code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(message);
+            this.$message.warning(message)
           }
         } else {
-          this.$message.warning("请输入规格值！");
+          this.$message.warning('请输入规格值！')
         }
       } else {
-        this.$message.warning("请选择规格类型！");
+        this.$message.warning('请选择规格类型！')
       }
     },
     async spec_idsearchChange(e) {
-      const { id, spec_name } = e;
-      this.ruleForm.spec_id = id || "";
-      this.ruleForm.spec_value = spec_name || "";
-      this.$refs.ruleForm.validateField("spec_id");
-      await this.getlist();
+      const { id, spec_name } = e
+      this.ruleForm.spec_id = id || ''
+      this.ruleForm.spec_value = spec_name || ''
+      this.$refs.ruleForm.validateField('spec_id')
+      await this.getlist()
     },
     spec_value_id_change(e) {
       if (e) {
-        const { id, spec_value } = this.specVlist.find((i) => i.id === e);
-        this.ruleForm.spec_value_id = id || "";
-        this.ruleForm.spec_value_value = spec_value || "";
+        const { id, spec_value } = this.specVlist.find((i) => i.id === e)
+        this.ruleForm.spec_value_id = id || ''
+        this.ruleForm.spec_value_value = spec_value || ''
       } else {
-        this.ruleForm.spec_value_id = "";
-        this.ruleForm.spec_value_value = "";
+        this.ruleForm.spec_value_id = ''
+        this.ruleForm.spec_value_value = ''
       }
-      this.$refs.ruleForm.validateField("spec_value_id");
+      this.$refs.ruleForm.validateField('spec_value_id')
     },
     async getlist() {
-      const { spec_id } = this.ruleForm;
+      const { spec_id } = this.ruleForm
       if (spec_id) {
         const { code, data, message } = await asyncRequest.valueall({
-          spec_id: spec_id,
-        });
+          spec_id: spec_id
+        })
         if (code === 0) {
-          this.specVlist = data;
+          this.specVlist = data
         } else if (code >= 100 && code <= 104) {
-          await this.logout();
+          await this.logout()
         } else {
-          this.$message.warning(message);
+          this.$message.warning(message)
         }
       } else {
-        this.specVlist = [];
+        this.specVlist = []
       }
     },
 
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
-          this.showModelThis = false;
-          this.$emit("refresh", this.ruleForm);
+          this.showModelThis = false
+          this.$emit('refresh', this.ruleForm)
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/goodStore/goodsCost/detail.vue

@@ -116,7 +116,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="固定与阶梯成本" name="6" v-if="displayCostField">
+            <el-collapse-item title="固定与阶梯成本" name="6" v-if="isDisplayPrivateField('1')">
               <show-data-table :columns="ladderColumns" :sitem="sitem">
                 <template slot="demo_fee">{{sitem.demo_fee}}元</template>
                 <template slot="open_fee">{{sitem.open_fee}}元</template>
@@ -199,9 +199,9 @@ export default {
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field", "originLevel"]),
-    displayCostField(){
-      return (["1", '3']).includes(this.originLevel) || this.private_field.includes('1')
-    },
+    // displayCostField(){
+    //   return (["1", '3']).includes(this.originLevel) || this.private_field.includes('1')
+    // },
     powers() {
       const { btnList } = this.$store.getters
       const tran = btnList.find((item) => item.menu_route == "goodsCostDetail") || {};

src/views/goodStore/supplierGoodsCost/components/addEdit.vue

@@ -249,7 +249,7 @@ export default {
       })
     },
     platform_codesearchChange(e) {
-      const { id, code, label } = e
+      const { id } = e
       this.ruleForm.platform = id || ''
       this.$refs.ruleForm.validateField('platform')
     },