From b46c081628481d49d5ca19f7c84e5ae2d0db1147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 11 Nov 2021 00:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2=E7=9A=84=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/package.json                       |  1 +
 .../src/components/jeecg/JEditableTable.vue   | 79 +++++++++++++------
 .../src/views/bill/mixins/BillModalMixin.js   |  4 +-
 .../views/bill/modules/AllocationOutModal.vue | 16 ++--
 .../src/views/bill/modules/AssembleModal.vue  | 18 ++---
 .../views/bill/modules/DisassembleModal.vue   | 18 ++---
 .../src/views/bill/modules/OtherInModal.vue   | 16 ++--
 .../src/views/bill/modules/OtherOutModal.vue  | 16 ++--
 .../views/bill/modules/PurchaseBackModal.vue  | 20 ++---
 .../views/bill/modules/PurchaseInModal.vue    | 24 +++---
 .../views/bill/modules/PurchaseOrderModal.vue | 16 ++--
 .../views/bill/modules/RetailBackModal.vue    | 16 ++--
 .../src/views/bill/modules/RetailOutModal.vue | 16 ++--
 .../src/views/bill/modules/SaleBackModal.vue  | 20 ++---
 .../src/views/bill/modules/SaleOrderModal.vue | 16 ++--
 .../src/views/bill/modules/SaleOutModal.vue   | 26 +++---
 jshERP-web/yarn.lock                          |  5 ++
 17 files changed, 183 insertions(+), 144 deletions(-)

diff --git a/jshERP-web/package.json b/jshERP-web/package.json
index d45e4830..11227e87 100644
--- a/jshERP-web/package.json
+++ b/jshERP-web/package.json
@@ -23,6 +23,7 @@
     "nprogress": "^0.2.0",
     "xlsx": "^0.14.3",
     "intro.js": "^4.2.2",
+    "jquery": "^1.12.4",
     "viser-vue": "^2.4.4",
     "vue": "^2.6.10",
     "vue-area-linkage": "^5.1.0",
diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index 3e7ebf17..cf367829 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -707,7 +707,9 @@
                     </div>
 
                     <!-- else (normal) -->
-                    <span v-else :key="i" v-bind="buildProps(row,col)">{{ inputValues[rowIndex][col.key] }}</span>
+                    <span v-else :key="i" v-bind="buildProps(row,col)" class="td-span" :title="inputValues[rowIndex][col.key]">
+                      {{ inputValues[rowIndex][col.key] }}
+                    </span>
                   </template>
                 </div>
               </div>
@@ -761,6 +763,7 @@
 
 <script>
   import Vue from 'vue'
+  import $ from 'jquery'
   import Draggable from 'vuedraggable'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import { FormTypes, VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
@@ -1430,7 +1433,7 @@
           tbody.scrollTop = tbody.scrollHeight
         })
         this.$nextTick(() => {
-          this.autoJumpNextInputBill('billModal')
+          this.autoJumpNextInputBill()
         })
       },
       /**
@@ -1463,6 +1466,9 @@
           num, insertIndex,
           target: this
         })
+        this.$nextTick(() => {
+          this.autoJumpNextInputBill()
+        })
       },
       /** 删除被选中的行 */
       removeSelectedRows() {
@@ -2744,31 +2750,35 @@
         return content;
       },
       /** 回车后自动跳到下一个input **/
-      autoJumpNextInputBill(domInfo) {
+      autoJumpNextInputBill() {
         let that = this
-        let domIndex = 0
-        let inputs = document.getElementById(domInfo).getElementsByTagName('input')
-        inputs[domIndex].focus()
-        document.getElementById(domInfo).addEventListener('keydown',function(e){
-          if(e.keyCode === 13){
-            domIndex++
-            if(domIndex === inputs.length) {
-              domIndex = 0
-              that.handleClickAdd()
+        let inputDom = $(".ant-modal-cust-warp:visible").find("#billModal");
+        inputDom.find("input:visible:not(:checkbox)").off("keydown").on("keydown", function(e){
+          //响应回车键按下的处理
+          e = event || window.event || arguments.callee.caller.arguments[0];
+          //捕捉是否按键为回车键，可百度JS键盘事件了解更多
+          if(e && e.keyCode==13) {
+            //捕捉inputDom下的文本输入框的个数
+            let inputs = inputDom.find("input:visible:not(:checkbox)");
+            let idx = inputs.index(this); // 获取当前焦点输入框所处的位置
+            if (idx == inputs.length - 1) { // 判断是否是最后一个输入框
+              let curKey = e.which;
+              if (curKey == 13) {
+                //新增行
+                that.handleClickAdd();
+                //进行下一行的自动聚焦
+                setTimeout(function() {
+                  inputs = inputDom.find("input:visible:not(:checkbox)");
+                  inputs[idx + 1].focus(); // 设置焦点
+                  inputs[idx + 1].select(); // 选中文字
+                },100)
+              }
+            } else {
+              inputs[idx + 1].focus(); // 设置焦点
+              inputs[idx + 1].select(); // 选中文字
             }
-            inputs[domIndex].focus()
           }
         })
-        for(let i=0; i<inputs.length; i++){
-          //这个index就是做个介质，来获取当前的i是第几个
-          inputs[i].index = i;
-          inputs[i].onclick = function () {
-            domIndex = this.index
-          }
-          inputs[i].onselect = function () {
-            domIndex = this.index
-          }
-        }
       },
       /** 自动选中特殊的key **/
       autoSelectBySpecialKey(specialKey) {
@@ -3030,6 +3040,29 @@
 
         }
 
+        .td-span {
+          font-variant: tabular-nums;
+          box-sizing: border-box;
+          margin: 0;
+          list-style: none;
+          position: relative;
+          display: inline-block;
+          padding: 2px 2px;
+          width: 100%;
+          height: 32px;
+          font-size: 14px;
+          line-height: 1.9;
+          color: rgba(0, 0, 0, 0.65);
+          background-color: #fff;
+          border: 1px dashed #d9d9d9;
+          border-radius: 4px;
+          transition: all 0.3s;
+          outline: none;
+          overflow:hidden;
+          white-space:nowrap;
+          text-overflow:ellipsis;
+        }
+
       }
 
     }
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index ef738f49..6a538d48 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -117,10 +117,10 @@ export const BillModalMixin = {
               if(this.prefixNo === 'CGRK' || this.prefixNo === 'XSTH' || this.prefixNo === 'CGTH') {
                 columns[i].type = FormTypes.date //显示
               } else {
-                columns[i].type = FormTypes.input //显示
+                columns[i].type = FormTypes.normal //显示
               }
             } else {
-              columns[i].type = FormTypes.input //显示
+              columns[i].type = FormTypes.normal //显示
             }
           } else {
             columns[i].type = FormTypes.hidden //隐藏
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index 2af010df..f401aba3 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -129,15 +129,15 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '调入仓库', key: 'anotherDepotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true},
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index ae46e2ff..3fd5c88e 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -123,21 +123,21 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '商品类型',key: 'mType',width:'7%', type: FormTypes.input, readonly: true },
+            { title: '商品类型',key: 'mType',width:'7%', type: FormTypes.normal },
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 818c2db6..a8ad52be 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -123,21 +123,21 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '商品类型',key: 'mType',width:'7%', type: FormTypes.input, readonly: true },
+            { title: '商品类型',key: 'mType',width:'7%', type: FormTypes.normal },
             { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
               allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index 0ef8c83f..c0bf0ddc 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -151,14 +151,14 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index a78982aa..2b84a70a 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -151,14 +151,14 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 5d780e76..dd01458e 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -220,27 +220,27 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号请用逗号隔开',
               validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }]
             },
             { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
             { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.date },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
-            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
+            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.normal },
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
-            { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true},
+            { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.normal },
             { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index e630d73d..ce7504aa 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -235,29 +235,29 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号请用逗号隔开',
               validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }]
             },
             { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
             { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.date },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
+            { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
+            { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '4%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '单价', key: 'unitPrice', width: '4%', type: FormTypes.inputNumber},
-            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
+            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.normal },
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
-            { title: '税额', key: 'taxMoney', width: '3%', type: FormTypes.inputNumber, statistics: true , readonly: true},
+            { title: '税额', key: 'taxMoney', width: '3%', type: FormTypes.normal },
             { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 9b048b9d..09a583eb 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -148,14 +148,14 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 146699b8..97a9ca7b 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -203,14 +203,14 @@
             { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '9%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '5%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '6%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '5%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 0d030268..d4da0425 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -216,14 +216,14 @@
             { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '9%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '5%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '6%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '5%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index d7b19528..32d63e88 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -225,27 +225,27 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号请用逗号隔开',
               validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }]
             },
             { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input },
             { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.date },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
-            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
+            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.normal },
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
-            { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.inputNumber, statistics: true, readonly: true},
+            { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.normal },
             { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 010ace34..66169e4a 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -153,14 +153,14 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 608337b7..a7069176 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -241,27 +241,27 @@
             { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
-            { title: '名称', key: 'name', width: '6%', type: FormTypes.input, readonly: true },
-            { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '颜色', key: 'color', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '名称', key: 'name', width: '6%', type: FormTypes.normal },
+            { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal },
+            { title: '型号', key: 'model', width: '5%', type: FormTypes.normal },
+            { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
+            { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
+            { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true },
             { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.popupJsh, kind: 'batch', multi: false },
-            { title: '有效期', key: 'expirationDate',width: '5%', type: FormTypes.input, readonly: true },
-            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.input, readonly: true },
-            { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.input, readonly: true },
+            { title: '有效期', key: 'expirationDate',width: '5%', type: FormTypes.normal },
+            { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
+            { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
+            { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '4%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '单价', key: 'unitPrice', width: '4%', type: FormTypes.inputNumber},
-            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.inputNumber, readonly: true},
+            { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.normal },
             { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
-            { title: '税额', key: 'taxMoney', width: '3%', type: FormTypes.inputNumber, statistics: true, readonly: true},
+            { title: '税额', key: 'taxMoney', width: '3%', type: FormTypes.normal },
             { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
             { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }
           ]
diff --git a/jshERP-web/yarn.lock b/jshERP-web/yarn.lock
index 4b68125d..271d9f9a 100644
--- a/jshERP-web/yarn.lock
+++ b/jshERP-web/yarn.lock
@@ -6657,6 +6657,11 @@ javascript-stringify@^1.6.0:
   resolved "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3"
   integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=
 
+jquery@^1.12.4:
+  version "1.12.4"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c"
+  integrity sha1-AeHfuikP5z3rp3zurLD5ui/sngw=
+
 js-base64@^2.1.9:
   version "2.5.2"
   resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209"