snow 2 年之前
父節點
當前提交
05f32a6517

文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/0.js


+ 7 - 1
src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1967,12 +1967,18 @@ export default {
     //商品分类选择
     async goods_class_change(e) {
       const { code, pid, id, label, cat_desc } = e;
+
+      if(pid === '6'){
+        this.$message.warning('不允许创建贵金属商品');
+        this.ruleForm.cat_id = []
+        return
+      }
+
       this.ruleForm.cat_id = id ? [id] : [];
       this.$refs.ruleForm.validateField("cat_id");
       this.ruleForm.after_sales = cat_desc || "";
       this.$refs.ruleForm.validateField("after_sales");
       this.is_noble = pid === "6";
-      console.log(pid)
       this.sch_is_noble();
       await this.set_must_spec();
       await this.get_all_fee();

+ 5 - 6
src/views/goodStore/supplierGoodsCost/columns.js

@@ -108,12 +108,11 @@ const listCol = [
     label: '业务公司名称',
     width: '110px'
   },
-  {
-    prop: 'charger_company_name',
-    label: '负责人部门',
-    minWidth: '150px'
-  },
-
+  // {
+  //   prop: 'charger_company_name',
+  //   label: '负责人部门',
+  //   minWidth: '150px'
+  // },
   {
     prop: 'charger',
     label: '负责人',

+ 5 - 4
src/views/goodStore/supplierGoodsCost/index.vue

@@ -236,7 +236,8 @@
             @click="getRouter('supplierGoodsCostDetail', scope.row.spuCode)"
           ></i>
         </el-tooltip>
-        <el-tooltip
+        
+        <!-- <el-tooltip
           v-if="powers.some((i) => i == '079') && scope.row.status !== '8'"
           effect="dark"
           content="下线商品"
@@ -246,7 +247,7 @@
             class="el-icon-download tb-icon"
             @click="showDonlineDlg(scope.row.spuCode)"
           ></i>
-        </el-tooltip>
+        </el-tooltip> -->
 
         <el-tooltip
           v-if="
@@ -317,14 +318,14 @@
           ></i>
         </el-tooltip>
 
-        <el-tooltip
+        <!-- <el-tooltip
           v-if="powers.some((i) => i == '006')"
           effect="dark"
           content="删除"
           placement="top"
         >
           <i class="el-icon-delete tb-icon" @click="deleteItem(scope.row.spuCode)"></i>
-        </el-tooltip>
+        </el-tooltip> -->
       </template>
     </ex-table>
     <no-auth v-else></no-auth>

+ 2 - 1
src/views/supplierSellOut/sellReturn/detail.vue

@@ -246,6 +246,7 @@ import asyncRequest from "@/apis/service/sellOut/sellReturn";
 import comExamForm from "./components/comExamForm";
 import { showColumns } from "./components/ShowDataTableColumns";
 import { xs_order_type_options } from "@/assets/js/statusList";
+
 export default {
   name: "sellReturnDetail",
   mixins: [mixinPage, resToken],
@@ -257,7 +258,7 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "sellReturnDetail"
+          (item) => item.menu_route == "supplierSellReturnDetail"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];

+ 4 - 3
src/views/supplierSellOut/sellReturn/index.vue

@@ -142,7 +142,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="getRouter('sellReturnDetail', scope.row.returnCode)"
+              @click="getRouter('supplierSellReturnDetail', scope.row.returnCode)"
             ></i>
           </el-tooltip>
         </template>
@@ -169,7 +169,7 @@ export default {
     powers() {
       const tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "sellReturn"
+          (item) => item.menu_route == "supplierSellReturn"
         ) || {};
       const { action } = tran ?? {};
       return action ?? [];
@@ -364,7 +364,8 @@ export default {
 
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
-      // model.supplierNo = this.currentCompany
+      model.supplierNo = this.currentCompany
+      model.noRelation = true
 
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {

部分文件因文件數量過多而無法顯示