From 6861612025ed69b57477aa06a18ed053cfaeca0e Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 2 Jul 2024 11:44:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200702-=E6=89=AB=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/busType/bussinessTypeModify.vue | 11 +++++++++++
 src/views/basic/product/productAdd.vue          |  5 +++--
 src/views/basic/product/productEdit.vue         |  7 ++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 05951c49..cd0914b8 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -226,6 +226,7 @@
             </el-select>
           </el-form-item>
         </el-col>
+
       </el-row>
 
       <el-row>
@@ -235,6 +236,16 @@
             ></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="是否开启校验扫码" prop="codeCheck">
+            <el-select v-model="inputQuery.codeCheck" style="width: 90%" placeholder="是否开启校验扫码">
+              <el-option label="不校验" :value="0"></el-option>
+              <el-option label="只允许录入扫码产品" :value="1"></el-option>
+              <el-option label="只允许录入不扫码产品" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
diff --git a/src/views/basic/product/productAdd.vue b/src/views/basic/product/productAdd.vue
index 16483883..e3888e0e 100644
--- a/src/views/basic/product/productAdd.vue
+++ b/src/views/basic/product/productAdd.vue
@@ -85,7 +85,6 @@
             style="width: 90%"
             reserve-keyword
             placeholder="请选择"
-            :remote-method="classifySearch"
             :loading="loading"
             @change="classifyChange()"
           >
@@ -211,7 +210,9 @@ export default {
   },
   methods: {
     classifyChange(){
-      this.editQuery.requireScanCode = this.classifyList.find(item => item.code == this.editQuery.flbm).requireScanCode;
+      this.classifyChange(this.newProductData.flbm)
+      let item = this.classifyList.find(item => item.code == this.newProductData.flbm)
+      if (item != null) this.newProductData.requireScanCode = item.requireScanCode;
     },
     classifySearch(key) {
       let query = {
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 5b2d8ea2..ac678d62 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -339,7 +339,6 @@
                 style="width: 80%"
                 reserve-keyword
                 placeholder="请选择"
-                :remote-method="classifySearch"
                 :loading="loading"
                 @change="classifyChange()"
               >
@@ -849,11 +848,13 @@ export default {
     if (this.editQuery.basicPrductRemak8 != null) {
       this.findHsflMethod(this.editQuery.basicPrductRemak8);
     }
-    this.classifySearch()
+    this.classifySearch("")
   },
   methods: {
     classifyChange(){
-      this.editQuery.requireScanCode = this.classifyList.find(item => item.code == this.editQuery.flbm).requireScanCode;
+      this.classifyChange(this.editQuery.flbm)
+      let item = this.classifyList.find(item => item.code == this.editQuery.flbm)
+      if (item != null) this.editQuery.requireScanCode = item.requireScanCode;
     },
     classifySearch(key) {
       let query = {