kz-ui-base 1.0.71 → 1.0.72

package/package.json

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

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

@@ -1,9 +1,12 @@
 <template>
   <base-dialog
+    v-dialogDrag
+    v-dialogDragHeight
+    :close-on-click-modal="false"
+    custom-class="custom-dialog"
     :visible.sync="visible"
-    title="缺陷组选择"
+    title="缺陷选择"
     width="1200px"
-    append-to-body
     @on-confirm="handleConfirm"
     @on-cancel="handleCancel"
   >
@@ -12,18 +15,51 @@
         ref="queryForm"
         :model="listQueryParams"
         :inline="true"
-        label-width="120px"
+        label-width="100px"
         size="small"
       >
-        <el-row>
+        <el-row class="mb8">
           <el-col :span="8">
-            <el-form-item label="缺陷组编号" prop="defectGroupNo">
-              <el-input placeholder="请输入" size="small" style="width: 240px" v-model="listQueryParams.defectGroupNo" />
+            <el-form-item label="组织" prop="siteId">
+              <el-select v-model="listQueryParams.siteId" :disabled="siteIdDisabled">
+                <el-option v-for="dict in siteOptions"
+                           :key="dict.id"
+                           :label="dict.componentName"
+                           :value="dict.id"/>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="缺陷组名称" prop="defectGroupName">
-              <el-input placeholder="请输入" size="small" style="width: 240px" v-model="listQueryParams.defectGroupName" />
+            <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"
+                           :key="dict.key"
+                           :label="dict.label"
+                           :value="dict.key" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </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="8">
+            <el-form-item label="缺陷项名称" prop="defectItemName">
+              <el-input placeholder="请输入" size="small" v-model="listQueryParams.defectItemName" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -60,8 +96,15 @@
         @selection-change="onSelectionChange"
       >
         <el-table-column type="selection" min-width="50" align="center" />
-        <el-table-column label="缺陷组编号" align="center" min-width="100" prop="defectGroupNo" />
-        <el-table-column label="缺陷组名称" align="center" min-width="100" prop="defectGroupName" />
+        <el-table-column label="组织" align="center" min-width="100" prop="siteName">
+          <template scope="scope">
+            <span>{{ getSiteName(scope.row.siteId) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="缺陷组编号" align="center" min-width="100" prop="defectGroupNo" show-overflow-tooltip/>
+        <el-table-column label="缺陷组名称" align="center" min-width="100" prop="defectGroupName" show-overflow-tooltip />
+        <el-table-column label="缺陷项编号" align="center" min-width="100" prop="defectItemNo" show-overflow-tooltip/>
+        <el-table-column label="缺陷项名称" align="center" min-width="100" prop="defectItemName" show-overflow-tooltip />
       </el-table>
       <pagination
         :total="listQueryParams.total"
@@ -76,10 +119,24 @@
 <script>
 
 import {tableHandleSelect, tableOnSelectionChange, tableRowClick, tableRowStyle} from "@/utils";
-import {getFlawGroup} from "@srcApi/qms/commonQms";
+import {getDefectGroup, 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: 'DefectGroupModal',
+  name: 'DefectItemModal',
   props: {
+    siteId: {
+      type: String,
+      default: function() {
+        return undefined
+      }
+    },
+    processId: {
+      type: String,
+      default: function() {
+        return undefined
+      }
+    },
     multipleChoice: {
       type: Boolean,
       default: false
@@ -95,17 +152,66 @@ export default {
         pageNum: 1,
         pageSize: 10,
         total: 0,
-        defectGroupNo: '',
-        defectGroupName: '',
+        siteId: '',
+        defectGroupId: '',
+        defectItemNo: '',
+        defectItemName: '',
       },
       listData: [],
-      multipleSelection: []
+      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()
+    }
+    if (!!this.processId) {
+      this.listQueryParams.processId = this.processId
+    }
+    await this.getSiteList()
+    await this.getDefectGroup()
     this.getList()
   },
   methods: {
+    getSiteList() {
+      let options = JSON.parse(localStorage.getItem("sites"));
+      // 受检组织要求携带制造职能-- isManufacturing 为 1
+      this.siteOptions = options.filter(item => item.isManufacturing == 1);
+    },
+    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()
     },
@@ -120,18 +226,41 @@ export default {
       const pageSize = this.listQueryParams.pageSize ? this.listQueryParams.pageSize : 10;
 
       const params = {
-        defectGroupNo: this.listQueryParams.defectGroupNo,
-        defectGroupName: this.listQueryParams.defectGroupName,
+        siteId: this.listQueryParams.siteId,
+        defectGroupId: this.listQueryParams.defectGroupId,
+        defectItemNo: this.listQueryParams.defectItemNo,
+        defectItemName: this.listQueryParams.defectItemName,
         pageNum: pageNum,
         pageSize: pageSize,
       }
-      getFlawGroup(params).then((response) => {
+      searchDefectList(params).then((response) => {
         this.listData = response.data;
         this.listQueryParams.total = Number(response.total)
       }).finally(() => {
         this.loading = false
       });
     },
+
+    async getDefectGroup() {
+      const queryData = {
+        siteId: this.listQueryParams.siteId,
+        processId: this.listQueryParams.processId,
+        pageSize: 9999
+      }
+      await getDefectGroup(queryData).then((res) => {
+        for (let obj of res.data) {
+          this.defectGroupOptions.push({
+            key: obj.id,
+            value: obj.defectGroupNo,
+            label: obj.defectGroupNo + ' ' + obj.defectGroupName,
+          })
+        }
+        if (this.defectGroupOptions.length === 1) {
+          this.listQueryParams.defectGroupId = this.defectGroupOptions[0].key
+        }
+      })
+    },
+
     // 取消按钮
     handleCancel() {
       this.$closeDialog()