发货退货增加物料名称，商品列表库存修改

src/views/mallManagement/goods/goods_add/index.vue

@@ -217,12 +217,12 @@
                 <el-input size="small" v-model="scope.row.innerShareAmount"></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="上架库存" prop="stockNum" min-width="120">
+            <el-table-column align="center" label="商品库存" prop="stockNum" min-width="120">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.stockNum"></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="当前库存" prop="stockQty" min-width="120">
+            <el-table-column align="center" label="仓库库存" prop="stockQty" min-width="120">
               <template slot-scope="scope">
                 {{scope.row.stockQty}}
               </template>

src/views/mallManagement/goods/goods_index/index.vue

@@ -139,13 +139,14 @@
               <i class="el-icon-edit pointer" @click="editData('innerSharePercent', scope.row)"></i>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="库存" prop="stockNum" min-width="110" sortable>
+          <el-table-column align="center" label="商品库存" prop="stockNum" min-width="110" sortable>
             <template slot-scope="scope">
               <!-- {{ scope.row.stockNum }} -->
               <span style="margin-right: 10px">{{ scope.row.stockNum }}</span>
               <i class="el-icon-edit pointer" @click="editData('stockNum', scope.row)"></i>
             </template>
           </el-table-column>
+		  <el-table-column align="center" label="仓库库存" prop="allStockNum" min-width="110" sortable></el-table-column>
           <el-table-column align="center" label="销量" prop="soldNum" min-width="110" sortable></el-table-column>
           <el-table-column align="center" label="排序" prop="sortNum" min-width="110" sortable>
             <template slot-scope="scope">
@@ -231,11 +232,12 @@
             <el-input v-model="scope.row.innerSharePercent" :disabled="editType !== 'innerSharePercent'"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="库存" prop="stockNum" min-width="120">
+        <el-table-column align="center" label="商品库存" prop="stockNum" min-width="120">
           <template slot-scope="scope">
             <el-input v-model="scope.row.stockNum" :disabled="editType != 'stockNum'"></el-input>
           </template>
         </el-table-column>
+		<el-table-column align="center" label="仓库库存" prop="goodsMaterialStock"></el-table-column>
         <el-table-column align="center" label="物料编号" prop="goodsCode" min-width="120">
           <template slot-scope="scope">
             <el-input v-model="scope.row.goodsCode"></el-input>
@@ -493,7 +495,7 @@ export default {
         sharePercent: '佣金比例',
         innerShareAmount: '内部分销金额',
         innerSharePercent: '内部佣金比例',
-        stockNum: '库存',
+        stockNum: '商品库存',
         sortNum: '排序'
       }
       await getGoodsDetail({goodsId: item.goodsId}).then(res => {

src/views/mallManagement/order/order_detail/index.vue

@@ -316,6 +316,7 @@
 									<el-table-column prop="mainName" align="center" label="大类"></el-table-column>
 									<el-table-column prop="smallName" align="center" label="小类"></el-table-column>
 									<el-table-column prop="goodsName" align="center" label="商品名称"></el-table-column>
+									<el-table-column prop="goodsMaterialName" align="center" label="物料名称"></el-table-column>
 									<el-table-column prop="goodsMaterialSpecsName" align="center" label="规格型号"></el-table-column>
 									<el-table-column prop="goodsMaterialUnit" align="center" label="单位">
 										<template slot-scope="scope">

src/views/mallManagement/order/order_list/index.vue

@@ -399,6 +399,7 @@
 											<el-table-column prop="mainName" align="center" label="大类"></el-table-column>
 											<el-table-column prop="smallName" align="center" label="小类"></el-table-column>
 											<el-table-column prop="goodsName" align="center" label="商品名称"></el-table-column>
+											<el-table-column prop="goodsMaterialName" align="center" label="物料名称"></el-table-column>
 											<el-table-column prop="goodsMaterialSpecsName" align="center" label="规格型号"></el-table-column>
 											<el-table-column prop="goodsMaterialUnit" align="center" label="单位">
 												<template slot-scope="scope">

src/views/mallManagement/order/order_refund/index.vue

@@ -295,6 +295,7 @@
                       <el-table-column prop="mainName" align="center" label="大类"></el-table-column>
                       <el-table-column prop="smallName" align="center" label="小类"></el-table-column>
                       <el-table-column prop="goodsName" align="center" label="商品名称"></el-table-column>
+					  <el-table-column prop="goodsMaterialName" align="center" label="物料名称"></el-table-column>
                       <el-table-column prop="goodsMaterialSpecsName" align="center" label="规格型号"></el-table-column>
                       <el-table-column prop="goodsMaterialUnit" align="center" label="单位">
                         <template slot-scope="scope">

src/views/mallManagement/order/order_refund_detail/index.vue

@@ -205,6 +205,7 @@
 									<el-table-column prop="mainName" align="center" label="大类"></el-table-column>
 									<el-table-column prop="smallName" align="center" label="小类"></el-table-column>
 									<el-table-column prop="goodsName" align="center" label="商品名称"></el-table-column>
+									<el-table-column prop="goodsMaterialName" align="center" label="物料名称"></el-table-column>
 									<el-table-column prop="goodsMaterialSpecsName" align="center" label="规格型号"></el-table-column>
 									<el-table-column prop="goodsMaterialUnit" align="center" label="单位">
 										<template slot-scope="scope">