Merge pull request '供应商结算成本、总成本' (#26) from yyw into master

Reviewed-on: #26

src/views/commodity/combination.vue

@@ -67,7 +67,7 @@
     </el-card>
 
     <el-dialog v-model="showDialog" width="900px" :title="opaType == 'add' ? '新增' : '编辑' ">
-      <el-form label-position="right" label-width="110px">
+      <el-form label-position="right" label-width="130px">
         <el-form-item label="组合商品名称：">
           <el-input v-model="itemInfo.title" clearable></el-input>
         </el-form-item>
@@ -80,9 +80,15 @@
         <el-form-item label="商品成本：">
           <el-input placeholder="商品成本" v-model="itemInfo.goods_cost" clearable style="width: 250px;"></el-input>
         </el-form-item>
+        <el-form-item label="供应商结算成本：">
+          <el-input placeholder="供应商结算成本" v-model="itemInfo.settle_cost" clearable></el-input>
+        </el-form-item>
         <el-form-item label="运费成本：">
           <el-input placeholder="运费成本" v-model="itemInfo.freight_cost" clearable style="width: 250px;"></el-input>
         </el-form-item>
+        <el-form-item label="总成本：">
+          <el-input placeholder="总成本" v-model="itemInfo.total_cost" clearable></el-input>
+        </el-form-item>
         <el-form-item label="状态：">
           <el-radio-group v-model="itemInfo.status">
             <el-radio :label="1">启用</el-radio>
@@ -205,7 +211,9 @@ export default {
         sort: 0,
         status: 1,
         goods_cost: 0,
-        freight_cost: 0
+        freight_cost: 0,
+        settle_cost: 0,
+        total_cost: 0
       }
       data.showDialog = true
     }

src/views/commodity/list.vue

@@ -140,7 +140,7 @@
 
       <div v-for="(item, i) in skusList" :key="i" class="skuBox">
         <div class="tit">规格{{ i + 1 }}</div>
-        <el-form label-width="110px" :inline="true" :disabled="opaType == 'view'">
+        <el-form label-width="130px" :inline="true" :disabled="opaType == 'view'">
           <el-form-item label="规格名称：">
             <el-input placeholder="规格名称" v-model="item.title" clearable style="width: 250px;"></el-input>
           </el-form-item>
@@ -175,12 +175,18 @@
           <el-form-item label="采购成本：">
             <el-input placeholder="采购成本" v-model="item.goods_cost" clearable style="width: 250px;"></el-input>
           </el-form-item>
+          <el-form-item label="供应商结算成本：">
+            <el-input placeholder="供应商结算成本" v-model="item.settle_cost" clearable style="width: 250px;"></el-input>
+          </el-form-item>
           <el-form-item label="其他成本：">
             <el-input placeholder="其他成本" v-model="item.other_cost" clearable style="width: 250px;"></el-input>
           </el-form-item>
           <el-form-item label="运费成本：">
             <el-input placeholder="运费成本" v-model="item.freight_cost" clearable style="width: 250px;"></el-input>
           </el-form-item>
+          <el-form-item label="总成本：">
+            <el-input placeholder="总成本" v-model="item.total_cost" clearable style="width: 250px;"></el-input>
+          </el-form-item>
           <el-form-item label="赠品：">
             <el-radio-group v-model="item.gift" style="width: 250px;">
               <el-radio :label="0">不是</el-radio>
@@ -404,6 +410,8 @@ export default {
         status: 1,
         sort: 0,
         gift: 0,
+        settle_cost: 0,
+        total_cost: 0,
         goods_cost: 0,
         other_cost: 0,
         freight_cost: 0,

src/views/commodity/sku.vue

@@ -167,8 +167,8 @@
       </template>
     </el-dialog>
 
-    <el-dialog v-model="showDialog" width="600px" :title="opaType == 'add' ? '新增' : '编辑' ">
+    <el-dialog v-model="showDialog" width="800px" :title="opaType == 'add' ? '新增' : '编辑' ">
-      <el-form label-position="right" label-width="110px">
+      <el-form label-position="right" label-width="130px">
         <el-form-item label="所属商品：">
           <el-select v-model="itemInfo.goods_id" placeholder="请选择" clearable filterable>
             <el-option v-for="it in goodsList" :key="it.id" :label="it.title" :value="it.id" />
@@ -203,14 +203,20 @@
             </el-select>
           </el-form-item>
         <el-form-item label="采购成本：">
-            <el-input placeholder="采购成本" v-model="itemInfo.goods_cost" clearable></el-input>
+          <el-input placeholder="采购成本" v-model="itemInfo.goods_cost" clearable></el-input>
-          </el-form-item>
+        </el-form-item>
-          <el-form-item label="其他成本：">
+        <el-form-item label="供应商结算成本：">
-            <el-input placeholder="其他成本" v-model="itemInfo.other_cost" clearable></el-input>
+          <el-input placeholder="供应商结算成本" v-model="itemInfo.settle_cost" clearable></el-input>
-          </el-form-item>
+        </el-form-item>
+        <el-form-item label="其他成本：">
+          <el-input placeholder="其他成本" v-model="itemInfo.other_cost" clearable></el-input>
+        </el-form-item>
         <el-form-item label="运费成本：">
           <el-input v-model="itemInfo.freight_cost" clearable></el-input>
         </el-form-item>
+        <el-form-item label="总成本：">
+          <el-input placeholder="总成本" v-model="itemInfo.total_cost" clearable></el-input>
+        </el-form-item>
         <el-form-item label="状态：">
           <el-radio-group v-model="itemInfo.status">
             <el-radio :label="1">启用</el-radio>