Merge branch 'redUrgent' into testToMerge

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -297,7 +297,7 @@ export default {
   computed: {
     checkNB () {
       let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
-      if (siteid === 'NB' && this.data.type === '特殊订单' && this.data.typemx === '样品') {
+      if ((siteid === 'NB' || siteid === 'HY') && this.data.type === '特殊订单' && this.data.typemx === '样品') {
         return true
       } else {
         return false
@@ -697,7 +697,7 @@ export default {
     setTimeout(() => {
       /* 处理宁波站点 */
       let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
-      if (siteid === 'NB' && this.data.type === '特殊订单' && this.data.typemx === '样品') {
+      if ((siteid === 'NB' || siteid === 'HY') && this.data.type === '特殊订单' && this.data.typemx === '样品') {
         this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols
       } else {
         this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols.filter(item => {

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

@@ -31,6 +31,15 @@
             <div v-if="scope.column.columnname === 'nominalpressure'">
               {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
             </div>
+            <div v-else-if="scope.column.columnname == 'itemno'">
+              {{scope.column.data[scope.column.columnname]}}
+              <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
+                <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
+                  <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                  <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+                </div>
+              </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>
@@ -97,11 +106,11 @@ export default {
           },
         },
       },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   computed: {},
   created() {
-    this.getOrderList();
     this.tablecols = this.tool.tabelCol(
       this.$route.name
     ).productTable.tablecols;

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

@@ -64,6 +64,15 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname == 'itemno'">
+            {{scope.column.data[scope.column.columnname]}}
+            <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
+              <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
+                <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+              </div>
+            </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">
@@ -123,6 +132,7 @@ export default {
       options: [],
       productList: "",
       currentProduct: {},
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   methods: {

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

@@ -31,6 +31,15 @@
             <div v-if="scope.column.columnname === 'nominalpressure'">
               {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
             </div>
+            <div v-else-if="scope.column.columnname == 'itemno'">
+              {{scope.column.data[scope.column.columnname]}}
+              <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
+                <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
+                  <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                  <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+                </div>
+              </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>
@@ -97,6 +106,7 @@ export default {
           },
         },
       },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   computed: {
@@ -109,7 +119,6 @@ export default {
     },
   },
   mounted() {
-    this.getOrderList();
   },
   created() {
     this.tablecols = this.tool.tabelCol(

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

@@ -27,6 +27,15 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname == 'itemno'">
+            {{scope.column.data[scope.column.columnname]}}
+            <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
+              <div v-for="item in scope.column.data.traceabilitytype" :key="item.index">
+                <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+              </div>
+            </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">
@@ -75,7 +84,8 @@ export default {
       options:[
       ],
       productList:'',
-      currentProduct:{}
+      currentProduct:{},
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{

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

@@ -23,7 +23,17 @@
         height="50vh"
         border
       >
-        <el-table-column prop="itemno" :label="$t('编号')"> </el-table-column>
+        <el-table-column prop="itemno" :label="$t('编号')">
+          <template slot-scope="scope">
+            {{scope.row.itemno}}
+            <div v-if="siteid == 'HY' && scope.row.traceabilitytype && scope.row.traceabilitytype.length > 0">
+              <div v-for="item in scope.row.traceabilitytype" :key="item.index">
+                <el-tag v-if="item == 'M'"  style="margin-left: 5px;color: #FFFFFF;background-color: #3874F6"  size="mini">{{$t('自制')}}</el-tag>
+                <el-tag v-else  style="margin-left: 5px;color: #FFFFFF;background-color: #fa8c16"  size="mini">{{$t('外购')}}</el-tag>
+              </div>
+            </div>
+          </template>
+        </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 :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">