2023-10-23 设备和质量修改2

src/api/qc/qc.js

@@ -144,6 +144,7 @@ export const checkIQCIsSubmit = data => createAPI(`/pms/qc/checkIQCIsSubmit`,'po
 export const saveIQCSubDetailed = data => createAPI(`/pms/qc/saveIQCSubDetailed`,'post',data)
 export const saveIQCSubmitResult = data => createAPI(`/pms/qc/saveIQCSubmitResult`,'post',data)
 export const iqcRecordDelete = data => createAPI(`/pms/qc/iqcRecordDelete`,'post',data)
+export const disposalMeasuresSearch = data => createAPI(`/pms/qc/disposalMeasuresSearch`,'post',data)
 
 
 

src/views/modules/qc/FAIResultEntry.vue

@@ -253,15 +253,21 @@
           <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
         <el-form-item :label="'处置措施'">
-          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalMeasures" disabled style="width: 100px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="特采" value="特采"></el-option>
-            <el-option label="拒收" value="拒收"></el-option>
+          <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
+            <el-option
+              v-for = "i in disposalMeasuresOptions"
+              :key = "i.id"
+              :label = "i.disposalMeasures"
+              :value = "i.disposalMeasures">
+            </el-option>
           </el-select>
-          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalMeasures" style="width: 100px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="特采" value="特采"></el-option>
-            <el-option label="拒收" value="拒收"></el-option>
+          <el-select v-if="detailData.submitFlag != 'Y'" clearable v-model="detailData.disposalMeasures" style="width: 100px">
+            <el-option
+              v-for = "i in disposalMeasuresOptions"
+              :key = "i.id"
+              :label = "i.disposalMeasures"
+              :value = "i.disposalMeasures">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="'处置说明'">
@@ -563,6 +569,7 @@
     getPartInformation, // 获取物料信息
     getSpecialOperationList, // 获取特殊工序列表
     InspectionTypeSearch, // 搜索所有检验类型
+    disposalMeasuresSearch // 获取处置措施列表
   } from "@/api/qc/qc.js";
   import Chooselist from '@/views/modules/common/Chooselist_eam';
   import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@@ -1224,7 +1231,8 @@
           },
         ],
         checked: false,
-        typeOptions: []
+        typeOptions: [],
+        disposalMeasuresOptions: []
       }
     },
     mounted () {
@@ -1236,8 +1244,18 @@
       this.getDataList()
       this.favoriteIsOk()
       this.InspectionTypeSearch()
+      this.disposalMeasuresSearch()
     },
     methods: {
+      // 获取处置措施列表
+      disposalMeasuresSearch(){
+        disposalMeasuresSearch().then(({data}) => {
+          if (data.code === 0) {
+            this.disposalMeasuresOptions = data.rows
+          }
+        })
+      },
+
       // 查询检验类型
       InspectionTypeSearch(){
         InspectionTypeSearch().then(({data}) => {

src/views/modules/qc/FQCResultEntry.vue

@@ -251,15 +251,21 @@
           <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
         <el-form-item :label="'处置措施'">
-          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalMeasures" disabled style="width: 100px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="特采" value="特采"></el-option>
-            <el-option label="拒收" value="拒收"></el-option>
+          <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
+            <el-option
+              v-for = "i in disposalMeasuresOptions"
+              :key = "i.id"
+              :label = "i.disposalMeasures"
+              :value = "i.disposalMeasures">
+            </el-option>
           </el-select>
-          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalMeasures" style="width: 100px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="特采" value="特采"></el-option>
-            <el-option label="拒收" value="拒收"></el-option>
+          <el-select v-if="detailData.submitFlag != 'Y'" clearable v-model="detailData.disposalMeasures" style="width: 100px">
+            <el-option
+              v-for = "i in disposalMeasuresOptions"
+              :key = "i.id"
+              :label = "i.disposalMeasures"
+              :value = "i.disposalMeasures">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="'处置说明'">
@@ -561,6 +567,7 @@
     getPartInformation, // 获取物料信息
     getSpecialOperationList, // 获取特殊工序列表
     InspectionTypeSearch, // 搜索所有检验类型
+    disposalMeasuresSearch // 获取处置措施列表
   } from "@/api/qc/qc.js";
   import Chooselist from '@/views/modules/common/Chooselist_eam';
   import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@@ -1220,7 +1227,8 @@
           },
         ],
         checked: false,
-        typeOptions: []
+        typeOptions: [],
+        disposalMeasuresOptions: []
       }
     },
     mounted () {
@@ -1232,8 +1240,18 @@
       this.getDataList()
       this.favoriteIsOk()
       this.InspectionTypeSearch()
+      this.disposalMeasuresSearch()
     },
     methods: {
+      // 获取处置措施列表
+      disposalMeasuresSearch(){
+        disposalMeasuresSearch().then(({data}) => {
+          if (data.code === 0) {
+            this.disposalMeasuresOptions = data.rows
+          }
+        })
+      },
+
       // 查询检验类型
       InspectionTypeSearch(){
         InspectionTypeSearch().then(({data}) => {

src/views/modules/qc/IPQCResultEntry.vue

@@ -271,15 +271,21 @@
           <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
         <el-form-item :label="'处置措施'">
-          <el-select v-if="detailData.submitFlag == 'Y'" v-model="detailData.disposalMeasures" disabled style="width: 100px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="特采" value="特采"></el-option>
-            <el-option label="拒收" value="拒收"></el-option>
+          <el-select v-if="detailData.submitFlag == 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
+            <el-option
+              v-for = "i in disposalMeasuresOptions"
+              :key = "i.id"
+              :label = "i.disposalMeasures"
+              :value = "i.disposalMeasures">
+            </el-option>
           </el-select>
-          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalMeasures" style="width: 100px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="特采" value="特采"></el-option>
-            <el-option label="拒收" value="拒收"></el-option>
+          <el-select v-if="detailData.submitFlag != 'Y'" clearable v-model="detailData.disposalMeasures" style="width: 100px">
+            <el-option
+              v-for = "i in disposalMeasuresOptions"
+              :key = "i.id"
+              :label = "i.disposalMeasures"
+              :value = "i.disposalMeasures">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="'处置说明'">
@@ -628,6 +634,7 @@
     getPartInformation, // 获取物料信息
     getSpecialOperationList, // 获取特殊工序列表
     InspectionTypeSearch, // 搜索所有检验类型
+    disposalMeasuresSearch, // 获取处置措施列表
     getOrderNoList // 查询工单列表
   } from "@/api/qc/qc.js";
   import Chooselist from '@/views/modules/common/Chooselist_eam';
@@ -1321,7 +1328,8 @@
           },
         ],
         checked: false,
-        typeOptions: []
+        typeOptions: [],
+        disposalMeasuresOptions: []
         // orderNoData:{
         //   limit: 10,
         //   page: 1,
@@ -1342,8 +1350,18 @@
       this.getDataList()
       this.favoriteIsOk()
       this.InspectionTypeSearch()
+      this.disposalMeasuresSearch()
     },
     methods: {
+      // 获取处置措施列表
+      disposalMeasuresSearch(){
+        disposalMeasuresSearch().then(({data}) => {
+          if (data.code === 0) {
+            this.disposalMeasuresOptions = data.rows
+          }
+        })
+      },
+
       // 查询检验类型
       InspectionTypeSearch(){
         InspectionTypeSearch().then(({data}) => {

src/views/modules/qc/IQCResultEntry.vue

@@ -149,15 +149,21 @@
           <el-input v-if="detailData.submitFlag != 'Y'" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
         </el-form-item>
         <el-form-item :label="'处置措施'">
-          <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.disposalMeasures" disabled style="width: 100px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="特采" value="特采"></el-option>
-            <el-option label="拒收" value="拒收"></el-option>
+          <el-select v-if="detailData.submitFlag === 'Y'" clearable v-model="detailData.disposalMeasures" disabled style="width: 100px">
+            <el-option
+              v-for = "i in disposalMeasuresOptions"
+              :key = "i.id"
+              :label = "i.disposalMeasures"
+              :value = "i.disposalMeasures">
+            </el-option>
           </el-select>
-          <el-select v-if="detailData.submitFlag != 'Y'" v-model="detailData.disposalMeasures" style="width: 100px">
-            <el-option label="请选择" value=""></el-option>
-            <el-option label="特采" value="特采"></el-option>
-            <el-option label="拒收" value="拒收"></el-option>
+          <el-select v-if="detailData.submitFlag != 'Y'" clearable v-model="detailData.disposalMeasures" style="width: 100px">
+            <el-option
+              v-for = "i in disposalMeasuresOptions"
+              :key = "i.id"
+              :label = "i.disposalMeasures"
+              :value = "i.disposalMeasures">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="'处置说明'">
@@ -388,6 +394,7 @@
     saveIQCSubDetailed, // 新增子明细信息
     saveIQCSubmitResult, // 审核
     iqcRecordDelete, // 删除检验记录
+    disposalMeasuresSearch // 获取处置措施列表
   } from "@/api/qc/qc.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js';
@@ -906,7 +913,8 @@
           samplingLocation: '',
           samplingLocationB: '',
           samplingNumber: ''
-        }
+        },
+        disposalMeasuresOptions: []
       }
     },
     mounted () {
@@ -917,8 +925,17 @@
     created () {
       this.getDataList()
       this.favoriteIsOk()
+      this.disposalMeasuresSearch()
     },
     methods: {
+      // 获取处置措施列表
+      disposalMeasuresSearch(){
+        disposalMeasuresSearch().then(({data}) => {
+          if (data.code === 0) {
+            this.disposalMeasuresOptions = data.rows
+          }
+        })
+      },
       selectFlag(){
         return true;
       },