20250218

src/views/modules/factory/tblbasedata.vue

@@ -72,7 +72,7 @@ export default {
           functionId: 998001,
           serialNumber: '998001TableSiteId',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "siteId",
           headerAlign: "center",
           align: "left",
@@ -90,7 +90,7 @@ export default {
           functionId: 998001,
           serialNumber: '998001TableSiteName',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "siteName",
           headerAlign: "center",
           align: "left",
@@ -103,12 +103,30 @@ export default {
           fixed: '',
           columnWidth: 120
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 998001,
+          serialNumber: '998001TableShowPound',
+          tableId: "998001Table",
+          tableName: "Site Info Table",
+          columnProp: "showPound",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "Show LBS in Weight",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 20,
+          status: true,
+          fixed: '',
+          columnWidth: 120
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 998001,
           serialNumber: '998001TableAddress',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "address",
           headerAlign: "center",
           align: "left",
@@ -126,7 +144,7 @@ export default {
           functionId: 998001,
           serialNumber: '998001TableContactName',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "contact",
           headerAlign: "center",
           align: "left",
@@ -144,7 +162,7 @@ export default {
           functionId: 998001,
           serialNumber: '998001TableEmail',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "email  ",
           headerAlign: "center",
           align: "left",
@@ -162,7 +180,7 @@ export default {
           functionId: 998001,
           serialNumber: '998001TablePhoneNo',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "phoneNo",
           headerAlign: "center",
           align: "left",
@@ -180,7 +198,7 @@ export default {
           functionId: 998001,
           serialNumber: '998001TableActive',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "active",
           headerAlign: "center",
           align: "center",
@@ -198,7 +216,7 @@ export default {
           functionId: 998001,
           serialNumber: '998001TableActive',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "createTime",
           headerAlign: "center",
           align: "center",
@@ -216,7 +234,7 @@ export default {
           functionId: 998001,
           serialNumber: '998001TableActive',
           tableId: "998001Table",
-          tableName: "工厂信息表",
+          tableName: "Site Info Table",
           columnProp: "createBy",
           headerAlign: "center",
           align: "left",
@@ -314,6 +332,9 @@ export default {
         if (valid){
           updateSite(this.siteForm).then(({data})=>{
             if (data && data.code === 0){
+              if (this.siteForm.siteId === this.$store.state.user.site){
+                this.$store.commit('user/updateShowPound',this.siteForm.showPound)
+              }
               this.getSiteList();
               this.saveVisible = false;
               this.$message.success(data.msg)
@@ -492,6 +513,7 @@ export default {
     </el-form-item>
   </el-form>
   <el-table
+    key="site"
     :height="height"
     :data="siteList" v-loading="tableLoading"
     border @row-dblclick="handleRowClick"
@@ -501,6 +523,7 @@ export default {
       align="center"
       width="100"
       fixed="left"
+      key="siteIdActions"
       label="Actions">
       <template slot-scope="scope">
         <el-link style="cursor:pointer;" @click="handleRowClick(scope.row, scope.column, $event,0)">Edit</el-link>

src/views/modules/label/printer.vue

@@ -1388,7 +1388,7 @@ export default {
       });
     },
     handleSaveSerialNumber(){
-      if (this.serialNumberList.length === 0){
+      if (this.scanSerialNumberList.length === 0){
         this.$message.warning("Please input Serial Number")
         return
       }