服务申请管理、服务申请、服务工单，新增字段公称通径和公称压力

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

@@ -28,7 +28,18 @@
           @upDateData="upDateData"
         >
           <template v-slot:customcol="scope">
-            <div>{{ $t(scope.column.data[scope.column.columnname]) }}</div>
+            <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>
+            </div>
+            <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>
         </selectTable>
         <div class="container normal-panel" style="text-align: right">

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

@@ -61,17 +61,18 @@
               {{ scope.column.data.qty ? scope.column.data.qty : "--" }}
             </div>
           </div>
-          <p v-else>{{ $t(scope.column.data[scope.column.columnname]) }}</p>
-          <p
-            v-if="
-              !scope.column.data[scope.column.columnname] &&
-              scope.column.data[scope.column.columnname] !== 0 &&
-              scope.column.columnname != 'operation' &&
-              scope.column.columnname != 'reason'
-            "
-          >
-            --
-          </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>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
         </template>
         <template v-slot:opreation="scope">
           <el-button

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

@@ -28,7 +28,18 @@
           @upDateData="upDateData"
         >
           <template v-slot:customcol="scope">
-            <div>{{ $t(scope.column.data[scope.column.columnname]) }}</div>
+            <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>
+            </div>
+            <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>
         </selectTable>
         <div class="container normal-panel" style="text-align: right">

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

@@ -24,8 +24,18 @@
             </div>
             <div v-else>{{scope.column.data.reason ? scope.column.data.reason : '--'}}</div>
           </div>
-          <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
-          <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'&& scope.column.columnname != 'reason'">--</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>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname == 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
         </template>
         <template v-slot:opreation="scope">
           <el-button class="inline-16" type="text" size="mini" @click="save(scope.data)" v-if="currentProduct.sa_serviceorderitemsid == scope.data.sa_serviceorderitemsid">{{$t('保 存')}}</el-button>

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

@@ -26,7 +26,27 @@
         <el-table-column prop="itemno" :label="$t('编号')"> </el-table-column>
         <el-table-column prop="itemname" :label="$t(`名称`)"> </el-table-column>
         <el-table-column prop="model" :label="$t('型号')"> </el-table-column>
-        <el-table-column prop="spec" :label="$t('规格')"> </el-table-column>
+        <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+          <template slot-scope="scope">
+            <p>
+              <span>{{ scope.row.caliber }}</span>
+            </p>
+          </template>
+        </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>
+          </template>
+        </el-table-column>
+        <el-table-column prop="spec" :label="$t('规格')" v-if="siteid != 'HY' && siteid != 'YOSTEST1'"> </el-table-column>
         <el-table-column prop="qty" :label="$t(`数量`)"> </el-table-column>
         <el-table-column
           v-if="data.actiontype == '非工序模板'"
@@ -57,6 +77,7 @@ export default {
   data() {
     return {
       options: [],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   methods: {},