瀏覽代碼

Merge branch 'sit' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into dev

lucky 2 年之前
父節點
當前提交
3501f750b0

二進制
dist/static/C端订单导入模板.xlsx


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


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


+ 13 - 3
src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -108,6 +108,11 @@
             class="fr"
             style="margin: 3px 0 0 8px"
             effect="dark"
+            v-if="
+              (status === '0' || status === '1') &&
+              powers.some((item) => item == '048') &&
+              sitem.send_type !== '1'
+            "
             content="导入收货地址"
             placement="top"
           >
@@ -121,6 +126,11 @@
             class="fr"
             style="margin: 3px 0 0 8px"
             effect="dark"
+            v-if="
+              (status === '0' || status === '1') &&
+              powers.some((item) => item == '048') &&
+              sitem.send_type !== '1'
+            "
             content="下载收货地址模板"
             placement="top"
           >
@@ -131,13 +141,13 @@
               ></i>
             </a>
           </el-tooltip>
-           <!-- v-if="is_return && powers.some((item) => item == '048')" -->
+
           <el-tooltip
             style="margin: 3px 0 0 0"
             effect="dark"
             content="退货"
             class="fr"
-           
+            v-if="is_return && powers.some((item) => item == '048')"
             placement="top"
           >
             <i
@@ -331,7 +341,7 @@ export default {
             addr_code: a.addr_code,
             receipt_quantity: a.receipt_quantity,
           };
-           model.addrlist.push(item)
+          model.addrlist.push(item);
         });
         if (wsend_num * 1 < t_num + add_num) {
           this.$message.warning("导入地址总数量不能大于未发货总数量!");

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