no message

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

@@ -242,7 +242,7 @@
                 <el-input size="small" v-model="scope.row.specValue" :disabled="scope.row.goodsCode != ''"></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="*规格型号" prop="goodsCode" min-width="180">
+            <el-table-column align="center" :label="`${joinCode == 'NO' ? '' : '*'}规格型号`" prop="goodsCode" min-width="180">
               <template slot-scope="scope">
                 <el-select
                   :disabled="joinCode == 'NO'"
@@ -298,7 +298,7 @@
             </el-table-column>
             <el-table-column align="center" label="总库存数量" prop="stockQty" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.stockQty}}
+                {{scope.row.stockQty || 0}}
               </template>
             </el-table-column>
             <el-table-column align="center" label="*规格图片" prop="imgUrl" min-width="120">

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

@@ -287,9 +287,9 @@
                 {{scope.row.num * scope.row.price * 100 / 100}}
               </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}}
+                {{scope.row.stockQty || 0}}
               </template>
             </el-table-column>
 
@@ -530,9 +530,9 @@
                 {{scope.row.num * scope.row.price * 100 / 100}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="库存数量" prop="goodsMaterialStock" min-width="120">
+            <el-table-column align="center" label="总库存数量" prop="goodsMaterialStock" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.flag == 1 ? scope.row.stockQty : scope.row.goodsMaterialStock}}
+                {{scope.row.flag == 1 ? (scope.row.stockQty || 0) : (scope.row.goodsMaterialStock || 0)}}
               </template>
             </el-table-column>
           </el-table>

src/views/mallManagement/storage/index.vue

@@ -115,8 +115,11 @@ export default {
         md: 6,
         isShow: true,
         name: 'el-checkbox',
-        options: [{value: '商品', label: '商品'}, {value: '辅材', label: '辅材'}, {value: '配件', label: '配件'}],
-        attributes: { disabled: this.formDialogType == 1 },
+        options: [
+          {value: '商品', label: '商品', disabled: this.formDialogType == 1 || this.formData.type.indexOf('辅材') >= 0 || this.formData.type.indexOf('配件') >= 0}, 
+          {value: '辅材', label: '辅材', disabled: this.formDialogType == 1 || this.formData.type.indexOf('商品') >= 0}, 
+          {value: '配件', label: '配件', disabled: this.formDialogType == 1 || this.formData.type.indexOf('商品') >= 0}],
+        // attributes: { disabled: this.formDialogType == 1 },
         formItemAttributes: {
           label: '仓储属性',
           prop: 'type',