Merge branch 'feature/zl' into 'release'

auto commit

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

gitPush.sh

@@ -7,7 +7,7 @@ if [ ! $hasGit ];then
 else
   git fetch --all
   result=`git symbolic-ref --short -q HEAD` # 获取分支名
-  current_id=`git log -n 1 release --pretty=format:"%H"`
+  current_id=`git log -n 1 origin/release --pretty=format:"%H"`
   git reset --soft $current_id
   git add .
   git commit -m "$msg"

package.json

@@ -6,7 +6,7 @@
   "private": true,
   "license": "GPL",
   "scripts": {
-    "dev": "cross-env BUILD_ENV=development node build/dev-server.js",
+    "dev": "cross-env BUILD_ENV=test node build/dev-server.js",
     "local": "cross-env BUILD_ENV=development node build/dev-server.js",
     "build": "node build/build.js",
     "build:dev": "cross-env BUILD_ENV=dev node build/build.js",

src/views/goods/common/forms.js

@@ -21,6 +21,7 @@ const form = {
   incrStock: "", //增加库存
   storeId: "",
   optPrice: "",
+  realCostPrice: "",
   scorePerformance: 0,
   goodsStock: 0,
   stock: 0,

src/views/goods/common/rules.js

@@ -107,6 +107,7 @@ const rules = {
   //   { validator: checkBarcode, trigger: "blur" },
   // ],
   optPrice: [{ required: true, message: "请输入价格", trigger: "blur" }],
+  realCostPrice: [{ required: true, message: "请输入价格", trigger: "blur" }],
   saleType: [{ required: true, message: "请选择销售方式", trigger: "change" }],
   stock: [{ required: true, message: "请输入库存", trigger: "blur" }],
   minWhole: [{ required: true, message: "请输入最小起批", trigger: "blur" }],

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

@@ -249,6 +249,13 @@
                 </el-col>
               </el-form-item>
             </div>
+            <div class="inline">
+              <el-form-item label="成本价" prop="realCostPrice">
+                <el-col :span="20">
+                  <el-input-number class="stock-com" @input="$forceUpdate();" v-model="formData.realCostPrice" 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="optPrice">
                 <el-col :span="20">
@@ -1056,6 +1063,7 @@
           this.buyLimitDtoList = this.formData.buyLimitDtoList;
           this.formData.expressLimitFlag = expressLimitFlag;
           this.formData.optPrice = this.formData.costPrice/100;
+          this.formData.realCostPrice = this.formData.realCostPrice/100;
           this.formData.scorePerformance = this.formData.scorePerformance/100;
           this.fileGoodsList = this.getImges(goodDet.goodsImgList,1);
           this.fileIntrList = this.getImges(goodDet.goodsDetailImageList,2);
@@ -1249,6 +1257,7 @@
           return false;
         }else{
           this.formData.costPrice = signFigures(this.formData.optPrice*100, 10);
+          this.formData.realCostPrice = signFigures(this.formData.realCostPrice*100, 10);
           this.formData.hasChanged = true;
           this.formData.inputType =  this.inputType;
           this.updateGoodsInfo();

src/views/goods/goods-manage.vue

@@ -144,6 +144,11 @@
             <span>{{scope.row.costPrice | rangePrice}}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="realCostPrice" label="成本价" width="120" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.realCostPrice | rangePrice}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="commissionType" v-if="commissionFlag == 2" label="分佣方式" width="150" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.commissionType | commissionTypeFormat}}</span>
@@ -566,7 +571,7 @@
         }
       },
     },
-    methods: {    
+    methods: {
       handlePreview(){},
       handleRemove(){},
       beforeRemove(){},
@@ -580,13 +585,13 @@
           val.map(item => {
           if (item !== '') {
             newVal.push(item);
-          }     
+          }
         })
         }
       if (newVal.length > 0) {
       str = newVal.join('/')
       }
-        return str;       
+        return str;
       },
       //批量上传
       getBatchUpload(file) {