|
|
@@ -1,5 +1,5 @@
|
|
|
define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
|
|
|
-
|
|
|
+ var kuoz=0
|
|
|
var Controller = {
|
|
|
index: function () {
|
|
|
// 初始化表格参数配置
|
|
|
@@ -37,10 +37,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|
|
// {field: 'formula_no', title: __('Formula_no'), operate: 'LIKE'},
|
|
|
{field: 'name', title: __('Name'), operate: 'LIKE',},
|
|
|
// {field: 'name', title: __('Name'), operate: 'LIKE',
|
|
|
- // cellStyle: function (value, row, index) {
|
|
|
- // console.log(row['id']);
|
|
|
- // return {css: {"color": "red"}};
|
|
|
- // }},
|
|
|
+ // cellStyle: function (value, row, index) {
|
|
|
+ // console.log(row['id']);
|
|
|
+ // return {css: {"color": "red"}};
|
|
|
+ // }},
|
|
|
{field: 'version', title: __('Version'),operate: false},
|
|
|
// {field: 'date', title: __('Date'), operate: 'LIKE'},
|
|
|
// {field: 'charge_name', title: __('Charge_name'), operate: 'LIKE'},
|
|
|
@@ -72,6 +72,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|
|
});
|
|
|
// 为表格绑定事件
|
|
|
Table.api.bindevent(table);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
},
|
|
|
add: function () {
|
|
|
var gy_num = 1;
|
|
|
@@ -128,6 +131,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|
|
|
|
|
Controller.api.bindevent();
|
|
|
|
|
|
+
|
|
|
$(document).on('click','.submit',function () {
|
|
|
Form.api.bindevent($("form[role=form]"), function(data, ret){
|
|
|
Toastr.success('111');//成功
|
|
|
@@ -189,7 +193,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|
|
baseData.push(model);
|
|
|
baseData.push(controlled_one);
|
|
|
baseData.push(controlled_two);
|
|
|
- console.log(baseData);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
//配方数据
|
|
|
var data = [];
|
|
|
var formulaTrList = $("#gy").find("tr");//行数
|
|
|
@@ -394,6 +401,119 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|
|
});
|
|
|
},
|
|
|
task: function () {
|
|
|
+
|
|
|
+ $('#kuodan').click(function () {
|
|
|
+ layer.prompt({
|
|
|
+ title: ['扩单'],
|
|
|
+ formType: 0, //输入框类型，支持0（文本）默认1（密码）2（多行文本）
|
|
|
+
|
|
|
+ },function(value2, index, elem){
|
|
|
+ kuoz= value2
|
|
|
+ $('#c-kuoz').val(value2)
|
|
|
+
|
|
|
+ //配方获取和计算
|
|
|
+ var ids = $('#ids').val();
|
|
|
+ var number = $('#c-number').val();
|
|
|
+ if (number == ''){
|
|
|
+ layer.confirm('生产量不能为空');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ var pc = $('#hidden').val();//当前批次号
|
|
|
+ // if($('#hidden').val() > $('#c-bach').val()){
|
|
|
+ // layer.confirm("批次号不能小于当前的批次,当前批次为"+pc, {
|
|
|
+ // title: ['信息'],
|
|
|
+ // btn: ['确认'],
|
|
|
+ // icon: 0,
|
|
|
+ // closeBtn: 2,
|
|
|
+ // shade: [0.3, '#000'],
|
|
|
+ // shadeClose: true,
|
|
|
+ // id: "one",
|
|
|
+ // anim: 2,
|
|
|
+ // isOutAnim: false,
|
|
|
+ // area: ['30%', '30%'],
|
|
|
+ // });
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
+ //给打印界面赋值
|
|
|
+ $('.total').text(number);
|
|
|
+ var remark = $('#c-remark').val();
|
|
|
+ remark = '备注：'+remark;
|
|
|
+ $('.remark').text(remark);
|
|
|
+ //给打印表头赋值
|
|
|
+ var bach = $('#c-bach').val();
|
|
|
+ $('#bach').text(bach);
|
|
|
+ var formula = $('#c-name').val();
|
|
|
+ $('#formula').val(formula);
|
|
|
+ var drawer_name = $('#c-drawer_name').val();
|
|
|
+ $('#drawer_name').text(drawer_name);
|
|
|
+ var examine_name = $('#c-examine_name').val();
|
|
|
+ $('#examine_name').text(examine_name);
|
|
|
+ $.ajax({
|
|
|
+ type: "POST",
|
|
|
+ url: "formula/getNumber",
|
|
|
+ data: {
|
|
|
+ 'ids': ids,
|
|
|
+ 'number': number
|
|
|
+ },
|
|
|
+ success:function(data) {
|
|
|
+ if (1 == data.status)
|
|
|
+ {
|
|
|
+ var formulaTrList = $("#gy").find("tr");//行数
|
|
|
+ for (var i = 1; i < formulaTrList.length; i++) {
|
|
|
+ var formulaTrArr=formulaTrList.eq(i);
|
|
|
+ var id = formulaTrArr.children("td").eq(2).find('input').attr('data-id');//应加量
|
|
|
+ $.each(data.data,function (key,value){
|
|
|
+ if (id == value.id){
|
|
|
+
|
|
|
+ $('#input-'+id).val(value.num);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ let p=0
|
|
|
+ for (var i = 1; i < formulaTrList.length; i++) {
|
|
|
+ var formulaTrArr=formulaTrList.eq(i);
|
|
|
+ var id = formulaTrArr.children("td").eq(2).find('input').attr('data-id');//应加量
|
|
|
+ $.each(data.data,function (key,value){
|
|
|
+ if (id == value.id){
|
|
|
+ $('#kuodan-'+id).val((Number(number)+Number(value2))*(value.percentage/100));
|
|
|
+ if((Number(number)+Number(value2))*(value.percentage/100)){
|
|
|
+ $('.tty_'+id).text((Number(number)+Number(value2))*(value.percentage/100))
|
|
|
+ p+=(Number(number)+Number(value2))*(value.percentage/100)
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ $('.zoj').text(p)
|
|
|
+
|
|
|
+ var print_gyList = $("#print_gy").find("tr");//行数
|
|
|
+ for (var i = 1; i < print_gyList.length; i++) {
|
|
|
+ var formulaTrArr=print_gyList.eq(i);
|
|
|
+ var id = formulaTrArr.children("td").eq(1).attr('data-id');//应加量
|
|
|
+ $.each(data.data,function (key,value){
|
|
|
+ if (id == value.id){
|
|
|
+ $('#text-'+id).text(value.num);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ $('#formula_no').text(data.formula_no);
|
|
|
+ $('#date').text(data.date);
|
|
|
+
|
|
|
+ }else {
|
|
|
+ layer.confirm(data.msg);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ layer.close(index);
|
|
|
+
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
$('#add').click(function () {
|
|
|
//配方获取和计算
|
|
|
var ids = $('#ids').val();
|
|
|
@@ -472,13 +592,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
- //扩单
|
|
|
- $('#kd').click(function () {
|
|
|
- alert(1);
|
|
|
- });
|
|
|
|
|
|
+//提交数据
|
|
|
Controller.api.bindevent();
|
|
|
$(document).on('click','.submit',function () {
|
|
|
+
|
|
|
+
|
|
|
var pc = $('#hidden').val();//当前批次号
|
|
|
// if($('#hidden').val() > $('#c-bach').val()){
|
|
|
// layer.confirm("批次号不能小于当前的批次,当前批次为"+pc, {
|
|
|
@@ -495,63 +614,68 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
|
|
|
// });
|
|
|
// return false;
|
|
|
// }else{
|
|
|
- Form.api.bindevent($("form[role=form]"), function(data, ret){
|
|
|
- Toastr.success('111');//成功
|
|
|
- }, function(data, ret){
|
|
|
- Toastr.success("222");
|
|
|
- }, function(success, error){
|
|
|
- var verify = 1;
|
|
|
- var ids = $('#ids').attr('value');
|
|
|
- var name = $('#c-name').val();
|
|
|
- if (name == '' || name== undefined) {
|
|
|
- verify = -1;
|
|
|
- }
|
|
|
- var bach = $('#c-bach').val();
|
|
|
- if (bach == '' || bach== undefined) {
|
|
|
- verify = -1;
|
|
|
- }
|
|
|
- var drawer_name = $('#c-drawer_name').val();
|
|
|
- if (drawer_name == '' || drawer_name== undefined) {
|
|
|
- verify = -1;
|
|
|
- }
|
|
|
- var examine_name = $('#c-examine_name').val();
|
|
|
- if (examine_name == '' || examine_name== undefined) {
|
|
|
- verify = -1;
|
|
|
- }
|
|
|
- var number = $('#c-number').val();
|
|
|
- var remark = $('#c-remark').val();
|
|
|
- var mid = $('#c-mid').val();
|
|
|
- var oid = $('#c-order-uncompleted').val();
|
|
|
- if (verify == -1){
|
|
|
- layer.confirm("数据格式不对,请仔细核查!");return false;
|
|
|
- }
|
|
|
- //基础数据
|
|
|
- var baseData = [];
|
|
|
- baseData.push(ids);
|
|
|
- baseData.push(name);
|
|
|
- baseData.push(bach);
|
|
|
- baseData.push(drawer_name);
|
|
|
- baseData.push(examine_name);
|
|
|
- baseData.push(number);
|
|
|
- baseData.push(remark);
|
|
|
- baseData.push(mid);
|
|
|
- baseData.push(oid);
|
|
|
- Fast.api.ajax({
|
|
|
- url:'formula/task?ids='+ids,
|
|
|
- data:{baseData:baseData}
|
|
|
- },function (data,ret) {
|
|
|
- //成功回调
|
|
|
- parent.Toastr.success("添加成功");
|
|
|
- Fast.api.close();
|
|
|
- parent.Fast.api.refreshmenu();
|
|
|
- return false;
|
|
|
- },function (data,ret) {
|
|
|
- parent.Toastr.error("添加失败");
|
|
|
- Fast.api.close();
|
|
|
- return false;
|
|
|
- });
|
|
|
+ Form.api.bindevent($("form[role=form]"), function(data, ret){
|
|
|
+ Toastr.success('111');//成功
|
|
|
+ }, function(data, ret){
|
|
|
+ Toastr.success("222");
|
|
|
+ }, function(success, error){
|
|
|
+ var verify = 1;
|
|
|
+ var ids = $('#ids').attr('value');
|
|
|
+ var name = $('#c-name').val();
|
|
|
+ if (name == '' || name== undefined) {
|
|
|
+ verify = -1;
|
|
|
+ }
|
|
|
+ var bach = $('#c-bach').val();
|
|
|
+ if (bach == '' || bach== undefined) {
|
|
|
+ verify = -1;
|
|
|
+ }
|
|
|
+ var drawer_name = $('#c-drawer_name').val();
|
|
|
+ if (drawer_name == '' || drawer_name== undefined) {
|
|
|
+ verify = -1;
|
|
|
+ }
|
|
|
+ var examine_name = $('#c-examine_name').val();
|
|
|
+ if (examine_name == '' || examine_name== undefined) {
|
|
|
+ verify = -1;
|
|
|
+ }
|
|
|
+ var number = $('#c-number').val();
|
|
|
+ var remark = $('#c-remark').val();
|
|
|
+ var mid = $('#c-mid').val();
|
|
|
+ var oid = $('#c-order-uncompleted').val();
|
|
|
+ if (verify == -1){
|
|
|
+ layer.confirm("数据格式不对,请仔细核查!");return false;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ //基础数据
|
|
|
+ var baseData = [];
|
|
|
+ baseData.push(ids);
|
|
|
+ baseData.push(name);
|
|
|
+ baseData.push(bach);
|
|
|
+ baseData.push(drawer_name);
|
|
|
+ baseData.push(examine_name);
|
|
|
+ baseData.push(number);
|
|
|
+ baseData.push(remark);
|
|
|
+ baseData.push(mid);
|
|
|
+ baseData.push(oid);
|
|
|
+ if(kuoz)
|
|
|
+ baseData.push(kuoz);
|
|
|
+ Fast.api.ajax({
|
|
|
+ url:'formula/task?ids='+ids,
|
|
|
+ data:{baseData:baseData}
|
|
|
+ },function (data,ret) {
|
|
|
+ //成功回调
|
|
|
+ parent.Toastr.success("添加成功");
|
|
|
+ Fast.api.close();
|
|
|
+ parent.Fast.api.refreshmenu();
|
|
|
+ return false;
|
|
|
+ },function (data,ret) {
|
|
|
+ parent.Toastr.error("添加失败");
|
|
|
+ Fast.api.close();
|
|
|
return false;
|
|
|
});
|
|
|
+ return false;
|
|
|
+ });
|
|
|
// }
|
|
|
|
|
|
});
|
