Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/warehouseBusiness/inStock/index.vue

@@ -1791,7 +1791,7 @@
               header-align="center"
               align="center"
               width="130px"
-              label="结算方式"
+              label="结算1方式"
             >
               <template slot-scope="scope">
                 <el-select
@@ -1800,7 +1800,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="dict in fStltypeidOptions"
+                    v-for="dict in fStltypeOptions"
                     :key="dict.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"
@@ -2146,7 +2146,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="dict in fStltypeidOptions"
+                    v-for="dict in fStltypeOptions"
                     :key="dict.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"

src/views/warehouseBusiness/outStock/index.vue

@@ -1605,7 +1605,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="dict in fStltypeidOptions"
+                    v-for="dict in fStltypeOptions"
                     :key="dict.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"
@@ -1949,7 +1949,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="dict in fStltypeidOptions"
+                    v-for="dict in fStltypeOptions"
                     :key="dict.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -1562,7 +1562,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="dict in fStltypeidOptions"
+                    v-for="dict in fStltypeOptions"
                     :key="dict.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"
@@ -1898,7 +1898,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="dict in fStltypeidOptions"
+                    v-for="dict in fStltypeOptions"
                     :key="dict.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"