From 90874f4ca971c696646ec69ee90d0adfa70c19b0 Mon Sep 17 00:00:00 2001 From: ylj20011123 Date: Fri, 5 Dec 2025 15:04:27 +0800 Subject: [PATCH] update --- cloudNew/p__Invoicing__index.async.js | 2 +- config/router.ts | 5 + src/models/user.ts | 7 + src/pages/DigitalElectronics/index.tsx | 31 ++- src/pages/RentCalculation/index.tsx | 189 ++++++++++++++++++ src/pages/authority.ts | 1 + .../components/AddInspectionContent.tsx | 14 +- .../components/AddInspectionItems.tsx | 9 +- .../RectificationStatusInfoModal.tsx | 34 ++-- src/pages/operationReport/index.tsx | 34 +++- .../operationReport/onSiteInspection.tsx | 6 +- .../operationReport/rectificationStatus.tsx | 18 +- .../operationReport/securityIssueList.tsx | 109 ++++------ src/pages/operationReport/service.ts | 13 ++ .../redReversal/components/InvoiceDetial.tsx | 1 + src/pages/redReversal/index.tsx | 2 +- src/utils/request.ts | 2 +- src/utils/requestAHYD.ts | 2 +- src/utils/requestCode.ts | 4 +- src/utils/requestKaiPiao.ts | 2 +- src/utils/requestMain.ts | 4 +- src/utils/requestMap.ts | 2 +- src/utils/requestMemberApi.ts | 6 +- src/utils/requestOld.ts | 2 +- src/utils/requestOldCode.ts | 2 +- 25 files changed, 377 insertions(+), 124 deletions(-) create mode 100644 src/pages/RentCalculation/index.tsx diff --git a/cloudNew/p__Invoicing__index.async.js b/cloudNew/p__Invoicing__index.async.js index 70aa539..244105c 100644 --- a/cloudNew/p__Invoicing__index.async.js +++ b/cloudNew/p__Invoicing__index.async.js @@ -1 +1 @@ -"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[117],{53006:function(Je,Z,o){o.r(Z),o.d(Z,{default:function(){return Ee}});var te=o(15009),d=o.n(te),ne=o(64599),re=o.n(ne),ae=o(99289),f=o.n(ae),ie=o(5574),E=o.n(ie),x=o(67294),se=o(30518),A=o(78158),ue=o(97857),H=o.n(ue),le=o(54683),O=o(16568),Ze=o(81354),He={NODE_ENV:"production",PUBLIC_PATH:"/cloudMenu/"}.UMI_APP_BASEURL,j=le.Z.create({baseURL:"https://api.eshangtech.com/EShangApiMain"});j.interceptors.request.use(function(a){return a.headers=H()(H()({},a.headers),{},{Authorization:"Bearer ".concat(localStorage.getItem("Authorization")||""),"Content-Type":"application/json;charset=utf-8"}),a},function(a){return Promise.reject(a)}),j.interceptors.response.use(function(a){var n=a.data;n.code!==200&&n.Result_Code!==100&&O.ZP.error({message:n.message});var t=k();return n},function(a){var n,t=a.response;if(!(t&&t.status===401)){var s;O.ZP.error({message:(t==null||(s=t.data)===null||s===void 0?void 0:s.message)||"\u8BF7\u6C42\u5931\u8D25",description:a.message})}return Promise.reject({code:(t==null?void 0:t.status)||500,message:(t==null||(n=t.data)===null||n===void 0?void 0:n.message)||"\u8BF7\u6C42\u5931\u8D25"})});var de=function(n,t){var s=CryptoJS.enc.Utf8.parse(t),i=CryptoJS.AES.encrypt(n,s,{mode:CryptoJS.mode.ECB,padding:CryptoJS.pad.Pkcs7}),r=i.ciphertext.toString(CryptoJS.enc.Hex);return r},Oe=function(n,t){var s=CryptoJS.enc.Utf8.parse(t),i=CryptoJS.enc.Hex.parse(n),r=CryptoJS.AES.decrypt({ciphertext:i},s,{mode:CryptoJS.mode.ECB,padding:CryptoJS.pad.Pkcs7}),D=r.toString(CryptoJS.enc.Utf8);return D},oe=function(n,t,s){var i="s"+n+t+s;return CryptoJS.MD5(i).toString(CryptoJS.enc.Hex)},k=function(){var n=new Date,t=n.getFullYear(),s=String(n.getMonth()+1).padStart(2,"0"),i=String(n.getDate()).padStart(2,"0"),r=String(n.getHours()).padStart(2,"0");return"es0".concat(t).concat(s).concat(i).concat(r,"0es")},ke=function(n){console.log("data",n);var t=k();console.log("timestamp",t);var s=parseInt((new Date().getTime()/1e3).toString());console.log("timeSecond",s);var i=de(n,t);console.log("encryptionData",i);var r=oe(t,i,t);console.log("md5Data",r);var D={data:i,timestamp:s,sign:r};return console.log("res",D),D},ce=j;function ze(a){return F.apply(this,arguments)}function F(){return F=_asyncToGenerator(_regeneratorRuntime().mark(function a(n){var t;return _regeneratorRuntime().wrap(function(i){for(;;)switch(i.prev=i.next){case 0:return i.next=2,request.get("/baiwang/auth/token",{params:n});case 2:return t=i.sent,i.abrupt("return",t);case 4:case"end":return i.stop()}},a)})),F.apply(this,arguments)}function pe(a,n){return B.apply(this,arguments)}function B(){return B=f()(d()().mark(function a(n,t){var s;return d()().wrap(function(r){for(;;)switch(r.prev=r.next){case 0:return r.next=2,A.Z.post("/baiwang/auth/certify-qrcode/".concat(n),t);case 2:return s=r.sent,r.abrupt("return",s);case 4:case"end":return r.stop()}},a)})),B.apply(this,arguments)}function he(a,n){return Y.apply(this,arguments)}function Y(){return Y=f()(d()().mark(function a(n,t){var s;return d()().wrap(function(r){for(;;)switch(r.prev=r.next){case 0:return r.next=2,A.Z.post("/baiwang/auth/certify-result/".concat(n),t);case 2:return s=r.sent,r.abrupt("return",s);case 4:case"end":return r.stop()}},a)})),Y.apply(this,arguments)}function ve(a,n){return N.apply(this,arguments)}function N(){return N=f()(d()().mark(function a(n,t){var s;return d()().wrap(function(r){for(;;)switch(r.prev=r.next){case 0:return r.next=2,A.Z.post("/api/baiwang/invoice/query-page/".concat(n),t);case 2:return s=r.sent,r.abrupt("return",s);case 4:case"end":return r.stop()}},a)})),N.apply(this,arguments)}function fe(a){return G.apply(this,arguments)}function G(){return G=f()(d()().mark(function a(n){var t;return d()().wrap(function(i){for(;;)switch(i.prev=i.next){case 0:return i.next=2,A.Z.get("/baiwang-config/".concat(n));case 2:return t=i.sent,i.abrupt("return",t);case 4:case"end":return i.stop()}},a)})),G.apply(this,arguments)}function ge(a,n){return R.apply(this,arguments)}function R(){return R=f()(d()().mark(function a(n,t){var s;return d()().wrap(function(r){for(;;)switch(r.prev=r.next){case 0:return r.next=2,A.Z.post("/api/baiwang/invoice/push/".concat(n),t);case 2:return s=r.sent,r.abrupt("return",s);case 4:case"end":return r.stop()}},a)})),R.apply(this,arguments)}function ye(a,n){return U.apply(this,arguments)}function U(){return U=f()(d()().mark(function a(n,t){var s;return d()().wrap(function(r){for(;;)switch(r.prev=r.next){case 0:return r.next=2,A.Z.post("/api/baiwang/invoice/invalid/".concat(n),t);case 2:return s=r.sent,r.abrupt("return",s);case 4:case"end":return r.stop()}},a)})),U.apply(this,arguments)}function me(a){return M.apply(this,arguments)}function M(){return M=f()(d()().mark(function a(n){var t;return d()().wrap(function(i){for(;;)switch(i.prev=i.next){case 0:return i.next=2,ce.get("/Logging/GetPassportInfoById?UserIdEncrypted=".concat(n.UserIdEncrypted),n);case 2:return t=i.sent,i.abrupt("return",t);case 4:case"end":return i.stop()}},a)})),M.apply(this,arguments)}var Ie=o(17788),xe=o(2453),Se=o(78957),De=o(22253),Ce=o(30381),S=o.n(Ce),u=o(85893),we=Ie.Z.confirm,Ae=function(n){var t=(0,x.useRef)(null),s=(0,x.useRef)(),i=(0,x.useRef)(),r=(0,x.useState)(),D=E()(r,2),Le=D[0],We=D[1],Te=(0,x.useState)(),z=E()(Te,2),L=z[0],je=z[1],Fe=(0,x.useState)(!1),W=E()(Fe,2),Be=W[0],Ye=W[1],Ne=(0,x.useState)(),Q=E()(Ne,2),Qe=Q[0],Ge=Q[1];(0,x.useEffect)(function(){Re()},[]);var Re=function(){var h=f()(d()().mark(function l(){var e,c,v,g,p,y,m,P,I,b,$e,K,C,V,X,q,_;return d()().wrap(function(w){for(;;)switch(w.prev=w.next){case 0:e=window.location.search.split("?")[1],console.log("url",e),c=new URLSearchParams(e),console.log("params",c),v={},g=re()(c.entries());try{for(g.s();!(p=g.n()).done;)y=E()(p.value,2),m=y[0],P=y[1],v[m]=P}catch($){g.e($)}finally{g.f()}return console.log("resultObj",v),I="menuCloud",v.UserIdEncrypted&&be(v.UserIdEncrypted),w.next=12,fe(I);case 12:return b=w.sent,$e=b.data,je(b.data),K={qrCodeType:0,operatorType:0},w.next=18,pe("menuCloud",K);case 18:C=w.sent,console.log("qrCodeData",C),console.log("321",C.data.response.qrCode),V=C.data.response.qrCode.split(",")&&C.data.response.qrCode.split(",").length>0?C.data.response.qrCode.split(",").length:0,X=C.data.response.qrCode.split(",")[V-1],q="data:image/png;base64,".concat(X),_=we({width:600,content:(0,u.jsxs)("div",{children:[(0,u.jsx)("div",{style:{fontSize:"18px",fontWeight:600,display:"flex",justifyContent:"center"},children:"\u8BF7\u5148\u626B\u7801\u8FDB\u884C\u4EBA\u8138\u8BA4\u8BC1\uFF01"}),(0,u.jsx)("div",{style:{width:"100%",height:"300px",display:"flex",justifyContent:"center"},children:(0,u.jsx)("img",{style:{width:"300px",height:"300px"},src:q})})]}),footer:!1}),t.current=setInterval(f()(d()().mark(function $(){var ee,J;return d()().wrap(function(T){for(;;)switch(T.prev=T.next){case 0:return T.next=2,he("menuCloud",{certifyQueryType:1});case 2:ee=T.sent,J=ee.data.response,console.log("res",J),J.certificationStatus=="1"&&(t.current&&(clearInterval(t.current),t.current=null),_.destroy(),xe.ZP.success({content:"\u8BA4\u8BC1\u6210\u529F\uFF01"}),Ye(!0));case 6:case"end":return T.stop()}},$)})),2e3);case 26:case"end":return w.stop()}},l)}));return function(){return h.apply(this,arguments)}}(),Ue=[{title:"\u7EDF\u8BA1\u65E5\u671F",dataIndex:"staticDate",hideInTable:!0,valueType:"dateRange",initialValue:[S()().startOf("M"),S()()],search:{transform:function(l){return{beginDate:S()(l[0]).format("YYYY-MM-DD"),endDate:S()(l[1]).format("YYYY-MM-DD")}}},fieldProps:{picker:"day",format:"YYYY-MM-DD"}},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u7533\u8BF7\u6D41\u6C34\u53F7"}),dataIndex:"serialNo",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u5F00\u7968\u5355\u53F7"}),dataIndex:"orderNo",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u8BA2\u5355\u65E5\u671F"}),dataIndex:"orderDateTime",hideInSearch:!0,width:150,ellipsis:!0,render:function(l,e){return e!=null&&e.orderDateTime?S()(e==null?void 0:e.orderDateTime).format("YYYY-MM-DD HH:mm:ss"):""}},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u5F00\u7968\u65F6\u95F4"}),dataIndex:"invoiceTime",hideInSearch:!0,width:150,ellipsis:!0,render:function(l,e){return e!=null&&e.invoiceTime?S()(e==null?void 0:e.invoiceTime).format("YYYY-MM-DD HH:mm:ss"):""}},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u5F00\u7968\u7EC8\u7AEF"}),dataIndex:"invoiceTerminalCode",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u9500\u65B9\u7A0E\u53F7"}),dataIndex:"taxNo",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u9500\u65B9\u540D\u79F0"}),dataIndex:"sellerName",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u8D2D\u65B9\u7A0E\u53F7"}),dataIndex:"buyerTaxNo",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u8D2D\u65B9\u540D\u79F0"}),dataIndex:"buyerName",hideInSearch:!0,width:150,ellipsis:!0},{dataIndex:(0,u.jsx)("div",{style:{textAlign:"center"},children:"invoiceType"}),title:"\u5F00\u7968\u7C7B\u578B",hideInSearch:!0,width:150,ellipsis:!0,render:function(l,e){return(e==null?void 0:e.invoiceType)===1?"\u84DD\u7968":(e==null?void 0:e.invoiceType)===2?"\u7EA2\u7968":""}},{dataIndex:(0,u.jsx)("div",{style:{textAlign:"center"},children:"invoiceTypeCode"}),title:"\u53D1\u7968\u79CD\u7C7B\u7F16\u7801",hideInSearch:!0,width:150,ellipsis:!0},{dataIndex:(0,u.jsx)("div",{style:{textAlign:"center"},children:"remarks"}),title:"\u5907\u6CE8",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u53D1\u7968\u4EE3\u7801"}),dataIndex:"invoiceCode",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u53D1\u7968\u53F7\u7801"}),dataIndex:"invoiceNo",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u6570\u7535\u53D1\u7968\u53F7\u7801"}),dataIndex:"digitInvoiceNo",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u4E0D\u542B\u7A0E\u91D1\u989D"}),dataIndex:"invoiceTotalPrice",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u7A0E\u989D"}),dataIndex:"invoiceTotalTax",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u542B\u7A0E\u91D1\u989D"}),dataIndex:"invoiceTotalPriceTax",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u53D1\u7968\u72B6\u6001"}),dataIndex:"status",hideInSearch:!0,width:150,ellipsis:!0,render:function(l,e){return(e==null?void 0:e.status)===0?"\u5F00\u7968\u4E2D":(e==null?void 0:e.status)===1?"\u5F00\u7968\u5B8C\u6210":(e==null?void 0:e.status)===2?"\u5F00\u7968\u5931\u8D25":(e==null?void 0:e.status)===3?"\u53D1\u7968\u5DF2\u4F5C\u5E9F":(e==null?void 0:e.status)===4?"\u53D1\u7968\u4F5C\u5E9F\u4E2D":""}},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u53D1\u7968\u72B6\u6001\u63CF\u8FF0"}),dataIndex:"statusMessage",hideInSearch:!0,width:150,ellipsis:!0},{title:(0,u.jsx)("div",{style:{textAlign:"center"},children:"\u9644\u4EF6\u5730\u5740"}),dataIndex:"pdfUrl",hideInSearch:!0,width:150,ellipsis:!0,render:function(l,e){return(0,u.jsx)("a",{children:"\u67E5\u770B\u9644\u4EF6"})}},{title:"\u64CD\u4F5C",dataIndex:"options",width:100,hideInSearch:!0,fixed:"right",render:function(l,e){return(0,u.jsxs)(Se.Z,{children:[(0,u.jsx)("a",{onClick:function(){console.log("record",e),Me(e)},children:"\u5F00\u7968"}),(0,u.jsx)("a",{onClick:function(){Pe(e)},children:"\u4F5C\u5E9F"})]})}}],Me=function(){var h=f()(d()().mark(function l(e){var c,v;return d()().wrap(function(p){for(;;)switch(p.prev=p.next){case 0:return c={invoiceCode:e.invoiceCode,invoiceNo:e.invoiceNo,digitInvoiceNo:e.digitInvoiceNo,pushPhone:e.pushPhone,pushEmail:e.pushEmail},console.log("req",c),p.next=4,ge("menuCloud",c);case 4:v=p.sent,console.log("data",v);case 6:case"end":return p.stop()}},l)}));return function(e){return h.apply(this,arguments)}}(),Pe=function(){var h=f()(d()().mark(function l(e){var c,v;return d()().wrap(function(p){for(;;)switch(p.prev=p.next){case 0:return console.log("obj",e),c={taxNo:L.taxNo,serialNo:e.serialNo,orderNo:e.orderNo,invoiceCode:e.invoiceCode,invoiceNo:e.invoiceNo,invalidOperator:"\u64CD\u4F5C\u4EBA"},p.next=4,ye("menuCloud",c);case 4:v=p.sent;case 5:case"end":return p.stop()}},l)}));return function(e){return h.apply(this,arguments)}}(),be=function(){var h=f()(d()().mark(function l(e){var c,v,g;return d()().wrap(function(y){for(;;)switch(y.prev=y.next){case 0:return c={UserIdEncrypted:e},y.next=3,me(c);case 3:v=y.sent,console.log("handleGetUserInfo",v),g=v.Result_Data,Ge(g);case 7:case"end":return y.stop()}},l)}));return function(e){return h.apply(this,arguments)}}();return(0,u.jsx)("div",{children:Be?(0,u.jsx)(De.Z,{actionRef:s,formRef:i,columns:Ue,bordered:!0,expandable:{expandRowByClick:!0},rowKey:function(l){return"".concat(l==null?void 0:l.id)},scroll:{x:"100%",y:"calc(100vh - 400px)"},headerTitle:(0,u.jsx)("span",{style:{color:"#1890ff",fontSize:14,fontWeight:600},children:"\u53D1\u7968\u5217\u8868"}),search:{span:6},request:function(){var h=f()(d()().mark(function l(e){var c,v,g,p,y,m;return d()().wrap(function(I){for(;;)switch(I.prev=I.next){case 0:return console.log("params",e),c=[S()().format("YYYY-MM-DD 00:00:00"),S()().format("YYYY-MM-DD 23:59:59")],v=c[0],g=c[1],p={taxNo:L.taxNo||"",pageNo:(e==null?void 0:e.current)||1,pageSize:(e==null?void 0:e.pageSize)||1,beginDate:v||"",endDate:g||""},I.next=5,ve("menuCloud",p);case 5:if(y=I.sent,console.log("data3232",y),m=y.data.response,console.log("tableData3232",m),!(m.list&&m.list.length>0)){I.next=11;break}return I.abrupt("return",{data:m.list,success:!0,total:m.total,current:m.pageNo,pageSize:m.pageSize});case 11:return I.abrupt("return",{data:[],success:!0});case 12:case"end":return I.stop()}},l)}));return function(l){return h.apply(this,arguments)}}()}):""})},Ee=(0,se.connect)(function(a){var n=a.user;return{currentUser:n.data}})(Ae)}}]); +"use strict"; (self.webpackChunk = self.webpackChunk || []).push([[117], { 53006: function (Je, Z, o) { o.r(Z), o.d(Z, { default: function () { return Ee } }); var te = o(15009), d = o.n(te), ne = o(64599), re = o.n(ne), ae = o(99289), f = o.n(ae), ie = o(5574), E = o.n(ie), x = o(67294), se = o(30518), A = o(78158), ue = o(97857), H = o.n(ue), le = o(54683), O = o(16568), Ze = o(81354), He = { NODE_ENV: "production", PUBLIC_PATH: "/cloudMenu/" }.UMI_APP_BASEURL, j = le.Z.create({ baseURL: "https://eshangtech.com:18900//EShangApiMain" }); j.interceptors.request.use(function (a) { return a.headers = H()(H()({}, a.headers), {}, { Authorization: "Bearer ".concat(localStorage.getItem("Authorization") || ""), "Content-Type": "application/json;charset=utf-8" }), a }, function (a) { return Promise.reject(a) }), j.interceptors.response.use(function (a) { var n = a.data; n.code !== 200 && n.Result_Code !== 100 && O.ZP.error({ message: n.message }); var t = k(); return n }, function (a) { var n, t = a.response; if (!(t && t.status === 401)) { var s; O.ZP.error({ message: (t == null || (s = t.data) === null || s === void 0 ? void 0 : s.message) || "\u8BF7\u6C42\u5931\u8D25", description: a.message }) } return Promise.reject({ code: (t == null ? void 0 : t.status) || 500, message: (t == null || (n = t.data) === null || n === void 0 ? void 0 : n.message) || "\u8BF7\u6C42\u5931\u8D25" }) }); var de = function (n, t) { var s = CryptoJS.enc.Utf8.parse(t), i = CryptoJS.AES.encrypt(n, s, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 }), r = i.ciphertext.toString(CryptoJS.enc.Hex); return r }, Oe = function (n, t) { var s = CryptoJS.enc.Utf8.parse(t), i = CryptoJS.enc.Hex.parse(n), r = CryptoJS.AES.decrypt({ ciphertext: i }, s, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 }), D = r.toString(CryptoJS.enc.Utf8); return D }, oe = function (n, t, s) { var i = "s" + n + t + s; return CryptoJS.MD5(i).toString(CryptoJS.enc.Hex) }, k = function () { var n = new Date, t = n.getFullYear(), s = String(n.getMonth() + 1).padStart(2, "0"), i = String(n.getDate()).padStart(2, "0"), r = String(n.getHours()).padStart(2, "0"); return "es0".concat(t).concat(s).concat(i).concat(r, "0es") }, ke = function (n) { console.log("data", n); var t = k(); console.log("timestamp", t); var s = parseInt((new Date().getTime() / 1e3).toString()); console.log("timeSecond", s); var i = de(n, t); console.log("encryptionData", i); var r = oe(t, i, t); console.log("md5Data", r); var D = { data: i, timestamp: s, sign: r }; return console.log("res", D), D }, ce = j; function ze(a) { return F.apply(this, arguments) } function F() { return F = _asyncToGenerator(_regeneratorRuntime().mark(function a(n) { var t; return _regeneratorRuntime().wrap(function (i) { for (; ;)switch (i.prev = i.next) { case 0: return i.next = 2, request.get("/baiwang/auth/token", { params: n }); case 2: return t = i.sent, i.abrupt("return", t); case 4: case "end": return i.stop() } }, a) })), F.apply(this, arguments) } function pe(a, n) { return B.apply(this, arguments) } function B() { return B = f()(d()().mark(function a(n, t) { var s; return d()().wrap(function (r) { for (; ;)switch (r.prev = r.next) { case 0: return r.next = 2, A.Z.post("/baiwang/auth/certify-qrcode/".concat(n), t); case 2: return s = r.sent, r.abrupt("return", s); case 4: case "end": return r.stop() } }, a) })), B.apply(this, arguments) } function he(a, n) { return Y.apply(this, arguments) } function Y() { return Y = f()(d()().mark(function a(n, t) { var s; return d()().wrap(function (r) { for (; ;)switch (r.prev = r.next) { case 0: return r.next = 2, A.Z.post("/baiwang/auth/certify-result/".concat(n), t); case 2: return s = r.sent, r.abrupt("return", s); case 4: case "end": return r.stop() } }, a) })), Y.apply(this, arguments) } function ve(a, n) { return N.apply(this, arguments) } function N() { return N = f()(d()().mark(function a(n, t) { var s; return d()().wrap(function (r) { for (; ;)switch (r.prev = r.next) { case 0: return r.next = 2, A.Z.post("/api/baiwang/invoice/query-page/".concat(n), t); case 2: return s = r.sent, r.abrupt("return", s); case 4: case "end": return r.stop() } }, a) })), N.apply(this, arguments) } function fe(a) { return G.apply(this, arguments) } function G() { return G = f()(d()().mark(function a(n) { var t; return d()().wrap(function (i) { for (; ;)switch (i.prev = i.next) { case 0: return i.next = 2, A.Z.get("/baiwang-config/".concat(n)); case 2: return t = i.sent, i.abrupt("return", t); case 4: case "end": return i.stop() } }, a) })), G.apply(this, arguments) } function ge(a, n) { return R.apply(this, arguments) } function R() { return R = f()(d()().mark(function a(n, t) { var s; return d()().wrap(function (r) { for (; ;)switch (r.prev = r.next) { case 0: return r.next = 2, A.Z.post("/api/baiwang/invoice/push/".concat(n), t); case 2: return s = r.sent, r.abrupt("return", s); case 4: case "end": return r.stop() } }, a) })), R.apply(this, arguments) } function ye(a, n) { return U.apply(this, arguments) } function U() { return U = f()(d()().mark(function a(n, t) { var s; return d()().wrap(function (r) { for (; ;)switch (r.prev = r.next) { case 0: return r.next = 2, A.Z.post("/api/baiwang/invoice/invalid/".concat(n), t); case 2: return s = r.sent, r.abrupt("return", s); case 4: case "end": return r.stop() } }, a) })), U.apply(this, arguments) } function me(a) { return M.apply(this, arguments) } function M() { return M = f()(d()().mark(function a(n) { var t; return d()().wrap(function (i) { for (; ;)switch (i.prev = i.next) { case 0: return i.next = 2, ce.get("/Logging/GetPassportInfoById?UserIdEncrypted=".concat(n.UserIdEncrypted), n); case 2: return t = i.sent, i.abrupt("return", t); case 4: case "end": return i.stop() } }, a) })), M.apply(this, arguments) } var Ie = o(17788), xe = o(2453), Se = o(78957), De = o(22253), Ce = o(30381), S = o.n(Ce), u = o(85893), we = Ie.Z.confirm, Ae = function (n) { var t = (0, x.useRef)(null), s = (0, x.useRef)(), i = (0, x.useRef)(), r = (0, x.useState)(), D = E()(r, 2), Le = D[0], We = D[1], Te = (0, x.useState)(), z = E()(Te, 2), L = z[0], je = z[1], Fe = (0, x.useState)(!1), W = E()(Fe, 2), Be = W[0], Ye = W[1], Ne = (0, x.useState)(), Q = E()(Ne, 2), Qe = Q[0], Ge = Q[1]; (0, x.useEffect)(function () { Re() }, []); var Re = function () { var h = f()(d()().mark(function l() { var e, c, v, g, p, y, m, P, I, b, $e, K, C, V, X, q, _; return d()().wrap(function (w) { for (; ;)switch (w.prev = w.next) { case 0: e = window.location.search.split("?")[1], console.log("url", e), c = new URLSearchParams(e), console.log("params", c), v = {}, g = re()(c.entries()); try { for (g.s(); !(p = g.n()).done;)y = E()(p.value, 2), m = y[0], P = y[1], v[m] = P } catch ($) { g.e($) } finally { g.f() } return console.log("resultObj", v), I = "menuCloud", v.UserIdEncrypted && be(v.UserIdEncrypted), w.next = 12, fe(I); case 12: return b = w.sent, $e = b.data, je(b.data), K = { qrCodeType: 0, operatorType: 0 }, w.next = 18, pe("menuCloud", K); case 18: C = w.sent, console.log("qrCodeData", C), console.log("321", C.data.response.qrCode), V = C.data.response.qrCode.split(",") && C.data.response.qrCode.split(",").length > 0 ? C.data.response.qrCode.split(",").length : 0, X = C.data.response.qrCode.split(",")[V - 1], q = "data:image/png;base64,".concat(X), _ = we({ width: 600, content: (0, u.jsxs)("div", { children: [(0, u.jsx)("div", { style: { fontSize: "18px", fontWeight: 600, display: "flex", justifyContent: "center" }, children: "\u8BF7\u5148\u626B\u7801\u8FDB\u884C\u4EBA\u8138\u8BA4\u8BC1\uFF01" }), (0, u.jsx)("div", { style: { width: "100%", height: "300px", display: "flex", justifyContent: "center" }, children: (0, u.jsx)("img", { style: { width: "300px", height: "300px" }, src: q }) })] }), footer: !1 }), t.current = setInterval(f()(d()().mark(function $() { var ee, J; return d()().wrap(function (T) { for (; ;)switch (T.prev = T.next) { case 0: return T.next = 2, he("menuCloud", { certifyQueryType: 1 }); case 2: ee = T.sent, J = ee.data.response, console.log("res", J), J.certificationStatus == "1" && (t.current && (clearInterval(t.current), t.current = null), _.destroy(), xe.ZP.success({ content: "\u8BA4\u8BC1\u6210\u529F\uFF01" }), Ye(!0)); case 6: case "end": return T.stop() } }, $) })), 2e3); case 26: case "end": return w.stop() } }, l) })); return function () { return h.apply(this, arguments) } }(), Ue = [{ title: "\u7EDF\u8BA1\u65E5\u671F", dataIndex: "staticDate", hideInTable: !0, valueType: "dateRange", initialValue: [S()().startOf("M"), S()()], search: { transform: function (l) { return { beginDate: S()(l[0]).format("YYYY-MM-DD"), endDate: S()(l[1]).format("YYYY-MM-DD") } } }, fieldProps: { picker: "day", format: "YYYY-MM-DD" } }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u7533\u8BF7\u6D41\u6C34\u53F7" }), dataIndex: "serialNo", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u5F00\u7968\u5355\u53F7" }), dataIndex: "orderNo", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u8BA2\u5355\u65E5\u671F" }), dataIndex: "orderDateTime", hideInSearch: !0, width: 150, ellipsis: !0, render: function (l, e) { return e != null && e.orderDateTime ? S()(e == null ? void 0 : e.orderDateTime).format("YYYY-MM-DD HH:mm:ss") : "" } }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u5F00\u7968\u65F6\u95F4" }), dataIndex: "invoiceTime", hideInSearch: !0, width: 150, ellipsis: !0, render: function (l, e) { return e != null && e.invoiceTime ? S()(e == null ? void 0 : e.invoiceTime).format("YYYY-MM-DD HH:mm:ss") : "" } }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u5F00\u7968\u7EC8\u7AEF" }), dataIndex: "invoiceTerminalCode", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u9500\u65B9\u7A0E\u53F7" }), dataIndex: "taxNo", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u9500\u65B9\u540D\u79F0" }), dataIndex: "sellerName", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u8D2D\u65B9\u7A0E\u53F7" }), dataIndex: "buyerTaxNo", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u8D2D\u65B9\u540D\u79F0" }), dataIndex: "buyerName", hideInSearch: !0, width: 150, ellipsis: !0 }, { dataIndex: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "invoiceType" }), title: "\u5F00\u7968\u7C7B\u578B", hideInSearch: !0, width: 150, ellipsis: !0, render: function (l, e) { return (e == null ? void 0 : e.invoiceType) === 1 ? "\u84DD\u7968" : (e == null ? void 0 : e.invoiceType) === 2 ? "\u7EA2\u7968" : "" } }, { dataIndex: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "invoiceTypeCode" }), title: "\u53D1\u7968\u79CD\u7C7B\u7F16\u7801", hideInSearch: !0, width: 150, ellipsis: !0 }, { dataIndex: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "remarks" }), title: "\u5907\u6CE8", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u53D1\u7968\u4EE3\u7801" }), dataIndex: "invoiceCode", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u53D1\u7968\u53F7\u7801" }), dataIndex: "invoiceNo", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u6570\u7535\u53D1\u7968\u53F7\u7801" }), dataIndex: "digitInvoiceNo", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u4E0D\u542B\u7A0E\u91D1\u989D" }), dataIndex: "invoiceTotalPrice", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u7A0E\u989D" }), dataIndex: "invoiceTotalTax", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u542B\u7A0E\u91D1\u989D" }), dataIndex: "invoiceTotalPriceTax", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u53D1\u7968\u72B6\u6001" }), dataIndex: "status", hideInSearch: !0, width: 150, ellipsis: !0, render: function (l, e) { return (e == null ? void 0 : e.status) === 0 ? "\u5F00\u7968\u4E2D" : (e == null ? void 0 : e.status) === 1 ? "\u5F00\u7968\u5B8C\u6210" : (e == null ? void 0 : e.status) === 2 ? "\u5F00\u7968\u5931\u8D25" : (e == null ? void 0 : e.status) === 3 ? "\u53D1\u7968\u5DF2\u4F5C\u5E9F" : (e == null ? void 0 : e.status) === 4 ? "\u53D1\u7968\u4F5C\u5E9F\u4E2D" : "" } }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u53D1\u7968\u72B6\u6001\u63CF\u8FF0" }), dataIndex: "statusMessage", hideInSearch: !0, width: 150, ellipsis: !0 }, { title: (0, u.jsx)("div", { style: { textAlign: "center" }, children: "\u9644\u4EF6\u5730\u5740" }), dataIndex: "pdfUrl", hideInSearch: !0, width: 150, ellipsis: !0, render: function (l, e) { return (0, u.jsx)("a", { children: "\u67E5\u770B\u9644\u4EF6" }) } }, { title: "\u64CD\u4F5C", dataIndex: "options", width: 100, hideInSearch: !0, fixed: "right", render: function (l, e) { return (0, u.jsxs)(Se.Z, { children: [(0, u.jsx)("a", { onClick: function () { console.log("record", e), Me(e) }, children: "\u5F00\u7968" }), (0, u.jsx)("a", { onClick: function () { Pe(e) }, children: "\u4F5C\u5E9F" })] }) } }], Me = function () { var h = f()(d()().mark(function l(e) { var c, v; return d()().wrap(function (p) { for (; ;)switch (p.prev = p.next) { case 0: return c = { invoiceCode: e.invoiceCode, invoiceNo: e.invoiceNo, digitInvoiceNo: e.digitInvoiceNo, pushPhone: e.pushPhone, pushEmail: e.pushEmail }, console.log("req", c), p.next = 4, ge("menuCloud", c); case 4: v = p.sent, console.log("data", v); case 6: case "end": return p.stop() } }, l) })); return function (e) { return h.apply(this, arguments) } }(), Pe = function () { var h = f()(d()().mark(function l(e) { var c, v; return d()().wrap(function (p) { for (; ;)switch (p.prev = p.next) { case 0: return console.log("obj", e), c = { taxNo: L.taxNo, serialNo: e.serialNo, orderNo: e.orderNo, invoiceCode: e.invoiceCode, invoiceNo: e.invoiceNo, invalidOperator: "\u64CD\u4F5C\u4EBA" }, p.next = 4, ye("menuCloud", c); case 4: v = p.sent; case 5: case "end": return p.stop() } }, l) })); return function (e) { return h.apply(this, arguments) } }(), be = function () { var h = f()(d()().mark(function l(e) { var c, v, g; return d()().wrap(function (y) { for (; ;)switch (y.prev = y.next) { case 0: return c = { UserIdEncrypted: e }, y.next = 3, me(c); case 3: v = y.sent, console.log("handleGetUserInfo", v), g = v.Result_Data, Ge(g); case 7: case "end": return y.stop() } }, l) })); return function (e) { return h.apply(this, arguments) } }(); return (0, u.jsx)("div", { children: Be ? (0, u.jsx)(De.Z, { actionRef: s, formRef: i, columns: Ue, bordered: !0, expandable: { expandRowByClick: !0 }, rowKey: function (l) { return "".concat(l == null ? void 0 : l.id) }, scroll: { x: "100%", y: "calc(100vh - 400px)" }, headerTitle: (0, u.jsx)("span", { style: { color: "#1890ff", fontSize: 14, fontWeight: 600 }, children: "\u53D1\u7968\u5217\u8868" }), search: { span: 6 }, request: function () { var h = f()(d()().mark(function l(e) { var c, v, g, p, y, m; return d()().wrap(function (I) { for (; ;)switch (I.prev = I.next) { case 0: return console.log("params", e), c = [S()().format("YYYY-MM-DD 00:00:00"), S()().format("YYYY-MM-DD 23:59:59")], v = c[0], g = c[1], p = { taxNo: L.taxNo || "", pageNo: (e == null ? void 0 : e.current) || 1, pageSize: (e == null ? void 0 : e.pageSize) || 1, beginDate: v || "", endDate: g || "" }, I.next = 5, ve("menuCloud", p); case 5: if (y = I.sent, console.log("data3232", y), m = y.data.response, console.log("tableData3232", m), !(m.list && m.list.length > 0)) { I.next = 11; break } return I.abrupt("return", { data: m.list, success: !0, total: m.total, current: m.pageNo, pageSize: m.pageSize }); case 11: return I.abrupt("return", { data: [], success: !0 }); case 12: case "end": return I.stop() } }, l) })); return function (l) { return h.apply(this, arguments) } }() }) : "" }) }, Ee = (0, se.connect)(function (a) { var n = a.user; return { currentUser: n.data } })(Ae) } }]); diff --git a/config/router.ts b/config/router.ts index dd16ada..8b2da6e 100644 --- a/config/router.ts +++ b/config/router.ts @@ -63,6 +63,11 @@ export default [ name: '整改情况追踪表', component: "@/pages/operationReport/rectificationStatus", }, + { + path: '/RentCalculation/index', + name: '租金测算', + component: "@/pages/RentCalculation/index", + }, ] diff --git a/src/models/user.ts b/src/models/user.ts index 8a71171..1a01e87 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -287,6 +287,12 @@ const UserModel: UserModelType = { name: '整改情况追踪表', component: "@/pages/operationReport/rectificationStatus", }, + { + path: '/RentCalculation/index', + redirect: '', + name: '租金测算', + component: "@/pages/RentCalculation/index", + }, ] } @@ -367,6 +373,7 @@ const UserModel: UserModelType = { "/operationReport/onSiteInspection", "/operationReport/securityIssueList", "/operationReport/rectificationStatus", + "/RentCalculation/index", // '/examine/index', // '/examine/modal', // '/examine/question', diff --git a/src/pages/DigitalElectronics/index.tsx b/src/pages/DigitalElectronics/index.tsx index bea5b7b..82f8dd2 100644 --- a/src/pages/DigitalElectronics/index.tsx +++ b/src/pages/DigitalElectronics/index.tsx @@ -64,6 +64,22 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { }); const columns: any = [ + { + title: "查询内容", + dataIndex: "searchText", + hideInTable: true, + fieldProps: { + placeholder: "请输入经办人/单据号/金额", + } + }, + { + title: "含税开票金额", + dataIndex: "INVOICE_TAXAMOUNT", + hideInTable: true, + fieldProps: { + placeholder: "请输入含税开票金额", + } + }, { title: '服务区名称', dataIndex: 'SERVERPART_NAME', @@ -562,6 +578,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { revenueCode: item.TABLE_NAME,// 税收分类编码 taxRate: (item.DUTY_PARAGRAPH / 100).toFixed(2),// 税率 units: item.ITEM_UNIT,// 计量单位 + specification: item.ITEM_RULE// 规格 }) }) @@ -588,7 +605,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号 buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱 - // remark: record?.BILL_DESC, + remark: record?.BILL_DESC, buyerAddressAndTel: `${record?.MERCHANTS_ADDRESS}、${record?.MERCHANTS_TEL}`,// 购方地址、电话 buyerBankAndAccount: `${record?.BANK_NAME}${record?.BANK_ACCOUNT}`,// 购方银行、账号 @@ -679,7 +696,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { revenueCode: item.TABLE_NAME,// 税收分类编码 taxRate: (item.DUTY_PARAGRAPH / 100).toFixed(2),// 税率 units: item.ITEM_UNIT,// 计量单位 - + specification: item.ITEM_RULE // 规格 }) }) } @@ -701,6 +718,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { sellerBankAndAccount: "", // 销方银行和账号 写死 sellerAddressAndTel: "", // 销方地址和电话 写死 应该可以不传 + remark: record?.BILL_DESC, buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号 buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱 @@ -1009,16 +1027,23 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => { const value = sorter[n] return value ? `${n} ${value.replace('end', '')}` : '' }) + + // 获取票据信息表列表 const req: any = { SearchParameter: { SERVERPART_IDS: userInfo?.ServerpartIds, BILL_STATES: "2000,9000", - BILL_TYPES: "" + BILL_TYPES: "", + INVOICE_TAXAMOUNT: params?.INVOICE_TAXAMOUNT || "" }, PageIndex: 1, PageSize: 999999, sortstr: sortstr.length ? sortstr.toString() : "BILL_ID desc", + keyWord: { + Key: "BILL_PERSON,BILL_NO", + Value: params?.searchText || "" + } } const data = await handleGetBILLList(req) diff --git a/src/pages/RentCalculation/index.tsx b/src/pages/RentCalculation/index.tsx new file mode 100644 index 0000000..357b909 --- /dev/null +++ b/src/pages/RentCalculation/index.tsx @@ -0,0 +1,189 @@ +import LeftSelectTree from "@/components/leftSelectTree/leftSelectTree"; +import { ActionType, FormInstance, ProTable } from "@ant-design/pro-components"; +import { Button } from "antd"; +import { useRef, useState } from "react"; +import { connect } from "umi"; + + +const RentCalculation: React.FC<{ currentUser: any }> = (props) => { + const actionRef = useRef(); + const formRef = useRef(); + // 树相关的属性和方法 + const [selectedId, setSelectedId] = useState() + const [collapsible, setCollapsible] = useState(false) + + const columns: any = [ + { + title: "片区", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title: "服务区", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title: "所属高速", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title: "产权所属", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title: "站点类型", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title: "分类定级", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title:
断面车流统计(辆/日)
, + dataIndex: "", + hideInSearch: true, + align: 'right', + width: 180, + ellipsis: true, + }, + { + title: "业态", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title: "招商模式", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title: "运营模式", + dataIndex: "", + hideInSearch: true, + align: 'center', + width: 120, + ellipsis: true, + }, + { + title:
首次保底营业额(元)
, + dataIndex: "", + hideInSearch: true, + align: 'right', + width: 150, + ellipsis: true, + }, + { + title:
首次采购人收益提点比例(%)
, + dataIndex: "", + hideInSearch: true, + align: 'right', + width: 200, + ellipsis: true, + }, + { + title:
二次保底营业额(元)
, + dataIndex: "", + hideInSearch: true, + align: 'right', + width: 150, + ellipsis: true, + }, + { + title:
二次采购人收益提点比例(%)
, + dataIndex: "", + hideInSearch: true, + align: 'right', + width: 200, + ellipsis: true, + }, + { + title:
三次保底营业额(元)
, + dataIndex: "", + hideInSearch: true, + align: 'right', + width: 150, + ellipsis: true, + }, + { + title:
三次采购人收益提点比例(%)
, + dataIndex: "", + hideInSearch: true, + align: 'right', + width: 200, + ellipsis: true, + } + + ] + + return ( +
+ +
+ + { + if (!selectedId) { + return { data: [], success: true } + } + + // if (data && data.length > 0) { + // return { data, success: true } + // } + // return { data: [], success: true } + }} + toolbar={{ + actions: [ + + ] + }} + /> +
+
) +} + +export default connect(({ user }: ConnectState) => ({ + currentUser: user.data +}))(RentCalculation); \ No newline at end of file diff --git a/src/pages/authority.ts b/src/pages/authority.ts index b7cce4b..3397ec9 100644 --- a/src/pages/authority.ts +++ b/src/pages/authority.ts @@ -11,6 +11,7 @@ const authority: PageAuthority = { '/operationReport/onSiteInspection': ['/operationReport/onSiteInspection'], '/operationReport/securityIssueList': ['/operationReport/securityIssueList'], '/operationReport/rectificationStatus': ['/operationReport/rectificationStatus'], + '/RentCalculation/index': ['/RentCalculation/index'], }; diff --git a/src/pages/operationReport/components/AddInspectionContent.tsx b/src/pages/operationReport/components/AddInspectionContent.tsx index 86ea23f..736e73f 100644 --- a/src/pages/operationReport/components/AddInspectionContent.tsx +++ b/src/pages/operationReport/components/AddInspectionContent.tsx @@ -85,14 +85,14 @@ const AddInspectionContent = ({ onRef, onShow, setOnShow, handleAddInspectionCon diff --git a/src/pages/operationReport/components/AddInspectionItems.tsx b/src/pages/operationReport/components/AddInspectionItems.tsx index d553997..18c1f38 100644 --- a/src/pages/operationReport/components/AddInspectionItems.tsx +++ b/src/pages/operationReport/components/AddInspectionItems.tsx @@ -1,6 +1,7 @@ // 同步检查项目的悬浮框 import { ProForm, ProFormDateTimePicker, ProFormDigit, ProFormSelect, ProFormText, ProFormTimePicker } from "@ant-design/pro-components"; import { Col, FormInstance, Modal, Row } from "antd"; +import moment from "moment"; import { useRef } from "react"; import { connect } from "umi"; @@ -28,8 +29,14 @@ const AddInspectionItems = ({ onRef, onShow, setOnShow, handleGetNewProjectData, }} onOk={async () => { // 提交框内的数据 AddInspectionItemsFormRef.current?.validateFields().then((res: any) => { + console.log('resdasa', res); + if (handleGetNewProjectData) { - handleGetNewProjectData(res) + handleGetNewProjectData({ + ...res, + INSPECTION_STARTTIME: res.INSPECTION_STARTTIME ? moment(res.INSPECTION_STARTTIME).format('YYYY-MM-DD HH:mm:ss') : "", + INSPECTION_ENDTIME: res.INSPECTION_ENDTIME ? moment(res.INSPECTION_ENDTIME).format('YYYY-MM-DD HH:mm:ss') : "" + }) } }) setOnShow(false) diff --git a/src/pages/operationReport/components/RectificationStatusInfoModal.tsx b/src/pages/operationReport/components/RectificationStatusInfoModal.tsx index e23c386..9b5e5bb 100644 --- a/src/pages/operationReport/components/RectificationStatusInfoModal.tsx +++ b/src/pages/operationReport/components/RectificationStatusInfoModal.tsx @@ -9,6 +9,7 @@ import { handleGetServerpartTree, handleGetSERVERPARTTYPEList } from "../service type DetailProps = { onRef: any, + currentRowInfo: any,// 当前整改行数据 onShow: boolean, setOnShow: (value: boolean) => void handleGetRectificationStatusData: any @@ -28,7 +29,7 @@ const beforeUpload = (file: any) => { return isJpgOrPng && isLt2M; } -const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRectificationStatusData, parentRow }: DetailProps) => { +const RectificationStatusInfoModal = ({ onRef, currentRowInfo, onShow, setOnShow, handleGetRectificationStatusData, parentRow }: DetailProps) => { const { confirm } = Modal; const RectificationStatusInfoFormRef = useRef(); // 文件列表 @@ -99,14 +100,17 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti layout={'horizontal'} labelCol={{ style: { width: 80 } }} request={async () => { - if (parentRow) { + if (currentRowInfo) { + console.log('currentRowInfocurrentRowInfocurrentRowInfo', currentRowInfo); + + } else if (parentRow) { console.log('parentRowparentRowparentRow', parentRow); - handleGetServerPartList(parentRow?.SPREGIONTYPE_ID) + handleGetServerPartList(parentRow?.belongAreaCode) return { - SERVERPART_ID: parentRow?.SERVERPART_ID, - SERVERPART_NAME: parentRow?.SERVERPART_NAME, - SPREGIONTYPE_ID: parentRow?.SPREGIONTYPE_ID, - SPREGIONTYPE_NAME: parentRow?.SPREGIONTYPE_NAME, + SACode: parentRow?.SACode, + SAName: parentRow?.SAName, + belongAreaCode: parentRow?.belongAreaCode, + belongArea: parentRow?.belongArea, } } else { return { @@ -119,7 +123,7 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti { const req: any = { @@ -151,9 +155,9 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti console.log('valuevalue', value); handleGetServerPartList(value) if (value) { - RectificationStatusInfoFormRef.current?.setFieldsValue({ SPREGIONTYPE_NAME: option.label }) + RectificationStatusInfoFormRef.current?.setFieldsValue({ belongArea: option.label }) } else { - RectificationStatusInfoFormRef.current?.setFieldsValue({ SPREGIONTYPE_NAME: "" }) + RectificationStatusInfoFormRef.current?.setFieldsValue({ belongArea: "" }) } } }} @@ -163,21 +167,21 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti { console.log('e', e); if (e) { - RectificationStatusInfoFormRef.current?.setFieldsValue({ SERVERPART_NAME: option.label }) + RectificationStatusInfoFormRef.current?.setFieldsValue({ SAName: option.label }) } else { - RectificationStatusInfoFormRef.current?.setFieldsValue({ SERVERPART_NAME: "" }) + RectificationStatusInfoFormRef.current?.setFieldsValue({ SAName: "" }) } } }} @@ -188,7 +192,7 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti diff --git a/src/pages/operationReport/index.tsx b/src/pages/operationReport/index.tsx index a0ed913..8a109d9 100644 --- a/src/pages/operationReport/index.tsx +++ b/src/pages/operationReport/index.tsx @@ -54,6 +54,8 @@ const OperationReport = ({ PATROLID }: DetailProps) => { const [rectificationStatusModal, setRectificationStatusModal] = useState(false) // 当前的巡检记录 const [currentRecord, setCurrentRecord] = useState() + // 整改情况的行数据 + const [currentRectification, setCurrentRectification] = useState() // 表格字段 @@ -306,6 +308,8 @@ const OperationReport = ({ PATROLID }: DetailProps) => { list.push({ label: item.SERVERPART_REGIONNAME, value: item.SERVERPART_REGION }) }) } + console.log('listlistlist', list); + setSERVERPARTREGION(list) } @@ -353,16 +357,23 @@ const OperationReport = ({ PATROLID }: DetailProps) => { if (addressParams.dataType) { setPageDataType(Number(addressParams.dataType)) } + console.log('PATROLIDPATROLIDPATROLIDPATROLID', PATROLID); if (PATROLID) { const req: any = { - PATROL_IDS: PATROLID + SearchParameter: { + PATROL_IDS: PATROLID + }, + PageIndex: 1, + PageSize: 100, } let newReq: any = { name: "", value: encryptAES(JSON.stringify(req)) } const data = await handleGetPATROLList(newReq) + console.log('datadatadata3213', data); + if (data && data.length > 0) { let detail: any = data[0] console.log('detaildetail', detail); @@ -388,7 +399,8 @@ const OperationReport = ({ PATROLID }: DetailProps) => { handleGetSERVERPARTREGION(detail.SERVERPART_ID) return { - ...detail + ...detail, + SERVERPART_REGION: Number(detail.SERVERPART_REGION) } } @@ -606,11 +618,11 @@ const OperationReport = ({ PATROLID }: DetailProps) => { { pageDataType === 3000 ? - {/* */} + /> : <> @@ -723,9 +735,13 @@ const OperationReport = ({ PATROLID }: DetailProps) => {
-
{ - setRectificationStatusModal(true) - }}>整改情况
+ { + item.EXCEPTION_CONTENT ? +
{ + setCurrentRectification(item) + setRectificationStatusModal(true) + }}>整改情况
: "" + }
}) : "" @@ -745,7 +761,7 @@ const OperationReport = ({ PATROLID }: DetailProps) => { {/* 整改情况 的录入悬浮框 */} - + ) diff --git a/src/pages/operationReport/onSiteInspection.tsx b/src/pages/operationReport/onSiteInspection.tsx index d67b1df..a8ddfb7 100644 --- a/src/pages/operationReport/onSiteInspection.tsx +++ b/src/pages/operationReport/onSiteInspection.tsx @@ -138,7 +138,7 @@ const onSiteInspection = () => { }, { title: "要求整改时间", - dataIndex: '要求整改时间', + dataIndex: 'TILLTIME', hideInSearch: true, align: 'center', width: 150, @@ -146,7 +146,7 @@ const onSiteInspection = () => { }, { title: "跟进处理时间", - dataIndex: '跟进处理时间', + dataIndex: 'FINISHTIME', hideInSearch: true, align: 'center', width: 150, @@ -154,7 +154,7 @@ const onSiteInspection = () => { }, { title: "处理完成时间", - dataIndex: '处理完成时间', + dataIndex: 'FINISH_CFMTIME', hideInSearch: true, align: 'center', width: 150, diff --git a/src/pages/operationReport/rectificationStatus.tsx b/src/pages/operationReport/rectificationStatus.tsx index baa1365..29b4908 100644 --- a/src/pages/operationReport/rectificationStatus.tsx +++ b/src/pages/operationReport/rectificationStatus.tsx @@ -47,6 +47,19 @@ const rectificationStatus = () => { }, initialValue: [moment().startOf('M'), moment()], }, + { + title: "内容类型", + dataIndex: "PATROLCONTENT_TYPE", + valueType: 'select', + fieldProps: { + options: [ + { label: '服务质量监督', value: 1000 }, + { label: '运营维护', value: 2000 }, + { label: '安全管理', value: 3000 }, + { label: '通用', value: 4000 }, + ] + } + }, { title: "序号", dataIndex: 'index', @@ -58,7 +71,7 @@ const rectificationStatus = () => { }, { title: "片区名称", - dataIndex: 'SPREGIONTYPE_NAME', + dataIndex: 'BELONGAREA', hideInSearch: true, align: 'center', width: 150, @@ -66,7 +79,7 @@ const rectificationStatus = () => { }, { title: "服务区名称", - dataIndex: 'SERVERPART_NAME', + dataIndex: 'SANAME', hideInSearch: true, align: 'center', width: 150, @@ -218,6 +231,7 @@ const rectificationStatus = () => { SearchParameter: { INSPECTIONDATE_Start: params?.INSPECTION_STARTTIME_Start || "", INSPECTIONDATE_End: params?.INSPECTION_STARTTIME_End || "", + PATROLCONTENT_TYPE: params?.PATROLCONTENT_TYPE || "" }, PageIndex: 1, PageSize: 999999, diff --git a/src/pages/operationReport/securityIssueList.tsx b/src/pages/operationReport/securityIssueList.tsx index 7be78a6..f8a4a07 100644 --- a/src/pages/operationReport/securityIssueList.tsx +++ b/src/pages/operationReport/securityIssueList.tsx @@ -4,7 +4,7 @@ import { connect } from "umi"; import LeftSelectTree from "@/components/leftSelectTree/leftSelectTree"; import { ActionType, FormInstance, ProTable } from "@ant-design/pro-components"; import { useEffect, useRef, useState } from "react"; -import { handleGetPATROLList } from "./service"; +import { handleGetPATROLList, handlGetPatrolSecurityList } from "./service"; import moment from 'moment' import { encryptAES } from "@/utils/handleAes"; import { Drawer } from "antd"; @@ -32,8 +32,8 @@ const securityIssueList = () => { search: { transform: (value: any) => { return { - INSPECTION_STARTTIME_Start: value[0], - INSPECTION_STARTTIME_End: value[1], + PATROL_DATE_Start: value[0], + PATROL_DATE_End: value[1], }; }, }, @@ -73,114 +73,64 @@ const securityIssueList = () => { ellipsis: true }, { - title: "发现日期", - dataIndex: '', + title: "责任单位名称", + dataIndex: 'DUTYUNIT_NAME', hideInSearch: true, align: 'center', width: 150, ellipsis: true }, { - title: "问题类型", - dataIndex: '', + title: "巡检位置", + dataIndex: 'PATROL_POSITION', hideInSearch: true, align: 'center', width: 150, ellipsis: true }, { - title: "问题描述", - dataIndex: '', + title: "巡查情况", + dataIndex: 'PATROL_SITUATION', hideInSearch: true, align: 'center', width: 150, ellipsis: true }, { - title: "风险等级", - dataIndex: '', + title: "巡检内容", + dataIndex: 'PATROLDETAIL_CONTENT', hideInSearch: true, align: 'center', width: 150, ellipsis: true }, { - title: "发现人", - dataIndex: '', - hideInSearch: true, - align: 'center', - width: 150, - ellipsis: true, - }, - { - title: "责任单位", - dataIndex: '', + title: "巡检结果", + dataIndex: 'PATROLDETAIL_RESULT', hideInSearch: true, align: 'center', width: 150, ellipsis: true }, { - title: "临时处置措施", - dataIndex: '', + title: "异常描述", + dataIndex: 'EXCEPTION_CONTENT', hideInSearch: true, align: 'center', width: 150, ellipsis: true }, { - title: "是否停业整改", - dataIndex: '', + title: "整改期限", + dataIndex: 'RECTIFICATION_PERIOD', hideInSearch: true, align: 'center', width: 150, ellipsis: true }, { - title: "上报时间", - dataIndex: '', - hideInSearch: true, - align: 'center', - width: 150, - ellipsis: true - }, - { - title: "审核人", - dataIndex: '', - hideInSearch: true, - align: 'center', - width: 150, - ellipsis: true - }, - { - title: "状态", - dataIndex: 'COMPLETE_STATE', - valueType: 'select', - hideInSearch: true, - align: 'center', - width: 120, - ellipsis: true, - fieldProps: { - options: [ - { label: "编辑中", value: 1 }, - { label: "巡查中", value: 2 }, - { label: "待跟进", value: 3 }, - { label: "整改中", value: 4 }, - { label: "已完成", value: 5 }, - ] - } - }, - { - title: "备注", - dataIndex: '', - hideInSearch: true, - align: 'center', - width: 150, - ellipsis: true - }, - { - title: "附件", - dataIndex: '', + title: "整改结果", + dataIndex: 'RECTIFICATION_RESULT', hideInSearch: true, align: 'center', width: 150, @@ -208,7 +158,28 @@ const securityIssueList = () => { headerTitle={'安全问题记录表'} search={{ span: 6, }} request={async (params) => { + if (!selectedId) { + return { data: [], success: true } + } + const req: any = { + SearchParameter: { + SERVERPART_IDS: selectedId, + PATROL_DATE_Start: params?.PATROL_DATE_Start || "", + PATROL_DATE_End: params?.PATROL_DATE_End || "", + }, + PageIndex: 1, + PageSize: 999999, + } + let newReq: any = { + name: "", + value: encryptAES(JSON.stringify(req)) + } + const data = await handlGetPatrolSecurityList(newReq) + if (data && data.length > 0) { + return { data, success: true } + } + return { data: [], success: true } }} toolbar={{ actions: [ diff --git a/src/pages/operationReport/service.ts b/src/pages/operationReport/service.ts index f1a0069..ef4e671 100644 --- a/src/pages/operationReport/service.ts +++ b/src/pages/operationReport/service.ts @@ -99,3 +99,16 @@ export async function handleGetSERVERPARTDetail(params: any) { return data.Result_Data } +// 获取巡查安全问题列表 +export async function handlGetPatrolSecurityList(params: any) { + const data = await requestOld(`/Examine/GetPatrolSecurityList`, { + method: 'POST', + data: params + }) + + if (data.Result_Code !== 100) { + return data + } + + return data.Result_Data.List +} diff --git a/src/pages/redReversal/components/InvoiceDetial.tsx b/src/pages/redReversal/components/InvoiceDetial.tsx index d731ef9..2a325c2 100644 --- a/src/pages/redReversal/components/InvoiceDetial.tsx +++ b/src/pages/redReversal/components/InvoiceDetial.tsx @@ -141,6 +141,7 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P { label: "填写中", value: 1000 }, { label: "待审核", value: 2000 }, { label: "开票中", value: 9000 }, + { label: "手动开票", value: 9100 }, { label: "已开票", value: 9200 }, { label: "红冲申请中", value: 9990 }, { label: "已红冲", value: 9999 } diff --git a/src/pages/redReversal/index.tsx b/src/pages/redReversal/index.tsx index 54baf3a..6d48e21 100644 --- a/src/pages/redReversal/index.tsx +++ b/src/pages/redReversal/index.tsx @@ -573,7 +573,7 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => { // blueInvoiceType: record?.blueInvoiceType, blueinvoiceCode: "", billDetail: billDetailReq, - remark: record?.BILL_DESC, + remark: `被红冲蓝字数电发票号码:${record?.SERIAL_NO}\t\t红字发票信息确认单编号：${record?.BILL_NO ? `HC-${record?.BILL_NO}` : ""};\n` + record?.BILL_DESC, } // 构造原始数据 diff --git a/src/utils/request.ts b/src/utils/request.ts index a2f6f6f..7e1d102 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -7,7 +7,7 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' }); diff --git a/src/utils/requestAHYD.ts b/src/utils/requestAHYD.ts index 9c8e44e..8a5997e 100644 --- a/src/utils/requestAHYD.ts +++ b/src/utils/requestAHYD.ts @@ -7,7 +7,7 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' }); diff --git a/src/utils/requestCode.ts b/src/utils/requestCode.ts index a6ff351..e2834fe 100644 --- a/src/utils/requestCode.ts +++ b/src/utils/requestCode.ts @@ -7,12 +7,12 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' }); // 修改baseURL为完整的API地址，确保在生产环境中正确访问 -const instance = axios.create({ baseURL: 'https://api.eshangtech.com/CommercialApi' }); +const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//CommercialApi' }); diff --git a/src/utils/requestKaiPiao.ts b/src/utils/requestKaiPiao.ts index 069558b..09a5712 100644 --- a/src/utils/requestKaiPiao.ts +++ b/src/utils/requestKaiPiao.ts @@ -7,7 +7,7 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' }); diff --git a/src/utils/requestMain.ts b/src/utils/requestMain.ts index 9d57bc7..286636a 100644 --- a/src/utils/requestMain.ts +++ b/src/utils/requestMain.ts @@ -7,12 +7,12 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' }); // 修改baseURL为完整的API地址，确保在生产环境中正确访问 -const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); diff --git a/src/utils/requestMap.ts b/src/utils/requestMap.ts index de3db4e..e8c51cd 100644 --- a/src/utils/requestMap.ts +++ b/src/utils/requestMap.ts @@ -7,7 +7,7 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' }); diff --git a/src/utils/requestMemberApi.ts b/src/utils/requestMemberApi.ts index 5cc8803..428951c 100644 --- a/src/utils/requestMemberApi.ts +++ b/src/utils/requestMemberApi.ts @@ -7,7 +7,7 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -const instance = axios.create({ baseURL: 'https://api.eshangtech.com/MemberApi' }); +const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//MemberApi' }); // const instance = axios.create({ baseURL: '/auth' }); @@ -24,7 +24,7 @@ instance.interceptors.request.use( Authorization: `Bearer ${localStorage.getItem('Authorization') || ''}`, "Content-Type": "application/json;charset=utf-8" } as AxiosRequestHeaders; - + return config; }, (error) => Promise.reject(error), @@ -36,7 +36,7 @@ instance.interceptors.response.use( const { data } = response; if (data.code !== 200 && data.Result_Code !== 100) { - + } const timestamp = getFormattedDate() diff --git a/src/utils/requestOld.ts b/src/utils/requestOld.ts index 6181d1e..3a95996 100644 --- a/src/utils/requestOld.ts +++ b/src/utils/requestOld.ts @@ -7,7 +7,7 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); const instance = axios.create({ baseURL: 'https://samember.yciccloud.com:8999/EShangApiMain' }); // const instance = axios.create({ baseURL: '/auth' }); diff --git a/src/utils/requestOldCode.ts b/src/utils/requestOldCode.ts index 593336e..fd4c8f7 100644 --- a/src/utils/requestOldCode.ts +++ b/src/utils/requestOldCode.ts @@ -7,7 +7,7 @@ import CryptoJS from "crypto-js"; const { UMI_APP_BASEURL } = process.env; // const instance = axios.create({ baseURL: UMI_APP_BASEURL }); -// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' }); +// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' }); const instance = axios.create({ baseURL: 'https://samember.yciccloud.com:8999/CommercialApi' }); // const instance = axios.create({ baseURL: '/auth' });