开票管理、开票业务、开票申请，详情页表格新增字段

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -28,6 +28,26 @@
             {{scope.row.model}}
           </template>
         </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="qty" :label="$t(`订单数量`)" width="90"></el-table-column>
         <!-- <el-table-column prop="qty" :label="$t(`发货数量`)"></el-table-column> -->
         <el-table-column prop="writeoffamount" :label="$t(`已核销金额`)" width="120"></el-table-column>
@@ -77,9 +97,9 @@ export default {
           }
         }
       },
-      list:[],
       total:0,
-      currentPage:0
+      currentPage:0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -22,6 +22,26 @@
       <el-table-column prop="rowno" :label="$t(`订单行号`)" width="150"></el-table-column>
       <el-table-column prop="itemno" :label="$t(`产品编码`)" width="150"></el-table-column>
       <el-table-column prop="itemname":label="$t('产品名称')" width="150"></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="price" :label="$t(`订单单价`)" width="90"></el-table-column>
       <el-table-column prop="uninvoiceamount" :label="$t(`可开票金额`)" width="90"></el-table-column>
       <el-table-column prop="invoiceaqty" :label="$t(`本次开票数量`)" width="120"></el-table-column>
@@ -72,9 +92,10 @@ export default {
           }
         }
       },
-      list:[],
       total:0,
-      currentPage:0
+      currentPage:0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
+
     }
   },
   methods:{

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/components/addorderline.vue

@@ -62,6 +62,26 @@
             {{ scope.row.model }}
           </template>
         </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="qty"
           :label="$t(`订单数量`)"
@@ -133,9 +153,9 @@ export default {
           },
         },
       },
-      list: [],
       total: 0,
       currentPage: 0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   methods: {

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -47,6 +47,26 @@
         :label="$t('产品名称')"
         width="150"
       ></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="price"
         :label="$t(`订单单价`)"
@@ -134,9 +154,9 @@ export default {
           },
         },
       },
-      list: [],
       total: 0,
       currentPage: 0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   methods: {

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -29,6 +29,26 @@
             {{scope.row.model}}
           </template>
         </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="qty" :label="$t(`订单数量`)" width="90"></el-table-column>
         <!-- <el-table-column prop="qty" :label="$t(`发货数量`)"></el-table-column> -->
         <el-table-column prop="writeoffamount" :label="$t(`已核销金额`)" width="120"></el-table-column>
@@ -87,9 +107,9 @@ export default {
           }
         }
       },
-      list:[],
       total:0,
-      currentPage:0
+      currentPage:0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -18,6 +18,26 @@
       <el-table-column prop="checkdate" :label="$t('审核日期')" width="150"></el-table-column>
       <el-table-column prop="itemno" :label="$t(`产品编码`)" width="150"></el-table-column>
       <el-table-column prop="itemname":label="$t('产品名称')" width="150"></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="price" :label="$t(`订单单价`)" width="90"></el-table-column>
       <el-table-column prop="uninvoiceamount" :label="$t(`可开票金额`)" width="90"></el-table-column>
       <el-table-column prop="invoiceaqty" :label="$t(`本次开票数量`)" width="120"></el-table-column>
@@ -68,9 +88,9 @@ export default {
           }
         }
       },
-      list:[],
       total:0,
-      currentPage:0
+      currentPage:0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{