snow 2 years ago
parent
commit
e773a826d8

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 2 - 13
src/views/businessReportQuery/businessSaleReport/components/table1.vue

@@ -126,7 +126,7 @@ export default {
 
       const res = await asyncRequest.saleexportconsultday({
         ...this.parmValue,
-        relaComNo:this.currentCompany
+       needRela: true
       });
 
       if (res && res.code === 0 && res.data) {
@@ -147,11 +147,6 @@ export default {
         date: "", //筛选日期
       };
       // 表格 - 分页
-      // this.pageInfo = {
-      //   size: 15,
-      //   curr: 1,
-      //   total: 0,
-      // };
       this.searchList();
     },
 
@@ -178,22 +173,16 @@ export default {
           responseType: "blob",
           data: {
             ...model,
-            relaComNo:this.currentCompany
+            needRela:true
           },
           headers: {
-            // 'Content-Type': 'multipart/form-data',
-            // Accept: "application/vnd.ms-excel"
             Accept: httpType,
           },
         })
           .then((res) => {
-            // console.log(res)
-            // console.log(this.fileUrl)
-            // return;
             if (res && res.status == 200 && res.data) {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], {
-                  // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
                   type: httpType,
                 })
               );

+ 2 - 2
src/views/goodStore/active/index.vue

@@ -123,7 +123,7 @@
               :span="3"
               class="fr"
               style="width: 66px; padding: 0 0 0 10px"
-              v-if="powers.some((i) => i == '003')"
+              v-if="powers.some((i) => i == '003') && !isSupertube"
             >
               <el-button
                 :size="searchSize"
@@ -193,7 +193,7 @@ export default {
   mixins: [mixinPage, resToken, companyHelper],
   computed: {
     //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find((item) => item.menu_route == "active") || {};

+ 2 - 2
src/views/goodStore/dealGoodsPool/index.vue

@@ -69,7 +69,7 @@
               :span="3"
               class="fr"
               style="width: 110px; padding: 0 0 0 10px"
-              v-if="powers.some((i) => i == '055')"
+              v-if="powers.some((i) => i == '055') && !isSupertube"
              
             >
               <el-button
@@ -218,7 +218,7 @@ export default {
   },
   computed: {
     //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find(

+ 38 - 15
src/views/goodStore/goodsCost/index.vue

@@ -113,7 +113,30 @@
                 />
               </el-select>
             </el-col>
-            <el-col :span="4" style="width: 147px; padding: 0 0 0 10px">
+
+            <el-col :span="4" style="width: 135px;margin-left:10px">
+              <el-select
+                v-model="parmValue.is_stock"
+                size="mini"
+                style="width: 100%"
+                placeholder="商品类型"
+                clearable
+                @change="
+                  pageInfo.curr = 1;
+                  parmValue.page = 1;
+                  searchList();
+                "
+              >
+                <el-option
+                  v-for="opt in isStockOptions"
+                  :key="opt.value"
+                  :value="opt.value"
+                  :label="opt.label"
+                />
+              </el-select>
+            </el-col>
+
+            <!-- <el-col :span="4" style="width: 147px; padding: 0 0 0 10px">
               <el-select
                 v-model="parmValue.has_account"
                 filterable
@@ -134,7 +157,7 @@
                   :value="item.code"
                 />
               </el-select>
-            </el-col>
+            </el-col> -->
             <el-col :span="3" style="margin: 0 10px">
               <search-supplier
                 :size="'mini'"
@@ -183,7 +206,7 @@
           </el-row>
 
           <el-row style="margin-top: 10px">
-            <el-col :span="4" style="width: 225px">
+            <!-- <el-col :span="4" style="width: 225px">
               <el-select
                 v-model="parmValue.is_stock"
                 size="mini"
@@ -203,8 +226,8 @@
                   :label="opt.label"
                 />
               </el-select>
-            </el-col>
-            <el-col :span="4" style="width: 420px; padding: 0 0 0 10px">
+            </el-col> -->
+            <el-col :span="4" style="width: 420px">
               <el-input
                 :size="searchSize"
                 v-model="sinput"
@@ -329,11 +352,11 @@
         <!-- scope.row.has_account + '' == '0' && -->
         <el-tooltip
           v-if="
-            ((ppowers.some((i) => i == '7') && scope.row.status + '' === '7') ||
+            (((ppowers.some((i) => i == '7') && scope.row.status + '' === '7') ||
               (ppowers.some((i) => i == '6') && scope.row.status + '' === '6') ||
               (ppowers.some((i) => i == '8') && scope.row.status + '' === '8')) &&
-            (scope.row.is_stock + '' === '0' || scope.row.is_stock + '' === '1') &&
-            !isSupertube
+            (scope.row.is_stock + '' === '0' || scope.row.is_stock + '' === '1')) &&
+            !isSupertube && String(scope.row.has_account) === '0'
           "
           effect="dark"
           content="修改"
@@ -352,10 +375,10 @@
         <!-- scope.row.has_account + '' == '0' && -->
         <el-tooltip
           v-if="
-            ppowers.some((i) => i == '4') &&
+            (ppowers.some((i) => i == '4') &&
             (scope.row.status + '' === '4' || scope.row.status + '' === '1') &&
-            (scope.row.is_stock + '' === '0' || scope.row.is_stock + '' === '1') &&
-            !isSupertube
+            (scope.row.is_stock + '' === '0' || scope.row.is_stock + '' === '1')) &&
+            !isSupertube && String(scope.row.has_account) === '0'
           "
           effect="dark"
           content="修改基础信息"
@@ -369,10 +392,10 @@
         <!-- scope.row.has_account + '' == '0' &&  -->
         <el-tooltip
           v-if="
-            ppowers.some((i) => i == '5') &&
+            (ppowers.some((i) => i == '5') &&
             (scope.row.status + '' === '5' || scope.row.status + '' === '1') &&
-            (scope.row.is_stock + '' === '0' || scope.row.is_stock + '' === '1') &&
-            !isSupertube
+            (scope.row.is_stock + '' === '0' || scope.row.is_stock + '' === '1')) &&
+            !isSupertube && String(scope.row.has_account) === '0' 
           "
           effect="dark"
           content="修改成本信息"
@@ -401,7 +424,7 @@
         </el-tooltip>
 
         <el-tooltip
-          v-if="powers.some((i) => i == '006')"
+          v-if="powers.some((i) => i == '006') && !isSupertube"
           effect="dark"
           content="删除"
           placement="top"

+ 3 - 4
src/views/goodStore/goodsOnline/index.vue

@@ -184,7 +184,6 @@
               </el-select>
             </el-col>
 
-
             <el-col
               :span="3"
               class="fr"
@@ -280,8 +279,8 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((i) => i == '078') &&
-            (scope.row.status + '' === '4' || scope.row.status + '' === '5')
+            (powers.some((i) => i == '078') &&
+            (scope.row.status + '' === '4' || scope.row.status + '' === '5')) && !isSupertube
           "
           effect="dark"
           content="重新发起上线流程"
@@ -293,7 +292,7 @@
           ></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((i) => i == '079') && scope.row.status !== '5'"
+          v-if="(powers.some((i) => i == '079') && scope.row.status !== '5') && !isSupertube"
           effect="dark"
           content="下线商品"
           placement="top"

+ 83 - 85
src/views/goodStore/supplierGoodsCost/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,17 +91,17 @@
   </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: {},
@@ -113,50 +111,50 @@ export default {
         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 +163,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>

+ 1 - 1
src/views/goodStore/supplierGoodsCost/detail.vue

@@ -369,7 +369,7 @@ export default {
       console.log(row);
     },
     async refresh(e) {
-      await this.routeReGoto("goodsCost", {});
+      await this.routeReGoto("supplierGoodsCost", {});
     },
     async initData() {
       this.loading = true;

+ 3 - 14
src/views/netOrderEntry/netOrderEnter/index.vue

@@ -74,7 +74,7 @@
                 >重置</el-button
               >
             </el-col>
-            <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
+            <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px" v-if="powers.includes('003') && !isSupertube">
               <el-button type="primary" :size="searchSize" @click="openModal({}, '003')"
                 >添加</el-button
               >
@@ -91,17 +91,6 @@
               />
             </el-col>
 
-            <!-- <el-col :span="6">
-              <search-supplier
-                size="mini"
-                placeholder="销售方公司"
-                :value="parmValue.supplierNo"
-                :disabled="false"
-                :isDetail="false"
-                @searchChange="handleSupplierChange"
-              />
-            </el-col> -->
-
             <el-col :span="3" style="margin-left: 10px">
               <el-input
                 v-model="parmValue.lower_price"
@@ -174,7 +163,7 @@
           <i class="el-icon-view tb-icon" @click="openModal(scope.row, '007')"></i>
         </el-tooltip>
         <el-tooltip
-          v-if="powers.some((i) => i == '005')"
+          v-if="powers.some((i) => i == '005') && !isSupertube"
           effect="dark"
           content="修改"
           placement="top"
@@ -213,7 +202,7 @@ export default {
   },
   computed: {
     //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const { btnList } = this.$store.getters;
       const tran = btnList.find((i) => i.menu_route == "netOrderEnter") || {};

+ 6 - 6
src/views/orderEntry/orderEnter/index.vue

@@ -106,7 +106,7 @@
                 :span="2"
                 class="fr"
                 style="width: 130px; padding: 0 0 0 10px"
-                v-if="powers.some((i) => i == '085')"
+                v-if="powers.some((i) => i == '085') && !isSupertube"
               >
                 <el-button
                   size="mini"
@@ -155,7 +155,7 @@
                 :span="2"
                 class="fr"
                 style="width: 66px; padding: 0 0 0 10px"
-                v-if="powers.some((i) => i == '006')"
+                v-if="powers.some((i) => i == '006') && !isSupertube"
               >
                 <el-button size="mini" type="danger" class="btn" @click="batchDel"
                   >删除</el-button
@@ -166,7 +166,7 @@
                 :span="2"
                 class="fr"
                 style="width: 130px; padding: 0 0 0 10px"
-                v-if="powers.some((i) => i == '086')"
+                v-if="powers.some((i) => i == '086') && !isSupertube"
               >
                 <el-button
                   class="btn entry"
@@ -202,8 +202,8 @@
           </el-tooltip>
           <el-tooltip
             v-if="
-              powers.some((i) => i == '006') &&
-              (scope.row.status + '' === '2' || scope.row.status + '' === '4')
+              (powers.some((i) => i == '006') &&
+              (scope.row.status + '' === '2' || scope.row.status + '' === '4')) && !isSupertube
             "
             effect="dark"
             content="删除"
@@ -292,7 +292,7 @@ export default {
   },
   computed: {
     //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find((item) => item.menu_route == "orderEnter") || {};

+ 2 - 2
src/views/youzan/othTransferOrderLog/index.vue

@@ -105,7 +105,7 @@
                 :span="3"
                 class="fr"
                 style="width: 90px; padding: 0 0 0 10px"
-                v-if="powers.some((i) => i == '006')"
+                v-if="powers.some((i) => i == '006') && !isSupertube"
               >
                 <el-button
                   type="danger"
@@ -217,7 +217,7 @@ export default {
   mixins: [mixinPage, resToken],
   computed: {
     //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find(

+ 4 - 2
src/views/youzan/othgoodsOnline/index.vue

@@ -232,8 +232,10 @@
           </el-tooltip>
           <el-tooltip
             v-if="
+             (
               powers.some((i) => i == '078') &&
               (String(scope.row.status) === '7' || String(scope.row.status) === '8')
+             ) && !isSupertube
             "
             effect="dark"
             content="重新发起上线流程"
@@ -245,7 +247,7 @@
             ></i>
           </el-tooltip>
           <el-tooltip
-            v-if="powers.some((i) => i == '079') && scope.row.status + '' !== '8'"
+            v-if="(powers.some((i) => i == '079') && scope.row.status + '' !== '8') && !isSupertube"
             effect="dark"
             content="下线商品"
             placement="top"
@@ -377,7 +379,7 @@ export default {
   mixins: [mixinPage, resToken],
   computed: {
     //组件SIZE设置
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find((i) => i.menu_route == "othgoodsOnline") ||

Some files were not shown because too many files changed in this diff