0505更新

src/views/main-navbar-update-password.vue

@@ -2,8 +2,11 @@
   <el-dialog
     title="修改密码"
     :visible.sync="visible"
-    :append-to-body="true">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+    :append-to-body="true"
+    v-drag
+    width="300px">
+<!--    style="width: 500px"-->
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px" >
       <el-form-item label="账号">
         <span>{{ userName }}</span>
       </el-form-item>

src/views/main-navbar.vue

@@ -39,7 +39,7 @@
           <el-submenu index="2-2">
             <template slot="title">用户设置</template>
             <el-menu-item index="2-2-1" @click.native="updatePasswordHandle()">修改密码</el-menu-item>
-            <el-menu-item index="2-2-2" @click.native="updateLanguageHandle()">修改默认语言</el-menu-item>
+<!--            <el-menu-item index="2-2-2" @click.native="updateLanguageHandle()">修改默认语言</el-menu-item>-->
 
           </el-submenu>
 <!--          <el-menu-item index="2-3" @click="$router.push({ name: 'theme' })">主题设置</el-menu-item>-->

src/views/modules/base/location.vue

@@ -158,7 +158,7 @@
     methods: {
       getBaseData(val){
         if (this.tagNo === 20){
-          this.locationData.wareHouseID = val.WareHouseID
+          this.locationData.wareHouseID = val.LocationName
         }
 
       },
@@ -170,7 +170,6 @@
           if (val === 20){
             strVal =  this.locationData.wareHouseID
           }
-
           this.$refs.baseList.init(val,strVal)
         })
       },

src/views/modules/pallet/pallet.vue

@@ -22,6 +22,10 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item >
+        <span slot="label" style="" @click="getBaseList(22)"><a herf="#">当前位置：</a></span>
+        <el-input v-model="searchData.locationName"  style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item label="是否可用">
         <el-select filterable v-model="searchData.status"  style="width: 120px">
           <el-option label="是" value="('空置','已装货')"></el-option>
@@ -144,6 +148,7 @@
         <el-button type="primary" @click="palletModalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
@@ -154,11 +159,15 @@
     printPallet,
   } from '@/api/production/pallet.js'
   /*打印标签专用的js*/
+  import Chooselist from '@/views/modules/common/Chooselist'
   import {
     printMaterialLabel,
   } from "@/views/modules/pallet/print_pallet_label.js"
   export default {
     name: "pallet",
+    components: {
+      Chooselist
+    },
     data() {
       return {
         height: 200,
@@ -167,6 +176,7 @@
           status:"('空置','已装货')",
           date1:'',
           date2:'',
+          locationName:'',
         },
         dataListSelections:'',
         addStatus:'',
@@ -194,6 +204,23 @@
       })
     },
     methods: {
+      getBaseData(val){
+        if (this.tagNo === 22){
+          this.searchData.locationName = val.LocationName
+        }
+
+      },
+      // 获取基础数据列表
+      getBaseList(val){
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = "";
+          if (val === 22){
+            strVal =  this.searchData.locationName
+          }
+          this.$refs.baseList.init(val,strVal)
+        })
+      },
       selectionChangeHandle (val) {
         this.dataListSelections = val
       },

src/views/modules/pallet/print_pallet_label.js

@@ -12,11 +12,11 @@ export function printMaterialLabel(printList) {
       let printData = printList[i];
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,1000,800,"");
-      LODOP.ADD_PRINT_TEXT(227,75,218,42,printData.palletNo);
+      LODOP.ADD_PRINT_TEXT(230,70,233,57,printData.palletNo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",24);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",30);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.ADD_PRINT_BARCODE(15,85,417,255,"QRCode",printData.palletNo);
+      LODOP.ADD_PRINT_BARCODE(15,85,389,219,"QRCode",printData.palletNo);
 
     }
     // LODOP.PRINT_DESIGN();