kz-ui-base 1.0.127 → 1.0.128

package/common/src/components/basics/RightToolbar/index.vue

@@ -80,7 +80,8 @@ export default {
         });
       }else{
         displayHideColumn={}
-        this.columns.forEach((item,index) => {
+        this.columns&&this.columns.forEach((item,index) => {
+          
           item.label=item.text
           item.key=index
         });

package/package.json

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

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

@@ -49,13 +49,18 @@
                 </el-form-item>
               </el-col>
 
-              <div style="float: right">
-                <el-button type="primary" @click="queryTableData">搜索</el-button>
-                <el-button @click="reset">重置</el-button>
-              </div>
+              <el-col :span="6" style="white-space:nowrap" >
+                <el-form-item label="标准类型" class="search-panel">
+                  <dict-select type="technical_standard_type_code" v-model="searchParams.technicalStandardType" style="width:80%;" :disabled="technicalStandardType != null" clearable></dict-select>
+                </el-form-item>
+              </el-col>
 
             </el-form>
           </el-row>
+          <div style="float: right">
+            <el-button type="primary" @click="queryTableData">搜索</el-button>
+            <el-button @click="reset">重置</el-button>
+          </div>
         </div>
 
       </el-col>
@@ -290,6 +295,7 @@ export default class StandardList extends ListBasePage {
 
   @Prop()
   prodCategoryCode = null;
+  technicalStandardType = null;
   @Prop()
   setting;
 
@@ -298,6 +304,7 @@ export default class StandardList extends ListBasePage {
     technicalStandardCode: "",
     technicalStandardName: "",
     prodCategoryCode: this.prodCategoryCode ? this.prodCategoryCode : "",
+    technicalStandardType: this.technicalStandardType ? this.technicalStandardType : "",
   };
   // 列表分页参数
   listQueryParams = {
@@ -325,6 +332,7 @@ export default class StandardList extends ListBasePage {
     // { text: "标准分类", property: "technicalStandardClassName" },
     { text: "标准名称", property: "technicalStandardName", width: 320, align: "left" },
     { text: "标准代号", property: "technicalStandardCode", width: 200, align: "left" },
+    { text: "标准类型", property: "technicalStandardTypeLabel" },
     { text: "宜订级别", property: "standardLevelLabel", width: 100 },
     { text: "采标程度", property: "adoptionLevelLabel", width: 100 },
     { text: "采标号", property: "adoptionNo", width: 200 },
@@ -334,6 +342,7 @@ export default class StandardList extends ListBasePage {
   ];
   standardLevelCodeMap =  {};
   adoptionLevelCodeMap =  {};
+  technicalStandardTypeCodeMap =  {};
   fileTypeCodeMap = {};
   deptIdMap = {};
   // 部门树选项
@@ -353,14 +362,16 @@ export default class StandardList extends ListBasePage {
     setDictMap("standard_level_code", self.standardLevelCodeMap).then(()=>{
       setDictMap("adoption_level_code", self.adoptionLevelCodeMap).then(()=>{
         setDictMap("file_type_code", self.fileTypeCodeMap).then(()=>{
-          listDept().then(res => {
-            let tmp = {};
-            res.data.map(x=>{
-              tmp[x.deptId] = x.deptName;
+          setDictMap("technical_standard_type_code", self.technicalStandardTypeCodeMap).then(()=> {
+            listDept().then(res => {
+              let tmp = {};
+              res.data.map(x => {
+                tmp[x.deptId] = x.deptName;
+              })
+              self.deptIdMap = tmp;
+              self.getTreeSelect();
+              self.getList();
             })
-            self.deptIdMap = tmp;
-            self.getTreeSelect();
-            self.getList();
           })
         })
       })
@@ -420,7 +431,8 @@ export default class StandardList extends ListBasePage {
           row['standardLevelLabel'] = this.standardLevelCodeMap[row['standardLevelCode']];
           row['adoptionLevelLabel'] = this.adoptionLevelCodeMap[row['adoptionLevelCode']];
           row['fileTypeLabel'] = this.fileTypeCodeMap[row['fileTypeCode']];
-          row['controlDepartmentLabel'] = this.deptIdMap[row['controlDepartmentId']]
+          row['controlDepartmentLabel'] = this.deptIdMap[row['controlDepartmentId']];
+          row['technicalStandardTypeLabel'] = this.technicalStandardTypeCodeMap[row['technicalStandardType']];
         }
         this.listData = response.rows;
         this.listQueryParams.total = Number(response.total);
@@ -475,7 +487,8 @@ export default class StandardList extends ListBasePage {
           row['standardLevelLabel'] = this.standardLevelCodeMap[row['standardLevelCode']];
           row['adoptionLevelLabel'] = this.adoptionLevelCodeMap[row['adoptionLevelCode']];
           row['fileTypeLabel'] = this.fileTypeCodeMap[row['fileTypeCode']];
-          row['controlDepartmentLabel'] = this.deptIdMap[row['controlDepartmentId']]
+          row['controlDepartmentLabel'] = this.deptIdMap[row['controlDepartmentId']];
+          row['technicalStandardTypeLabel'] = this.technicalStandardTypeCodeMap[row['technicalStandardType']];
         }
         this.listData = response.rows;
         this.listQueryParams.total = Number(response.total);