feat: 0531增加是否需要扫码字段

src/views/basic/product/product.vue

@@ -808,6 +808,28 @@
                         </div>
                       </el-col>
                     </el-row>
+
+                    <el-row :gutter="20" class="el-row" type="flex">
+                      <el-col :span="12" class="el-col">
+                        <div class="text item">
+                          <div class="itemTag">
+                            <span>是否需要扫码:&nbsp;</span>
+                          </div>
+                          <el-select
+                            v-model="editQuery.requireScanCode"
+                            disabled
+                            style="width: 65%"
+                            size="small"
+                          >
+                            <el-option label="是" :value=1></el-option>
+                            <el-option label="否" :value=0></el-option>
+                          </el-select>
+                        </div>
+                      </el-col>
+                      <el-col :span="12" class="el-col">
+                      </el-col>
+                    </el-row>
+
                   </el-collapse-item>
 
                   <el-collapse-item name="2">

src/views/basic/product/productEdit.vue

@@ -341,6 +341,35 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="分类编码：" prop="require">
+              <el-select
+                v-model="editQuery.flbm"
+                filterable
+                remote
+                clearable="true"
+                style="width: 80%"
+                reserve-keyword
+                placeholder="请选择"
+                :remote-method="classifySearch"
+                :loading="loading"
+                @change="classifyChange()"
+              >
+                <el-option
+                  v-for="item in classifyList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code">
+                  <span>{{ item.code }}</span>
+                  <span>{{ item.name }}</span>
+                </el-option>
+              </el-select>
+
+
+            </el-form-item>
+          </el-col>
+        </el-row>
 
 
       </el-card>
@@ -364,8 +393,23 @@
               </el-col>
             </el-row>
             <el-divider direction="horizontal"></el-divider>
-
+            <el-row>
-
+              <el-col span="5">
+                <span class="sptext">是否需要扫码</span>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="5">
+                <el-select v-model="editQuery.requireScanCode" style="width: 65%" placeholder="状态" clearable>
+                  <el-option label="是" :value=1></el-option>
+                  <el-option label="否" :value=0></el-option>
+                </el-select>
+              </el-col>
+              <el-divider direction="vertical"></el-divider>
+              <el-col span="13">
+                <span class="sptext">是否需要扫码</span>
+              </el-col>
+            </el-row>
+            <el-divider></el-divider>
             <el-row>
               <el-col span="5">
                 <span class="sptext">是否禁用</span>
@@ -714,7 +758,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
 import {getListMenu, getOneName} from '@/api/basic/basicHospType'
 import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
-
+import {filterClassify} from "@/api/purchase/classifyCode"
 
 export default {
   name: "productEdit",
@@ -776,6 +820,7 @@ export default {
       loading: false,
       hsflOptions: [],
       thrTypeOptions: [],
+      classifyList: [],
     }
   },
   components: {
@@ -800,8 +845,26 @@ export default {
     if (this.editQuery.basicPrductRemak7 != null) {
       this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
     }
+    this.classifySearch()
   },
   methods: {
+    classifyChange(){
+      this.editQuery.requireScanCode = this.classifyList.find(item => item.code == this.editQuery.flbm).requireScanCode;
+    },
+    classifySearch(key) {
+      let query = {
+        key: key,
+      }
+      filterClassify(query)
+        .then(response => {
+          this.loading = false;
+          this.classifyList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.classifyList = [];
+        });
+    },
     getYbHcData(){
       let query = {
         specificationCode: this.editQuery.ybbm

src/views/supplier/company/basicCompanyProductsImport.vue

@@ -331,14 +331,18 @@
             </div>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="医保编码:">
+            <div class="text item">
-              <el-input style="width: 80%"
+              <div class="itemTag">
+                <span>医保编码:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
                 size="small"
                 splaceholder="请输入内容"
                 v-model="repEditQuery.ybbm"
                 v-debounce-input:500ms="getYbHcData"
               ></el-input>
-            </el-form-item>
+            </div>
           </el-col>
         </el-row>
 
@@ -360,15 +364,18 @@
             </div>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="二级分类名称:">
+            <div class="text item">
+              <div class="itemTag">
+                <span>二级分类名称:&nbsp;</span>
+              </div>
               <el-input
-                style="width: 80%"
+                style="width: 65%"
                 size="small"
                 splaceholder="请输入内容"
                 v-model="repEditQuery.catalogname2"
                 disabled
               ></el-input>
-            </el-form-item>
+            </div>
           </el-col>
         </el-row>
 
@@ -387,16 +394,20 @@
               ></el-input>
             </div>
           </el-col>
+
           <el-col :span="12" class="el-col">
-            <el-form-item label="耗材材质:">
+            <div class="text item">
+              <div class="itemTag">
+                <span>耗材材质:&nbsp;</span>
+              </div>
               <el-input
-                style="width: 80%"
+                style="width: 65%"
                 size="small"
                 splaceholder="请输入内容"
                 v-model="repEditQuery.matrial"
                 disabled
               ></el-input>
-            </el-form-item>
+            </div>
           </el-col>
         </el-row>
 
@@ -544,6 +555,35 @@
             </el-select>
             </div>
           </el-col>
+
+          <el-col :span="12" class="el-col">
+            <div class="text item">
+              <div class="itemTag">
+                <span>分类编码:&nbsp;</span>
+              </div>
+              <el-select
+                v-model="repEditQuery.flbm"
+                filterable
+                remote
+                clearable="true"
+                style="width: 65%"
+                reserve-keyword
+                placeholder="请选择"
+                :remote-method="classifySearch"
+                :loading="loading"
+              >
+                <el-option
+                  v-for="item in classifyList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code">
+                  <span>{{ item.code }}</span>
+                  <span>{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </div>
+          </el-col>
+
         </el-row>
 
 
@@ -720,6 +760,7 @@ import {insertCompanyProductRelevance, insertFilter} from "../../../api/basic/co
 import store from "../../../store";
 import {isBlank} from "@/utils/strUtil";
 import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import {filterClassify} from "@/api/purchase/classifyCode"
 
 export default {
   name: "UdIInfoSelect",
@@ -785,6 +826,7 @@ export default {
         purType: null,
         attributeType: null,
         hcType: null,
+        flbm: null,
 
       },
       relevanceEdit: {
@@ -823,10 +865,26 @@ export default {
       supplementRequest: null,
       hsflOptions: [],
       thrTypeOptions: [],
+      classifyList: [],
     };
   },
 
   methods: {
+
+    classifySearch(key) {
+      let query = {
+        key: key,
+      }
+      filterClassify(query)
+        .then(response => {
+          this.loading = false;
+          this.classifyList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.classifyList = [];
+        });
+    },
     getYbHcData(){
       let query = {
         specificationCode: this.repEditQuery.ybbm
@@ -1025,7 +1083,9 @@ export default {
       this.repEditQuery.manufactory = this.currentRow.manufactory;
       this.repEditQuery.spmc = this.currentRow.spmc;
       this.repEditQuery.cpms = this.currentRow.cpms;
+      this.repEditQuery.flbm = this.currentRow.flbm;
       this.getYbHcData()
+      this.classifySearch()
       // if (isBlank(this.relevanceEdit.cpms)) {
       //   this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh
       // }

src/views/supplier/company/basicCompanyproductDetail.vue

@@ -160,6 +160,24 @@
                 </div>
               </el-col>
             </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>是否需要扫码:&nbsp;</span>
+                  </div>
+                  <el-select v-model="editQuery.requireScanCode" disabled style="width: 65%" size="small">
+                    <el-option label="是" :value=1></el-option>
+                    <el-option label="否" :value=0></el-option>
+                  </el-select>
+                </div>
+              </el-col>
+              <el-col :span="12" class="el-col">
+
+              </el-col>
+            </el-row>
+
+
           </el-collapse-item>
 
 

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -160,7 +160,7 @@
                 v-model="editQuery.attributeType"
                 placeholder="请选择"
                 clearable
-                style="width: 65%"
+                style="width: 80%"
               >
                 <el-option label="设备" :value="1"></el-option>
                 <el-option label="耗材" :value="2"></el-option>
@@ -321,7 +321,29 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item  class="query-form-item" >
+            <el-form-item    label="分类编码:"
+                             prop="flbm"
+                             class="query-form-item">
+                  <el-select
+                    v-model="editQuery.flbm"
+                    filterable
+                    remote
+                    clearable="true"
+                    style="width: 80%"
+                    reserve-keyword
+                    placeholder="请选择"
+                    :remote-method="classifySearch"
+                    :loading="loading"
+                  >
+                    <el-option
+                      v-for="item in classifyList"
+                      :key="item.code"
+                      :label="item.name"
+                      :value="item.code">
+                      <span>{{ item.code }}</span>
+                      <span>{{ item.name }}</span>
+                    </el-option>
+                  </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -367,6 +389,7 @@ import {filterByUuid} from '@/api/basic/udiInfo'
 import selectErp from "./udiInfoselectErpUdi";
 import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
 import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import { filterClassify } from '@/api/purchase/classifyCode'
 
 export default {
   name: 'productEdit',
@@ -415,10 +438,25 @@ export default {
       selectErpDialogVisible: false,  //选入ERP产品
       hsflOptions: [],
       thrTypeOptions: [],
+      classifyList: [],
     }
   },
 
   methods: {
+    classifySearch(key) {
+      let query = {
+        key: key,
+      }
+      filterClassify(query)
+        .then(response => {
+          this.loading = false;
+          this.classifyList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.classifyList = [];
+        });
+    },
     getYbHcData(){
       let query = {
         specificationCode: this.editQuery.ybbm
@@ -642,6 +680,7 @@ export default {
     // if (this.editQuery.basicPrductRemak7 != null) {
     this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
     // }
+    this.classifySearch()
 console.log("editQuery:",this.editQuery)
   }, directives: {
   'debounce-input': {