8/25 界面优化

src/views/basic/collectPoint/selectWorkplace.vue

@@ -11,18 +11,21 @@
             <el-form-item label="编码/名称:" class="query-form-item">
               <el-input v-model="query.key" placeholder="请输入编码/工位名称" clearable>
               </el-input>
-              <!--<el-form-item label="所属仓库:">-->
-
-              <!--              :isDisable.sync="defaultInv"-->
-              <!--</el-form-item>-->
-              <!--<el-select-->
-              <!--  v-model="query.key"-->
-              <!--  placeholder="请选择仓库">-->
-              <!--  <el-option v-for="item in unitStorageList"-->
-              <!--             :key="item.name"-->
-              <!--             :label="item.name"-->
-              <!--             :value="item.code"></el-option>-->
-              <!--</el-select>-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属组别:" class="query-form-item">
+              <el-select v-model="query.code" placeholder="请选择所属组别"
+                         style="width: 80%" clearable>
+                <el-option
+                  v-for="item in fromDeptOptions"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.label }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -58,6 +61,12 @@
             <span>{{ workplaceTypes[scope.row.workplaceType] }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="所属组别" prop="categoryName" width="90">
+          <template slot-scope="scope">
+            <span v-if="scope.row.categoryName !== '全部'">{{ scope.row.categoryName }}</span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
         <el-table-column label="所属部门" prop="deptCodeName" width="90"></el-table-column>
         <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
         <el-table-column label="工位负责人" prop="employeeName" width="90"></el-table-column>
@@ -616,7 +625,7 @@ export default {
   created() {
     this.getList()
     this.getInvList()
-    this.getBusType()
+    // this.getBusType()
     this.getTree()
     this.getLstTree()
   }