Merge branch 'dev' into test

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -298,7 +298,7 @@
           // console.log(row);
           return (
             _this.productLists.some((it) => it.categoryId == row.categoryId) ||
-            _this.dimension == '3'
+            _this.dimension == '3' || row.measureQuantity == 0
           );
         };
       },
@@ -393,7 +393,7 @@
                 selectable: (row) => {
                   return !_this.productLists.some(
                     (it) => it.categoryId == row.categoryId
-                  );
+                  ) && row.measureQuantity != 0;
                 }
               }
             : {
@@ -406,7 +406,7 @@
                 selectable: (row) => {
                   return !_this.productLists.some(
                     (it) => it.categoryId == row.categoryId
-                  );
+                  ) && row.measureQuantity != 0;
                 }
               },
           {
@@ -440,6 +440,15 @@
             showOverflowTooltip: true,
             slot: 'outboundNum'
           },
+          {
+            prop: 'inventoryCycle',
+            label: '存货周期(天)',
+            align: 'center',
+            width: 150,
+            sortable: true,
+            showOverflowTooltip: true,
+            hide: this.dimension == 1
+          },
           {
             prop: 'brandNum',
             label: '牌号',
@@ -515,7 +524,7 @@
             showOverflowTooltip: true
           }
         ];
-        return arr;
+        return arr.filter((item) => !item.hide);
       }
     },
 

src/views/warehouseManagement/stockManagement/index.vue

@@ -290,7 +290,7 @@
           </el-link>
           <el-link
             type="primary"
-            v-if="($hasPermission('wms:outintwo:delete') && rowrow.verifyStatus == 0 || row.verifyStatus == 3)"
+            v-if="row.verifyStatus == 0 || row.verifyStatus == 3"
             :underline="false"
             icon="el-icon-delete"
             @click="deleted(row)"