Merge branch 'orangeUrgent' into allTestUrgent

src/HDrpManagement/invoicePredictionManage/details/modules/order.vue

@@ -399,6 +399,17 @@
               </el-date-picker>
             </span>
           </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>
+          </div>
           <p v-else>
             {{
               scope.column.data[scope.column.columnname]

src/SDrpManagement/invoicePrediction/detail/orderDetail.vue

@@ -404,6 +404,17 @@
               </el-date-picker>
             </span>
           </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>
+          </div>
           <p v-else>
             {{
               scope.column.data[scope.column.columnname]

src/template/prediction/addTemp.vue

@@ -61,6 +61,17 @@
                 <div v-else-if="scope.column.columnname === 'marketprice'">
                   <span>¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
                 </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>
+                </div>
                 <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
               </template>
               <template v-slot:opreation="scope">

src/template/prediction/addTemp1.vue

@@ -61,6 +61,17 @@
                 <div v-else-if="scope.column.columnname === 'marketprice'">
                   <span>¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
                 </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>
+                </div>
                 <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
               </template>
               <template v-slot:opreation="scope">