Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/CommodityMan/goodsListEdit.vue

@@ -179,6 +179,11 @@
                       :inactive-value="2">
                     </el-switch>
                   </el-form-item>
+                  <el-form-item label="是否可开发票" v-if="isShowTax">
+                    <el-switch v-model="addMsg.IsNoTax" active-color="#409EFF" :active-value="1"
+                      :inactive-value="0">
+                    </el-switch>
+                  </el-form-item>
                   <el-form-item label="自动上架时间">
                     <el-date-picker size="small" v-model="addMsg.ShelvesDate" default-time="12:00:00"
                       value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期时间">
@@ -1188,7 +1193,8 @@
           SendArea: '', //发货仓库
           VideoType: 1, //视频填充方式(0默认，1-填充)
           GoodsPageType:0, //分类 0全部 1商城 2校园
-          Remark:'' //备注
+          Remark:'', //备注
+          IsNoTax:0 //是否可开发票
         },
         predefineColors: [
           '#000000',
@@ -1294,7 +1300,8 @@
         FXlevelList: [],
         giveDate: false,
         My_cateList:[], //分类类型
-        isShowPlat:true //是否显示上架版面和分类
+        isShowPlat:true, //是否显示上架版面和分类
+        isShowTax:false  //赞羊显示是否可开发票
       };
     },
     created() {
@@ -1328,6 +1335,11 @@
       }else{
         this.isShowPlat=true;
       }
+      if(mall_userInfo.TenantId==1&&mall_userInfo.MallBaseId==1){
+        this.isShowTax=true;
+      }else{
+        this.isShowTax=false;
+      }
     },
     methods: {
       initShareSettings() {

src/router/index.js

@@ -978,6 +978,12 @@ export default new Router({
           name: 'schoolPoster',
           component: resolve => require(['@/components/StoreDesign/schoolPoster'], resolve),
         },
+        //店铺管理 财务管理-出纳提现
+        {
+          path: '/CashierWithdrawal',
+          name: 'CashierWithdrawal',
+          component: resolve => require(['@/components/StoreDesign/CashierWithdrawal'], resolve),
+        },
         //营销中心 插件中心
         {
           path: '/pluginCenter',