项目管理、合同管理、选型系统，调整公称压力展示方式

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -269,15 +269,7 @@
             >
           </div>
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
-                <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
-                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
-                    <span v-if="index == scope.column.data.nominalpressure.length -1">
-                      {{item}}
-                    </span>
-                    <span v-else>{{item}},</span>
-                  </span>
-                </span>
-            <div v-else>--</div>
+            {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
           <div v-else-if="scope.column.columnname == 'standards'">
             <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -246,15 +246,7 @@
             >
           </div>
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
-                <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
-                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
-                    <span v-if="index == scope.column.data.nominalpressure.length -1">
-                      {{item}}
-                    </span>
-                    <span v-else>{{item}},</span>
-                  </span>
-                </span>
-            <div v-else>--</div>
+            {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
           <div v-else-if="scope.column.columnname == 'standards'">
             <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>

src/HDrpManagement/contractManage/components/toolList/toolList.vue

@@ -52,15 +52,7 @@
             {{scope.column.data[scope.column.columnname][0] ? $t(scope.column.data[scope.column.columnname])[0].brandname : ''}}
           </div>
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
-                <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
-                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
-                    <span v-if="index == scope.column.data.nominalpressure.length -1">
-                      {{item}}
-                    </span>
-                    <span v-else>{{item}},</span>
-                  </span>
-                </span>
-            <div v-else>--</div>
+            {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
           <div v-else-if="scope.column.columnname == 'standards'">
             <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -234,15 +234,7 @@
             >
           </div>
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
-            <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
-              <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
-                <span v-if="index == scope.column.data.nominalpressure.length -1">
-                  {{item}}
-                </span>
-                <span v-else>{{item}},</span>
-              </span>
-            </span>
-            <div v-else>--</div>
+            {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
           <div v-else-if="scope.column.columnname == 'standards'">
             <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -309,15 +309,7 @@
             >
           </div>
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
-            <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
-              <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
-                <span v-if="index == scope.column.data.nominalpressure.length -1">
-                  {{item}}
-                </span>
-                <span v-else>{{item}},</span>
-              </span>
-            </span>
-            <div v-else>--</div>
+            {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
           <div v-else-if="scope.column.columnname == 'standards'">
             <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>

src/optionSystem/itemManage/detail/index.vue

@@ -153,7 +153,7 @@ export default {
             { label: "公称通径", value: this.mainData.caliber },
             {
               label: "公称压力",
-              value: this.mainData.nominalpressure.join(","),
+              value: this.tool.nominalPressureSet(this.mainData.nominalpressure)
             },
             { label: "连接方式", value: this.mainData.connection },
             { label: "阀体材质", value: this.mainData.bodymaterial },

src/optionSystem/itemManage/index.vue

@@ -88,7 +88,7 @@
         {{ tool.formatAmount(scope.data.column.data.marketprice, 2) }}
       </div>
       <div v-else-if="scope.data.column.columnname === 'nominalpressure'">
-        {{ scope.data.column.data.nominalpressure.join(',') }}
+        {{tool.nominalPressureSet(scope.data.column.data.nominalpressure)}}
       </div>
       <div v-else-if="scope.data.column.columnname === 'drivetype'">
         <el-tag size="mini" type="primary" v-for="item in scope.data.column.data.drivetype" :key="item" style="margin-right: 10px;">{{ $t(item) }}</el-tag>
@@ -138,7 +138,7 @@ export default {
           this.$refs.basicLayout.listData()
         })
       }
-      
+
     },
     selectStatusChange() {
       this.$refs["basicLayout"].param.content.where = this.selectParam;
@@ -180,4 +180,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

src/optionSystem/optionOrder/detail/modules/components/DieFa.vue

@@ -48,7 +48,7 @@
             >
               <div class="attrite-title">{{ $t("公称压力") }}：</div>
               <div class="attrite-value">
-                {{ resultArr[0].nominalpressure.join(",") }}
+                {{ tool.nominalPressureSet(resultArr[0].nominalpressure) }}
               </div>
             </div>
             <div

src/optionSystem/optionOrder/detail/modules/setOrder.vue

@@ -12,7 +12,7 @@
                     <div class="item" v-if="resultArr.length && resultArr[0].torque"><span style="color: #888888;">{{$t('扭矩')}}：</span>{{resultArr[0].torque }}</div>
                     <div class="item" v-if="resultArr.length && resultArr[0].flh"><span style="color: #888888;">{{$t('法兰号')}}：</span>{{resultArr[0].flh.join('-') }}</div>
                     <div class="item" v-if="resultArr.length && resultArr[0].caliber"><span style="color: #888888;">{{$t('公称通径')}}：</span>{{resultArr[0].caliber }}</div>
-                    <div class="item" v-if="resultArr.length && resultArr[0].nominalpressure"><span style="color: #888888;">{{$t('公称压力')}}：</span>{{resultArr[0].nominalpressure.join(',') }}</div>
+                    <div class="item" v-if="resultArr.length && resultArr[0].nominalpressure"><span style="color: #888888;">{{$t('公称压力')}}：</span>{{ tool.nominalPressureSet(resultArr[0].nominalpressure) }}</div>
                     <div class="item" v-if="resultArr.length && resultArr[0].stemmaterial"><span style="color: #888888;">{{$t('阀杆材质')}}：</span>{{resultArr[0].stemmaterial }}</div>
                     <div class="item" v-if="resultArr.length && resultArr[0].mainmaterial"><span style="color: #888888;">{{$t('主体材质')}}：</span>{{resultArr[0].mainmaterial }}</div>
                 </div>

src/optionSystem/valveOption/DieFa.vue

@@ -731,7 +731,7 @@
                   v-if="resultArr.length && resultArr[0].nominalpressure"
                 >
                   <span style="color: #888888">{{ $t("公称压力") }}：</span
-                  >{{ resultArr[0].nominalpressure.join(",") }}
+                  >{{ tool.nominalPressureSet(resultArr[0].nominalpressure) }}
                 </div>
                 <div
                   class="item"

src/template/addProductContract/index.vue

@@ -360,15 +360,7 @@
                 ></previewImage>
               </p>
               <div v-else-if="scope.column.columnname === 'nominalpressure'">
-                <span v-if="scope.column.data.nominalpressure && scope.column.data.nominalpressure[0] != null">
-                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
-                    <span v-if="index == scope.column.data.nominalpressure.length -1">
-                      {{item}}
-                    </span>
-                    <span v-else>{{item}},</span>
-                  </span>
-                </span>
-                <div v-else>--</div>
+                {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
               </div>
               <div v-else-if="scope.column.columnname == 'standards'">
                 <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>