|
|
@@ -129,6 +129,8 @@ interface defaultState {
|
|
|
additionalCostsMxRef: any;
|
|
|
specialProcessesMxData: any;
|
|
|
additionalCostsMxData: any;
|
|
|
+ specialProcessesMxInitData: any;
|
|
|
+ additionalCostsMxInitData: any;
|
|
|
specialProcessesEnum: any;
|
|
|
additionalCostsEnum: any;
|
|
|
isShowOriginFormulaMattress: boolean;
|
|
|
@@ -232,6 +234,16 @@ export const useHooks = (t?: any) => {
|
|
|
label: "顶布裥棉",
|
|
|
name: "topCottonMx",
|
|
|
ref: "topCottonMxRef"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "特殊工艺费用",
|
|
|
+ name: "specialProcesses",
|
|
|
+ ref: "specialProcessesMxRef"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "其他额外费用",
|
|
|
+ name: "additionalCosts",
|
|
|
+ ref: "additionalCostsMxRef"
|
|
|
}
|
|
|
],
|
|
|
otherMxTabList: [
|
|
|
@@ -385,6 +397,8 @@ export const useHooks = (t?: any) => {
|
|
|
additionalCostsMxRef: null,
|
|
|
specialProcessesMxData: [],
|
|
|
additionalCostsMxData: [],
|
|
|
+ specialProcessesMxInitData: [],
|
|
|
+ additionalCostsMxInitData: [],
|
|
|
specialProcessesEnum: [],
|
|
|
additionalCostsEnum: [],
|
|
|
isShowOriginFormulaMattress: false
|
|
|
@@ -1764,7 +1778,7 @@ export const useHooks = (t?: any) => {
|
|
|
/**
|
|
|
* @description 明细，新增
|
|
|
*/
|
|
|
- const funcAddMtrlMx = async (data: any, cb?: Function, refName?: string, firstRow?: boolean) => {
|
|
|
+ const funcAddMtrlMx = async (data: any, cb?: Function, refName?: string, firstRow?: any) => {
|
|
|
console.log("state.LjDetail. :>> ", state.LjDetailRef);
|
|
|
console.log("funcAddMtrlMx data :>> ", data);
|
|
|
let { row, $rowIndex, visibleData } = data;
|
|
|
@@ -1782,23 +1796,39 @@ export const useHooks = (t?: any) => {
|
|
|
|
|
|
const $table = state[tgRefName].element;
|
|
|
if ($table) {
|
|
|
- const records = {
|
|
|
- addmx: "+",
|
|
|
- delmx: "-",
|
|
|
- formulatype: row.formulatype,
|
|
|
- if_mtrl: row.if_mtrl,
|
|
|
- formulaid: row.formulaid,
|
|
|
- sortcode: row.sortcode,
|
|
|
- formulakind: row.formulakind,
|
|
|
- formula: row.formula,
|
|
|
- thickness: 0,
|
|
|
- mtrlid: 0,
|
|
|
- chastr: row.chastr,
|
|
|
- xu: Number(row.xu) + 0.01
|
|
|
- };
|
|
|
+ let records = {};
|
|
|
+ if (["specialProcessesMxRef", "additionalCostsMxRef"].includes(tgRefName)) {
|
|
|
+ records = {
|
|
|
+ addmx: "+",
|
|
|
+ delmx: "-",
|
|
|
+ mattressid: state.LjDetailRef._mainData.mattressid,
|
|
|
+ mattressmxid: 0,
|
|
|
+ extraid: row?.extraid ?? 0,
|
|
|
+ extraname: "",
|
|
|
+ price: "",
|
|
|
+ qty: 1,
|
|
|
+ dscrp: ""
|
|
|
+ };
|
|
|
+ } else {
|
|
|
+ records = {
|
|
|
+ addmx: "+",
|
|
|
+ delmx: "-",
|
|
|
+ formulatype: row.formulatype,
|
|
|
+ if_mtrl: row.if_mtrl,
|
|
|
+ formulaid: row.formulaid,
|
|
|
+ sortcode: row.sortcode,
|
|
|
+ formulakind: row.formulakind,
|
|
|
+ formula: row.formula,
|
|
|
+ thickness: 0,
|
|
|
+ mtrlid: 0,
|
|
|
+ chastr: row.chastr,
|
|
|
+ xu: Number(row.xu) + 0.01
|
|
|
+ };
|
|
|
+ }
|
|
|
|
|
|
// null 从第一行插入, row: 从当前行下一行插入
|
|
|
- let _rowIdx = firstRow ? null : row;
|
|
|
+ let _rowIdx = firstRow == -1 ? -1 : firstRow ? null : row;
|
|
|
+ console.log("funcAddMtrlMx _rowIdx :>> ", firstRow, firstRow == -1, _rowIdx);
|
|
|
|
|
|
const { row: newRow } = await $table.insertNextAt(records, _rowIdx);
|
|
|
await $table.setEditCell(newRow, "mtrlname");
|
|
|
@@ -2022,6 +2052,15 @@ export const useHooks = (t?: any) => {
|
|
|
newMxData = res.mattressMx;
|
|
|
_mainData.biandai_qty = res?.biandai_qty;
|
|
|
state.diancengAreaEnum = res?.diancengarea;
|
|
|
+
|
|
|
+ state.specialProcessesMxData = res?.extraEnum.filter(t => t.typeid == 1);
|
|
|
+ state.additionalCostsMxData = res?.extraEnum.filter(t => t.typeid == 2);
|
|
|
+
|
|
|
+ state.specialProcessesEnum = res?.extraTypeEnum.filter(t => t.typeid == 1);
|
|
|
+ state.additionalCostsEnum = res?.extraTypeEnum.filter(t => t.typeid == 2);
|
|
|
+
|
|
|
+ state.specialProcessesMxInitData = res?.extraProcessesMx;
|
|
|
+ state.additionalCostsMxInitData = res?.extraCostsMx;
|
|
|
}
|
|
|
|
|
|
state.oriMxData.list = newMxData;
|
|
|
@@ -2029,8 +2068,61 @@ export const useHooks = (t?: any) => {
|
|
|
getMattressType();
|
|
|
|
|
|
funcChaifenTab();
|
|
|
+
|
|
|
+ await initExtraData();
|
|
|
};
|
|
|
|
|
|
+ const initExtraData = async () => {
|
|
|
+ console.log("initExtraData state.specialProcessesMxInitData :>> ", state.specialProcessesMxInitData);
|
|
|
+ console.log("initExtraData state.additionalCostsMxInitData :>> ", state.additionalCostsMxInitData);
|
|
|
+ const $tableSpecial = state.specialProcessesMxRef.element;
|
|
|
+ const $tableAdditional = state.additionalCostsMxRef.element;
|
|
|
+
|
|
|
+ if ($tableSpecial) {
|
|
|
+ $tableSpecial.remove();
|
|
|
+ let _arr = [];
|
|
|
+ let _mattressId = state.LjDetailRef._mainData.mattressid;
|
|
|
+ state.specialProcessesMxInitData.map(o => {
|
|
|
+ let _itm = {
|
|
|
+ addmx: "+",
|
|
|
+ delmx: "-",
|
|
|
+ mattressid: _mattressId,
|
|
|
+ mattressmxid: 0,
|
|
|
+ extraid: o.extraid,
|
|
|
+ extraname: o.extraname,
|
|
|
+ price: o.price,
|
|
|
+ qty: o.qty,
|
|
|
+ dscrp: o.dscrp,
|
|
|
+ inputtype: o.inputtype,
|
|
|
+ typeid: o.typeid
|
|
|
+ };
|
|
|
+ _arr.push(_itm);
|
|
|
+ });
|
|
|
+ await $tableSpecial.insertAt(_arr, -1);
|
|
|
+ }
|
|
|
+ if ($tableAdditional) {
|
|
|
+ $tableAdditional.remove();
|
|
|
+ let _arr = [];
|
|
|
+ let _mattressId = state.LjDetailRef._mainData.mattressid;
|
|
|
+ state.additionalCostsMxInitData.map(o => {
|
|
|
+ let _itm = {
|
|
|
+ addmx: "+",
|
|
|
+ delmx: "-",
|
|
|
+ mattressid: _mattressId,
|
|
|
+ mattressmxid: 0,
|
|
|
+ extraid: o.extraid,
|
|
|
+ extraname: o.extraname,
|
|
|
+ price: o.price,
|
|
|
+ qty: o.qty,
|
|
|
+ dscrp: o.dscrp,
|
|
|
+ inputtype: o.inputtype,
|
|
|
+ typeid: o.typeid
|
|
|
+ };
|
|
|
+ _arr.push(_itm);
|
|
|
+ });
|
|
|
+ await $tableAdditional.insertAt(_arr, -1);
|
|
|
+ }
|
|
|
+ };
|
|
|
/**
|
|
|
* @description 变更床垫分类时，重载明细数据 dw_1 itemchange
|
|
|
* @author w_mattress_add dw_1 itemchange
|
|
|
@@ -4555,15 +4647,10 @@ export const useHooks = (t?: any) => {
|
|
|
field: "addmx",
|
|
|
width: 80,
|
|
|
render: (scope: any) => {
|
|
|
- let _if_mtrl = Number(scope.row.if_mtrl);
|
|
|
- if (_if_mtrl > 1) {
|
|
|
- if (state.orderStatus) {
|
|
|
- return <ElButton type="primary" plain circle icon={Plus} onClick={() => funcAddMtrlMx(scope)}></ElButton>;
|
|
|
- } else {
|
|
|
- return <>+</>;
|
|
|
- }
|
|
|
+ if (state.orderStatus) {
|
|
|
+ return <ElButton type="primary" plain circle icon={Plus} onClick={() => funcAddMtrlMx(scope)}></ElButton>;
|
|
|
} else {
|
|
|
- return <></>;
|
|
|
+ return <>+</>;
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -4599,38 +4686,201 @@ export const useHooks = (t?: any) => {
|
|
|
},
|
|
|
{
|
|
|
title: "项目类型",
|
|
|
- field: "extratypename",
|
|
|
- editRender: {
|
|
|
- name: "select"
|
|
|
+ field: "extraid",
|
|
|
+ // editRender: {
|
|
|
+ // name: "select"
|
|
|
+ // }
|
|
|
+ editRender: {},
|
|
|
+ editColRender: (scope: any) => {
|
|
|
+ console.log("extratypename state.specialProcessesEnum :>> ", state.specialProcessesEnum);
|
|
|
+ return (
|
|
|
+ <el-select v-model={scope.row.extraid} disabled={scope.row.extraid == 1}>
|
|
|
+ {{
|
|
|
+ default: () => {
|
|
|
+ let rs = [];
|
|
|
+ if (state.specialProcessesEnum.length) {
|
|
|
+ state.specialProcessesEnum.map((t: any) => {
|
|
|
+ rs.push(<el-option label={t.typename} value={t.extraid} disabled={t.extraid == 1} />);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ return rs;
|
|
|
+ }
|
|
|
+ }}
|
|
|
+ </el-select>
|
|
|
+ );
|
|
|
+ },
|
|
|
+ render: scope => {
|
|
|
+ let item = state.specialProcessesEnum.find(t => t.extraid == scope.row.extraid);
|
|
|
+ if (item) {
|
|
|
+ return item.typename;
|
|
|
+ } else {
|
|
|
+ return "";
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
title: "项目名称",
|
|
|
field: "extraname",
|
|
|
- editRender: {
|
|
|
- name: "$input"
|
|
|
+ editRender: {},
|
|
|
+ editColRender: (scope: any) => {
|
|
|
+ let _disabled = scope.row.inputtype == 2;
|
|
|
+ return (
|
|
|
+ <el-autocomplete
|
|
|
+ v-model={scope.row.extraname}
|
|
|
+ disabled={_disabled}
|
|
|
+ value-key="extramxname"
|
|
|
+ fetch-suggestions={(queryString: string, callback: any) =>
|
|
|
+ querySearch_processes(queryString, callback, scope, state.specialProcessesMxData)
|
|
|
+ }
|
|
|
+ onSelect={itm => additionalOnSelect(itm, scope)}
|
|
|
+ clearable
|
|
|
+ />
|
|
|
+ );
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
title: "金额",
|
|
|
field: "price",
|
|
|
- editRender: {
|
|
|
- name: "$input",
|
|
|
- props: {
|
|
|
- type: "number"
|
|
|
- }
|
|
|
+ datatype: "number",
|
|
|
+ editRender: {},
|
|
|
+ editColRender: (scope: any) => {
|
|
|
+ const { $table, column, row, status } = scope;
|
|
|
+ return <el-input v-model={scope.row.price} type="number" disabled={row.inputtype == 2}></el-input>;
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
title: "数量",
|
|
|
field: "qty",
|
|
|
+ datatype: "number",
|
|
|
+ editRender: {},
|
|
|
+ editColRender: (scope: any) => {
|
|
|
+ const { $table, column, row, status } = scope;
|
|
|
+ return <el-input v-model={scope.row.qty} type="number" disabled={row.inputtype == 2}></el-input>;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "备注",
|
|
|
+ field: "dscrp",
|
|
|
editRender: {
|
|
|
- name: "$input",
|
|
|
- props: {
|
|
|
- type: "number"
|
|
|
+ name: "$input"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ ];
|
|
|
+ const columnsMx_additional: any = [
|
|
|
+ { type: "checkbox", width: 50, fixed: "left" },
|
|
|
+ {
|
|
|
+ title: "+",
|
|
|
+ field: "addmx",
|
|
|
+ width: 80,
|
|
|
+ render: (scope: any) => {
|
|
|
+ if (state.orderStatus) {
|
|
|
+ return <ElButton type="primary" plain circle icon={Plus} onClick={() => funcAddMtrlMx(scope)}></ElButton>;
|
|
|
+ } else {
|
|
|
+ return <>+</>;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "-",
|
|
|
+ field: "delmx",
|
|
|
+ width: 80,
|
|
|
+ render: (scope: any) => {
|
|
|
+ if (state.orderStatus) {
|
|
|
+ return (
|
|
|
+ <>
|
|
|
+ <ElPopconfirm
|
|
|
+ width="220"
|
|
|
+ icon={InfoFilled}
|
|
|
+ title={t("business.tips.mattress.delMx")}
|
|
|
+ confirm-button-text={t("common.delText")}
|
|
|
+ confirm-button-type="danger"
|
|
|
+ onConfirm={() => funcDelMtrlMx(scope)}
|
|
|
+ >
|
|
|
+ {{
|
|
|
+ reference: () => {
|
|
|
+ return <ElButton type="danger" plain circle icon={Minus} />;
|
|
|
+ }
|
|
|
+ }}
|
|
|
+ </ElPopconfirm>
|
|
|
+ </>
|
|
|
+ );
|
|
|
+ // return <ElButton type="danger" plain circle icon={Minus} onClick={() => funcDelMtrlMx(scope)}></ElButton>;
|
|
|
+ } else {
|
|
|
+ return <>-</>;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "项目类型",
|
|
|
+ field: "extraid",
|
|
|
+ editRender: {},
|
|
|
+ editColRender: (scope: any) => {
|
|
|
+ return (
|
|
|
+ <el-select v-model={scope.row.extraid}>
|
|
|
+ {{
|
|
|
+ default: () => {
|
|
|
+ let rs = [];
|
|
|
+ if (state.additionalCostsEnum.length) {
|
|
|
+ state.additionalCostsEnum.map((t: any) => {
|
|
|
+ rs.push(<el-option label={t.typename} value={t.extraid} />);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ return rs;
|
|
|
+ }
|
|
|
+ }}
|
|
|
+ </el-select>
|
|
|
+ );
|
|
|
+ },
|
|
|
+ render: scope => {
|
|
|
+ let item = state.additionalCostsEnum.find(t => t.extraid == scope.row.extraid);
|
|
|
+ if (item) {
|
|
|
+ return item.typename;
|
|
|
+ } else {
|
|
|
+ return "";
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ {
|
|
|
+ title: "项目名称",
|
|
|
+ field: "extraname",
|
|
|
+ editRender: {},
|
|
|
+ editColRender: (scope: any) => {
|
|
|
+ console.log("editColRender 1111 scope :>> ", scope);
|
|
|
+ let _disabled = scope.row.inputtype == 2;
|
|
|
+ return (
|
|
|
+ <el-autocomplete
|
|
|
+ v-model={scope.row.extraname}
|
|
|
+ disabled={_disabled}
|
|
|
+ value-key="extramxname"
|
|
|
+ fetch-suggestions={(queryString: string, callback: any) =>
|
|
|
+ querySearch_additional(queryString, callback, scope, state.additionalCostsMxData)
|
|
|
+ }
|
|
|
+ onSelect={itm => additionalOnSelect(itm, scope)}
|
|
|
+ clearable
|
|
|
+ />
|
|
|
+ );
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "金额",
|
|
|
+ field: "price",
|
|
|
+ datatype: "number",
|
|
|
+ editRender: {},
|
|
|
+ editColRender: (scope: any) => {
|
|
|
+ const { $table, column, row, status } = scope;
|
|
|
+ return <el-input v-model={scope.row.price} type="number" disabled={row.inputtype == 2}></el-input>;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "数量",
|
|
|
+ field: "qty",
|
|
|
+ datatype: "number",
|
|
|
+ editRender: {},
|
|
|
+ editColRender: (scope: any) => {
|
|
|
+ const { $table, column, row, status } = scope;
|
|
|
+ return <el-input v-model={scope.row.qty} type="number" disabled={row.inputtype == 2}></el-input>;
|
|
|
+ }
|
|
|
+ },
|
|
|
{
|
|
|
title: "备注",
|
|
|
field: "dscrp",
|
|
|
@@ -4640,6 +4890,52 @@ export const useHooks = (t?: any) => {
|
|
|
}
|
|
|
];
|
|
|
|
|
|
+ const additionalOnSelect = (item: Record<string, any>, scope: any) => {
|
|
|
+ const { row } = scope;
|
|
|
+ // console.log("additionalOnSelect: >>", item);
|
|
|
+ // const $tableAdditional = state.additionalCostsMxRef.element;
|
|
|
+
|
|
|
+ // if ($tableAdditional) {
|
|
|
+ // const { visibleData } = $tableAdditional.getTableData();
|
|
|
+
|
|
|
+ // const row = visibleData[$rowIndex];
|
|
|
+ // console.log("additionalOnSelect: row >>", row);
|
|
|
+ // row.extramxname = item.extramxname;
|
|
|
+ row.extramxid = item.extramxid;
|
|
|
+ row.inputtype = item.inputtype;
|
|
|
+ row.extraid = item.extraid;
|
|
|
+ row.extraname = item.extramxname;
|
|
|
+ row.typeid = item.typeid;
|
|
|
+ row.price = item.price;
|
|
|
+ row.qty = item.qty;
|
|
|
+ row.dscrp = item.dscrp;
|
|
|
+
|
|
|
+ // $tableAdditional.reloadData(visibleData);
|
|
|
+ // }
|
|
|
+ };
|
|
|
+
|
|
|
+ const querySearch_processes = (queryString: string, cb: any, data, list) => {
|
|
|
+ const { row } = data;
|
|
|
+ const results = queryString
|
|
|
+ ? list.filter(o => {
|
|
|
+ return o.extramxname.indexOf(queryString) > -1 && o.extraid == row.extraid;
|
|
|
+ })
|
|
|
+ : list.filter(o => o.extraid == row.extraid);
|
|
|
+
|
|
|
+ cb(results);
|
|
|
+ };
|
|
|
+
|
|
|
+ const querySearch_additional = (queryString: string, cb: any, data, list) => {
|
|
|
+ const { row } = data;
|
|
|
+ const results = queryString
|
|
|
+ ? list.filter(o => {
|
|
|
+ return o.extramxname.indexOf(queryString) > -1 && o.extraid == row.extraid;
|
|
|
+ })
|
|
|
+ : list.filter(o => o.extraid == row.extraid);
|
|
|
+
|
|
|
+ cb(results);
|
|
|
+ };
|
|
|
+
|
|
|
const columnsMx_subSpecs: any = [
|
|
|
{ type: "checkbox", width: 50, fixed: "left" },
|
|
|
{
|
|
|
@@ -4802,6 +5098,20 @@ export const useHooks = (t?: any) => {
|
|
|
}, 200);
|
|
|
};
|
|
|
|
|
|
+ const resetSpecialProcesses = (type: string) => {
|
|
|
+ console.log("resetSpecialProcesses type:>> ", type);
|
|
|
+ console.log("resetSpecialProcesses additionalCostsMxInitData:>> ", state.additionalCostsMxInitData);
|
|
|
+ console.log("resetSpecialProcesses specialProcessesMxInitData:>> ", state.specialProcessesMxInitData);
|
|
|
+ // setTimeout(() => {
|
|
|
+ // const $table = state.innerClothLayerMxRef.element;
|
|
|
+ // if ($table) {
|
|
|
+ // let mergeCells = autoMergeCells($table, ["chastr"]);
|
|
|
+ // console.log("resetMergeCellsInner autoMergeCells :>> ", mergeCells);
|
|
|
+ // $table.setMergeCells(mergeCells);
|
|
|
+ // }
|
|
|
+ // }, 200);
|
|
|
+ };
|
|
|
+
|
|
|
const hanleDelMxInner = (type: number) => {
|
|
|
const $table = state.innerClothLayerMxRef.element;
|
|
|
if ($table) {
|
|
|
@@ -5040,6 +5350,7 @@ export const useHooks = (t?: any) => {
|
|
|
// fieldParams,
|
|
|
columnsMx_subSpecs,
|
|
|
columnsMx_processes,
|
|
|
+ columnsMx_additional,
|
|
|
funcAddMxSide,
|
|
|
funcChaifenTab,
|
|
|
getData_mx,
|
|
|
@@ -5060,6 +5371,7 @@ export const useHooks = (t?: any) => {
|
|
|
wf_rtr_bednet,
|
|
|
funcAddMtrlMx,
|
|
|
resetMergeCellsInner,
|
|
|
+ resetSpecialProcesses,
|
|
|
resetMergeCellsTopCotton,
|
|
|
wf_rtr_cwdc
|
|
|
};
|
