相关界面调整修改

src/views/basic/busType/busTypeAdvancedSettings.vue

@@ -240,7 +240,7 @@
 
       <el-row>
         <el-col span="5">
-          <span class="sptext">是否只允许有库存产品出库</span>
+          <span class="sptext">允许单据库存0库存出库</span>
         </el-col>
         <el-divider direction="vertical"></el-divider>
         <el-col span="5">
@@ -252,7 +252,7 @@
         </el-col>
         <el-divider direction="vertical"></el-divider>
         <el-col span="13">
-          <span class="sptext">设置是否只允许有库存产品出库</span>
+          <span class="sptext">允许单据库存0库存出库</span>
         </el-col>
       </el-row>
       <el-divider></el-divider>

src/views/basic/busType/bussinessType.vue

@@ -224,7 +224,7 @@ export default {
         storageCode: null,
         supplementOrderType: null,
         defaultUnit: null,
-        useDyCount: false,
+        useDyCount: 0,
         expireTip: true,
         prefix: null,
         outToSpms: null,
@@ -506,7 +506,7 @@ export default {
         storageCode: null,
         supplementOrderType: null,
         defaultUnit: null,
-        useDyCount: false,
+        useDyCount: 0,
         expireTip: true,
         prefix: null,
         outToSpms: null,

src/views/basic/busType/bussinessTypeModify.vue

@@ -326,7 +326,26 @@
             </el-row>
             <el-divider direction="horizontal"></el-divider>
           </div>
-
+          <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="inputQuery.useDyCount" style="width: 65%"
+                         :disabled=" inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
+                         placeholder="是否启用"
+              >
+                <el-option label="正常" :value="0"></el-option>
+                <el-option label="物资多次使用出库" :value="1"></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>
@@ -369,7 +388,7 @@
 
           <el-row>
             <el-col span="5">
-              <span class="sptext">是否只允许有库存产品出库</span>
+              <span class="sptext">允许单据库存0库存出库</span>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
@@ -383,31 +402,12 @@
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="13">
-              <span class="sptext">设置是否只允许有库存产品出库</span>
+              <span class="sptext">允许单据库存0库存出库</span>
             </el-col>
           </el-row>
           <el-divider></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="inputQuery.useDyCount" style="width: 65%"
-                         :disabled=" inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
-                         placeholder="是否启用"
-              >
-                <el-option label="是" :value="true"></el-option>
-                <el-option label="否" :value="false"></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>
@@ -418,8 +418,8 @@
                          :disabled=" inputQuery.mainAction!= 'WareHouseOut'"
               >
                 <el-option label="无" :value="0"></el-option>
-                <el-option label="按指定货位出库" :value="1"></el-option>
+                <el-option label="整单按指定货位出库" :value="1"></el-option>
-                <el-option label="默认货位出库" :value="2"></el-option>
+                <el-option label="按物资摆放货位出库" :value="2"></el-option>
               </el-select>
 
             </el-col>

src/views/inventory/InvProductPlaceModify.vue

@@ -4,10 +4,12 @@
       style="display: flex; margin: 0px 0 10px 80%; height: 35px"
     >
       <el-button size="mini" type="primary" @click.native="saveData()"
-        >提交</el-button
+      >提交
+      </el-button
       >
       <el-button size="mini" type="primary" @click.native="closePlaceDialog(1)"
-        >关闭</el-button
+      >关闭
+      </el-button
       >
     </el-button-group>
     <el-row>
@@ -150,6 +152,7 @@ import {
   getInvPlaceOrderDetailList,
   getInvProductInfo,
 } from "@/api/inventory/invPlace";
+import A from "@/plugins/KeyScaner";
 
 export default {
   props: {
@@ -174,6 +177,7 @@ export default {
       spaceList: [],
       loading: false,
       spaceSearchResult: [],
+      sitcomScan: false,
     };
   },
   methods: {
@@ -218,7 +222,8 @@ export default {
               this.$message.error(error.message);
             });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     clearFormData() {
       //清空表单数据
@@ -285,7 +290,8 @@ export default {
           this.getList();
           this.$refs.spaceInputRef.focus();
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     getSpaceList() {
       let params = {
@@ -361,6 +367,27 @@ export default {
   mounted() {
     //默认获取上架货物光标
     this.$refs.spaceInputRef.focus();
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+    var that = this;
+    var inputer = document.getElementById("inputer");
+    window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
+    sc.onInput = function (text) {
+      //onInput事件在检测到回车键按下或在连续输入后超过500ms没有继续输入时触发
+      if (text.includes("delete")) {
+        that.formData.code = "";
+        return;
+      }
+      if (that.sitcomScan) {
+        that.formData.code = that.formData.code;
+      } else {
+        that.formData.code = text;
+      }
+    };
+    inputer.focus();//别忘了给要监听的节点放置焦点，如果是div一类默认不具备焦点的节点需要给它加上“tabindex”属性。不建议传入document、Body等全局节点，可能会影响其它输入控件的流畅性。
+
   },
 };
 </script>

src/views/remind/invRemindSet.vue

@@ -141,7 +141,7 @@
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         :before-close="closeAddDialog"
-        width="60%"
+        width="80%"
       >
         <addInvRemindSetDialog
           :closeDialog="closeAddDialog"