Merge branch 'orangeUrgent' into allTestUrgent

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -33,7 +33,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/HDrpManagement/invoiceapp/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -33,7 +33,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/HDrpManagement/logistics/details/tabs/logisticsBox/add.vue

@@ -54,7 +54,7 @@
               </el-table-column>
               <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
                 <template slot-scope="scope">
-                 <span v-if="scope.row.nominalpressure">
+                 <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
                     <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
                       <span v-if="index == scope.row.nominalpressure.length -1">
                         {{item}}

src/HDrpManagement/logistics/details/tabs/logisticsBox/logisticsBoxmx.vue

@@ -29,7 +29,7 @@
      </el-table-column>
      <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
        <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/HDrpManagement/logistics/modules/productlist.vue

@@ -35,7 +35,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/HDrpManagement/toolBorrowingMag/detail/tabs/toolList.vue

@@ -81,7 +81,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/SDrpManagement/invoiceapp_saler/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -24,7 +24,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/SDrpManagement/invoiceapp_saler/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -32,7 +32,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/SDrpManagement/salerToolBorrowing/detail/tabs/toolList.vue

@@ -70,7 +70,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/SDrpManagement/sinvoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -33,7 +33,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/SDrpManagement/sinvoiceapp/detail/tab/redInvoice/components/invoiceTablemx.vue

@@ -18,7 +18,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/SDrpManagement/toolBorrowing/detail/tabs/toolList.vue

@@ -71,7 +71,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/template/invoiceCanUseProduct/index.vue

@@ -50,7 +50,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}

src/template/logisticsCanUseProduct/index.vue

@@ -43,7 +43,7 @@
       </el-table-column>
       <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
         <template slot-scope="scope">
-         <span v-if="scope.row.nominalpressure">
+         <span v-if="scope.row.nominalpressure && scope.row.nominalpressure[0] != null">
             <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
               <span v-if="index == scope.row.nominalpressure.length -1">
                 {{item}}