kz-ui-base 1.0.90 → 1.0.92

package/api/system/dept.js

@@ -1,14 +1,22 @@
 import request from '@utils/request'
 
-// 查询部门列表
+// 查询部门列表(可用状态)
 export function listDept(query) {
   return request({
-    url: '/system/dept/list',
+    url: '/system/dept/listAvailDept',
     method: 'get',
     params: query
   })
 }
 
+// 查询部门列表(全部状态)
+export function listDeptAllStatus(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
+}
 // 查询部门列表（排除节点）
 export function listDeptExcludeChild(query) {
   return request({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "description": "",
   "main": "index.js",
   "scripts": {

package/views/bd/common/modal/EmployeeModal.vue

@@ -298,14 +298,14 @@ export default {
         this.msgError("请选择一笔员工数据！");
       } else {
         if(this.multipleChoice) {
-          this.$closeDialog(true, this.multipleSelection)
+          this.confirm(this.multipleSelection)
         } else {
-          this.$closeDialog(true, this.multipleSelection?.[0])
+          this.confirm(this.multipleSelection?.[0])
         }
       }
     },
     handleCancel() {
-      this.$closeDialog()
+      this.cancel()
     },
     siteChangeEvent(val) {
       this.listQueryParams.deptId = ""

package/views/bd/common/modal/ItemModal.vue

@@ -30,11 +30,16 @@
                     <el-input clearable v-model="searchParams.item.itemSpec" placeholder="请输入规格型号"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6" v-if="!isSkipSearch('itemStatusCode')">
-                  <el-form-item label="物料状态" prop="itemStatusCode">
-                    <dict-select clearable type="item_status_code" v-model="searchParams.item.itemStatusCode"
-                                 placeholder="请输入物料状态"></dict-select>
+                <el-col :span="6" v-if="!isSkipSearch('itemClassId') && !showItemClass">
+                  <el-form-item label="存货分类" prop="itemSpec">
+                    <el-cascader
+                      :options="treeData"
+                      @change="onItemClassIdChange"
+                      :props="{ value: 'id', name: 'itemClassName', label: 'itemClassName', children: 'children', checkStrictly: true }"
+                      clearable>
+                    </el-cascader>
                   </el-form-item>
+
                 </el-col>
               </el-row>
               <el-row>
@@ -103,6 +108,7 @@
                   </el-table-column>
                   <el-table-column v-for="col in listColumns" :label="col.text" :property="col.property"
                                    :align="col.align || 'left'" :prop="col.property" v-if="col.visible != false"
+                                   :width="col.width"
                                    :min-width="col.width || 100" show-overflow-tooltip>
                     <template slot-scope="scope">
                       {{
@@ -146,6 +152,7 @@ import {listItemCategoryItmAttribute} from "@srcApi/bd/itemCategory";
 import {listItem} from "@srcApi/bd/item";
 import {tableHandleSelect, tableOnSelectionChange, tableRowClick, tableRowStyle} from "@/utils/index";
 
+
 @Component({
   components: {
     EntitySelect
@@ -181,7 +188,7 @@ export default class itemModal extends Vue {
       itemNo: null,
       itemName: null,
       itemSpec: null,
-      itemStatusCode: null,
+      itemClassId: null,
       baseUomCode: null,
       isDomesticSale: null,
       isExportSale: null,
@@ -196,14 +203,9 @@ export default class itemModal extends Vue {
     pageNum: 1,
   };
   listColumns = [
-    {text: "物料编号", property: "itemNo"},
+    {text: "物料编号", property: "itemNo", width: 120},
     {text: "物料名称", property: "itemName"},
     {text: "规格型号", property: "itemSpec"},
-    {
-      text: "物料状态",
-      property: "itemStatusCode",
-      dictType: "item_status_code",
-    }
   ];
 
   @Watch("searchParams.item", {deep: true})
@@ -238,6 +240,15 @@ export default class itemModal extends Vue {
     tableRowStyle({row, rowIndex})
   }
 
+  onItemClassIdChange(data) {
+    console.log(data)
+    if (data.length > 0) {
+      this.searchParams.item.itemClassId = data[data.length - 1];
+    } else {
+      this.$set(this.searchParams.item, 'itemClassId', null);
+    }
+  }
+
   handleItemCategorySelect(itemCategoryId) {
     this.loadingParams = true;
     this.$set(this, "searchAttributes", []);
@@ -270,10 +281,28 @@ export default class itemModal extends Vue {
 
   getTreeData() {
     treeSelect().then((response) => {
-      this.treeData = response.data;
+      let resData = response.data;
+      this.deleteEmptyChildren(resData)
+      this.$set(this, 'treeData', resData);
     });
   }
 
+  deleteEmptyChildren(rootNodes) {
+    rootNodes.forEach(node => {
+      if (node.children && node.children.length === 0) {
+        delete node.children
+      }
+      if (node.children) {
+        this.deleteEmptyChildren(node.children)
+      }
+    })
+  }
+
+
+  treeSelectSelect(node, instanceId) {
+    this.searchParams.item.itemClassId = node.id
+  }
+
   getList() {
     this.tableLoading = true;
     if (this.searchObj != null) {
@@ -281,6 +310,9 @@ export default class itemModal extends Vue {
         this.searchParams.item[prop] = this.searchObj[prop];
       }
     }
+    if (this.searchParams.item.itemClassId == '') {
+      this.searchParams.item.itemClassId = null;
+    }
     listItem(this.searchParams).then((res) => {
       this.listData = res.data;
       this.tableLoading = false;