2025/7/9

src/views/modules/part/bomManagement.vue

@@ -158,10 +158,6 @@
         <el-form-item :label="'工程版本号'">
           <el-input v-model="modalData.engRevision" readonly style="width: 90px"></el-input>
         </el-form-item>
-        <el-form-item prop="productGroupId4">
-          <span style="cursor: pointer" slot="label" @click="queryProductGroupId4Save"><a herf="#">计划人</a></span>
-          <el-input v-model="modalData.productGroupId4" readonly clearable style="width: 120px"></el-input>
-        </el-form-item>
 <!--        <el-form-item :label="'净重'">-->
 <!--          <el-input-number :controls="false" :step="0" v-model="modalData.netWeight" style="width: 110px"></el-input-number>-->
 <!--        </el-form-item>-->
@@ -442,6 +438,16 @@
           <el-form-item :label="'物料名称'">
             <el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
           </el-form-item>
+          <el-form-item prop="productGroupId4">
+            <span style="cursor: pointer" slot="label" @click="queryProductGroupId4Save"><a herf="#">计划人</a></span>
+            <el-input v-model="partData.productGroupId4" readonly clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'零件状态'">
+            <el-select v-model="partData.partStatus" clearable style="width: 120px">
+              <el-option label="Active" value="active"></el-option>
+              <el-option label="All" value="all"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryPartList()">查询</el-button>
           </el-form-item>
@@ -1172,7 +1178,7 @@ export default {
     'componentPartProductGroupId4SaveData.productGroupId4': {
       deep: true,
       handler: function (newV, oldV) {
-        this.modalData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
+        this.partData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
       }
     }
 
@@ -1255,7 +1261,6 @@ export default {
         printUnit: '',
         printUnitName: '',
         officialFlag: '',
-        productGroupId4: ''
       },
       detailData: {
         site: this.$store.state.user.site,
@@ -1309,6 +1314,8 @@ export default {
         plmPartNo: '',
         ifsPartNo: '',
         partDesc: '',
+        partStatus: 'active',
+        productGroupId4: '',
         page: 1,
         limit: 10
       },
@@ -1320,7 +1327,7 @@ export default {
         partDesc: '',
         status: '',
         productGroupId4: '',
-        partStatus: 'all',
+        partStatus: 'active',
         page: 1,
         limit: 10
       },
@@ -1744,6 +1751,17 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          columnProp: 'productGroupId4',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '计划人',
+          columnHidden: false,
+          columnImage: false,
+          status: true,
+          fixed: '',
+          columnWidth: 100
+        },
         {
           columnProp: 'partType',
           headerAlign: "center",
@@ -3296,7 +3314,6 @@ export default {
         officialFlag: row.officialFlag,
         alternativeNo: row.alternativeNo,
         ifsPartNo: row.ifsPartNo,
-        productGroupId4: row.productGroupId4
       }
       this.subDetailTable = 'bom_sub_detail'
       // 查bom明细
@@ -4342,7 +4359,6 @@ export default {
             typeFlag: data.rows.modalData.typeFlag,
             netWeight: data.rows.modalData.netWeight,
             officialFlag: data.rows.modalData.officialFlag,
-            productGroupId4: data.rows.modalData.productGroupId4,
           }
           this.detailDataList = data.rows.detailDataList
           this.detailData = data.rows.detailData
@@ -4988,7 +5004,7 @@ export default {
     },
 
     queryProductGroupId4Save(){
-      this.componentPartProductGroupId4SaveData.productGroupId4 = this.modalData.productGroupId4
+      this.componentPartProductGroupId4SaveData.productGroupId4 = this.partData.productGroupId4
       this.componentPartProductGroupId4SaveData.limit = this.pageSize6
       this.componentPartProductGroupId4SaveData.page = this.pageIndex6
       this.componentPartProductGroupId4SaveData.site = this.$store.state.user.site
@@ -5006,7 +5022,7 @@ export default {
     },
 
     getProductGroupId4SaveRowData(row){
-      this.modalData.productGroupId4 = row.productGroupId4
+      this.partData.productGroupId4 = row.productGroupId4
       this.productGroupId4SaveModelFlag = false
     }
   }

src/views/modules/part/recipeManagement.vue

@@ -152,10 +152,6 @@
         <el-form-item :label="'工程版本号'">
           <el-input v-model="modalData.engRevision" readonly style="width: 90px"></el-input>
         </el-form-item>
-        <el-form-item prop="productGroupId4">
-          <span style="cursor: pointer" slot="label" @click="queryProductGroupId4Save"><a herf="#">计划人</a></span>
-          <el-input v-model="modalData.productGroupId4" readonly clearable style="width: 120px"></el-input>
-        </el-form-item>
         <el-form-item>
           <el-button v-if="modalData.flag === '1' && headerSaveFlag" :loading="saveHeaderLoading" type="primary" @click="saveRecipeHeader" style="margin-top: 23px;width: 120px">保存</el-button>
           <el-button v-else-if="modalData.flag === '2'" type="primary" @click="copyRecipeRevision" style="margin-top: 23px;width: 120px">Copy</el-button>
@@ -321,6 +317,16 @@
           <el-form-item :label="'物料名称'">
             <el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
           </el-form-item>
+          <el-form-item prop="productGroupId4">
+            <span style="cursor: pointer" slot="label" @click="queryProductGroupId4Save"><a herf="#">计划人</a></span>
+            <el-input v-model="partData.productGroupId4" readonly clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'零件状态'">
+            <el-select v-model="partData.partStatus" clearable style="width: 120px">
+              <el-option label="Active" value="active"></el-option>
+              <el-option label="All" value="all"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item :label="' '">
             <el-button type="primary" @click="queryPartList()">查询</el-button>
           </el-form-item>
@@ -1060,7 +1066,7 @@ export default {
     'componentPartProductGroupId4SaveData.productGroupId4': {
       deep: true,
       handler: function (newV, oldV) {
-        this.modalData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
+        this.partData.productGroupId4 = this.componentPartProductGroupId4SaveData.productGroupId4
       }
     }
 
@@ -1231,6 +1237,8 @@ export default {
         plmPartNo: '',
         ifsPartNo: '',
         partDesc: '',
+        partStatus: 'active',
+        productGroupId4: '',
         page: 1,
         limit: 10
       },
@@ -1240,6 +1248,7 @@ export default {
         plmPartNo: '',
         ifsPartNo: '',
         partDesc: '',
+        partStatus: 'active',
         status: '',
         productGroupId4: '',
         page: 1,
@@ -3261,7 +3270,6 @@ export default {
         officialFlag: row.officialFlag,
         alternativeNo: row.alternativeNo,
         ifsPartNo: row.ifsPartNo,
-        productGroupId4: row.productGroupId4
       }
       this.subDetailTable = 'recipe_sub_detail'
       // 查recipe明细
@@ -4275,8 +4283,7 @@ export default {
             engRevision: data.rows.modalData.engRevision,
             typeFlag: data.rows.modalData.typeFlag,
             netWeight: data.rows.modalData.netWeight,
-            officialFlag: data.rows.modalData.officialFlag,
-            productGroupId4: data.rows.modalData.productGroupId4,
+            officialFlag: data.rows.modalData.officialFlag
           }
           this.detailDataList = data.rows.detailDataList
           this.detailData = data.rows.detailData
@@ -4784,7 +4791,7 @@ export default {
     },
 
     queryProductGroupId4Save(){
-      this.componentPartProductGroupId4SaveData.productGroupId4 = this.modalData.productGroupId4
+      this.componentPartProductGroupId4SaveData.productGroupId4 = this.partData.productGroupId4
       this.componentPartProductGroupId4SaveData.limit = this.pageSize5
       this.componentPartProductGroupId4SaveData.page = this.pageIndex5
       this.componentPartProductGroupId4SaveData.site = this.$store.state.user.site
@@ -4802,7 +4809,7 @@ export default {
     },
 
     getProductGroupId4SaveRowData(row){
-      this.modalData.productGroupId4 = row.productGroupId4
+      this.partData.productGroupId4 = row.productGroupId4
       this.productGroupId4SaveModelFlag = false
     },
 

src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue

@@ -340,6 +340,11 @@ export default {
           }
         })
       }
+    },
+
+    formatDecimal(value) {
+      const num = parseFloat(value);
+      return !isNaN(num) ? num.toFixed(4) : value;
     }
   },
   watch:{
@@ -373,8 +378,11 @@ export default {
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope" >
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp]}}</span>
-          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          <template v-if="item.columnProp === 'unitPriceRate'">
+            {{ formatDecimal(scope.row.unitPriceRate) }}
+          </template>
+          <span v-else-if="!item.columnHidden"> {{ scope.row[item.columnProp]}}</span>
+          <span v-else-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
     </el-table>

src/views/modules/quote/detail/quoteDetail.vue

@@ -989,6 +989,10 @@ export default {
         this.$router.push({name:`part-partInformation`,params:{partNo:partNo},})
       }
     },
+    formatDecimal(value) {
+      const num = parseFloat(value);
+      return !isNaN(num) ? num.toFixed(4) : value;
+    }
   },
   watch:{
     quote(newVal,oldVal){
@@ -1077,7 +1081,10 @@ export default {
       :min-width="item.columnWidth"
       :label="item.columnLabel">
       <template slot-scope="scope">
-        <template v-if="!quoteGroupDetail && item.columnProp === 'plmPartNo'">
+        <template v-if="item.columnProp === 'unitPriceRate'">
+          {{ formatDecimal(scope.row.unitPriceRate) }}
+        </template>
+        <template v-else-if="!quoteGroupDetail && item.columnProp === 'plmPartNo'">
           <el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="toPartMenu(scope.row.plmPartNo)"> {{ scope.row[item.columnProp] }}</el-link>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>

src/views/modules/sampleManagement/technicalSpecificationList.vue

@@ -1409,8 +1409,8 @@
       },
       //导出excel
       async createExportData() {
-        this.searchData.limit = -1
-        this.searchData.page = 1
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
         await technicalSpecificationListSearch(this.searchData).then(({data}) => {
           this.exportList= data.page.list;
         })