20241217

src/views/modules/quote/detail/primary/quoteDetailBom.vue

@@ -294,6 +294,7 @@ export default {
       },
       quoteDetailBom:{},
       quoteDetailBomVisible:false,
+      preValue:undefined,
     }
   },
   methods: {
@@ -486,10 +487,16 @@ export default {
         this.quoteDetailBom = {
           ...row,
         }
+        this.preValue = row.attritionRate;
         this.quoteDetailBomVisible = true;
       }
     },
-
+    handleBlur(row){
+      if (row.attritionRate === this.preValue) {
+        this.quoteDetailBomVisible = false;
+        this.preValue = undefined
+      }
+    }
   },
   created() {
     if (this.quoteDetail && this.quoteDetail.id) {
@@ -550,7 +557,7 @@ export default {
                 <el-link @click="handleJumpToBom(scope.row)">{{ scope.row[item.columnProp] }}</el-link>
               </template>
               <template v-else-if="item.columnProp === 'attritionRate' && quoteDetailBomVisible && scope.row.id === quoteDetailBom.id">
-                <el-input-number v-model="scope.row.attritionRate" @change="handleUpdateQuoteDetailBom(scope.row)" style="width: 100%" :controls="false" :min="0"></el-input-number>
+                <el-input-number v-model="scope.row.attritionRate" @blur="handleBlur(scope.row)" @change="handleUpdateQuoteDetailBom(scope.row)" style="width: 100%" :controls="false" :min="0"></el-input-number>
               </template>
               <template v-else>
                 <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>

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

@@ -571,9 +571,10 @@ export default {
 </script>
 
 <template>
-<div>
+<div class="rq">
   <el-button type="primary" v-if="!authFlag" :disabled="quote.status === '下达' || !quote.status" @click="handleSaveQuoteDetail(null)">新增</el-button>
-  <el-table v-loading="queryLoading" border :data="dataList" style="width: 100%;margin-top: 5px" :height="height">
+
+  <el-table  v-loading="queryLoading" border :data="dataList" style="width: 100%;margin-top: 5px" :height="height">
     <el-table-column type="index" width="55" align="center" label="序号"></el-table-column>
     <el-table-column
       v-for="(item,index) in columns" :key="index"
@@ -693,10 +694,6 @@ export default {
 </template>
 
 <style scoped>
-.el-table /deep/ .cell{
-  height: auto;
-  line-height: 1.5;
-}
 
 .auto /deep/ .el-form-item__content{
   height: auto;

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

@@ -37,6 +37,15 @@ export default {
         this.$message.error(error);
       })
     },
+    alignIsNan(key,arr){
+      for (let i = 0; i < arr.length; i++) {
+        let item = arr[i];
+        if (isNaN(item[key])){
+          return 'left';
+        }
+      }
+      return 'right';
+    },
     flexColumnWidth (str, arr1, flag = 'max') {
       str = str + ''
       let columnContent = ''
@@ -124,7 +133,7 @@ export default {
 <template>
 <div>
   <el-table :data="dataList" border :height="height" v-loading="queryLoading">
-    <el-table-column v-for="key in objectKeys" header-align="center" :width="flexColumnWidth(key,dataList)" :key="key" :prop="key" :label="key"></el-table-column>
+    <el-table-column v-for="key in objectKeys" :align="alignIsNan(key,dataList)" header-align="center" :width="flexColumnWidth(key,dataList)" :key="key" :prop="key" :label="key"></el-table-column>
   </el-table>
 </div>
 </template>

src/views/modules/quote/quoteDetailReport.vue

@@ -640,8 +640,9 @@ export default {
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="inquiryDataList" v-loading="queryPropertyLoading" height="19vh"
-                  style="margin-top: 10px;width: 1000px" border>
+      </el-tab-pane>
+      <el-tab-pane name="property" label="询价单属性">
+        <el-table :data="inquiryDataList" v-loading="queryPropertyLoading" height="36vh" border>
           <el-table-column label="属性编码" header-align="center" min-width="100" prop="itemNo"></el-table-column>
           <el-table-column label="属性名称" header-align="center" min-width="160" prop="itemDesc"></el-table-column>
           <el-table-column label="属性类型" header-align="center" min-width="80" prop="valueType"></el-table-column>
@@ -720,10 +721,6 @@ export default {
 </template>
 
 <style scoped>
-.el-table /deep/ .cell {
-  height: auto;
-  line-height: 1.5;
-}
 
 .auto /deep/ .el-form-item__content {
   height: auto;