2025.04.25 优化

src/views/modules/common/Chooselist_eam.vue

@@ -84,7 +84,7 @@ export default {
       param3: '',
       param4: '',
       param5: '',
-      param6: '',
+      param6: 'Y',
       param7: this.$store.state.user.name,
       param: '',
       conSql: '',

src/views/modules/product/operatorGroup.vue

@@ -219,7 +219,8 @@
                                                        style="width: 100px; height: 80px"/></span>
                   </div>
                   <div v-else-if=" (item.columnProp === 'wagesRate')">
-                    <el-input v-model="scope.row.wagesRate" type="number" @change="changeSum(scope.row)"  placeholder="请输入工资系数"
+                    <el-input v-model="scope.row.wagesRate" type="number" @change="changeSum(scope.row)"
+                              placeholder="请输入工作时间"
                               style="width:98%"></el-input>
                   </div>
                   <div v-else>
@@ -594,7 +595,6 @@
         getOperatorGroupDefault(this.currentRow).then(({data}) => {
           if (data && data.code === 0) {
             this.detailList=data.rows
-
           }
         })
       },

src/views/modules/qc/FAIResultEntry.vue

@@ -3307,17 +3307,20 @@
             actionBy: this.$store.state.user.name,
             state: '待检验'
           }
-          actionFAIInspection(tempData).then(({data}) => {
+          actionFAIInspection(tempData).then(async ({data}) => {
             if (data && data.code === 0) {
-              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {}
+                onClose: () => {
+                }
               })
+              this.searchData.inspectionNo = row.inspectionNo
+              await this.getDataList()
+              this.detailModal(row)
             } else {
-              this.$alert(data.msg, '错误', {
+              await this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
             }

src/views/modules/qc/FQASResultEntry.vue

@@ -2907,17 +2907,20 @@
             actionBy: this.$store.state.user.name,
             state: '待检验'
           }
-          actionFQASInspection(tempData).then(({data}) => {
+          actionFQASInspection(tempData).then(async ({data}) => {
             if (data && data.code === 0) {
-              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {}
+                onClose: () => {
+                }
               })
+              this.searchData.inspectionNo = row.inspectionNo
+              await this.getDataList()
+              this.detailModal(row)
             } else {
-              this.$alert(data.msg, '错误', {
+              await this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
             }

src/views/modules/qc/FQCResultEntry.vue

@@ -3280,17 +3280,20 @@
             actionBy: this.$store.state.user.name,
             state: '待检验'
           }
-          actionFQCInspection(tempData).then(({data}) => {
+          actionFQCInspection(tempData).then(async ({data}) => {
             if (data && data.code === 0) {
-              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {}
+                onClose: () => {
+                }
               })
+              this.searchData.inspectionNo = row.inspectionNo
+              await this.getDataList()
+              this.detailModal(row)
             } else {
-              this.$alert(data.msg, '错误', {
+              await this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
             }

src/views/modules/qc/IPQCResultEntry.vue

@@ -61,15 +61,9 @@
       <el-form-item :label="'派工单号'">
         <el-input v-model="searchData.seqNo" clearable style="width: 143px"></el-input>
       </el-form-item>
-      <el-form-item :label="'加工中心'">
-        <el-select v-model="searchData.workCenterNo" placeholder="请选择" clearable style="width: 110px">
-          <el-option
-            v-for = "i in workCenterList"
-            :key = "i.workCenterNo"
-            :label = "i.workCenterDesc"
-            :value = "i.workCenterNo">
-          </el-option>
-        </el-select>
+      <el-form-item :label="''">
+        <span style="cursor: pointer" slot="label" @click="getBaseList(24)" ><a>加工中心</a></span>
+        <el-input v-model="searchData.workCenterNo" clearable style="width: 110px"></el-input>
       </el-form-item>
       <el-form-item :label="'工序'">
         <el-input v-model="searchData.operationDesc" clearable style="width: 80px"></el-input>
@@ -950,7 +944,6 @@
   import qcFAIUploadFile from "./qc_FAI_upload_file"
   import comQcItemImageUploadFile from "./com_qc_itemImage_upload_file"
   import subDetailUpload from "./sub_detail_upload";
-  import {getWorkCenterData} from "../../../api/base/site";
   /*上传文件的組件*/
   export default {
     components: {
@@ -1026,7 +1019,6 @@
         exportFooter: [],
         exportList: [],
         // 导出 end
-        workCenterList: [],
         checkCompletedData:{
           inspectionNo: ''
         },
@@ -2461,8 +2453,6 @@
       this.inspectionTypeSearch()
       // 处置措施
       this.disposalMeasuresSearch()
-      // 获取加工中心
-      this.getWorkCenterList()
       // 单位
       this.umSearch()
       // 查看 质量任务生成规则控制 动控是否开启
@@ -3113,6 +3103,7 @@
         this.type = type
         this.$nextTick(() => {
           let strVal = ''
+          let conSql = ''
           if (val === 1052) {
             this.searchSeqInfo()
             this.seqDetailFlag = true
@@ -3129,6 +3120,14 @@
             strVal = this.detailData.responsiblePerson
             this.$refs.baseList.init(val, strVal)
           }
+          if (val === 509) {
+            strVal = this.detailData.responsiblePerson
+            this.$refs.baseList.init(val, strVal)
+          }
+          if (val === 24) {
+            strVal = this.searchData.workCenterNo
+            this.$refs.baseList.init(val, strVal)
+          }
           // if (val === 206) {
           //   strVal = this.modalData.partNo
           //   this.$refs.baseList.init(val, strVal)
@@ -3157,6 +3156,9 @@
         if (this.tagNo === 509) {
           this.detailData.responsiblePerson = val.SupplierID
         }
+        if (this.tagNo === 24) {
+          this.searchData.workCenterNo = val.WorkCenterNo
+        }
         // if (this.tagNo === 206) {
         //   this.modalData.partNo = val.part_no
         //   this.modalData.partDesc = val.part_desc
@@ -3761,17 +3763,20 @@
             actionBy: this.$store.state.user.name,
             state: '待检验'
           }
-          actionIPQCInspection(tempData).then(({data}) => {
+          actionIPQCInspection(tempData).then(async ({data}) => {
             if (data && data.code === 0) {
-              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {}
+                onClose: () => {
+                }
               })
+              this.searchData.inspectionNo = row.inspectionNo
+              await this.getDataList()
+              this.detailModal(row)
             } else {
-              this.$alert(data.msg, '错误', {
+              await this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
             }
@@ -4094,14 +4099,6 @@
         })
       },
 
-      getWorkCenterList(){
-        getWorkCenterData().then(({data}) => {
-          if (data.code === 0) {
-            this.workCenterList = data.rows
-          }
-        })
-      },
-
       // 收藏 OR 取消收藏
       favoriteFunction () {
         let userFavorite = {

src/views/modules/qc/IQCResultEntry.vue

@@ -3091,17 +3091,20 @@
             actionBy: this.$store.state.user.name,
             state: '待检验'
           }
-          actionIQCInspection(tempData).then(({data}) => {
+          actionIQCInspection(tempData).then(async ({data}) => {
             if (data && data.code === 0) {
-              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {}
+                onClose: () => {
+                }
               })
+              this.searchData.inspectionNo = row.inspectionNo
+              await this.getDataList()
+              this.detailModal(row)
             } else {
-              this.$alert(data.msg, '错误', {
+              await this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
             }

src/views/modules/qc/OQCResultEntry.vue

@@ -2429,17 +2429,20 @@
             actionBy: this.$store.state.user.name,
             state: '待检验'
           }
-          actionFQASInspection(tempData).then(({data}) => {
+          actionFQASInspection(tempData).then(async ({data}) => {
             if (data && data.code === 0) {
-              this.getDataList()
               this.$message({
                 message: '操作成功',
                 type: 'success',
                 duration: 1500,
-                onClose: () => {}
+                onClose: () => {
+                }
               })
+              this.searchData.inspectionNo = row.inspectionNo
+              await this.getDataList()
+              this.detailModal(row)
             } else {
-              this.$alert(data.msg, '错误', {
+              await this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
             }

src/views/modules/report/IPQC_report.vue

@@ -29,15 +29,9 @@
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc" clearable style="width: 400px"></el-input>
       </el-form-item>
-      <el-form-item :label="'加工中心'">
-        <el-select v-model="searchData.workCenterNo" placeholder="请选择" clearable style="width: 125px">
-          <el-option
-            v-for = "i in workCenterList"
-            :key = "i.workCenterNo"
-            :label = "i.workCenterDesc"
-            :value = "i.workCenterNo">
-          </el-option>
-        </el-select>
+      <el-form-item :label="''">
+        <span style="cursor: pointer" slot="label" @click="getBaseList(24)" ><a>加工中心</a></span>
+        <el-input v-model="searchData.workCenterNo" clearable style="width: 125px"></el-input>
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData">
@@ -186,6 +180,8 @@
         </el-pagination>
       </div>
     </el-drawer>
+
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
@@ -201,8 +197,11 @@
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
-  import {getWorkCenterData} from "../../../api/base/site";
+  import Chooselist from '@/views/modules/common/Chooselist_eam'
   export default {
+    components: {
+      Chooselist
+    },
     computed: {
       templateTableData () {
         let start = (this.pageIndex2 - 1) * this.pageSize2
@@ -239,6 +238,7 @@
           startDate2: '',
           endDate2: '',
           inspectionTypeNo: '',
+          workCenterNo: '',
           partNo: '',
           partDesc: '',
           disposalMeasures: '',
@@ -972,7 +972,6 @@
         currentRow: {},
         disposalMeasuresOptions: [],
         downLoading: false,
-        workCenterList: [],
       }
     },
 
@@ -989,8 +988,6 @@
       this.getSiteAndBuByUserName()
       // 获取处置措施
       this.disposalMeasuresSearch()
-      // 获取加工中心
-      this.getWorkCenterList()
       // 校验用户是否收藏
       this.favoriteIsOk()
       // 动态列
@@ -1002,6 +999,25 @@
     },
 
     methods: {
+      // 获取基础数据列表S
+      getBaseList (val, type) {
+        this.tagNo = val
+        this.type = type
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 24) {
+            strVal = this.searchData.workCenterNo
+            this.$refs.baseList.init(val, strVal)
+          }
+        })
+      },
+
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 24) {
+          this.searchData.workCenterNo = val.WorkCenterNo
+        }
+      },
 
       // 导出按钮
       downloadQcRecord () {
@@ -1104,14 +1120,6 @@
         })
       },
 
-      getWorkCenterList(){
-        getWorkCenterData().then(({data}) => {
-          if (data.code === 0) {
-            this.workCenterList = data.rows
-          }
-        })
-      },
-
       // 校验用户是否收藏
       favoriteIsOk () {
         let userFavorite = {