取消496

src/views/product/addProduct/index.vue

@@ -246,13 +246,13 @@
               </el-radio-group>
             </el-form-item>
             <!-- 新加 ************ -->
-            <el-form-item v-if="merInfo.mer_id == 496" label="养老金：" props="pension_is">
+            <el-form-item v-if="merInfo.mer_id == 496 && merInfo.mer_id == -1" label="养老金：" props="pension_is">
               <el-radio-group v-model="formValidate.pension_is" @change="onChangePensiontype(formValidate.pension_is)">
                 <el-radio label="1" class="radio">单独设置</el-radio>
                 <el-radio label="0" :disabled="formValidate.volunteer == 1?true:false">默认设置</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="merInfo.mer_id == 496" label="分享奖：" props="share_is">
+            <el-form-item v-if="merInfo.mer_id == 496 && merInfo.mer_id == -1" label="分享奖：" props="share_is">
               <el-radio-group v-model="formValidate.share_is" @change="onChangeShareMoneytype(formValidate.share_is)">
                 <el-radio label="1" class="radio">单独设置</el-radio>
                 <el-radio label="0" :disabled="formValidate.volunteer == 1?true:false">默认设置</el-radio>
@@ -435,7 +435,7 @@
                   </el-table-column>
                 </template> -->
 
-                <template v-if="merInfo.mer_id == 496">
+                <template v-if="merInfo.mer_id == 496 && merInfo.mer_id == -1">
                   <template v-if="formValidate.share_is == 1">
                     <el-table-column align="center" label="分享奖(%)" min-width="120">
                       <template slot-scope="scope">
@@ -541,7 +541,7 @@
                   </el-table-column>
                 </template> -->
 
-                <template v-if="merInfo.mer_id == 496">
+                <template v-if="merInfo.mer_id == 496 && merInfo.mer_id == -1">
 
                 <template v-if="formValidate.share_is == 1">
                   <el-table-column align="center" label="分享奖(%)" min-width="120">
@@ -648,7 +648,7 @@ const defaultObj = {
     stock: null,
     bar_code: '',
     weight: null,
-    volume: null
+    volume: null,
     // stock_num: null,
     // shares_num: null
   }],