Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/inout/DialogCreateOrder.vue

src/views/inout/DialogCreateOrder.vue

@@ -51,6 +51,7 @@
           </el-col>
         </el-row>
         <el-row>
+
           <el-col :span="11">
             <el-form-item prop="invCode" label="收货仓库:">
               <el-select v-model="orderFormData.invCode" placeholder="收货仓库"
@@ -69,6 +70,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="11">
             <el-form-item prop="action" label="单据类型:">
               <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
@@ -85,6 +87,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+
         </el-row>
         <el-row>
           <el-col :span="11">

src/views/system/dept/authDept.vue

@@ -66,8 +66,9 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="部门名称" prop="name"></el-table-column>
         <el-table-column label="部门编码" prop="code"></el-table-column>
-        <el-table-column label="部门名称" prop="name"></el-table-column>
-        <el-table-column label="部门编码" prop="code"></el-table-column>
+
+<!--        <el-table-column label="部门名称" prop="name"></el-table-column>-->
+<!--        <el-table-column label="部门编码" prop="code"></el-table-column>-->
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
             <el-tag :type="scope.row.status | statusFilterType"
@@ -75,6 +76,13 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="允许供应商使用" prop="spUse">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.spUse | spUerFilterType"
+            >{{ scope.row.spUse | spUerFilterName }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">