修改 开票信息；

CallCenterWeb.UI/WorkOrder/invoice.html

@@ -48,6 +48,7 @@
 					<thead>
 						<tr>
 							<th data-field="F_BillType" data-align="center">发票类型</th>
+							<th data-field="F_IsDeal" data-formatter="formatterStates" data-width="100" data-align="center">状态</th>
 							<th data-field="F_CusName" data-align="center">客户名称</th>
 							<th data-field="F_TaxIDNum" data-align="center">纳税人识别号</th>
 							<th data-field="F_Address" data-align="center">地址</th>
@@ -76,7 +77,7 @@
 			</div>
 		</div>
 		<script src="../js/laydate/laydate.js"></script>
-		<script src="js/invoice.js"></script>
+		<script src="js/invoice.js?v=201905311711"></script>
 
 	</body>
 

CallCenterWeb.UI/WorkOrder/js/addOrEditInvoice.js

@@ -29,7 +29,7 @@ function getCustomer(ids) {
 		token: $.cookie("token")
 	}, function(data) {
 		if (data.state.toLowerCase() == "success") {
-			data = data.data;
+			data = data.data.dModel;
 			if (data) {
 				$('#F_BillType').selectpicker('val', data.F_BillType);//	string 发票类型	
 				$('#F_TaxIDNum').val(data.F_TaxIDNum);//	string 纳税人识别号

CallCenterWeb.UI/WorkOrder/js/invoice.js

@@ -58,6 +58,20 @@ function initTable() {
 	});
 }
 
+//格式化状态
+function formatterStates(val){
+	// F_IsDeal：是否处理，0未处理，1已接收，2已处理
+	var str = '-';
+	if(!val){
+		str = '未处理';
+	}else if(val === 1){
+		str = '已接收';
+	}else if(val === 2){
+		str= '已处理';
+	}
+	return str;
+}
+
 //格式化是否开票
 function formatterState(val){
 	var str = '否';
@@ -77,15 +91,28 @@ function formatterDetail(val) {
 		}
 		return strD;
 	}
-
 }
 
 //格式化操作
-function formatterOprate(val) {
-	return '<ul class="tool_downs">' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + val + '" onclick="btn_edit(' + val + ')" title="编辑">编辑</a></li>' +
-						'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + val + '" onclick="btn_delete(' + val + ')" title="删除">删除</a></li>' +
-					'</ul>';
+function formatterOprate(val, row) {
+	// F_IsDeal：是否处理，0未处理，1已接收，2已处理
+	// 所有人所有状态有查看操作
+	// 取消删除操作
+	// 所有人均可接单
+	// 接单后 接单人有编辑和处理操作
+	// 已处理后 只有查看操作
+
+	var str = '<ul class="tool_downs">';
+			str += '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_detail_' + val + '" onclick="btn_detail(' + val + ')" title="详情">详情</a></li>';
+	if (!row.F_IsDeal){
+		str += '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_receive_' + val + '" onclick="btn_receive(' + val + ')" title="接单">接单</a></li>';
+	} else if (row.F_IsDeal === 1 && row.F_DealBy === $.cookie("usercode")){
+		str += '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_deal_' + val + '" onclick="btn_deal(' + val + ')" title="处理">处理</a></li>';
+		str += '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + val + '" onclick="btn_edit(' + val + ')" title="编辑">编辑</a></li>';
+	}
+	// str += '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + val + '" onclick="btn_delete(' + val + ')" title="删除">删除</a></li>'; 
+	str += '</ul>';
+	return str;
 }
 
 //添加
@@ -112,6 +139,67 @@ function btn_edit(editId){
 	});
 }
 
+//详情
+function btn_detail(editId) {
+	layer.open({
+		type: 2,
+		title: '开票信息详情',
+		maxmin: true, //开启最大化最小化按钮
+		shade: 0,
+		area: ['80%', '90%'],
+		content: 'template/seeInvoice.html?edit_id=' + editId
+	});
+}
+
+//接单
+function btn_receive(bid) {
+	layer.confirm('您确认要接单吗？', {
+		icon: 7,
+		btn: ['接单', '取消'] //按钮
+	}, function () {
+		$.post(huayi.config.callcenter_url + 'WoBill/DealRBill', {
+			billid: bid,
+			token: $.cookie("token")
+		}, function (result) {
+			result = $.parseJSON(result);
+			if (result.state.toLowerCase() == "success") {
+				$('#workorderlist').bootstrapTable('refresh');
+				top.workcount();
+				$('.Closed').trigger('click');
+				layer.msg("接单成功");
+			}
+		})
+	});
+}
+
+/**
+ * 处理
+ * @id billid
+ * */
+function btn_deal(bid) {
+	layer.prompt({
+		formType: 2,
+		value: '',
+		title: '请输入处理的备注信息',
+		area: ['800px', '240px'] //自定义文本域宽高
+	}, function (value, index, elem) {
+		$.post(huayi.config.callcenter_url + 'WoBill/DealBill', {
+			billid: bid,
+    	content: value,//备注信息
+			token: $.cookie("token")
+		}, function (result) {
+			result = $.parseJSON(result);
+			if (result.state.toLowerCase() == "success") {
+				$('#workorderlist').bootstrapTable('refresh');
+				top.workcount();
+				$('.Closed').trigger('click');
+				layer.close(index);
+				layer.msg("处理成功！");
+			}
+		})
+	});
+}
+
 //删除
 function btn_delete(oid) {
 	layer.confirm('确定删除当前记录？', {

CallCenterWeb.UI/WorkOrder/js/seeInvoice.js

@@ -0,0 +1,72 @@
+/**
+ * 开票信息详情
+ * */
+$(function() {
+// 	//获取所属行业//获取税务类别//获取客户信誉等级
+// 	$.when(helper.getDropList.getlistDropByDic($('#customer_subtrade'), 'KHSSHY'),
+// 			helper.getDropList.getlistDropByDic($('#customer_taxCategory'), 'SWLB'),
+// 			helper.getDropList.getlistDropByDic($('#customer_layer'), 'KHLayer'))
+// 		.done(function() {
+			var edit_id = helper.request.queryString("edit_id");
+			if (edit_id) {
+				getCustomer(edit_id);
+			}
+		// });
+
+});
+
+//获取详情
+function getCustomer(ids) {
+	$.getJSON(huayi.config.callcenter_url + "WoBill/GetBill", {
+		billid: ids, //id
+		token: $.cookie("token")
+	}, function(data) {
+		if (data.state.toLowerCase() == "success") {
+			var dealnames = data.data.dealname;
+			var res = data.data.dModel;
+			if (res) {
+				$('#F_BillType').text(res.F_BillType);//	string 发票类型	
+				$('#F_CusName').text(res.F_CusName);//	string 客户名称	
+				$('#F_TaxIDNum').text(res.F_TaxIDNum);//	string 纳税人识别号
+				$('#F_Address').text(res.F_Address);//	string 地址	
+				// $('#F_Phone').text(helper.filter.cutTel(res.F_Phone));//	string 电话
+				$('#F_Phone').text(res.F_Phone);//	string 电话
+				$('#F_Bank').text(res.F_Bank);//	string 开户行
+				$('#F_BankAccount').text(res.F_BankAccount);//	string 开户行账号	
+				$('#F_ProName').text(res.F_ProName);//	string 项目名称	
+				$('#F_Models').text(res.F_Models);//	string 型号
+				$('#F_Unit').text(res.F_Unit);//	string 单位	
+				$('#F_Amount').text(res.F_Amount);//	string 数量	
+				$('#F_UnitPrice').text(res.F_UnitPrice);//	string 单价
+				$('#F_SumPrice').text(res.F_SumPrice);//	string 金额	
+				$('#F_TaxRate').text(res.F_TaxRate);//	string 税率	
+				$('#F_TaxAmount').text(res.F_TaxAmount);//	string 税额
+				$('#F_State').text(formatterState(res.F_State));//	F_State 是否开票 0否1是
+				$('#F_BillingMethod').text(res.F_BillingMethod);//	string 开票方式：快递/自取	
+				$('#F_BillingTime').text(res.F_BillingTime);//string 开票时间
+				$('#F_remark').html(helper.filter.content(res.F_Remark));//	string 备注
+				if (dealnames){
+					$('#dealname').text(dealnames + '(' + res.F_DealBy + ')');//处理人
+				}
+				if(res.F_DealOn){
+					$('#F_DealOn').text(res.F_DealOn);//处理时间
+				}
+				if (res.F_DealROn){
+					$('#F_DealROn').text(res.F_DealROn);//接收时间
+				}
+				if (res.F_DealContent){
+					$('#F_DealContent').html(helper.filter.content(res.F_DealContent));//处理备注信息
+				}
+			}
+		}
+	});
+}
+
+//格式化是否开票
+function formatterState(val) {
+	var str = '否';
+	if (val === 1) {
+		str = '是';
+	}
+	return str;
+}

CallCenterWeb.UI/WorkOrder/template/addOrEditInvoice.html

@@ -171,7 +171,7 @@
 		<script src="../../js/autosize/autosize.min.js"></script>
 		<script src="../../js/laydate/laydate.js"></script>
 		<script src="../../Script/Common/regexs.js"></script>
-		<script src="../js/addOrEditInvoice.js"></script>
+		<script src="../js/addOrEditInvoice.js?v=201905311715"></script>
 	</body>
 
 </html>

CallCenterWeb.UI/WorkOrder/template/seeInvoice.html

@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<meta charset="UTF-8">
+	<title>开票信息详情</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<script src="../../Script/Common/huayi.load.js"></script>
+	<script src="../../Script/Common/huayi.config.js"></script>
+	<link href="../../css/Table/table1.css" rel="stylesheet" />
+	<link href="../../css/init.css" rel="stylesheet" />
+	<link rel="stylesheet" type="text/css" href="../../css/lookMsg.css" />
+</head>
+
+<body class="gray-bg">
+	<div class="wrapper clearfix lookMsgs cusDetails">
+
+		<div class="content_1 clearfix">
+			<div class="shark_content_title clearfix">
+				<span>基本信息</span>
+			</div>
+			<ul class="clearfix form-inline cus_base">
+				<li class="col-md-3 col-sm-4">
+					<label for="F_BillType">发票类型:</label>
+					<span id="F_BillType"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_CusName">客户名称:</label>
+					<span id="F_CusName"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_TaxIDNum">纳税人识别号:</label>
+					<span id="F_TaxIDNum"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_Phone">电话:</label>
+					<span id="F_Phone"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_Bank">开户行:</label>
+					<span id="F_Bank"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_BankAccount">开户行账号:</label>
+					<span id="F_BankAccount"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_ProName">项目名称:</label>
+					<span id="F_ProName"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_Models">型号:</label>
+					<span id="F_Models"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_Unit">单位:</label>
+					<span id="F_Unit"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_Amount">数量:</label>
+					<span id="F_Amount"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_UnitPrice">单价:</label>
+					<span id="F_UnitPrice"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_SumPrice">金额:</label>
+					<span id="F_SumPrice"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_TaxRate">税率:</label>
+					<span id="F_TaxRate"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_TaxAmount">税额:</label>
+					<span id="F_TaxAmount"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_State">是否开票:</label>
+					<span id="F_State"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_BillingMethod">开票方式:</label>
+					<span id="F_BillingMethod"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_BillingTime">开票时间:</label>
+					<span id="F_BillingTime"></span>
+				</li>
+				<li class="col-md-12 col-sm-12">
+					<label for="F_Address">地址:</label>
+					<span id="F_Address"></span>
+				</li>
+				<li class="col-md-12 col-sm-12">
+					<label for="F_remark">备注:</label>
+					<span id="F_remark"></span>
+				</li>
+			</ul>
+		</div>
+
+		<div class="content_1 clearfix">
+			<div class="shark_content_title clearfix">
+				<span>处理信息</span>
+			</div>
+			<ul class="clearfix form-inline cus_base">
+				<li class="col-md-3 col-sm-4">
+					<label for="dealname">处理人:</label>
+					<span id="dealname"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_DealOn">处理时间:</label>
+					<span id="F_DealOn"></span>
+				</li>
+				<li class="col-md-3 col-sm-4">
+					<label for="F_DealROn">接收时间:</label>
+					<span id="F_DealROn"></span>
+				</li>
+				<li class="col-md-12 col-sm-12">
+					<label for="F_DealContent">处理备注:</label>
+					<span id="F_DealContent"></span>
+				</li>
+			</ul>
+		</div>	
+	</div>
+	<script src="../js/seeInvoice.js"></script>
+</body>
+
+</html>

CallCenterWeb.UI/login.html

@@ -128,6 +128,9 @@
 							$.cookie("token", data.data.token, {
 								expires: 7
 							});
+							$.cookie("usercode", $("#user").val(), {
+								expires: 7
+							});
 							$.cookie("extno", $('#extensionNumber').val(), {
 								expires: 7
 							});