2025.04.21 rfq以及审批优化

src/views/modules/inquiry/inquiryApplication.vue

@@ -137,10 +137,11 @@
           </div>
           <div v-else-if="item.columnProp === 'status'">
             <span v-if="!item.columnHidden">
-              <span v-if="scope.row.status === 'C'">草稿</span>
-              <span v-if="scope.row.status === 'B'">下达</span>
-              <span v-if="scope.row.status === 'A'">已转报价</span>
-              <span v-if="scope.row.status === 'D'">已驳回</span>
+              <span v-if="scope.row.visible === 'N'">审批未通过</span>
+              <span v-else-if="scope.row.status === 'C'">草稿</span>
+              <span v-else-if="scope.row.status === 'B'">下达</span>
+              <span v-else-if="scope.row.status === 'A'">已转报价</span>
+              <span v-else-if="scope.row.status === 'D'">已驳回</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>

src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue

@@ -324,13 +324,13 @@
       <!--      @open="openInquiryPartSaveDataDialog"-->
       <el-form :inline="true" label-position="top" :model="inquiryPartModalData" :rules="inquiryPartRules" style="margin-top: -5px;">
         <el-form-item prop="partNo" :rules="inquiryPartRules.partNo">
-          <span v-if="noFlag === 'N' || !inquiryPartModalDisableFlag" style="cursor: pointer" slot="label"
-                @click="getBaseList(2005)"><a
+          <span v-if="noFlag === 'N' && !inquiryPartModalDisableFlag" style="cursor: pointer" slot="label"
+                @click="getBaseList(2011)"><a
             herf="#">产品编码
           </a></span>
-          <span v-else style="cursor: pointer" slot="label">产品编码</span>
-          <el-input v-model="inquiryPartModalData.partNo" :disabled="noFlag === 'Y' || inquiryPartModalDisableFlag" @blur="partNoBlur(2005)"
-                    style="width: 128px"></el-input>
+          <span v-else slot="label">产品编码</span>
+          <el-input v-model="inquiryPartModalData.partNo" :disabled="noFlag === 'Y' || inquiryPartModalDisableFlag"
+                    @blur="partNoBlur(2011)" style="width: 128px"></el-input>
         </el-form-item>
         <el-form-item prop="partDesc" label="产品名称" style="margin-left: -10px">
           <el-input v-model="inquiryPartModalData.partDesc" :disabled="noFlag === 'N' || inquiryPartModalDisableFlag"
@@ -609,7 +609,7 @@ export default {
         requestEndDate: '',
         requiredCompletionStartDate: '',
         requiredCompletionEndDate: '',
-        status: 'B',
+        status: 'BB',
         bomStatusDb: '未创建',
         quoterName: '',
         requesterName: '',
@@ -2162,7 +2162,7 @@ export default {
             conSql = " and b.site = '" + this.$store.state.user.site + "'"
           }
         }
-        if (val === 2005) {
+        if (val === 2011) {
             strVal = this.inquiryPartModalData.partNo ? this.inquiryPartModalData.partNo : ''
             conSql = " and a.site = '" + this.$store.state.user.site + "'"
         }
@@ -2217,9 +2217,11 @@ export default {
           this.modalData.requesterName = val.user_display
         }
       }
-      if (this.tagNo === 2005) {
+      if (this.tagNo === 2011) {
         this.inquiryPartModalData.partNo = val.part_no
         this.inquiryPartModalData.partDesc = val.part_desc
+        this.inquiryPartModalData.umId = val.umid2
+        this.inquiryPartModalData.umName = val.umid
       }
     },