浏览代码

商品列表,商品选择,海盐站点标准展示调整

qymljy 1 年之前
父节点
当前提交
5fa3fb7cba

+ 4 - 0
src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -279,6 +279,9 @@
                 </span>
                 </span>
             <div v-else>--</div>
             <div v-else>--</div>
           </div>
           </div>
+          <div v-else-if="scope.column.columnname == 'standards'">
+            <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+          </div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         </template>
         <template v-slot:opreation="scope"> </template>
         <template v-slot:opreation="scope"> </template>
@@ -380,6 +383,7 @@ export default {
         },
         },
       ],
       ],
       value: "",
       value: "",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
     };
   },
   },
   computed: {},
   computed: {},

+ 4 - 0
src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -256,6 +256,9 @@
                 </span>
                 </span>
             <div v-else>--</div>
             <div v-else>--</div>
           </div>
           </div>
+          <div v-else-if="scope.column.columnname == 'standards'">
+            <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+          </div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         </template>
         <template v-slot:opreation="scope"> </template>
         <template v-slot:opreation="scope"> </template>
@@ -357,6 +360,7 @@ export default {
           },
           },
         },
         },
       },
       },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
     };
   },
   },
   computed: {},
   computed: {},

+ 5 - 1
src/HDrpManagement/contractManage/components/toolList/toolList.vue

@@ -62,6 +62,9 @@
                 </span>
                 </span>
             <div v-else>--</div>
             <div v-else>--</div>
           </div>
           </div>
+          <div v-else-if="scope.column.columnname == 'standards'">
+            <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+          </div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         </template>
         <template v-slot:opreation="scope">
         <template v-slot:opreation="scope">
@@ -140,7 +143,8 @@ export default {
       total:0,
       total:0,
       editIndex:'',
       editIndex:'',
       totalPrice:0,
       totalPrice:0,
-      currentPage:0
+      currentPage:0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
     };
   },
   },
   computed:{
   computed:{

+ 4 - 0
src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -244,6 +244,9 @@
             </span>
             </span>
             <div v-else>--</div>
             <div v-else>--</div>
           </div>
           </div>
+          <div v-else-if="scope.column.columnname == 'standards'">
+            <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+          </div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         </template>
       </tableLayout>
       </tableLayout>
@@ -347,6 +350,7 @@ export default {
         },
         },
       },
       },
       items: [],
       items: [],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
     };
   },
   },
   provide() {
   provide() {

+ 1 - 1
src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -93,7 +93,7 @@
         </div>
         </div>
         <div>
         <div>
           <p class="normal-margin">
           <p class="normal-margin">
-            {{ $t("标准") }}:&emsp;{{ $t(selectProduct.standards) || "--" }}
+            {{ $t("标准") }}:&emsp;{{ $t(siteid == 'HY' || siteid == 'YOSTEST1'?selectProduct.standardsmx?selectProduct.standardsmx:'--':selectProduct.standards?selectProduct.standards:'--') }}
           </p>
           </p>
         </div>
         </div>
         <div v-if="selectProduct.itemextend">
         <div v-if="selectProduct.itemextend">

+ 1 - 2
src/SDrpManagement/QuotedPrice/detail/modules/productInventory/addSelectionList.vue

@@ -76,7 +76,7 @@
     </el-drawer>
     </el-drawer>
   </div>
   </div>
 </template>
 </template>
-    
+
 <script>
 <script>
 import tableTemp from "@/components/table";
 import tableTemp from "@/components/table";
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
@@ -186,4 +186,3 @@ export default {
   margin: 5px auto 0;
   margin: 5px auto 0;
 }
 }
 </style>
 </style>
-    

+ 4 - 0
src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -319,6 +319,9 @@
             </span>
             </span>
             <div v-else>--</div>
             <div v-else>--</div>
           </div>
           </div>
+          <div v-else-if="scope.column.columnname == 'standards'">
+            <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+          </div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         </template>
       </tableNewLayout>
       </tableNewLayout>
@@ -451,6 +454,7 @@ export default {
         },
         },
       ],
       ],
       value: "",
       value: "",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
     };
   },
   },
   methods: {
   methods: {

+ 5 - 1
src/template/addProduct/index.vue

@@ -46,6 +46,9 @@
                 </span>
                 </span>
                 <div v-else>--</div>
                 <div v-else>--</div>
               </div>
               </div>
+              <div v-else-if="scope.column.columnname == 'standards'">
+                <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+              </div>
               <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
               <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
             </template>
             </template>
             <template v-slot:opreation="scope">
             <template v-slot:opreation="scope">
@@ -99,7 +102,8 @@ export default {
         itemstandards:[],
         itemstandards:[],
         itemmaterials:[]
         itemmaterials:[]
       },
       },
-      items:[]
+      items:[],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
     }
   },
   },
   methods:{
   methods:{

+ 4 - 0
src/template/addProduct/index1.vue

@@ -189,6 +189,9 @@
                 </span>
                 </span>
                 <div v-else>--</div>
                 <div v-else>--</div>
               </div>
               </div>
+              <div v-else-if="scope.column.columnname == 'standards'">
+                <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+              </div>
               <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
               <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
             </template>
             </template>
             <template v-slot:opreation="scope">
             <template v-slot:opreation="scope">
@@ -250,6 +253,7 @@ export default {
         itemmaterials: [],
         itemmaterials: [],
       },
       },
       items: [],
       items: [],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
     };
   },
   },
   methods: {
   methods: {

+ 4 - 0
src/template/addProductContract/index.vue

@@ -370,6 +370,9 @@
                 </span>
                 </span>
                 <div v-else>--</div>
                 <div v-else>--</div>
               </div>
               </div>
+              <div v-else-if="scope.column.columnname == 'standards'">
+                <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+              </div>
               <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
               <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
             </template>
             </template>
             <template v-slot:opreation="scope">
             <template v-slot:opreation="scope">
@@ -463,6 +466,7 @@ export default {
         },
         },
       },
       },
       quotationData: [],
       quotationData: [],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
     };
   },
   },
   methods: {
   methods: {

+ 5 - 1
src/template/addTool/index.vue

@@ -46,6 +46,9 @@
                 </span>
                 </span>
                 <div v-else>--</div>
                 <div v-else>--</div>
               </div>
               </div>
+              <div v-else-if="scope.column.columnname == 'standards'">
+                <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+              </div>
               <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
               <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
             </template>
             </template>
             <template v-slot:opreation="scope">
             <template v-slot:opreation="scope">
@@ -99,7 +102,8 @@ export default {
         itemstandards:[],
         itemstandards:[],
         itemmaterials:[]
         itemmaterials:[]
       },
       },
-      items:[]
+      items:[],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
     }
   },
   },
   methods:{
   methods:{

+ 4 - 0
src/template/prediction/addProductTemp.vue

@@ -175,6 +175,9 @@
                 :deletebtn="false"
                 :deletebtn="false"
               ></previewImage>
               ></previewImage>
             </p>
             </p>
+            <div v-else-if="scope.column.columnname == 'standards'">
+              <span>{{ siteid == 'HY' || siteid == 'YOSTEST1' ? scope.column.data.standardsmx?scope.column.data.standardsmx:'--': scope.column.data.standards?scope.column.data.standards:'--'}}</span>
+            </div>
             <p v-else>{{ $t(scope.column.data[scope.column.columnname]) }}</p>
             <p v-else>{{ $t(scope.column.data[scope.column.columnname]) }}</p>
           </template>
           </template>
           <template v-slot:opreation="scope">
           <template v-slot:opreation="scope">
@@ -240,6 +243,7 @@ export default {
         itemmaterials: [],
         itemmaterials: [],
       },
       },
       items: [],
       items: [],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
     };
   },
   },
   methods: {
   methods: {