yusheng 1 rok temu
rodzic
commit
b18382f0d0

+ 17 - 12
src/BIZComponents/inventoryTable.vue

@@ -622,7 +622,15 @@
           </el-select>
         </el-form-item>
       </template>
-
+      <template v-slot:batchNo="scope">
+        <el-form-item
+          style="margin-bottom: 20px"
+          :prop="'datasource.' + scope.$index + '.batchNo'"
+        >
+          <el-input v-model="scope.row.batchNo" placeholder="请输入" v-no-chinese>
+          </el-input>
+        </el-form-item>
+      </template>
       <!-- 操作列 -->
       <template v-slot:action="scope">
         <el-popconfirm
@@ -954,17 +962,7 @@
             slot: 'totalPrice',
             align: 'center'
           },
-          // {
-          //   width: 120,
-          //   prop: 'notaxTotalPrice',
-          //   label: '含税合计',
-          //   align: 'center',
-          //   formatter: (_row, _column, cellValue) => {
-          //     return _row.notaxTotalPrice
-          //       ? Number(_row.notaxTotalPrice).toFixed(2)
-          //       : '';
-          //   }
-          // },
+        
           {
             width: 160,
             prop: 'discountTotalPrice',
@@ -977,6 +975,13 @@
                 : '';
             }
           },
+          {
+            width: 110,
+            prop: 'batchNo',
+            label: '批次号',
+            slot: 'batchNo',
+            align: 'center'
+          },
           {
             width: 120,
             prop: 'availableCountBase',

+ 7 - 0
src/BIZComponents/inventoryTableDetails.vue

@@ -331,6 +331,13 @@
                 : '';
             }
           },
+          {
+            width: 110,
+            prop: 'batchNo',
+            label: '批次号',
+            slot: 'batchNo',
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'productBrand',

+ 2 - 0
src/main.js

@@ -16,8 +16,10 @@ import authSelection from '@/components/authSelection';
 import Vue2OrgTree from 'vue2-org-tree';
 import seekPage from '@/BIZComponents/seekPage';
 import clickOnce from './utils/clickOnce.js';
+import noChinese from './utils/noChinese.js';
 // 注册全局自定义指令
 Vue.directive('click-once', clickOnce);
+Vue.directive('no-chinese', noChinese);
 Vue.component('HeaderTitle', HeaderTitle);
 Vue.component('authSelection', authSelection);
 // // register globally

+ 10 - 0
src/utils/noChinese.js

@@ -0,0 +1,10 @@
+export default {
+  bind(el, binding, vnode) {
+    el.addEventListener('input', function (e) {
+      console.log(e,'e')
+      if (/[\u4e00-\u9fa5]/.test(e.target.value)) {
+        e.target.value = e.target.value.replace(/[\u4e00-\u9fa5]/g, '');
+      }
+    });
+  }
+};

+ 1 - 1
src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue

@@ -416,7 +416,7 @@
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.batchNo'"
         >
-          <el-input v-model="scope.row.batchNo" placeholder="请输入">
+          <el-input v-model="scope.row.batchNo" placeholder="请输入" v-no-chinese>
           </el-input>
         </el-form-item>
       </template>

+ 1 - 1
src/views/purchasingManage/purchasePlanManage/components/inventoryTable.vue

@@ -61,7 +61,7 @@
       </template>
       <template v-slot:batchNo="scope">
         <el-form-item :prop="'datasource.' + scope.$index + '.batchNo'">
-          <el-input v-model="scope.row.batchNo"></el-input>
+          <el-input v-model="scope.row.batchNo" v-no-chinese></el-input>
         </el-form-item>
       </template>
       <template v-slot:productCode="scope">

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -133,7 +133,7 @@
       </template>
       <template v-slot:batchNo="scope">
         <el-form-item :prop="'datasource.' + scope.$index + '.batchNo'">
-          <el-input v-model="scope.row.batchNo"></el-input>
+          <el-input v-model="scope.row.batchNo" v-no-chinese></el-input>
         </el-form-item>
       </template>
       <template v-slot:blockCount="scope">

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/replaceTable.vue

@@ -138,7 +138,7 @@
       </template>
       <template v-slot:batchNo="scope">
         <el-form-item :prop="'datasource.' + scope.$index + '.batchNo'">
-          <el-input v-model="scope.row.batchNo"></el-input>
+          <el-input v-model="scope.row.batchNo" v-no-chinese></el-input>
         </el-form-item>
       </template>
       <template v-slot:blockCount="scope">

+ 2 - 2
src/views/saleManage/saleOrder/invoice/index.vue

@@ -54,11 +54,11 @@
                 >
                 <el-dropdown-item
                   @click.native="handlePrint('printTemplateJsRef')"
-                  >出库单模板一</el-dropdown-item
+                  >器械出库单</el-dropdown-item
                 >
                 <el-dropdown-item
                   @click.native="handlePrint('printTemplateJsYpRef')"
-                  >出库单模板二(药品)</el-dropdown-item
+                  >药品出库单</el-dropdown-item
                 >
                 <el-dropdown-item
                   @click.native="handlePrint('printTemplateWlRef')"

+ 1 - 1
src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturn.vue

@@ -345,7 +345,7 @@
           :prop="'datasource.' + scope.$index + '.batchNo'">
           <el-input
             :disabled="isContractId"
-            v-model="scope.row.batchNo"
+            v-model="scope.row.batchNo" v-no-chinese
             placeholder="请输入">
           </el-input>
         </el-form-item>