Forráskód Böngészése

fix(组合商品库存):流程权限

snow 1 éve
szülő
commit
9e4e02e5f9

+ 11 - 2
src/views/sellOut/combinedAdd/components/baseForm.vue

@@ -11,7 +11,16 @@
       <el-input v-if="!productinfo" placeholder="选择组合商品" @focus="pVisible = true" />
 
       <div v-else key="product" style="display:flex">
-        <show-data-table border :columns="productColumns" :sitem="productinfo">
+        <show-goods-data-table
+          border
+           v-if="newTime !== ''"
+           type="1"
+           :iscgd="true"
+           :newTime="newTime"
+           :spucode="productinfo.spuCode"
+           :isStockInfo="true"
+         />
+        <!-- <show-data-table border :columns="productColumns" :sitem="productinfo">
           <template slot="packing_spec">
             <el-tag
               size="mini"
@@ -111,7 +120,7 @@
           <template slot="sample_day">{{ productinfo.sample_day }}天</template>
           <template slot="delivery_place">{{ delivery_place }}</template>
           <template slot="origin_place">{{ origin_place }}</template>
-        </show-data-table>
+        </show-data-table> -->
 
         <el-tooltip v-if="type !== 'view'" content="重新选择组合商品" placement="top">
           <i

+ 1 - 1
src/views/sellOut/combinedAdd/components/productModal.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     center
-    title="选择商品"
+    title="选择组合商品"
     :visible="_visible"
     :close-on-click-modal="false"
     :append-to-body="true"

+ 1 - 1
src/views/sellOut/combinedAdd/detail.vue

@@ -119,7 +119,7 @@ export default {
     },
     ppowers() {
       const tran =
-        this.$store.getters.roleProcess.find((i) => i.process_type === "ZHTC") || {};
+        this.$store.getters.roleProcess.find((i) => i.process_type === "ZHTJ") || {};
       const { action } = tran ?? {};
       return action ?? [];
     }

+ 12 - 2
src/views/sellOut/combinedRemove/components/baseForm.vue

@@ -11,7 +11,17 @@
       <el-input v-if="!productinfo" placeholder="选择组合商品" @focus="pVisible = true" />
 
       <div v-else key="product" style="display:flex">
-        <show-data-table border :columns="productColumns" :sitem="productinfo">
+        <show-goods-data-table
+          border
+           v-if="newTime !== ''"
+           type="1"
+           :iscgd="true"
+           :newTime="newTime"
+           :spucode="productinfo.spuCode"
+           :isStockInfo="true"
+         />
+        
+        <!-- <show-data-table border :columns="productColumns" :sitem="productinfo">
           <template slot="packing_spec">
             <el-tag
               size="mini"
@@ -111,7 +121,7 @@
           <template slot="sample_day">{{ productinfo.sample_day }}天</template>
           <template slot="delivery_place">{{ delivery_place }}</template>
           <template slot="origin_place">{{ origin_place }}</template>
-        </show-data-table>
+        </show-data-table> -->
 
         <el-tooltip v-if="type !== 'view'" content="重新选择组合商品" placement="top">
           <i

+ 1 - 1
src/views/sellOut/combinedRemove/components/productModal.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     center
-    title="选择商品"
+    title="选择组合商品"
     :visible="_visible"
     :close-on-click-modal="false"
     :append-to-body="true"