kz-ui-base 1.0.121 → 1.0.122

package/package.json

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

package/views/qms/components/modal/DefectModal.vue

@@ -19,7 +19,7 @@
         size="small"
       >
         <el-row class="mb8">
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="组织" prop="siteId">
               <el-select v-model="listQueryParams.siteId" :disabled="siteIdDisabled">
                 <el-option v-for="dict in siteOptions"
@@ -29,7 +29,18 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
+            <el-form-item label="工序" prop="processId">
+              <el-select v-model="listQueryParams.processId" placeholder="请选择" clearable :disabled="processIdDisabled">
+                <el-option v-for="item in processOptions"
+                           :key="item.id"
+                           :label="item.processName"
+                           :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="缺陷组" prop="defectGroupId">
               <el-select v-model="listQueryParams.defectGroupId"  filterable>
                 <el-option v-for="dict in defectGroupOptions"
@@ -39,19 +50,19 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+        </el-row>
+        <el-row class="mb8">
+          <el-col :span="8">
             <el-form-item label="缺陷项编号" prop="defectItemNo">
               <el-input placeholder="请输入" size="small" v-model="listQueryParams.defectItemNo" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="缺陷项名称" prop="defectItemName">
               <el-input placeholder="请输入" size="small" v-model="listQueryParams.defectItemName" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row class="mb8">
-          <el-col :span="24">
+          <el-col :span="8">
             <el-form-item align="right">
               <el-button
                 type="primary"
@@ -110,6 +121,7 @@
 import {tableHandleSelect, tableOnSelectionChange, tableRowClick, tableRowStyle} from "@/utils";
 import {getDefectGroup, getverGroup, searchDefectList} from "@srcApi/qms/commonQms";
 import {getSiteNameByIdOrNo} from "kz-ui-base/common/src/utils/cache/fdCache";
+import {process} from "kz-ui-base/api/pd/routing";
 export default {
   name: 'DefectItemModal',
   props: {
@@ -119,6 +131,12 @@ export default {
         return undefined
       }
     },
+    processId: {
+      type: String,
+      default: function() {
+        return undefined
+      }
+    },
     multipleChoice: {
       type: Boolean,
       default: false
@@ -142,20 +160,28 @@ export default {
       listData: [],
       multipleSelection: [],
       siteOptions: [],
+      processOptions: [],
       defectGroupOptions: []
     }
   },
   computed: {
     siteIdDisabled() {
       return !!this.siteId
+    },
+    processIdDisabled() {
+      return !!this.processId
     }
   },
-  created() {
+  async created() {
     if (!!this.siteId) {
       this.listQueryParams.siteId = this.siteId
+      await this.getProcessList()
     }
-    this.getSiteList()
-    this.getDefectGroup()
+    if (!!this.processId) {
+      this.listQueryParams.processId = this.processId
+    }
+    await this.getSiteList()
+    await this.getDefectGroup()
     this.getList()
   },
   methods: {
@@ -167,6 +193,25 @@ export default {
     getSiteName(siteId) {
       return getSiteNameByIdOrNo(siteId);
     },
+    getProcessList() {
+      this.processOptions = []
+      const pageNum = 1
+      const pageSize = 99999
+      process({ op: 'AND', orderBy: 'id', isAsc: 'desc', ...this.getProcessSearchParams(), pageNum, pageSize}).then(res => {
+        this.processOptions = res.data;
+      })
+    },
+    getProcessSearchParams() {
+      const searchParams = { rules: [] };
+      searchParams.rules = [
+        {
+          op: 'EQ',
+          property: 'siteId',
+          value: this.listQueryParams.siteId,
+        }
+      ];
+      return searchParams;
+    },
     handleQuery() {
       this.getList()
     },
@@ -196,12 +241,13 @@ export default {
       });
     },
 
-    getDefectGroup() {
-      const queryData= {
-        siteId: this.siteId,
+    async getDefectGroup() {
+      const queryData = {
+        siteId: this.listQueryParams.siteId,
+        processId: this.listQueryParams.processId,
         pageSize: 9999
       }
-      getDefectGroup(queryData).then((res) => {
+      await getDefectGroup(queryData).then((res) => {
         for (let obj of res.data) {
           this.defectGroupOptions.push({
             key: obj.id,
@@ -209,6 +255,9 @@ export default {
             label: obj.defectGroupNo + ' ' + obj.defectGroupName,
           })
         }
+        if (this.defectGroupOptions.length === 1) {
+          this.listQueryParams.defectGroupId = this.defectGroupOptions[0].key
+        }
       })
     },