修改功能

src/views/inv/modules/scanOutStorage.vue

@@ -11,15 +11,17 @@
       <el-col>
         <p>员工编号：<span>{{userInfo.jobNo}}</span></p></el-col>
     </el-row>
-    <el-row style="padding: 10px 0;text-align: left;" type="flex" :gutter="10">
-      <el-col :span="5">
-        <el-input size="medium" ref="barCodeInput" v-model="memberCode" @keyup.enter.native="changeQrCode"
+    <el-row style="padding: 10px 0;text-align: left;" type="flex" :gutter="16">
+<!--      <el-col>-->
+        <el-input size="medium" ref="barCodeInput" style="width: 200px;margin-right: 5px;" v-model="memberCode" @keyup.enter.native="changeQrCode"
                   placeholder="点击扫描员工二维码"></el-input>
-      </el-col>
-      <el-col :span="5">
-        <el-input size="medium" ref="barCodeInput" v-model="barCode" @keyup.enter.native="changeBarCode"
+        <el-button type="primary" size="medium" @click="changeQrCode" style="margin-right: 20px;">确定</el-button>
+<!--      </el-col>-->
+<!--      <el-col>-->
+        <el-input size="medium" ref="barCodeInput" style="width: 200px;margin-right: 5px;" v-model="barCode" @keyup.enter.native="changeBarCode"
                   placeholder="点击扫描条形码"></el-input>
-      </el-col>
+        <el-button type="primary" size="medium" @click="changeBarCode">确定</el-button>
+<!--      </el-col>-->
 
     </el-row>
     <div class="scroll-container no-bottom"
@@ -377,6 +379,10 @@ export default {
     },
     // 改变扫码枪
     changeQrCode() {
+      if(!this.memberCode){
+        this.$message.warning('请点击扫描员工二维码')
+        return
+      }
       // let data = {"onlyId":"c7535c6f80d345b5b7e513c98993499a","memberId":"36"}
       const data = JSON.parse(this.memberCode)
       checkQcode(data).then(res => {
@@ -390,6 +396,10 @@ export default {
     },
     // 改变barcode
     changeBarCode(value) {
+      if(!this.barCode){
+        this.$message.warning('请点击扫描条形码')
+        return
+      }
       getGoodsDetail({
         barCode: this.barCode,
         stockRoomId: this.$store.getters.type == 2 ? this.$store.getters.stockRoomId : null

src/views/inv/modules/scanPutStorage.vue

@@ -9,6 +9,7 @@
       <!--      <el-col span="4">   <el-button type="primary" size="medium" @click="handleScan">扫描条形码</el-button></el-col>-->
       <el-input size="medium" ref="barCodeInput" v-model="barCode" @keyup.enter.native="changeBarCode"
                 placeholder="点击扫描条形码" style="width: 300px;"></el-input>
+      <el-button type="primary" size="medium" @click="changeBarCode">确定</el-button>
     </el-row>
     <div class="scroll-container no-bottom"
          ref="scrollContainer">
@@ -347,6 +348,10 @@ export default {
     // 改变barcode
     changeBarCode(value) {
       console.log('value', value, this.barCode)
+      if(!this.barCode){
+        this.$message.warning('请点击扫码枪扫码')
+        return
+      }
       getGoodsDetail({
         barCode: this.barCode,
         stockRoomId: this.$store.getters.type == 2 ? this.$store.getters.stockRoomId : null

src/views/use/modules/AddAdmin.vue

@@ -10,24 +10,25 @@
              label-width="200px">
       <div class="scroll-container"
            ref="scrollContainer">
-        <el-form-item label="用户名称："
+        <el-form-item label="域账号："
                       prop="username"
-                      :rules="[{ required: true, message: '用户名称不能为空', trigger: 'blur' }]">
+                      :rules="[{ required: true, message: '域账号不能为空', trigger: 'blur' }]">
           <el-input v-model="model.username"
                     :disabled="isEdit"
+                    placeholder="请输入ad域账号"
                     class="input-width"></el-input>
-          <div class="tip">可使用手机号作为用户名称</div>
-        </el-form-item>
-        <el-form-item label="登录密码："
-                      prop="password"
-                      :rules="[{ required: true, message: '登录密码不能为空', trigger: 'blur' }]">
-          <el-input
-            :maxlength="6"
-            v-model="model.password"
-            type="password"
-            auto-complete="new-password"
-            class="input-width"></el-input>
+<!--          <div class="tip">可使用手机号作为用户名称</div>-->
         </el-form-item>
+<!--        <el-form-item label="登录密码："-->
+<!--                      prop="password"-->
+<!--                      :rules="[{ required: true, message: '登录密码不能为空', trigger: 'blur' }]">-->
+<!--          <el-input-->
+<!--            :maxlength="6"-->
+<!--            v-model="model.password"-->
+<!--            type="password"-->
+<!--            auto-complete="new-password"-->
+<!--            class="input-width"></el-input>-->
+<!--        </el-form-item>-->
         <el-form-item label="库房："
                       prop="stockRoomId"
                       :rules="[{ required: true, trigger: 'change', message: '请选择库房' }]">