Merge branch 'blueBranch' into allTestUrgent

src/Form/commissionDistribution/add.vue

@@ -109,15 +109,7 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </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>
                     {{ scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation' ? scope.column.data[[scope.column.columnname]] : '--' }}

src/Form/salerExpenditure/add.vue

@@ -106,15 +106,7 @@
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'nominalpressure' ">
-                      <span v-if="scope.column.data.nominalpressure">
-                        <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>
                       {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -255,15 +255,7 @@
                   {{scope.data.data[scope.data.columnname] ? tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):'￥0.00'}}
                 </div>
                 <div v-else-if="scope.data.columnname === 'nominalpressure'">
-                  <span v-if="scope.data.data.nominalpressure && scope.data.data.nominalpressure[0] != null">
-                    <span v-for="(item,index) in scope.data.data.nominalpressure" :key="index">
-                      <span v-if="index == scope.data.data.nominalpressure.length -1">
-                        {{item}}
-                      </span>
-                      <span v-else>{{item}},</span>
-                    </span>
-                  </span>
-                  <div v-else>--</div>
+                  {{tool.nominalPressureSet(scope.data.data.nominalpressure)}}
                 </div>
                 <div v-else>
                   {{ $t(scope.data.data[scope.data.columnname]) || '--' }}

src/HDrpManagement/serveBill/modules/product/add.vue

@@ -29,15 +29,7 @@
         >
           <template v-slot:customcol="scope">
             <div v-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>
             <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>

src/HDrpManagement/serveBill/modules/product/index.vue

@@ -62,15 +62,7 @@
             </div>
           </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>
           <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
         </template>

src/HDrpManagement/serveBillMag/modules/product/add.vue

@@ -29,15 +29,7 @@
         >
           <template v-slot:customcol="scope">
             <div v-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>
             <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>

src/HDrpManagement/serveBillMag/modules/product/index.vue

@@ -25,15 +25,7 @@
             <div v-else>{{scope.column.data.reason ? scope.column.data.reason : '--'}}</div>
           </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>
           <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
         </template>

src/HDrpManagement/serveWorkBill/modules/items/index.vue

@@ -35,15 +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 && 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}}
-              </span>
-              <span v-else>{{item}},</span>
-            </span>
-          </span>
-            <div v-else></div>
+            {{tool.nominalPressureSet(scope.row.nominalpressure)}}
           </template>
         </el-table-column>
         <el-table-column prop="spec" :label="$t('规格')" v-if="siteid != 'HY' && siteid != 'YOSTEST1'"> </el-table-column>

src/SDrpManagement/commissionDistribution/detail/components/income.vue

@@ -70,22 +70,14 @@
         <div v-else-if="scope.column.columnname === 'amount'">
           <div v-if="data.status != '发放' ">
             <el-input v-model.number="scope.column.data.amount" placeholder="本次发放金额" @change="amountChange(scope.column.data.amount,scope.column.data)" size="small"></el-input>
-            <p style="color: red" v-if="isCheck && sa_hrcashbilldetailid == scope.column.data.sa_hrcashbilldetailid">不得大于未发放金额</p>
+            <p style="color: red" v-if="isCheck && sa_hrcashbilldetailid == scope.column.data.sa_hrcashbilldetailid">{{$t(`不得大于未发放金额`)}}</p>
           </div>
           <div v-else>
             {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
           </div>
         </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>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/commissionDistribution/detail/modules/addDetail.vue

@@ -107,15 +107,7 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </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>
                     {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/detail/components/income.vue

@@ -64,15 +64,7 @@
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </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>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/detail/modules/income/add.vue

@@ -53,15 +53,7 @@
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </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>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/detail/components/commissionDetails.vue

@@ -65,15 +65,7 @@
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </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>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/detail/modules/commissionDetails/add.vue

@@ -78,15 +78,7 @@
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </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>
               {{

src/views/salesData/components/financialCollectionDetail.vue

@@ -56,15 +56,7 @@
                 <span v-else>--</span>
               </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>
               <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
             </template>

src/views/salesData/components/shippingUninvoiceDetail.vue

@@ -53,15 +53,7 @@
                 <span v-else>--</span>
               </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>
               <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
             </template>

src/views/salesData/modules/delayedShipmentAnalysis.vue

@@ -83,15 +83,7 @@
               <span>¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
             </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>
             <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>

src/views/salesData/modules/unshippedExtensionAnalysis.vue

@@ -83,15 +83,7 @@
               <span>¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
             </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>
             <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>