增加环境配置

.env.staging

@@ -6,4 +6,4 @@ ENV = 'staging'
 # base api
 VUE_APP_BASE_API = '/stage-api'
 
-VUE_APP_DOMAIN_PREFIX = 'https://ceresdev.zkthink.com/businessapi'
+VUE_APP_DOMAIN_PREFIX = 'http://122.9.152.120/ceres-business-api'

src/views/commodity/commoditySystem/addCommodity.vue

@@ -80,7 +80,7 @@
             <el-form-item class="form-item-long" label="供应商">
               <el-input v-model="form.supplierName" maxlength="30" show-word-limit placeholder="请输入供应商名称" />
             </el-form-item>
-            <el-form-item label="需要物流1" prop="ifLogistics">
+            <el-form-item label="需要物流" prop="ifLogistics">
               <el-radio-group v-model="form.ifLogistics">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -225,10 +225,14 @@ export default {
             skuValue: '', // 规格值
             price: '', // 售价
             originalPrice: '', // 原价
+            rate: '', // 税率
+            storehouseId : '',//仓库Id
+            isCross: 0, //是否跨境
             stockNumber: '', // 库存数量
             weight: '', // 重量
             skuImage: '', // 配图地址
-            style: '' // 款式  1-单款式 2-多款式
+            style: '', // 款式  1-单款式 2-多款式
+            sku:''
           }
         ]
       },
@@ -281,6 +285,9 @@ export default {
             skuImg: '',
             price: 0,
             originalPrice: 0,
+            rate: 0,
+            storehouseId: 0,
+            isCross: 0, //是否跨境
             stockNumber: 0,
             weight: 0
           }
@@ -417,10 +424,14 @@ export default {
             skuValue: '',
             price: '',
             originalPrice: '',
+            rate: '',
+            storehouseId: '',
+            isCross: 0, //是否跨境
             stockNumber: '',
             weight: '',
             skuImage: '',
-            style: ''
+            style: '',
+            sku:''
           }
         ]
       }
@@ -473,6 +484,9 @@ export default {
             skuImg: '',
             price: 0,
             originalPrice: 0,
+            rate: 0,
+            storehouseId: 0,
+            isCross: 0, //是否跨境
             stockNumber: 0,
             weight: 0
           }
@@ -502,7 +516,7 @@ export default {
     },
     // 保存
     async save() {
-      console.log(this.params.skuAttrList)
+      console.log(this.params)
       if (this.params.attrStyle === 1) {
         for (let i = 0; i < this.params.skuAttrList.length; i++) {
           if (this.params.skuAttrList[i].skuName === '') {
@@ -514,6 +528,51 @@ export default {
           }
         }
       }
+      for (let i = 0; i < this.params.skuList.length; i++) {
+        let skuItem = this.params.skuList[i];
+        console.log("skuItem:" + skuItem);
+        if(skuItem.rate === '' || skuItem.rate === null || skuItem.rate === undefined){
+          this.$message({
+            message: '税率不能为空',
+            type: 'warning'
+          })
+          return false
+        }
+        
+        if(skuItem.rate < 0){
+          this.$message({
+            message: '税率必须大于0',
+            type: 'warning'
+          })
+          return false
+        }
+        if(skuItem.rate > 100){
+          this.$message({
+            message: '税率必须小于100',
+            type: 'warning'
+          })
+          return false
+        }
+
+        console.log("skuItem:" + (skuItem.isCross === 1));
+        console.log("skuItem:" + (skuItem.sku === '' || skuItem.sku === null || skuItem.sku === undefined));
+        if(skuItem.isCross === 1 && (skuItem.sku === '' || skuItem.sku === null || skuItem.sku === undefined)){
+          this.$message({
+            message: '跨境商品必须设置国际条码',
+            type: 'warning'
+          })
+          return false
+        }
+
+        var storehouseId = skuItem.storehouseId;
+        if (storehouseId === '' || storehouseId === null || storehouseId === undefined || storehouseId === 0) {
+          this.$message({
+            message: '仓库不能为空',
+            type: 'warning'
+          })
+          return false
+        }
+      }
       this.form.names = this.params.skuAttrList
       this.params.skuList.forEach(element => {
         element.style = this.params.attrStyle

src/views/commodity/commoditySystem/addComponent.vue

@@ -57,6 +57,11 @@
               <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
             </template>
           </el-table-column>
+          <el-table-column label="税率">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.rate" :controls="false" :min="0" :precision="2" :step="0.01" />
+            </template>
+          </el-table-column>
           <el-table-column label="仓库">
             <template slot-scope="scope">
               <el-select v-model="scope.row.storehouseId" placeholder="请选择具体仓库" clearable>
@@ -186,6 +191,11 @@
               <el-input-number v-model="scope.row.originalPrice" :controls="false" :min="0" :precision="2" :step="0.01" />
             </template>
           </el-table-column>
+          <el-table-column label="税率">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.rate" :controls="false" :min="0" :precision="2" :step="0.01" />
+            </template>
+          </el-table-column>
           <el-table-column label="仓库">
             <template slot-scope="scope">
               <el-select v-model="scope.row.storehouseId" placeholder="请选择具体仓库" clearable>
@@ -300,16 +310,7 @@ export default {
       fileList: []
     }
   },
-  mounted(){
-    this.getStorehouseList();
-  },
   computed: {
-    // 获取商品分组
-    async getStorehouseList() {
-      const res = await storehouseGetAll({ page: 1, pageSize: 100
-      })
-      this.storehouseList = res.data.list
-    },
     skuAttrName() {
       return (
         this.form.skuAttrList &&
@@ -366,8 +367,15 @@ export default {
   },
   created() {
     this.headers.tenant = 'MDAwMA=='
+    this.getStorehouseList();
   },
   methods: {
+    // 获取商品分组
+    async getStorehouseList() {
+      const res = await storehouseGetAll({ page: 1, pageSize: 100
+      })
+      this.storehouseList = res.data.list
+    },
     // proving1(e) {
     //   var keynum = window.event ? e.keyCode : e.which // 获取键盘码
     //   // var keychar = String.fromCharCode(keynum) // 获取键盘码对应的字符
@@ -499,7 +507,9 @@ export default {
         price: 0,
         originalPrice: 0,
         stockNumber: 0,
-        weight: 0
+        weight: 0,
+        storehouseId: '',
+        isCross:0
       }
       const doExchange = (arr, depth) => {
         const map = {

src/views/system/logistics/Edit.vue

@@ -183,7 +183,7 @@ export default {
       },
       params: {
         logisticsName: '',
-        storehouseId: 0,
+        storehouseId: null,
         chargeType: 1,
         charges: [
           {