2024-10-11

RFQ 功能优化

src/views/modules/part/bomManagement.vue

@@ -141,24 +141,23 @@
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="生效日期" prop="effPhaseInDate">
           <el-date-picker
-            :readonly="detailData.partNo !== ''"
             style="width: 150px"
             v-model="modalData.effPhaseInDate"
             type="date"
+            value-format="yyyy-MM-dd"
             format="yyyy-MM-dd"
-            placeholder="请选择日期"
-            :editable=false>
+            placeholder="请选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="失效日期">
           <el-date-picker
-            readonly
+            :readonly="!modalDisableFlag"
             style="width: 150px"
             v-model="modalData.effPhaseOutDate"
             type="date"
+            value-format="yyyy-MM-dd"
             format="yyyy-MM-dd"
-            placeholder="请选择日期"
-            :editable=false>
+            placeholder="请选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="'BOM版本号'" prop="engChgLevel">
@@ -2622,7 +2621,8 @@ export default {
         return
       }
       let tempData = {
-        site: this.$store.state.user.site,
+        site: this.modalData.site,
+        buNo: this.modalData.buNo,
         partNo: this.modalData.partNo,
         partDesc: this.modalData.partDesc,
         engChgLevel: this.modalData.engChgLevel,

src/views/modules/qc/IQCResultEntry.vue

@@ -41,6 +41,9 @@
       <el-form-item :label="'PN'">
         <el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item :label="'物料类别'">
+        <el-input v-model="searchData.invdefinetype" clearable style="width: 120px"></el-input>
+      </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'供应商'">
@@ -96,14 +99,14 @@
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
       <el-form-item :label="'送检日期'">
-        <el-date-picker style="width: 150px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 160px" v-model="searchData.startDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 150px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 160px" v-model="searchData.endDate2" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="'检验时间'">
-        <el-date-picker style="width: 150px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
+        <el-date-picker style="width: 160px" v-model="searchData.startDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="开始日期"></el-date-picker>
         -
-        <el-date-picker style="width: 150px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
+        <el-date-picker style="width: 160px" v-model="searchData.endDate" type="datetime" value-format='yyyy-MM-dd HH:mm' format='yyyy-MM-dd HH:mm' placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList">查询</el-button>
@@ -761,7 +764,8 @@
           poItemNo: '',
           orderType: '',
           states: ['未开始','待检验'],
-          submissionType: ''
+          submissionType: '',
+          invdefinetype: ''
         },
         pageIndex: 1,
         pageSize: 20,