diff --git a/js/accessory/child/accessory_return_form.js b/js/accessory/child/accessory_return_form.js
index 316939d..f1a2bb5 100644
--- a/js/accessory/child/accessory_return_form.js
+++ b/js/accessory/child/accessory_return_form.js
@@ -1,8 +1,7 @@
let idParam, objParam, fileList = new Array(), imgListUp = new Array();
let form, laydate, layer, upload, table, util;
let pageNum = 1, tableIns; // 定义分页
-let jjDataArr = []; // 入库配件数据
-let cjList = []; // 厂家下拉选
+let jjDataArr = []; // 退料配件数据
let delIdArr = [];
let checkUserId;
function setParams(obj) {
@@ -15,13 +14,13 @@ function setParams(obj) {
table = layui.table;
util = layui.util;
laydate.render({
- elem: '#inputDay'
+ elem: '#backDay'
});
form.verify();
form.on('submit(formData)', function (data) {
submitApply(data);
});
- form.on('select(inputUser)', function (data) {
+ form.on('select(createId)', function (data) {
if (checkUserId && data.value !== checkUserId) {
// 清空退料配件明细数据
jjDataArr.splice(0, jjDataArr.length);
@@ -64,8 +63,36 @@ function setParams(obj) {
}
});
});
- getVendList();
+ getUserList();
}
+
+// 退料人下拉选
+function getUserList() {
+ let params = {
+ encryptedData: JSON.stringify({})
+ };
+ let url = dataUrl + 'backstage/partBack/getUserList';
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ console.log(result);
+ if (result.code === 200) {
+ setSelectData(result.data);
+ }
+ }, function (xhr, status, error) {
+ errorFn(xhr, status, error)
+ }, null);
+}
+
+// 退料人下拉选赋值
+function setSelectData(list) {
+ let html = '';
+ $.each(list, function (index, item) {
+ html += ''
+ })
+ $('#createId').empty().append(html);
+ layui.form.render();
+}
+
// 设置文件类型
function handleFileType(index, file, result) {
let html = '', img = '';
@@ -197,12 +224,12 @@ function getBaseTableData() {
// 选择退回配件类型
function chooseFitType() {
- let userId = $('#inputUser').val()
+ let userId = $('#createId').val()
if (!userId) {
return layer.msg('请选择退料人', { icon: 7 });
}
let params = { userId: userId };
- openIframeByParamObj("choose_return_fit_type", '选择退回配件类型（只可选择该人员已领用过的配件）', "./choose_return_fit_type_list.html", '92%', '95%', params);
+ openIframeByParamObj("choose_return_fit_type", '选择退回配件类型（只可选择该人员已领用过的配件）', "./choose_return_fit_type_list.html", '92%', '95%', params);
}
// 查询
diff --git a/js/accessory/child/choose_return_fit_type_list.js b/js/accessory/child/choose_return_fit_type_list.js
index c71d8d1..af0b84a 100644
--- a/js/accessory/child/choose_return_fit_type_list.js
+++ b/js/accessory/child/choose_return_fit_type_list.js
@@ -1,5 +1,5 @@
let objParam, userId;
-let form, table, element, tableIns, layer, util;
+let form, table, tableIns, layer, util;
let pageNum = 1;
let quanju = new Array();//全局
let huancun = new Array();//缓存
@@ -9,10 +9,9 @@ function setParams(obj) {
objParam = JSON.parse(obj);
userId = objParam.userId;
console.log(objParam);
- layui.use(["form", "table", 'element', 'layer', 'util'], function () {
+ layui.use(["form", "table", 'layer', 'util'], function () {
form = layui.form;
table = layui.table;
- element = layui.element;
layer = layui.layer;
util = layui.util;
initTable();
@@ -24,9 +23,9 @@ function queryTable(type) {
if (type === 1) {
reloadTable(1);
} else if (type === 2) {
- $('#name').val('');
- $('#module').val('');
- $('#type').val('');
+ $('#partType').val('');
+ $('#partName').val('');
+ $('#partModel').val('');
layui.form.render();
reloadTable(1);
}
@@ -40,9 +39,10 @@ function reloadTable(pageNum) {
},
where: {
encryptedData: JSON.stringify({
- 'name': $('#name').val(),
- 'model': $('#model').val(),
- 'type': $('#type').val(),
+ 'partType': $('#partType').val(),
+ 'partName': $('#partName').val(),
+ 'partModel': $('#partModel').val(),
+ 'userId': userId
}),
},
},
@@ -59,12 +59,12 @@ function initTable() {
headers: {
authorization: sessionStorage.getItem("gz-token"),
},
- url: dataUrl + "backstage/paType/findByPage",
+ url: dataUrl + "backstage/partBack/getPaTypeList",
where: {
encryptedData: JSON.stringify({
- 'type': $('#type').val(),
- 'name': $('#name').val(),
- 'model': $('#model').val(),
+ 'partType': $('#partType').val(),
+ 'partName': $('#partName').val(),
+ 'partModel': $('#partModel').val(),
'userId': userId
}),
},
@@ -104,42 +104,42 @@ function initTable() {
},
},
{
- field: "type",
+ field: "partType",
width: '10%',
title: "配件类型",
unresize: true,
align: "center",
},
{
- field: "name",
+ field: "partName",
width: '15%',
title: "配件名称",
unresize: true,
align: "center",
},
{
- field: "model",
+ field: "partModel",
width: '10%',
title: "规格型号",
unresize: true,
align: "center",
},
{
- field: "unit",
+ field: "partUnit",
title: "单位",
width: '10%',
unresize: true,
align: "center",
},
{
- field: "num",
+ field: "lyNum",
width: '10%',
title: "累计领料数量",
unresize: true,
align: "center",
},
{
- field: "price",
+ field: "ghNum",
width: '10%',
title: " * 本次退回量",
unresize: true,
@@ -148,7 +148,7 @@ function initTable() {
style: 'outline: 1px solid #e6e6e6;outline-offset: -5px;'
},
{
- field: "remarks",
+ field: "remark",
width: '20%',
title: "备注",
unresize: true,
@@ -163,24 +163,8 @@ function initTable() {
limit: 10,
page: true,
done: function (res, curr, count) {
- var options = this;
table.resize("currentTableId");
pageNum = tableIns.config.page.curr;
- form.on('select(select-demo)', function (obj) {
- console.log(obj);
- var value = obj.value; // 获取选中项 value
- // 获取当前行数据(如 id 等字段，以作为数据修改的索引)
- var data = table.getRowData(options.id, obj.elem);
- // 更新数据中对应的字段
- data.manufacturer = value;
- updateOrAddObject(data.id, data);
- });
- // 获取当前行数据 - 自定义方法
- table.getRowData = function (tableId, elem) {
- var index = $(elem).closest('tr').data('index');
- return table.cache[tableId][index] || {};
- };
-
//设置全部数据到全局变量
quanju = res.data;
for (var i = 0; i < res.data.length; i++) {
diff --git a/page/accessory/child/accessory_return_form.html b/page/accessory/child/accessory_return_form.html
index b0dd147..c70490e 100644
--- a/page/accessory/child/accessory_return_form.html
+++ b/page/accessory/child/accessory_return_form.html
@@ -19,10 +19,7 @@
@@ -32,7 +29,7 @@
-
diff --git a/page/accessory/child/choose_return_fit_type_list.html b/page/accessory/child/choose_return_fit_type_list.html
index 8e88ceb..29dbaaa 100644
--- a/page/accessory/child/choose_return_fit_type_list.html
+++ b/page/accessory/child/choose_return_fit_type_list.html
@@ -43,19 +43,19 @@