3.1上线补充细节

src/views/system/goods/add/components/goodsinfomation.vue

@@ -23,10 +23,11 @@
         </el-select>
         <el-link class="edit-type-span el-icon-plus" type="primary" :underline="false" @click="toPage('brand')">新增品牌</el-link>
       </el-form-item>
-      <el-form-item label="计量单位：">
+      <el-form-item label="计量单位：" prop="metering_unit">
         <el-select v-model.trim="goodsInfoForm.metering_unit" placeholder="请选择商品计量单位" style="width: 420px;">
           <el-option v-for="item in unitList" :key="item.id" :label="item.title" :value="item.id"></el-option>
         </el-select>
+        <el-link class="edit-type-span el-icon-plus" type="primary" :underline="false" @click="toPage('metering_unit')">新增计量单位</el-link>
       </el-form-item>
       <el-form-item label="包装单位：" prop="packaging_unit">
         <el-select v-model.trim="goodsInfoForm.packaging_unit" placeholder="请选择商品包装单位" style="width: 420px;">
@@ -51,22 +52,22 @@
       <!-- <el-form-item label='商品编码：' prop="out_goods_id">
         <el-input v-model.trim="goodsInfoForm.out_goods_id" placeholder="请输入商品编码（非必须）" style="width:420px;"></el-input>
       </el-form-item> -->
-      <div style="display: flex;justify-content: flex-start;flex-direction: row;">
-        <el-form-item label='税收分类：' prop="ssfl">
-          <el-input v-model.trim="goodsInfoForm.ssfl" :disabled="true" placeholder="请输入税收分类" style="width:160px;"></el-input>
-        </el-form-item>
-
-        <el-form-item label='税率：' prop="tax_rate" label-width="100px">
-          <el-select v-model.trim="goodsInfoForm.tax_rate" placeholder="请选择商品税率" style="width: 160px;">
-            <el-option
-              v-for="item in taxRateOptions"
-              :key="item.id"
-              :label="item.value"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </div>
+<!--      <div style="display: flex;justify-content: flex-start;flex-direction: row;">-->
+<!--        <el-form-item label='税收分类：' prop="ssfl">-->
+<!--          <el-input v-model.trim="goodsInfoForm.ssfl" :disabled="true" placeholder="请输入税收分类" style="width:160px;"></el-input>-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item label='税率：' prop="tax_rate" label-width="100px">-->
+<!--          <el-select v-model.trim="goodsInfoForm.tax_rate" placeholder="请选择商品税率" style="width: 160px;">-->
+<!--            <el-option-->
+<!--              v-for="item in taxRateOptions"-->
+<!--              :key="item.id"-->
+<!--              :label="item.value"-->
+<!--              :value="item.id"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--      </div>-->
       <el-form-item label="商品图片：" prop="imgs">
         <span class="tip-span" style="display: block;line-height: 34px;">
           <i style="margin: 10px;">{{ goodsImgFileList.length }} / 7</i>
@@ -104,14 +105,15 @@
       </el-form-item>
 
       <!--  更多设置  -->
-      <p class="more-settings-p" @click="switchMoreSetting">
-        <span>{{ !isMoreSetting ? "展开" : "收起"}}</span>更多设置
-        <i v-show="!isMoreSetting" class="el-icon-arrow-down"></i>
-        <i v-show="isMoreSetting" class="el-icon-arrow-up"></i>
-      </p>
+<!--      <p class="more-settings-p" @click="switchMoreSetting">-->
+<!--        <span>{{ !isMoreSetting ? "展开" : "收起"}}</span>更多设置-->
+<!--        <i v-show="!isMoreSetting" class="el-icon-arrow-down"></i>-->
+<!--        <i v-show="isMoreSetting" class="el-icon-arrow-up"></i>-->
+<!--      </p>-->
 
       <transition name="fade">
-        <div v-show="isMoreSetting">
+<!--        <div v-show="isMoreSetting">-->
+        <div v-show="true">
         <el-form-item label='市场参考价链接：'>
           <el-input v-model.trim="goodsInfoForm.web_url" placeholder="请输入京东或者淘宝的商品链接" style="width:420px;"></el-input>
         </el-form-item>
@@ -183,7 +185,7 @@
   import { NewGetCategoryData, UploadImg, getByCategoryData, uploadVideo,synthesisList } from '@/api/module/goods'
   import { getBrandsInf } from '@/api/module/brand/brand'
   import { getAreaList } from '@/api/module/retreat/address'
-  import { wareHoustList } from "@/api/system/wareHouse";
+  // import { wareHoustList } from "@/api/system/wareHouse";
   import draggable from 'vuedraggable'
   export default {
     name: 'goods',
@@ -294,8 +296,8 @@
           metering_unit: '', // 计量单位
           packaging_unit: '', // 包装单位
           conversion_unit: '', // 换算关系
-          ssfl: '', // 税收分类
-          tax_rate: 0, // 税率
+          // ssfl: '', // 税收分类
+          // tax_rate: 0, // 税率
           web_url: '',          // 外部链接
           group: '',          // 商品分组
           supplier: '',          // 供应商
@@ -312,11 +314,11 @@
             { min: 3, max: 50, message: '商品标题限制在3字符以上，50个字符以下', trigger: 'blur' }
           ],
           brand_id: [{ required: true, message: '请选择商品品牌', trigger: 'change' }],
-          ssfl: [{ required: true, message: '请选择商品税收分类', trigger: 'change' }],
+          // ssfl: [{ required: true, message: '请选择商品税收分类', trigger: 'change' }],
           // goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}],
           producing_area_id_list:[{required: true, message: '请选择商品产地', trigger: 'change'}],
           deliver_area_id_list: [{ required: true, message: '请选择商品发货地', trigger: 'change' }],
-          // metering_unit: [{ required: true, message: '商品单位不能为空', trigger: 'change' }],
+          metering_unit: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
           goods_brand: [{ required: true, message: '请选择商品品牌', trigger: 'change' }],
           imgs: [{ required: true, message: '请上传商品图片', validator: categoryIdCheck }]
         },
@@ -868,6 +870,10 @@
             this.$router.push({ path: '/system/goods/brand' });
             break;
           }
+          case 'metering_unit' : {
+            this.$router.push({ path: '/system/goods/commodityUnitd' });
+            break;
+          }
           case 'group' : {
             // this.$router.push({ path: '/system/settings/commodityGroup' });
             this.$router.push({ path: '/system/goods/commodityGroup' });

src/views/system/goods/add/index.vue

@@ -222,7 +222,7 @@
               producing_area: res.data.producing_area, // 产地中文名称
               deliver_area_id_list: "", // 发货地的idlist
               deliver_area: res.data.deliver_area, // 发货地中文名称
-              tax_rate: res.data.tax_rate,// 税率
+              // tax_rate: res.data.tax_rate,// 税率
               goods_brand: res.data.goods_brand, // 品牌
               brand_id: res.data.brand_id, // 品牌
               web_url: res.data.web_url,  // 市场参考价链接
@@ -231,7 +231,7 @@
               storehouse: res.data.storehouse !== 0 ? res.data.storehouse : "", // 仓库
               imgs: res.data.imgs,          // 商品图片
               video:res.data.video,
-              ssfl: (res.data.category_three_id && res.data.category_three_name) ? res.data.category_three_name : ""
+              // ssfl: (res.data.category_three_id && res.data.category_three_name) ? res.data.category_three_name : ""
             }
             this.goodsinfodata.categoryStr = res.data.category_first_name + '/' + res.data.category_first_name + '/' + res.data.category_three_name;