|
@@ -1935,16 +1935,21 @@ export const useHooks = (t?: any) => {
|
|
|
|
|
|
state.mattressYWList = visibleData.map(mx => {
|
|
|
const key = `${mx.erp_pzid}`;
|
|
|
- if (copyMap.has(key) && (mx.bj_inputtype === 1 || mx.bj_inputtype === 0 || mx.bj_pzname.includes("床网"))) {
|
|
|
+
|
|
|
+ if (copyMap.has(key)) {
|
|
|
matchQty++;
|
|
|
const mx2 = copyMap.get(key);
|
|
|
- if (mx.bj_inputtype === 2) {
|
|
|
- mx.bj_namemx = mx2.bj_namemx;
|
|
|
- } else {
|
|
|
- mx.bj_inputtype = mx2.bj_inputtype;
|
|
|
- mx.bj_namemx = mx2.bj_namemx;
|
|
|
+
|
|
|
+ if (mx.bj_inputtype === 1 || mx.bj_inputtype === 0 || mx.bj_pzname.includes("床网")) {
|
|
|
+ if (mx.bj_inputtype === 2) {
|
|
|
+ mx.bj_namemx = mx2.bj_namemx;
|
|
|
+ } else {
|
|
|
+ mx.bj_inputtype = mx2.bj_inputtype;
|
|
|
+ mx.bj_namemx = mx2.bj_namemx;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+ // 生产信息覆盖,不看类型
|
|
|
SPECIAL_PRESERVED_PROPS.forEach(prop => {
|
|
|
mx[prop] = mx2[prop];
|
|
|
});
|