Merge branch 'bug' into develop

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -685,7 +685,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          if (!this.detailList.installDate) {
+          if (this.isCustomer && !this.detailList.installDate) {
             this.$message.error('请选择安装时间')
             return
           }

src/views/deposit_home/components/refund_list-detail.vue

@@ -901,7 +901,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          if (!this.detailList.installDate) {
+          if (this.isCustomer && !this.detailList.installDate) {
             this.$message.error('请选择安装时间')
             return
           }

src/views/stock/stock_list.vue

@@ -107,6 +107,13 @@
             min-width="100"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            align="left"
+            label="物料分组"
+            prop="materialGroupName"
+            min-width="200"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.materialNumber" />