Merge branch 'hotfix0404' into 'release'

Hotfix0404

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!499

src/views/goods/create-good-new.vue

@@ -325,7 +325,13 @@
                 </el-col>
               </el-form-item>
             </div>
-
+            <div class="inline">
+              <el-form-item label="阳性报销上限" prop="reimburseMax">
+                <el-col :span="20">
+                  <el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.reimburseMax" size="small" :precision="2" :min="0.00" :max="99999.99"></el-input-number>
+                </el-col>
+              </el-form-item>
+            </div>
             <div class="inline" v-if="formData.saleType == 2">
               <el-form-item label="最小起批" prop="minWhole" class="required-label">
                 <el-col :span="20">
@@ -376,6 +382,7 @@
               <span style="margin-left: 5px;">次</span>
             </el-form-item>
           </div>
+
           <div class="inline">
             <el-form-item>
               <el-button size="small" type="primary" @click="addBuyingLimit"><i class="el-icon-plus"></i>限购条件</el-button>
@@ -635,7 +642,7 @@
             label: '年',
             value: 365,
           }],
-        formData: JSON.parse(JSON.stringify(originForm)), // 通用信息
+        formData: {...JSON.parse(JSON.stringify(originForm)),reimburseMax:''}, // 通用信息
         formData1: JSON.parse(JSON.stringify(originForm1)), // 基本信息
         formData3: JSON.parse(JSON.stringify(originForm3)),
         buyLimitDtoList:[],
@@ -716,7 +723,8 @@
       this.inputType = inputType || '';
       this.commissionFlag = commissionFlag;
       this.storeType = storeType;
-      this.rules = originRules;
+
+      this.rules = {...originRules};
       this.rules1 = originRules1;
       this.rules3 = originRules3;
 
@@ -1068,6 +1076,7 @@
           this.fileGoodsList = this.getImges(goodDet.goodsImgList,1);
           this.fileIntrList = this.getImges(goodDet.goodsDetailImageList,2);
           this.formData.stock = this.formData.goodsStock;
+          this.formData.reimburseMax = this.formData.reimburseMax/100;
           if (goodDet.goodsVideoList.length > 0) {
               this.videoList.push(goodDet.goodsVideoList[0]);
               this.videoModel.videoFullPath = this.videoList[0].goodsImgUrl;
@@ -1257,7 +1266,8 @@
           return false;
         }else{
           this.formData.costPrice = signFigures(this.formData.optPrice*100, 10);
-          this.formData.realCostPrice = signFigures(this.formData.realCostPrice*100, 10);
+          this.formData.realCostPrice = signFigures(this.formData.realCostPrice * 100, 10);
+          this.formData.reimburseMax = signFigures(this.formData.reimburseMax*100, 10);
           this.formData.hasChanged = true;
           this.formData.inputType =  this.inputType;
           this.updateGoodsInfo();