Merge branch 'master' into sso-login

# Conflicts:
#	dist/index.html

src/views/custom/outStock/index.vue

@@ -122,7 +122,7 @@
             <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.sterilisation == 1">已冲销</span>
-                <span v-if="scope.row.sterilisation == 2">部分冲销</span>
+                <span v-else-if="scope.row.sterilisation == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>

src/views/custom/returngoods/index.vue

@@ -536,7 +536,7 @@
           <el-table-column prop="dflag" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.dflag == 1">已冲销</span>
-                <span v-if="scope.row.dflag == 2">部分冲销</span>
+                <span v-else-if="scope.row.dflag == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>

src/views/custom/storage/index.vue

@@ -108,7 +108,7 @@
             <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.sterilisation == 1">已冲销</span>
-                <span v-if="scope.row.sterilisation == 2">部分冲销</span>
+                <span v-else-if="scope.row.sterilisation == 2">部分冲销</span>
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>