From 4cf50898cd0e7227ae59f1c46264596205ad08c4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 16 十二月 2023 09:10:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/crm_Version' into crm_Version
---
src/main/webapp/static/js/contract/contract.js | 207 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 168 insertions(+), 39 deletions(-)
diff --git a/src/main/webapp/static/js/contract/contract.js b/src/main/webapp/static/js/contract/contract.js
index dec90b0..48362f9 100644
--- a/src/main/webapp/static/js/contract/contract.js
+++ b/src/main/webapp/static/js/contract/contract.js
@@ -1,7 +1,8 @@
var pageCurr;
+var sign=false;
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table', 'laydate', 'form', 'admin', 'tree', 'dropdown'], function () {
+}).use(['table', 'laydate', 'form', 'admin','xmSelect', 'tree', 'dropdown'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -88,11 +89,12 @@
, {field: 'status$', align: 'center', title: '鐘舵��'}
, {field: 'userId$', align: 'center', title: '娣诲姞浜哄憳'}
, {field: 'createTime$', align: 'center', title: '娣诲姞鏃堕棿'}
+ , {field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
, {field: 'updateBy$', align: 'center', title: '淇敼浜哄憳'}
, {field: 'updateTime$', align: 'center', title: '淇敼鏃堕棿'}
, {field: 'memo', align: 'center', title: '澶囨敞'}
- , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 400}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 500}
]],
request: {
pageName: 'curr',
@@ -193,28 +195,76 @@
table.on('tool(contract)', function (obj) {
var data = obj.data;
switch (obj.event) {
- case 'edit':
- showEditModel(data);
+ case 'approval':
+ layer.confirm('瀹℃壒閫氳繃锛�', {
+ skin: 'layui-layer-admin',
+ shade: .1,
+ offset: '200px',
+ title: data.name
+ }, function (i) {
+ layer.close(i);
+ approval(data.id);
+ });
break;
+ case 'more':
+ top.contractByMore = data.id;
+ admin.popupRight({
+ type: 1,
+ window: "top",
+ area: "1250px",
+ url: "contract_more.html",
+ end: function () {
+ // $(".layui-laypage-btn")[0].click();
+ }
+ })
+ break;
+ case 'edit':
+ if (sign){
+ showEditModel(data);
+ break;
+ }else {
+ layer.msg('鎶辨瓑浣犳病鏉冮檺', {icon: 2});
+ break
+ }
case "del":
del([data.id]);
break;
case "generate":
- //鐢熸垚鍚堝悓
- generate(data)
- break
+ if (sign){
+ //鐢熸垚鍚堝悓
+ generate(data)
+ break
+ }else {
+ layer.msg('鎶辨瓑浣犳病鏉冮檺', {icon: 2});
+ break
+ }
case "sales":
- //鍚堝悓鏄庣粏
- sales(data);
- break
+ if (sign){
+ //鍚堝悓鏄庣粏
+ sales(data);
+ break
+ }else {
+ layer.msg('鎶辨瓑浣犳病鏉冮檺', {icon: 2});
+ break
+ }
case "upload":
- //涓婁紶鍚堝悓
- upload(data)
- break
+ if (sign){
+ //涓婁紶鍚堝悓
+ upload(data)
+ break
+ }else {
+ layer.msg('鎶辨瓑浣犳病鏉冮檺', {icon: 2});
+ break
+ }
case "download":
- //涓嬭浇鍚堝悓
- download(data)
- break
+ if (sign){
+ //涓嬭浇鍚堝悓
+ download(data)
+ break
+ }else {
+ layer.msg('鎶辨瓑浣犳病鏉冮檺', {icon: 2});
+ break
+ }
}
});
@@ -226,9 +276,12 @@
title: (mData ? '淇敼' : '娣诲姞') + '鍚堝悓',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
+ let loadNameXml = loadNameXmlSel()
+ console.log(loadNameXml)
layDateRender(mData);
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+ data.field.customer = loadNameXml.getValue()[0] ? loadNameXml.getValue()[0].name : null;
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl + "/contract/" + (mData ? 'update' : 'add') + "/auth",
@@ -379,30 +432,28 @@
headers: {'token': localStorage.getItem('token')},
data: data,
method: 'GET',
- xhrFields: {
- responseType: "blob" // 璁剧疆鍝嶅簲绫诲瀷涓轰簩杩涘埗鏁版嵁
- },
success: function (res) {
- // 鍒涘缓涓�涓复鏃剁殑涓嬭浇閾炬帴
- const url = window.URL.createObjectURL(res);
- // 鍒涘缓涓�涓殣钘忕殑 <a> 鍏冪礌骞惰缃笅杞介摼鎺�
- const a = document.createElement("a");
- a.style.display = "none";
- a.href = url;
-
- let list = data.filepath.split(".")
- let suffix = "." + list[list.length - 1]//鑾峰彇鍚庣紑鍚�
- a.download = data.name + suffix; // 鎸囧畾涓嬭浇鐨勬枃浠跺悕
- document.body.appendChild(a);
-
- // 瑙﹀彂鐐瑰嚮浜嬩欢浠ュ紑濮嬩笅杞�
- a.click();
-
- // 娓呯悊涓存椂璧勬簮
- setTimeout(function () {
- window.URL.revokeObjectURL(url);
- document.body.removeChild(a);
- }, 100);
+ location.href = res.data
+ // // 鍒涘缓涓�涓复鏃剁殑涓嬭浇閾炬帴
+ // const url = window.URL.createObjectURL(res);
+ // // 鍒涘缓涓�涓殣钘忕殑 <a> 鍏冪礌骞惰缃笅杞介摼鎺�
+ // const a = document.createElement("a");
+ // a.style.display = "none";
+ // a.href = url;
+ //
+ // let list = data.filepath.split(".")
+ // let suffix = "." + list[list.length - 1]//鑾峰彇鍚庣紑鍚�
+ // a.download = data.name + suffix; // 鎸囧畾涓嬭浇鐨勬枃浠跺悕
+ // document.body.appendChild(a);
+ //
+ // // 瑙﹀彂鐐瑰嚮浜嬩欢浠ュ紑濮嬩笅杞�
+ // a.click();
+ //
+ // // 娓呯悊涓存椂璧勬簮
+ // setTimeout(function () {
+ // window.URL.revokeObjectURL(url);
+ // document.body.removeChild(a);
+ // }, 100);
}
});
}
@@ -472,8 +523,86 @@
layDateRender();
+ function approval(contractId, plannerId, dIdx) {
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/contract/approval/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ contractId: contractId,
+ plannerId: plannerId
+ },
+ method: 'POST',
+ success: function (res) {
+ if (dIdx) {
+ layer.close(dIdx);
+ }
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+
+ window.loadNameXmlSel = function () {
+ return xmSelect.render({
+ el: '#nameXmlSel',
+ autoRow: true,
+ filterable: true,
+ remoteSearch: true,
+ clickClose: true,
+ radio: true,
+ remoteMethod: function (val, cb, show) {
+ $.ajax({
+ url: baseUrl + "/cstmr/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ },
+ });
+ }
+ f();
});
+function f() {
+ let token = localStorage.getItem("token");
+ layui.jquery.ajax({
+ url: baseUrl + "/dashboard/popup/auth",
+ data:{token : token},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ if (res.msg === "true"){
+ sign=true;
+ }else {
+
+ }
+ console.log(sign)
+ // showPopupGenerate(res.msg)
+ // showPopupDel(res.msg)
+ // showPopupEdit(res.msg)
+ }
+ }
+ })
+}
+
// 鍏抽棴鍔ㄤ綔
$(document).on('click','#data-detail-close', function () {
parent.layer.closeAll();
--
Gitblit v1.9.1