From 53e87da47f606e04df6c5a43cbffa93514102d51 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 2 Jun 2022 09:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=AE=8C=E6=95=B4=E6=80=A7?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userManage/phoneRegisterManage.vue | 40 ++++++++++++++++++++
 src/views/warehouse/DialogSelectRl.vue       |  6 +--
 src/views/warehouse/addHosOrder.vue          |  3 +-
 src/views/warehouse/addOrder.vue             |  8 ++++
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/src/views/userManage/phoneRegisterManage.vue b/src/views/userManage/phoneRegisterManage.vue
index 7e2063a..09c956d 100644
--- a/src/views/userManage/phoneRegisterManage.vue
+++ b/src/views/userManage/phoneRegisterManage.vue
@@ -31,9 +31,31 @@
         </el-form>
         <el-dialog title="手持终端服务IP地址设置" :visible.sync="qrCodeVisible" width="27%">
             <div id="qrCodeUrl"></div>
+            <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
+                <el-col :span="24" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>当前系统:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 60%"
+                            size="small"
+                            placeholder="请输入内容"
+                            clearable
+                            v-model="companyInfo.companyName"
+                        ></el-input>
+                    </div>
+                </el-col>
+            </el-row>
             <span slot="footer" class="dialog-footer">
+                   <el-button type="primary" icon="search" @click="saveNameClick"
+                   >保存
+                        </el-button
+                        >
                 <el-button @click="qrCodeVisible = false">取消</el-button>
             </span>
+
+
         </el-dialog>
 
         <el-table v-loading="loading" :data="list" style="width: 100%">
@@ -184,6 +206,8 @@
 import {registerList, check, deleterKey} from "../../api/auth/deviceCheck";
 import QRCode from 'qrcodejs2'
 import axios from "axios";
+import store from "@/store";
+import {getCompany, modifyCompany} from "@/api/warehouse/company";
 
 export default {
     data() {
@@ -213,6 +237,7 @@ export default {
             editDialogVisible: false,
             qrCodeVisible: false,
             serverUrl: false,
+            companyInfo: {},
         };
     },
 
@@ -328,6 +353,13 @@ export default {
             this.centerDialogVisible = false;
         },
         qrCodeGeneration() {
+            let tquery = {
+                customerId: 110,
+            };
+            getCompany(tquery).then((response) => {
+                this.loading = false;
+                this.companyInfo = response.data;
+            });
             this.qrCodeVisible = true;
             this.$nextTick(function () {
                 document.getElementById("qrCodeUrl").innerHTML = "";
@@ -339,6 +371,14 @@ export default {
                     colorLight: "#fff"
                 });
             });
+        },
+        saveNameClick() {
+            modifyCompany(this.companyInfo).then((response) => {
+                if (response.code == 20000) {
+                    this.$message.success("保存成功！");
+                    this.qrCodeVisible = false;
+                }
+            });
         }
 
     },
diff --git a/src/views/warehouse/DialogSelectRl.vue b/src/views/warehouse/DialogSelectRl.vue
index 96ea47e..8cbcec1 100644
--- a/src/views/warehouse/DialogSelectRl.vue
+++ b/src/views/warehouse/DialogSelectRl.vue
@@ -462,13 +462,13 @@
                             <el-checkbox v-model="editQuery.isAdavence"
                             >是否寄售
                             </el-checkbox>
-                            <el-checkbox v-model="editQuery.allowNoBatch" class=""
+                            <el-checkbox v-model="editQuery.allowNoBatch"
                             >允许无批次号
                             </el-checkbox>
-                            <el-checkbox v-model="editQuery.allowNoExpire" class=""
+                            <el-checkbox v-model="editQuery.allowNoExpire"
                             >允许无失效日期
                             </el-checkbox>
-                            <el-checkbox v-model="editQuery.allowNoProduct" class=""
+                            <el-checkbox v-model="editQuery.allowNoProduct"
                             >允许无生产日期
                             </el-checkbox>
                         </div>
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 98a1f67..4f3efb8 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -172,7 +172,7 @@
 
                         <el-checkbox v-model="formData.preCheck"
                                      :disabled="!curAction.changeEnable  ||corpOrderIdDisabled"
-                        >是否预验收产品
+                        >是否只采集预验收产品
                         </el-checkbox>
                     </div>
 
@@ -560,6 +560,7 @@ export default {
                         this.checkSuccess = false;
                         this.formData.code = response.data;
                         this.originCode = this.formData.code;
+                        this.$message.error(response.message);
                     } else if (response.code == 503) {
                         this.checkSuccess = false;
                         this.formData.code = response.data;
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 1699359..2073e60 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -473,6 +473,7 @@ export default {
                         this.checkSuccess = false;
                         this.formData.code = response.data;
                         this.originCode = this.formData.code;
+                        this.$message.error(response.message);
                     } else if (response.code == 503) {
                         this.checkSuccess = false;
                         this.formData.code = response.data;
@@ -507,6 +508,12 @@ export default {
             } else event.target.select();
             this.sictomText = "";
             this.originCode = "";
+            this.formData.corpOrderId = this.formData.corpOrderId.trim();
+            this.formData.batchNo = "";
+            this.formData.produceDate = "";
+            this.formData.expireDate = "";
+            this.formData.serialNo = "";
+            this.actionEnable = true;
             this.$refs.inputRef.select();
             if (this.$isBlank(this.formData.billType)) {
                 this.$message.warning("请选择单据类型！");
@@ -531,6 +538,7 @@ export default {
             tQuery.action = tQuery.billType
             console.log("tQuery = " + tQuery)
             this.addCodeSubmit(tQuery);
+            this.$refs.inputRef.select();
         },
 
         addCodeSubmit(tQuery) {