JC26WMS.git - Gitblit

			@@ -95,36 +95,20 @@
			<div class="layui-input-inline">
			<select name="Type" id="Type" lay-filter="Type" lay-search>
			<option value=""></option>
			<!-- JC23 -->
			<!--JC26-->
			<option value="0">成品入库</option>
			<option value="1">采购入库</option>
			<option value="4">车间余料退回入库</option>
			<option value="5">其它入库</option>
			<option value="6">代储入库</option>
			<!-- JC24 -->
			<!-- <option value="0">成品入库</option>
			<option value="1">采购入库</option>
			<option value="2">中间品入库</option>-->
			<!-- <option value="3">退货入库</option> -->
			<!-- <option value="4">车间余料退回入库</option>
			<option value="5">其它入库</option>
			<option value="6">代储入库</option>
			<option value="7">寄存入库</option> -->
			<!-- JC09 -->
			<!-- <option value="0">标准产品入库</option>
			<option value="1">非标产品入库</option> -->
			<!-- JC08 -->
			<!-- <option value="0">成品入库</option>
			<option value="1">原料入库</option>
			<option value="2">退货入库</option> -->
			<option value="2">中间品入库</option>
			<option value="3">退货入库</option>
			<option value="4">余料退回入库</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 90px;">上游系统单号</label>
			<label class="layui-form-label">下发单号</label>
			<div class="layui-input-inline">
			<input type="text" id="OrderCode" name="OrderCode" placeholder="上游系统单号" autocomplete="off"
			class="layui-input">
			<input type="text" id="OrderCode" name="OrderCode" placeholder="上游系统下发的单号"
			autocomplete="off" class="layui-input">
			</div>
			</div>
			<div class="layui-inline">
			@@ -152,9 +136,9 @@
			<label class="layui-form-label">撤销原因</label>
			<div class="layui-input-inline">
			<textarea id="Reason" name="Reason" placeholder="请输入内容" class="layui-textarea"></textarea>

			</div>
			</div>

			<div class="layui-inline">
			<button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
			lay-filter="LAY-app-contlist-search">
			@@ -224,19 +208,16 @@
			<script type="text/html" id="buttonTpl">
			{{# function GetBtn3(d){
			var html = ``;
			if(d.Status=='0'){
			html = `<button class="layui-btn layui-btn-radius layui-btn-xs">等待执行</button>`;
			} else if(d.Status=='1') {
			html = `<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">正在执行</button>`;
			} else if(d.Status=='2') {
			html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">执行完毕</button>`;
			} else if(d.Status=='3') {
			html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">订单关闭</button>`;
			} else if(d.Status=='4') {
			html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">上传完毕</button>`;
			} else {

			switch(d.Status)
			{
			case "0" : html = `<button class="layui-btn layui-btn-radius layui-btn-xs">等待执行</button>`;break;
			case "1" : html = `<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">正在执行</button>`; break;
			case "2" : html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">执行完毕</button>`; break;
			case "3" : html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">订单关闭</button>`; break;
			case "4" : html = `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">上传完毕</button>`; break;
			default : break;
			}

			return html;
			}
			}}
			@@ -246,24 +227,16 @@
			<script type="text/html" id="templetType">
			{{# function GetBtn4(d){
			var html = ``;
			if(d.Type=='0'){
			html = `成品入库`;
			} else if(d.Type=='1') {
			html = `采购入库`;
			} else if(d.Type=='2') {
			html = `中间品入库`;
			switch(d.Type)
			{
			case "0" : html = `成品入库`;break;
			case "1" : html = `采购入库`; break;
			case "2" : html = `中间品入库`; break;
			case "3" : html = `退货入库`; break;
			case "4" : html = `余料退回入库`; break;
			default : break;
			}
			else if(d.Type=='4') {
			html = `车间余料退回入库`;
			}else if(d.Type=='5') {
			html = `其它入库`;
			}else if(d.Type=='6') {
			html = `代储入库`;
			}else if(d.Type=='7') {
			html = `寄存入库`;
			}else {

			}

			return html;
			}
			}}
			@@ -318,7 +291,10 @@
			<i class="layui-icon"></i>添加
			</button>
			</script>

			<!-- if((d.AsnType =="1" \|\| d.AsnType == "4" \|\| d.AsnType == "5" \|\| d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" \|\| d.Status == "1")){
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
			<i class="layui-icon layui-icon-edit"></i>生成标签</a>`;
			} -->
			<script type="text/html" id="toolbarDemoList">
			{{# function GetBtn2(d){
			console.log(d);
			@@ -327,10 +303,7 @@
			html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
			<i class="layui-icon layui-icon-delete"></i>删除</a>`;
			}
			if((d.AsnType =="1" \|\| d.AsnType == "4" \|\| d.AsnType == "5" \|\| d.AsnType == "6") && d.IsPasteCode == "1" && (d.Status == "0" \|\| d.Status == "1")){
			html += `<a class="layui-btn layui-btn-normal layui-btn-xs addLabelClass" lay-event="Addlabel">
			<i class="layui-icon layui-icon-edit"></i>生成标签</a>`;
			}


			return html;
			}
			@@ -428,7 +401,7 @@
			base: '../../layuiadmin/' //静态资源所在路径
			}).extend({
			index: 'lib/index' //主入口模块
			}).use(['index', 'table', 'laypage', 'layer', 'laydate'], function () {
			}).use(['index', 'form','table', 'laypage', 'layer', 'laydate'], function () {

			var doing = true;

			@@ -463,9 +436,10 @@
			{ field: 'Origin', title: '来源', align: 'center', width: 80 },
			{ field: 'CustomerName', title: '客户名称', align: 'center' },
			{ field: 'Type', title: '单据类型', align: 'center', templet: '#templetType' },
			{ field: 'OrderCode', title: '上游系统单号', align: 'center', width: 180 },
			{ field: 'OrderCode', title: '下发单号', align: 'center', width: 180 },
			{ field: 'CompleteTime', title: '完成时间', align: 'center', templet: '#templetCompleteTime' },
			{ field: 'Demo', title: '备注', align: 'center', width: 180 },
			{ field: 'UserName', title: '制单人', align: 'center', width: 110 },
			{ field: 'CreateUserName', title: '创建人', align: 'center', width: 110 },
			{ field: 'CreateTime', title: '创建时间', align: 'center', templet: '#templetCreateTime' },
			{ field: 'UpdateUserName', title: '修改人', align: 'center', width: 110 },
			@@ -512,7 +486,6 @@
			height: h1,
			id: 'LAY-app-content-list',
			where: param,

			contentType: 'application/json',
			headers: { ToKen: $.cookie('token') },
			page: true,
			@@ -627,7 +600,7 @@
			$(".clossClass").hide();
			$(".editDemoClass").hide();//备注
			$(".checkClass").hide(); //复核
			$(".addLabelClass").hide(); //复核
			//$(".addLabelClass").hide(); //生成标签

			});
			sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
			@@ -668,11 +641,11 @@
			$(".checkClass").show();
			});
			}
			if (res.data[k].MenuName == "生成标签") {
			$(function () {
			$(".addLabelClass").show();
			});
			}
			// if (res.data[k].MenuName == "生成标签") {
			// $(function () {
			// $(".addLabelClass").show();
			// });
			// }
			}
			} else { //不成功
			layer.msg('获取权限信息失败', {