From c69120c632f60bbbaf7a075d12ee0071b47deccc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 15:42:22 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index a870dbe..a96fd48 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -32,15 +32,15 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+ ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', width: 160}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ // ,{field: 'model', align: 'center',title: '鎵规'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
@@ -385,8 +385,8 @@
cellMinWidth: 100,
cols: [[
{type: 'checkbox'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', align: 'center', width: 350},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', align: 'center'},
+ {field: 'matnr', title: '鍗曟嵁鍙�', align: 'center', width: 350},
+ {field: 'maktx', title: '鐗╂枡鍙�', align: 'center'},
{field: 'specs', title: '瑙勬牸', align: 'center'},
{field: 'batch', title: '鎵瑰彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
@@ -555,7 +555,7 @@
}
,yes: function(index, layero){
//鎸夐挳銆愮珛鍗冲嚭搴撱�戠殑鍥炶皟
- pakout(tableCache, index);
+ pakout(mergeTabCache, index);
}
,btn2: function(index, layero){
//鎸夐挳銆愮◢鍚庡鐞嗐�戠殑鍥炶皟
--
Gitblit v1.9.1