kz-ui-base 1.0.140 → 1.0.142

package/api/system/dept.js

@@ -1,6 +1,6 @@
 import request from '@utils/request'
 
-// 查询部门列表(可用状态)
+// 查询部门列表(可用状态&PageSize=10条)
 export function listDept(query) {
   return request({
     url: '/system/dept/listAvailDept',
@@ -9,6 +9,15 @@ export function listDept(query) {
   })
 }
 
+// 查询部门列表(可用状态&PageSize=999条)
+export function listDeptAll(query) {
+  return request({
+    url: '/system/dept/listAvailDeptAll',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询部门列表(全部状态)
 export function listDeptAllStatus(query) {
   return request({

package/common/src/api/common/common.js

@@ -13,6 +13,9 @@ export function getDicts(dictType) {
     return Promise.resolve({
       data: cache[dictType],
     });
+  }else{
+    //如果cache是个undefined就在缓存中创建dict
+    cache = {}
   }
   return new Promise((resolve) => {
     request({

package/components/sm/SmOrderSelectModal.vue

@@ -163,7 +163,7 @@ export default class SmOrderSelectModal extends Vue {
       });
     }
     },
-    {text: "下发数量", property: "currentQuantity", width: 80, align: "right",
+    {text: "合同下发数量", property: "currentQuantity", width: 100, align: "right",
     formatter: (row: any, column: any, cellValue: any) => {
       if (cellValue == null || isNaN(cellValue)) return '0.00';
       return parseFloat(cellValue).toLocaleString('en-US', {

package/package.json

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

package/views/pd/common/modal/technicalStandardModal.vue

@@ -305,6 +305,8 @@ export default class StandardList extends ListBasePage {
     technicalStandardName: "",
     prodCategoryCode: this.prodCategoryCode ? this.prodCategoryCode : "",
     technicalStandardType: this.technicalStandardType ? this.technicalStandardType : "",
+    isExecutionStandard: undefined,
+    isInspectionStandard: undefined
   };
   // 列表分页参数
   listQueryParams = {
@@ -376,8 +378,14 @@ export default class StandardList extends ListBasePage {
         })
       })
     })
+    if (this.setting?.data?.searchObj?.isExecutionStandard) {
+      this.searchParams.isExecutionStandard = this.setting.data.searchObj.isExecutionStandard
+    }
+    if (this.setting?.data?.searchObj?.isInspectionStandard) {
+      this.searchParams.isInspectionStandard = this.setting.data.searchObj.isInspectionStandard
+    }
     if(this.setting?.data?.technicalStandardName){
-      this.searchParams.technicalStandardName=this.setting.data.technicalStandardName
+      this.searchParams.technicalStandardName = this.setting.data.technicalStandardName
     }
   }
   //树设定
@@ -457,7 +465,6 @@ export default class StandardList extends ListBasePage {
   queryTableData(data) {
     // this.$set()
     let searchParams = {op: 'AND', rules: []};
-
     if (data && data.hasOwnProperty("parentTechnicalStandardClassId")) {
       this.selectedTreeNodeId = data.parentTechnicalStandardClassId === "0" ? null : data.id;
       for (let key in this.searchParams) {