修改替代料确认

master
Yang 3 years ago
parent 0359982c54
commit 1767971f66

1
.gitignore vendored

@ -1 +1,2 @@
node_modules node_modules
/dist

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
.dataInfo[data-v-a4d8cdf6]{max-width:90%;height:600px;margin:30px auto;padding-right:30px;overflow-y:auto}.search-btn2[data-v-a4d8cdf6]{position:absolute;right:0;top:0}.note2[data-v-a4d8cdf6]{display:inline-block;margin-left:16px}.note3[data-v-a4d8cdf6]{display:inline-flex;line-height:38px;margin-left:12px}.note2[data-v-a4d8cdf6],.note[data-v-a4d8cdf6]{color:#999;font-size:12px}.note[data-v-a4d8cdf6]{margin-top:4px;position:absolute}.note .layui-form-radio[data-v-a4d8cdf6],.note .layui-form-radio i[data-v-a4d8cdf6]{margin:-2px 1px 0 0;padding:0;font-size:14px;line-height:0}.FSearchName[data-v-a4d8cdf6]{color:var(--global-primary-color)}.dataInfo[data-v-6b2ec07a]{max-width:90%;height:600px;margin:30px auto;padding-right:30px;overflow-y:auto}.search-btn2[data-v-6b2ec07a]{position:absolute;right:0;top:0}.note2[data-v-6b2ec07a]{display:inline-block;margin-left:16px}.note3[data-v-6b2ec07a]{display:inline-flex;line-height:38px;margin-left:12px}.note2[data-v-6b2ec07a],.note[data-v-6b2ec07a]{color:#999;font-size:12px}.note[data-v-6b2ec07a]{margin-top:4px;position:absolute;left:0}.note .layui-form-radio[data-v-6b2ec07a],.note .layui-form-radio i[data-v-6b2ec07a]{margin:-2px 1px 0 0;padding:0;font-size:14px;line-height:0}.FSearchName[data-v-6b2ec07a]{color:var(--global-primary-color)}.layui-item33[data-v-66f427dc]{width:90%;padding-right:30px;margin:30px auto 10px;display:block;overflow:auto;position:relative;clear:both}.menuBtn[data-v-66f427dc]{display:block;text-align:center;width:96%;margin:20px auto}.content-box[data-v-b2751b9c]{margin:30px 10px;display:block;position:relative;clear:both;float:none;min-height:740px}.row-select td[data-v-b2751b9c]{overflow:inherit}.layui-select[data-v-b2751b9c]{width:100%}.edit[data-v-b2751b9c]{color:green}[data-v-b2751b9c] .edit-item .layui-input{border-color:#5fb878!important}[data-v-b2751b9c] .edit-item .layui-input:hover{border-color:#009688!important;color:#009688}.isShow[data-v-b2751b9c]{width:370px;height:30px;border:none}.isHidden[data-v-b2751b9c],.isBomHidden[data-v-b2751b9c]{display:none}

@ -1 +0,0 @@
.dataInfo[data-v-71a18e87]{max-width:90%;height:600px;margin:30px auto;padding-right:30px;overflow-y:auto}.search-btn2[data-v-71a18e87]{position:absolute;right:0;top:0}.note2[data-v-71a18e87]{display:inline-block;margin-left:16px}.note3[data-v-71a18e87]{display:inline-flex;line-height:38px;margin-left:12px}.note2[data-v-71a18e87],.note[data-v-71a18e87]{color:#999;font-size:12px}.note[data-v-71a18e87]{margin-top:4px;position:absolute;left:0}.note .layui-form-radio[data-v-71a18e87],.note .layui-form-radio i[data-v-71a18e87]{margin:-2px 1px 0 0;padding:0;font-size:14px;line-height:0}.FSearchName[data-v-71a18e87]{color:var(--global-primary-color)}.layui-item33[data-v-33342b24]{width:90%;padding-right:30px;margin:30px auto 10px;display:block;overflow:auto;position:relative;clear:both}.menuBtn[data-v-33342b24]{display:block;text-align:center;width:96%;margin:20px auto}.content-box[data-v-7d007464]{margin:30px 10px;display:block;position:relative;clear:both;float:none;min-height:740px}.row-select td[data-v-7d007464]{overflow:inherit}.layui-select[data-v-7d007464]{width:100%}.edit[data-v-7d007464]{color:green}[data-v-7d007464] .edit-item .layui-input{border-color:#5fb878!important}[data-v-7d007464] .edit-item .layui-input:hover{border-color:#009688!important;color:#009688}.isShow[data-v-7d007464]{width:370px;height:30px;border:none}.isHidden[data-v-7d007464],.isBomHidden[data-v-7d007464]{display:none}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{v as n}from"./index.58a4812e.js";async function r(a){var t=[];return await n.post("/api/Common/GetBasicList",{FType:a}).then(e=>{t=e.Data.sort(function(s,o){return s.FOrder>o.FOrder})}),t}async function u(a,t){let e=0;return await n.post("/api/"+t+"/GetDataModel",a).then(s=>{e=s.Data}),e}async function l(a,t){let e=0;return await n.post("/api/"+t+"/UpdateDataModel",a).then(s=>{e=s.Data}),e}async function c(a,t){let e=0;return await n.post("/api/"+t+"/InsertDataModel",a).then(s=>{e=s.Data}),e}async function p(a,t){let e=0;return await n.post("/api/"+t+"/DeleteDataById",{FID:a.FID||a}).then(s=>{e=s.Data}),e}async function D(a,t){a=a||{FPageIndex:1,FPageSize:10};let e={};return await n.post("/api/"+t+"/GetPageList",a).then(s=>{e=s}),e}async function f(a,t){let e={};return await n.post("/api/"+t+"/Save",a).then(s=>{e=s}),e}async function m(a){let t="";return await n.post("/api/Common/GetTempFile",{FType:a||1}).then(e=>{t=e.Data}),t}async function C(a){let t={};return await n.post("/api/Common/CheckIsHasPower",a).then(e=>{t=e.Data}),t}async function d(a){let t={};return await n.post("/api/Common/GetDataCodeList",a).then(e=>{t=e.Data}),t}async function h(){let a={};return await n.post("/api/Common/GetConfigList",{}).then(t=>{a=t.Data}),a}async function y(a){let t={};return await n.post("/api/Common/GetConfigValue",{FID:a}).then(e=>{t=e.Data}),t}async function g(a){let t={};return await n.post("/api/Common/StateDataCode",{FID:a}).then(e=>{t=e.Data}),t}async function w(a){let t={};return await n.post("/api/Common/DeleteDataCode",{FID:a}).then(e=>{t=e.Data}),t}async function F(a){let t={};return await n.post("/api/Common/ChangeDataCode",a).then(e=>{t=e.Data}),t}export{u as a,d as b,r as c,f as d,C as e,m as f,D as g,p as h,c as i,F as j,h as k,w as l,y as m,g as s,l as u};

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{v as o}from"./index.58a4812e.js";async function c(){var t=[];return await o.post("/api/Factory/GetFactoryList").then(a=>{t=a.Data}),t}async function i(t,a){let e=0;return await o.post("/api/Factory/CheckHasCode",{FID:t,FCode:a}).then(r=>{e=r.Data}),e}export{i as c,c as g};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{_ as C,r as h,u as k,g as w,a as L,o as r,c as p,w as n,b as H,d as s,e as t,t as i,f as D,h as S,n as N,F as z,i as T,j as P,k as E,l as M,m as A,p as B,q as I,s as V}from"./index.58a4812e.js";/* empty css */import{g as $}from"./common.a907f978.js";const O={setup(){let a=[{title:"\u9500\u552E\u53F7",key:"FSaleCode",align:"center"},{title:"\u53D1\u8D77\u65F6\u95F4",key:"FAddDate",align:"center",width:"182px"},{title:"\u5F53\u524D\u6D41\u7A0B",key:"FName",align:"center",width:"200px"},{title:"\u4E8B\u9879\u72B6\u6001",key:"FState",align:"center",width:"98px"},{title:"\u4EFB\u52A1\u6765\u6E90",key:"FDesc",align:"center"}];const o=h([]),l=h([" "," "," "," "]),e=h(""),f=k(),_=h([]);return{topCount:l,dataColumn:a,dataList:o,tableHeight:e,routerInfo:f,fastList:_}},mounted(){this._getHomeTopCount();let a=parseInt(this.$refs["lay-row3-div"].offsetHeight)-100;this.tableHeight=a+"px",this._getHomeFast(),this._getHomeNeed(a/40)},methods:{async _getHomeTopCount(){this.topCount=await w()||[0,0,0,0]},async _getHomeFast(){let a=await L({}),o=[];a.forEach(l=>{l.FChild.forEach(e=>{e.FName.indexOf("\u5168\u90E8")==-1&&e.FName.indexOf("\u7BA1\u7406")==-1&&o.length<8&&o.push(e)})}),this.fastList=o},async _getHomeNeed(a){let o={FPageIndex:1,FPageSize:Math.floor(a)};o.FPageSize=o.FPageSize<5?5:o.FPageSize;let l=await $(o,"Task");l.Data.List=l.Data.List||[],l.Data.List.forEach(e=>{e.FAddDate=e.FAddDate==null?"":this.dateFormat(e.FAddDate),e.FState=e.FState==2?"\u5DF2\u5B8C\u6210":"\u8FDB\u884C\u4E2D"}),this.dataList=l.Data.List||[]},dateFormat(a){return a.replace("T"," ").split(".")[0]},_goToMore(a){let o="";a==-1?o="/need/all":o=this.fastList[a].FRemark,this.routerInfo.push(o)}}},R=t("div",{class:"height20"},null,-1),j={class:"home-box1"},q={class:"icon"},G={class:"desc"},J={class:"count"},K=t("label",null,"\u672A\u5B8C\u4EE3\u529E\u4E8B\u9879",-1),Q={class:"home-box1"},U={class:"icon c1"},W={class:"desc"},X={class:"count"},Y=t("label",null,"\u4ECA\u65E5\u65B0\u589E\u5F85\u529E",-1),Z={class:"home-box1"},tt={class:"icon c2"},et={class:"desc"},ot={class:"count"},st=t("label",null,"\u534F\u540C\u8DEF\u7EBF",-1),at={class:"home-box1"},nt={class:"icon c3"},lt={class:"desc"},ct={class:"count"},it=t("label",null,"\u6211\u53C2\u4E0E\u7684\u8DEF\u7EBF",-1),_t=t("div",{class:"height10"},null,-1),dt={class:"lay-row2"},ht=t("h1",null,"\u5FEB\u6377\u5165\u53E3",-1),rt=["title"],ut={class:"lay-row3"},mt={class:"lay-row3-div",ref:"lay-row3-div"},pt={class:"home-box3"},ft=t("h1",null,"\u6700\u65B0\u5F85\u529E\u4E8B\u9879",-1);function gt(a,o,l,e,f,_){const F=P,d=E,c=M,g=A,y=B,b=I,v=V,x=H;return r(),p(x,{class:"home-layout"},{default:n(()=>[s(y,null,{default:n(()=>[s(F,{fluid:"true",style:{padding:"10px"}}),R,s(g,{space:"10"},{default:n(()=>[s(c,{md:"6"},{default:n(()=>[t("div",j,[t("p",q,[s(d,{type:"layui-icon-note",size:"26px"})]),t("p",G,[t("label",J,i(e.topCount[0]),1),K])])]),_:1}),s(c,{md:"6"},{default:n(()=>[t("div",Q,[t("p",U,[s(d,{type:"layui-icon-form",size:"26px"})]),t("p",W,[t("label",X,i(e.topCount[1]),1),Y])])]),_:1}),s(c,{md:"6"},{default:n(()=>[t("div",Z,[t("p",tt,[s(d,{type:"layui-icon-slider",size:"26px"})]),t("p",et,[t("label",ot,i(e.topCount[2]),1),st])])]),_:1}),s(c,{md:"6"},{default:n(()=>[t("div",at,[t("p",nt,[s(d,{type:"layui-icon-download-circle",size:"26px"})]),t("p",lt,[t("label",ct,i(e.topCount[3]),1),it])])]),_:1})]),_:1})]),_:1}),s(y,{class:"layui-header2"},{default:n(()=>[_t,t("div",dt,[s(g,{space:"10"},{default:n(()=>[s(c,{md:"24"},{default:n(()=>[ht]),_:1}),(r(!0),D(z,null,S(e.fastList,(u,m)=>(r(),p(c,{md:"3",key:m,onClick:yt=>_._goToMore(m)},{default:n(()=>[t("div",{class:N("home-box2 c"+m),title:u.FName},i(u.FName),11,rt)]),_:2},1032,["onClick"]))),128))]),_:1})])]),_:1}),s(v,null,{default:n(()=>[t("div",ut,[t("div",mt,[t("div",pt,[t("h2",{onClick:o[0]||(o[0]=u=>_._goToMore(-1))},"\u70B9\u51FB\u67E5\u770B\u66F4\u591A\u5F85\u529E\u4E8B\u9879"),ft]),e.tableHeight!=""?(r(),p(b,{key:0,height:e.tableHeight,columns:e.dataColumn,dataSource:e.dataList},null,8,["height","columns","dataSource"])):T("",!0)],512)])]),_:1})]),_:1})}var xt=C(O,[["render",gt]]);export{xt as default};

@ -1 +0,0 @@
.height20{height:20px;display:block}.height10{height:10px;display:block}.height30{height:30px;display:block}.home-layout .layui-header{text-align:center;min-height:148px;height:auto;background-color:unset;overflow-x:hidden}.home-layout .layui-header2{min-height:194px}.home-layout .layui-body{display:flex;align-items:center;justify-content:center;margin:10px auto;overflow-x:hidden}.home-box1{width:70%;display:inline-block;text-align:center;line-height:100px;height:100px;border-radius:4px;overflow:hidden}.home-box1 p{display:inline-block;height:100px;overflow:hidden;position:relative;border-radius:4px 0 0 4px;color:#fff}.home-box1 .icon{width:40%;background:#FD4D4F}.home-box1 .icon.c1{background:#32BDB6}.home-box1 .icon.c2{background:#AAEB0E}.home-box1 .icon.c3{background:#597CF4}.home-box1 .desc{width:calc(60% - 2px);background:#FFF;color:#444;padding:20px 0;height:58px;color:#595959;border:1px solid rgba(187,187,187,100);border-radius:0 4px 4px 0}.home-box1 .desc label{display:block;line-height:28px}.home-box1 .desc .count{font-size:24px}.lay-row2{background:#fff;width:95%;display:block;overflow:hidden;margin:0 auto;padding:20px}.lay-row2 h1{color:#101010;font-weight:700;text-align:left;margin-bottom:5px}.home-box2{height:94px;width:110px;display:block;background:#000;line-height:94px;border-radius:4px;cursor:pointer;margin-bottom:10px;color:#fff;font-size:12px}.home-box2.c0{background:#36cfca}.home-box2.c1{background:#597cf4}.home-box2.c2{background:#e99d42}.home-box2.c3{background:#36cf3c}.home-box2.c4{background:#F4595c}.home-box2.c5{background:#31BDEC}.home-box2.c6{background:#FF5722}.home-box2.c7{background:#AAEB0E}.lay-row3{background:#fff;width:95%;display:block;overflow:hidden;margin:0 auto;padding:0 20px 20px;height:calc(100% - 40px)}.lay-row3-div{display:block;overflow:hidden;margin-bottom:20px;clear:both;height:100%}.lay-row3 .home-box3{height:60px;line-height:60px;margin-top:4px}.lay-row3 .home-box3 h1{font-weight:700;display:inline-block}.lay-row3 .home-box3 h2{font-weight:400;color:#168add;display:inline-block;float:right;font-size:14px;margin-right:2px;cursor:pointer}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
.layui-collapse{border-width:1px;border-style:solid;border-radius:2px}.layui-colla-content,.layui-colla-item{border-top-width:1px;border-top-style:solid}.layui-colla-item:first-child{border-top:none}.layui-colla-title{position:relative;height:42px;line-height:42px;padding:0 15px 0 35px;color:#333;background-color:var(--global-neutral-color-1);cursor:pointer;font-size:14px;overflow:hidden}.layui-colla-content{padding:10px 15px;line-height:1.6;color:#666}.layui-colla-icon{position:absolute;left:15px;top:0;font-size:14px}

@ -1 +0,0 @@
:root{--block-default-color: var(--global-checked-color);--block-border-radius: var(--global-border-radius)}.layui-quote{padding:15px;line-height:1.6;margin-bottom:10px;border-left:5px solid var(--block-default-color);border-radius:var(--block-border-radius);background-color:var(--global-neutral-color-1)}.layui-quote-nm{border-left:5px solid #eee}

@ -1 +0,0 @@
.layui-radio[size=lg] .layui-form-radio>i{font-size:24px}.layui-radio[size=md] .layui-form-radio>i{font-size:22px}.layui-radio[size=sm] .layui-form-radio>i{font-size:20px}.layui-radio[size=xs] .layui-form-radio>i{font-size:18px}.layui-radio input[type=radio]{display:none}.layui-form-radio,.layui-form-radio *{display:inline-block;vertical-align:middle}.layui-form-radio{line-height:28px;margin:6px 10px 0 0;padding-right:10px;cursor:pointer;font-size:0}.layui-form-radio *{font-size:14px}.layui-form-radio>i{margin-right:8px;font-size:22px;color:var(--global-neutral-color-8)}.layui-form-radio:hover *,.layui-form-radioed,.layui-form-radioed>i{color:var(--global-checked-color)}.layui-radio-disabled>i{color:var(--global-neutral-color-3)!important}.layui-radio-disabled *{color:var(--global-neutral-color-8)!important}

@ -1 +0,0 @@
import a from"./all.aa125321.js";import{_ as n,r as p,J as e,o as m,c as i}from"./index.58a4812e.js";/* empty css *//* empty css */import"./view.a8aea462.js";/* empty css */import"./common.a907f978.js";import"./all.0c305d2b.js";import"./factory.56670aad.js";import"./materialType.20973eba.js";import"./package.a040d70a.js";/* empty css *//* empty css */const s={components:{AllData:a},setup(){return{dataInfoObj:p(2)}}};function c(o,f,l,t,_,d){const r=e("AllData");return m(),i(r,{dataInfoObj:t.dataInfoObj},null,8,["dataInfoObj"])}var C=n(s,[["render",c]]);export{C as default};

@ -1 +0,0 @@
import a from"./all.aa125321.js";import{_ as n,r as p,J as e,o as m,c}from"./index.58a4812e.js";/* empty css *//* empty css */import"./view.a8aea462.js";/* empty css */import"./common.a907f978.js";import"./all.0c305d2b.js";import"./factory.56670aad.js";import"./materialType.20973eba.js";import"./package.a040d70a.js";/* empty css *//* empty css */const s={components:{AllData:a},setup(){return{dataInfoObj:p(1)}}};function i(o,f,l,t,_,d){const r=e("AllData");return m(),c(r,{dataInfoObj:t.dataInfoObj},null,8,["dataInfoObj"])}var C=n(s,[["render",i]]);export{C as default};

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{_ as e}from"./index.58a4812e.js";const r={name:"log.vue"};function o(t,a,n,s,_,c){return" 111 "}var f=e(r,[["render",o]]);export{f as default};

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
.content-box[data-v-36abbda6]{height:744px;display:block;position:relative;clear:both;float:none}.edit-box[data-v-36abbda6]{display:block;width:99%;text-align:center;margin:0 auto;clear:both;float:none}.edit-info[data-v-36abbda6]{margin:20px .75% 10px 0;width:47%;padding-left:1%;padding-right:1%;display:inline-block}.edit-info+.edit-info[data-v-36abbda6]{margin-left:.75%;margin-right:0}.layui-form-item[data-v-36abbda6]{margin-bottom:16px}.content-box[data-v-045e108a]{height:400px;margin:20px 10px;display:block;position:relative;clear:both;float:none}

@ -1 +0,0 @@
import{v as n}from"./index.58a4812e.js";async function r(t){let a={};return await n.post("/api/MaterialType/GetInfoData",t||{}).then(e=>{a=e.Data}),a}async function i(t){let a=0;return await n.post("/api/MaterialType/ChangeInfoData",t).then(e=>{a=e.Data||0}),a}export{i as c,r as g};

@ -1 +0,0 @@
.edit-info[data-v-35b794fc]{padding-right:30px;margin:20px auto;overflow:hidden}.empty-small2[data-v-35b794fc]{margin:0 auto 20px;display:block}.layui-form-item[data-v-35b794fc]{margin-bottom:16px;width:46%;float:left;display:block;clear:initial}.layui-form-item[data-v-35b794fc]:nth-child(even){float:right}.edit-info[data-v-ad53da44]{width:90%;padding-right:30px;margin:30px auto 10px}.menuBtn[data-v-ad53da44]{display:block;text-align:center;width:96%;margin:20px auto}.empty-small2[data-v-ad53da44]{max-width:96%;margin:0 auto}.empty-small2>.layui-btn[data-v-ad53da44]{margin-bottom:16px}.note[data-v-ad53da44]{color:#999;font-size:12px;margin:12px auto 2px;text-align:right}.edit-info[data-v-26720406]{margin:0 28px;display:block;clear:both;float:none;overflow:auto;height:290px}.float-clear[data-v-26720406]{overflow:hidden;display:block;clear:both;float:none;height:0}.menuBtn[data-v-26720406]{display:block;text-align:center;width:96%;margin:10px auto}.empty-small2[data-v-26720406]{max-width:96%;margin:20px auto;display:block}.empty-small2>.layui-btn[data-v-26720406]{margin-bottom:16px}.note[data-v-26720406]{color:#999;font-size:12px;margin:12px auto 2px;text-align:right}

@ -1 +0,0 @@
import{v as n}from"./index.58a4812e.js";async function i(t){let a={};return await n.post("/api/Package/GetPackageChildList",t).then(e=>{a=e}),a}async function s(t){let a=0;return await n.post("/api/Package/DeletePackageChild",{FID:t}).then(e=>{a=e.Data}),a}async function o(t){let a=0;return await n.post("/api/Package/GetPackageInfo",t).then(e=>{a=e.Data}),a}async function l(t){let a=0;return await n.post("/api/Package/UpdatePackageData",t).then(e=>{a=e.Data}),a}async function u(t){let a=0;return await n.post("/api/Package/DockMDMCode",t).then(e=>{a=e.Data}),a}async function p(t){let a=0;return await n.post("/api/Package/NoSupplyPackageChild",t).then(e=>{a=e.Data}),a}export{i as a,s as b,u as d,o as g,p as n,l as u};

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
:root{--textarea-border-radius: var(--global-border-radius);--textarea-border-color: var(--global-neutral-color-3)}.layui-textarea{border-width:1px;border-style:solid;background-color:#fff;color:#000000d9;border-radius:var(--textarea-border-radius);border-color:var(--textarea-border-color);display:block;width:100%;height:auto;line-height:20px;min-height:100px;padding:6px 10px;resize:vertical;position:relative}.layui-textarea-wrapper{position:relative}.layui-textarea:hover{border-color:#eee!important}.layui-textarea:focus{border-color:#d2d2d2!important}.layui-textarea-clear{position:absolute;color:#00000073;right:10px;top:10px}.layui-textarea::-webkit-input-placeholder{line-height:1.3}.layui-texterea-count{text-align:right;color:inherit;white-space:nowrap;pointer-events:none;margin-top:4px}.power-box[data-v-41fb242c]{display:block;height:75vh}.tab-box[data-v-41fb242c]{max-width:96%;margin:20px auto 0}.menuBtn[data-v-41fb242c]{display:block;text-align:center;width:96%;position:absolute;bottom:38px}.mb4[data-v-41fb242c],.mb5[data-v-41fb242c]{position:relative;margin-top:70px}.view-box[data-v-41fb242c]{padding-left:16px;display:block}.layui-checkbox[data-v-41fb242c]{margin-bottom:16px;display:inline-block}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
.dataInfo[data-v-dcc53da0]{max-width:90%;margin:30px auto;padding-right:30px;overflow-y:auto}.layui-item33[data-v-03d64be6]{width:90%;padding-right:30px;margin:30px auto 10px;display:block;overflow:auto;position:relative;clear:both}.menuBtn[data-v-03d64be6]{display:block;text-align:center;width:96%;margin:20px auto}.empty-small2[data-v-03d64be6]{max-width:96%;margin:0 auto}.empty-small2>.layui-btn[data-v-03d64be6]{margin-bottom:16px}.title-materail[data-v-03d64be6]{margin:8px 10px 0 0;vertical-align:middle;text-align:right}.data-materail[data-v-03d64be6]{margin:0 20px 0 0}

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{S as e}from"./all.0c305d2b.js";import{_ as r,r as a,J as n,o as s,c as m}from"./index.58a4812e.js";/* empty css *//* empty css */import"./view.a8aea462.js";/* empty css */import"./common.a907f978.js";import"./factory.56670aad.js";import"./materialType.20973eba.js";import"./package.a040d70a.js";/* empty css */const c={components:{AllData:e},setup(){return{pageTypeObj:a(2)}}};function i(o,l,_,t,f,u){const p=n("AllData");return s(),m(p,{pageTypeObj:t.pageTypeObj},null,8,["pageTypeObj"])}var $=r(c,[["render",i]]);export{$ as default};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{v as i}from"./index.58a4812e.js";async function r(e){e=e||{FPageIndex:1,FPageSize:10};let t={};return await i.post("/api/Teamwork/GetTeamworkPageList",e).then(a=>{t=a}),t}async function o(e){let t={FPageIndex:1,FPageSize:999,FTeamID:e},a=[];return await i.post("/api/Teamwork/GetTeamProcessList",t).then(s=>{a=s.Data.List||[]}),a}async function u(e){let t={};return await i.post("/api/Teamwork/GetTeamworkView",e).then(a=>{t=a.Data}),t}async function w(e){let t={FTeamID:e},a=[];return await i.post("/api/Teamwork/DockDownBomData",t).then(s=>{a=s}),a}async function p(e){let t=[];return await i.post("/api/Teamwork/EditTypeList",e).then(a=>{t=a}),t}async function c(e){let t={};return await i.post("/api/View/GetListByTeamId",e).then(a=>{t=a.Data}),t}async function l(e){let t={};return await i.post("/api/View/UpdateBatchById2",e).then(a=>{t=a}),t}async function m(e){let t={};return await i.post("/api/View/GetMaterialInfoListByTeamId",e).then(a=>{t=a}),t}export{p as E,m as G,c as a,o as b,r as c,w as d,u as g,l as u};

BIN
dist/favicon.ico vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

133
dist/index.html vendored

@ -1,133 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>配方物料协同系统</title>
<style>
.loader-main {
position: fixed;
width: 100%;
height: 100%;
background-color: whitesmoke;
z-index: 9999999;
}
.loader {
width: 50px;
height: 50px;
margin: 30px auto 40px;
margin-top: 20%;
position: relative;
z-index: 999999;
background-color: whitesmoke;
}
.loader:before {
content: "";
width: 50px;
height: 7px;
border-radius: 50%;
background: #000;
opacity: 0.1;
position: absolute;
top: 59px;
left: 0;
animation: shadow 0.5s linear infinite;
}
.loader:after {
content: "";
width: 50px;
height: 50px;
border-radius: 3px;
background-color: #5fb878;
position: absolute;
top: 0;
left: 0;
animation: loading 0.5s linear infinite;
}
@-webkit-keyframes loading {
17% {
border-bottom-right-radius: 3px;
}
25% {
transform: translateY(9px) rotate(22.5deg);
}
50% {
transform: translateY(18px) scale(1, 0.9) rotate(45deg);
border-bottom-right-radius: 40px;
}
75% {
transform: translateY(9px) rotate(67.5deg);
}
100% {
transform: translateY(0) rotate(90deg);
}
}
@keyframes loading {
17% {
border-bottom-right-radius: 3px;
}
25% {
transform: translateY(9px) rotate(22.5deg);
}
50% {
transform: translateY(18px) scale(1, 0.9) rotate(45deg);
border-bottom-right-radius: 40px;
}
75% {
transform: translateY(9px) rotate(67.5deg);
}
100% {
transform: translateY(0) rotate(90deg);
}
}
@-webkit-keyframes shadow {
0%,
100% {
transform: scale(1, 1);
}
50% {
transform: scale(1.2, 1);
}
}
@keyframes shadow {
0%,
100% {
transform: scale(1, 1);
}
50% {
transform: scale(1.2, 1);
}
}
</style>
<script type="module" crossorigin src="/assets/index.58a4812e.js"></script>
<link rel="stylesheet" href="/assets/index.bdb27522.css">
</head>
<body>
<div id="app">
<div class="loader-main">
<div class="loader"></div>
</div>
</div>
</body>
</html>

@ -44,4 +44,14 @@ export async function DownViewAll(param) {
result = data; result = data;
}); });
return result; return result;
}
//更新物料
export async function UpdateDataModel(param)
{
let result = [];
await http.post('/api/Material/UpdateDataModel2', param).then((data) => {
result = data;
});
return result;
} }

@ -3,8 +3,8 @@ import { layer } from '@layui/layer-vue'
const config = { const config = {
timeout: 600000, timeout: 600000,
baseURL: "http://124.222.104.55:58178/", //baseURL: "http://124.222.104.55:58178/",
//baseURL: "http://localhost:58178/", baseURL: "http://localhost:58178/",
// baseURL: "http://plm-pw-test.hbflavor.com:81/", // baseURL: "http://plm-pw-test.hbflavor.com:81/",
headers: { headers: {
'Content-Type': 'application/json;charset=UTF-8', 'Content-Type': 'application/json;charset=UTF-8',

@ -277,6 +277,7 @@
}, },
// //
async _getPageList(isFirst, showOk) { async _getPageList(isFirst, showOk) {
//this.dataList = []; //this.dataList = [];
this.pageInfo.total = 0; this.pageInfo.total = 0;
if (isFirst) { if (isFirst) {
@ -306,6 +307,7 @@
this.pageInfo.total = result.Data.Total || 0; this.pageInfo.total = result.Data.Total || 0;
this.dataList = result.Data.List; this.dataList = result.Data.List;
this.hasLoaded = true; this.hasLoaded = true;
debugger
}, },
// //
dateFormat(dataStr) { dateFormat(dataStr) {

@ -1,8 +1,8 @@
<template> <template>
<lay-container style="height:700px;overflow: auto;" fluid="true" class="content-box"> <lay-container style="height:700px;overflow: auto;" fluid="true" class="content-box">
<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView> <FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
<lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn" <lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn" :data-source="dataList"
:data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName"> :cellStyle="cellStyle" :cellClassName="cellClassName">
<template v-slot:toolbar v-if="dataInfoObj.FCanEdit != 2"> <template v-slot:toolbar v-if="dataInfoObj.FCanEdit != 2">
<!-- <lay-button size="sm" type="primary" :class="this.isBomShow ? 'isBomShow' : 'isBomHidden'" @click="changeVisible2">BOM</lay-button>--> <!-- <lay-button size="sm" type="primary" :class="this.isBomShow ? 'isBomShow' : 'isBomHidden'" @click="changeVisible2">BOM</lay-button>-->
<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true"> <lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true">
@ -13,7 +13,8 @@
</lay-input> </lay-input>
</template> </template>
<template v-if="dataList == undefined || !dataList.FID" v-slot:operator="{ data }"> <template v-if="dataList == undefined || !dataList.FID" v-slot:operator="{ data }">
<lay-button size="sm" type="primary" @click="changeVisible2(data)"></lay-button> <lay-button size="sm" type="primary" v-if="data.FSuccedaneumID == 0 || data.FSuccedaneumID == ''"
@click="changeVisible2(data)">选择</lay-button>
</template> </template>
</lay-table> </lay-table>
<OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog> <OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog>
@ -83,10 +84,11 @@ import {
getBasicRoleList getBasicRoleList
} from "/src/api/api/user"; } from "/src/api/api/user";
import { import {
getDataCode,
commonSave commonSave
} from "/src/api/api/common"; } from "/src/api/api/common";
import{
UpdateDataModel
} from "/src/api/api/material"
import { import {
getInfoData, getInfoData,
changeInfoData changeInfoData
@ -100,7 +102,7 @@ import FormulaView from "./FormulaView.vue";
export default { export default {
components: { components: {
OperateLog, OperateLog,
FormulaView FormulaView,
}, },
setup() { setup() {
let dataColumn = [{ let dataColumn = [{
@ -131,7 +133,7 @@ export default {
}, },
{ {
title: "替代料编号", title: "替代料编号",
key: "FSuccedaneumID", key: "FSuccedaneumCode",
width: "178px", width: "178px",
align: 'center' align: 'center'
}, },
@ -148,7 +150,7 @@ export default {
align: 'center' align: 'center'
}, },
{ {
title: "状态", title: "是否需要替代料",
key: "selected", key: "selected",
width: "160px", width: "160px",
align: 'center' align: 'center'
@ -187,7 +189,7 @@ export default {
const inputDescValue = ref(""); const inputDescValue = ref("");
const visible2 = ref(false); const visible2 = ref(false);
return { return {
dataColumn, dataColumn,
@ -234,20 +236,18 @@ export default {
this.initPage(layer.load(2)); this.initPage(layer.load(2));
}, },
async initPage(idx) { async initPage(idx) {
debugger
let _data = await GetMaterialInfoListByTeamId({ let _data = await GetMaterialInfoListByTeamId({
tempId: this.dataInfoObj.FTeamID tempId: this.dataInfoObj.FTeamID
}); });
this.dataList = _data.Data.map(function(item){ this.dataList = _data.Data.map(function (item) {
if(item){ if (item.FSuccedaneumID == -1) {
if (item.FSuccedaneumID == -1) { item["selected"] = "不需要";
item["selected"] = "不选择";
}
else if (item.FSuccedaneumInfo != "") {
item["selected"] = "选择";
}
} }
else if (item.FSuccedaneumID > 0) {
item["selected"] = "需要";
}
return item; return item;
}); });
setTimeout(function () { setTimeout(function () {
@ -256,25 +256,25 @@ export default {
}, },
changeVisible2(data) { changeVisible2(data) {
let $this = this; let $this = this;
layer.confirm("是否选择替代料", { layer.confirm("是否需要替代料", {
btn: [{ btn: [{
text: '选择', text: '需要',
callback: function (id) { callback: function (id) {
layer.close(id); layer.close(id);
$this.$emit('cancelClick', true, false); $this.$emit('cancelClick', true, false);
$this.$emit("getData", data); $this.$emit("getData", data);
} }
}, },
{ {
text: '不选择', text: '不需要',
callback:function(id){ callback: function (id) {
layer.close(id); layer.close(id);
data.FSuccedaneumID=-1; data.FSuccedaneumID = -1;
$this.saveBatch(); $this.saveBatch(data);
} }
}] }]
}) })
}, },
cancelClick(isRefresh) { cancelClick(isRefresh) {
@ -301,89 +301,33 @@ export default {
} }
} }
}, },
async saveBatch() { async saveBatch(data) {
let updateInfo = {
var arr = new Array(); FID: data.FID,
tempId:this.dataInfoObj.FTeamID,
for (let i = 0; i < this.dataList.length; i++) { taskId:this.dataInfoObj.FID
if (this.dataList[i].FTypeID1 == null || this.dataList[i].FTypeID1 == "") {
layer.msg("请选择一级分类", { icon: 2, time: 1000 });
return;
}
if (this.dataList[i].FTypeID2 == null || this.dataList[i].FTypeID2 == "") {
layer.msg("请选择二级分类", { icon: 2, time: 1000 });
return;
}
arr.push({ FMaterialID: this.dataList[i].FMaterialID, FTypeID1: this.dataList[i].FTypeID1, FTypeID2: this.dataList[i].FTypeID2 })
}
let arr2 = {
taskId: this.dataInfoObj.FID,
tempId: this.dataInfoObj.FTeamID,
list: arr
}
let result = await EditTypeList(arr2);
let idx = layer.load(2);
let updateObj = {
LogList: [],
FTeamID: this.dataInfoObj['FTeamID'],
FViewType: this.dataInfoObj.FViewType
}; };
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; updateInfo.FSuccedaneumID = -1;
let cacheDataList = JSON.parse(localStorage.getItem('EditFSuccedaneum' + saveId)); updateInfo.FSuccedaneumInfo = "";
this.dataList.forEach((row, index) => { updateInfo.FSuccedaneumType = "";
let cache = cacheDataList[index]; updateInfo.FSuccedaneumCode = "";
let dataObj = {}; let result = await UpdateDataModel(updateInfo) || 0;
for (let col of this.editColumn) { debugger
let valTemp = row[col.key]; //
if (valTemp != cache[col.key]) { if (result.Code==200) {
if (!dataObj[col.table]) { await commonSave({
dataObj[col.table] = {}; teamId: this.dataInfoObj.FTeamID,
dataObj[col.table].FMaterialID = row["FMaterialID"]; type: this.dataInfoObj.FType,
} desc: data.FTestCode + "确认不使用替代料"
dataObj[col.table][col.key] = valTemp; }, "OperateLog");
if (col.key == "FTypeID1" || col.key == "FTypeID2") { let $this = this;
let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; this.initPage();
let temp = temps.find(s => s.FID == valTemp) || null; setTimeout(function () {
valTemp = temp == null ? "" : temp.FName; layer.close(idx);
} layer.msg('保存成功');
updateObj.LogList.push(col.title + "" + (valTemp == "" ? "删除" : valTemp)); //$this.$emit('cancelClick', true, true);
} this.$refs.OperateLog._getPageList();
} }, 500);
for (let key in dataObj) {
if (!updateObj[key]) updateObj[key] = [];
updateObj[key].push(dataObj[key]);
}
});
let updateLog = updateObj.LogList.join("、");
if (updateLog != "") {
delete updateObj.LogList
//
if (result.Code === 200) {
await commonSave({
teamId: updateObj.FTeamID,
type: this.dataInfoObj['FType'],
desc: this.objInfo["FName"]+"选择不使用替代物料"
}, "OperateLog");
let $this = this;
//$this.initPage();
localStorage.setItem('EditFSuccedaneum' + saveId, JSON.stringify(this.dataList));
setTimeout(function () {
layer.close(idx);
layer.msg('保存成功');
$this.$emit('cancelClick', true, true);
$this.$refs.OperateLog._getPageList();
}, 500);
}
} else {
layer.close(idx);
layer.msg('您没有做任何更改')
} }
} }
} }

@ -1,5 +1,5 @@
<template> <template>
<lay-container class="content-box" :style="'padding-top:'+(editType!=1?0:35)+'px'"> <lay-container class="content-box" :style="'padding-top:' + (editType != 1 ? 0 : 35) + 'px'">
<view class="edit-box"> <view class="edit-box">
<lay-form :model="searchObj" class="search-box edit-info"> <lay-form :model="searchObj" class="search-box edit-info">
<lay-row class="color666"> <lay-row class="color666">
@ -14,7 +14,7 @@
</lay-form-item> </lay-form-item>
<lay-form-item label="产品分类" prop="FType"> <lay-form-item label="产品分类" prop="FType">
<lay-select v-model="searchObj.FType"> <lay-select v-model="searchObj.FType">
<lay-select-option v-for="(tIdv,tIdx) in typeListObj" :key="tIdx" :value="tIdv.FValue" <lay-select-option v-for="(tIdv, tIdx) in typeListObj" :key="tIdx" :value="tIdv.FValue"
:label="tIdv.FName"></lay-select-option> :label="tIdv.FName"></lay-select-option>
</lay-select> </lay-select>
</lay-form-item> </lay-form-item>
@ -32,10 +32,10 @@
<lay-form-item label="主物料描述" prop="FName"> <lay-form-item label="主物料描述" prop="FName">
<lay-input :disabled="isDisabled" v-model="objInfo.FName" type="FName"></lay-input> <lay-input :disabled="isDisabled" v-model="objInfo.FName" type="FName"></lay-input>
</lay-form-item> </lay-form-item>
<lay-form-item :label=" editType == 1 ? '替代料物料号' : '副产物物料号' "> <lay-form-item :label="editType == 1 ? '替代料物料号' : '副产物物料号'">
<lay-input :disabled="isDisabled" v-model="objInfo.choseData.FCode"></lay-input> <lay-input :disabled="isDisabled" v-model="objInfo.choseData.FCode"></lay-input>
</lay-form-item> </lay-form-item>
<lay-form-item :label=" editType == 1 ? '替代料描述' : '副产物描述' "> <lay-form-item :label="editType == 1 ? '替代料描述' : '副产物描述'">
<lay-input :disabled="isDisabled" v-model="objInfo.choseData.FName"></lay-input> <lay-input :disabled="isDisabled" v-model="objInfo.choseData.FName"></lay-input>
</lay-form-item> </lay-form-item>
<lay-form-item v-if="editType != 1" label="副产物数量"> <lay-form-item v-if="editType != 1" label="副产物数量">
@ -51,254 +51,261 @@
</lay-form> </lay-form>
</view> </view>
<view class="edit-box"> <view class="edit-box">
<lay-table :class=" 'empty-small' + editType " :columns="dataColumn" id="id" :dataSource="dataList" <lay-table :class="'empty-small' + editType" :columns="dataColumn" id="id" :dataSource="dataList"
v-model:selected-key="selectedKey" :page="dataList.length>0?pageInfo:null" @change="changePage"> v-model:selected-key="selectedKey" :page="dataList.length > 0 ? pageInfo : null" @change="changePage">
</lay-table> </lay-table>
</view> </view>
</lay-container> </lay-container>
</template> </template>
<style scoped> <style scoped>
.content-box { .content-box {
height: 744px; height: 744px;
display: block; display: block;
position: relative; position: relative;
clear: both; clear: both;
float: none; float: none;
} }
.edit-box { .edit-box {
display: block; display: block;
width: 99%; width: 99%;
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;
clear: both; clear: both;
float: none; float: none;
} }
.edit-info { .edit-info {
margin: 20px 0 10px; margin: 20px 0 10px;
width: 47%; width: 47%;
padding-left: 1%; padding-left: 1%;
padding-right: 1%; padding-right: 1%;
display: inline-block; display: inline-block;
margin-right: 0.75%; margin-right: 0.75%;
} }
.edit-info+.edit-info { .edit-info+.edit-info {
margin-left: 0.75%; margin-left: 0.75%;
margin-right: 0; margin-right: 0;
} }
.layui-form-item { .layui-form-item {
margin-bottom: 16px; margin-bottom: 16px;
} }
</style> </style>
<script> <script>
import { import {
ref, ref,
watch watch
} from 'vue'; } from 'vue';
import { import {
updateDataInfo, getPageList,
getPageList, commonSave
commonSave } from "/src/api/api/common";
} from "/src/api/api/common";
export default { import {
setup() { UpdateDataModel
const objInfo = ref({ } from "/src/api/api/material"
choseData: {
FName: "",
FType: "",
FCode: ""
}
});
const postData = ref({});
const pageInfo = ref({ export default {
total: 0, setup() {
limit: 5, const objInfo = ref({
current: 1 choseData: {
}); FName: "",
let dataColumn = [{ FType: "",
type: "radio" FCode: ""
},
{
title: "物料号",
key: "FCode",
width: "200px"
},
{
title: "试验号",
key: "FTestCode",
width: "200px"
},
{
title: "物料描述",
key: "FName",
minWidth: "300px"
},
{
title: "产品分类",
key: "FTypeName",
width: "110px"
}
];
dataColumn.forEach((item) => {
item.align = "center";
});
const dataList = ref([]);
const selectedKey = ref("");
const isDisabled = ref(true);
const searchObj = ref({});
watch(selectedKey, function() {
const choseObj = dataList.value.find(s => s.id == selectedKey.value) || null;
if (choseObj != null) {
objInfo.value.choseData.FID = choseObj.FID;
objInfo.value.choseData.FName = choseObj.FName;
objInfo.value.choseData.FType = choseObj.FType;
objInfo.value.choseData.FCode = choseObj.FCode;
}
});
return {
objInfo,
postData,
pageInfo,
dataColumn,
dataList,
selectedKey,
isDisabled,
searchObj
} }
});
const postData = ref({});
const pageInfo = ref({
total: 0,
limit: 5,
current: 1
});
let dataColumn = [{
type: "radio"
}, },
props: { {
dataInfoObj: { title: "物料号",
type: Object, key: "FCode",
default: () => {}, width: "200px"
},
MaterialModel:{
type: Object,
default: () => {},
},
typeListObj: {
type: Array,
default: () => [],
},
editType: {
type: Number,
default: () => 1,
},
}, },
mounted() { {
this.objInfoObj=this.MaterialModel; title: "试验号",
let objInfo = JSON.parse(JSON.stringify(this.objInfoObj)); key: "FTestCode",
objInfo.choseData = { width: "200px"
FID: this.editType == 1 ? objInfo.FSuccedaneumID : objInfo.FFuProductsID, },
FName: this.editType == 1 ? objInfo.FSuccedaneumInfo : objInfo.FFuProductsInfo, {
FType: this.editType == 1 ? objInfo.FSuccedaneumType : objInfo.FFuProductsType, title: "物料描述",
FCode: this.editType == 1 ? objInfo.FSuccedaneumCode : objInfo.FFuProductsCode, key: "FName",
FCount: objInfo.FFuProductsCount || "", minWidth: "300px"
FUnit: objInfo.FFuProductsUnit || "" },
}; {
if (this.editType == 1) this.pageInfo.limit = 6; title: "产品分类",
this.objInfo = objInfo; key: "FTypeName",
width: "110px"
}
];
dataColumn.forEach((item) => {
item.align = "center";
});
const dataList = ref([]);
const selectedKey = ref("");
const isDisabled = ref(true);
const searchObj = ref({});
watch(selectedKey, function () {
const choseObj = dataList.value.find(s => s.id == selectedKey.value) || null;
if (choseObj != null) {
objInfo.value.choseData.FID = choseObj.FID;
objInfo.value.choseData.FName = choseObj.FName;
objInfo.value.choseData.FType = choseObj.FType;
objInfo.value.choseData.FCode = choseObj.FCode;
}
});
return {
objInfo,
postData,
pageInfo,
dataColumn,
dataList,
selectedKey,
isDisabled,
searchObj
}
},
props: {
dataInfoObj: {
type: Object,
default: () => { },
},
MaterialModel: {
type: Object,
default: () => { },
},
typeListObj: {
type: Array,
default: () => [],
},
editType: {
type: Number,
default: () => 1,
},
},
mounted() {
this.objInfoObj = this.MaterialModel;
let objInfo = JSON.parse(JSON.stringify(this.objInfoObj));
objInfo.choseData = {
FID: this.editType == 1 ? objInfo.FSuccedaneumID : objInfo.FFuProductsID,
FName: this.editType == 1 ? objInfo.FSuccedaneumInfo : objInfo.FFuProductsInfo,
FType: this.editType == 1 ? objInfo.FSuccedaneumType : objInfo.FFuProductsType,
FCode: this.editType == 1 ? objInfo.FSuccedaneumCode : objInfo.FFuProductsCode,
FCount: objInfo.FFuProductsCount || "",
FUnit: objInfo.FFuProductsUnit || ""
};
if (this.editType == 1) this.pageInfo.limit = 6;
this.objInfo = objInfo;
this._getPageList();
},
methods: {
//-
changePage(obj) {
this.pageInfo.current = obj.current;
this._getPageList(); this._getPageList();
}, },
methods: { //-
//- _clickSearch() {
changePage(obj) { this.postData = {};
this.pageInfo.current = obj.current; for (let key in this.searchObj) {
this._getPageList(); let val = this.searchObj[key];
}, if (val != null && val != "") this.postData[key] = val;
//- }
_clickSearch() { this._getPageList(true);
this.postData = {}; },
for (let key in this.searchObj) { //-
let val = this.searchObj[key]; _clickReset() {
if (val != null && val != "") this.postData[key] = val; this.searchObj = {};
} this._clickSearch();
this._getPageList(true); },
}, //-
//- async _getPageList(isFirst) {
_clickReset() { debugger
this.searchObj = {}; this.pageInfo.total = 0;
this._clickSearch(); if (isFirst) {
}, this.pageInfo.current = 1;
//-
async _getPageList(isFirst) {
debugger
this.pageInfo.total = 0; this.pageInfo.total = 0;
if (isFirst) { }
this.pageInfo.current = 1; this.postData.FPageIndex = this.pageInfo.current;
this.pageInfo.total = 0; this.postData.FPageSize = this.pageInfo.limit;
} let result = await getPageList(this.postData, "Material");
this.postData.FPageIndex = this.pageInfo.current; result.Data.List = result.Data.List || [];
this.postData.FPageSize = this.pageInfo.limit; let cD = this.objInfo.choseData;
let result = await getPageList(this.postData, "Material"); result.Data.List.forEach((item) => {
result.Data.List = result.Data.List || []; let type = this.typeListObj.find(s => s.FValue == item.FType);
let cD = this.objInfo.choseData; item.FTypeName = type == null ? "" : type.FName;
result.Data.List.forEach((item) => { item.id = item.FID;
let type = this.typeListObj.find(s => s.FValue == item.FType); if (item.FCode == cD.FCode && item.FName == cD.FName && item.FType == cD.FType &&
item.FTypeName = type == null ? "" : type.FName; this.selectedKey != item.id) {
item.id = item.FID; this.selectedKey = item.id
if (item.FCode == cD.FCode && item.FName == cD.FName && item.FType == cD.FType &&
this.selectedKey != item.id) {
this.selectedKey = item.id
}
});
this.pageInfo.total = result.Data.Total || 0;
this.dataList = result.Data.List;
},
//
async submitClick() {
let updateInfo = {
FID: this.objInfo.FID
};
if (this.editType == 1) {
updateInfo.FSuccedaneumID = this.objInfo.choseData.FID || -1;
updateInfo.FSuccedaneumInfo = this.objInfo.choseData.FName || "";
updateInfo.FSuccedaneumType = this.objInfo.choseData.FType || "";
updateInfo.FSuccedaneumCode = this.objInfo.choseData.FCode || "";
} else {
updateInfo.FFuProductsID = this.objInfo.choseData.FID || -1;
updateInfo.FFuProductsInfo = this.objInfo.choseData.FName || "";
updateInfo.FFuProductsType = this.objInfo.choseData.FType || "";
updateInfo.FFuProductsCode = this.objInfo.choseData.FCode || "";
updateInfo.FFuProductsCount = this.objInfo.choseData.FCount || "";
updateInfo.FFuProductsUnit = this.objInfo.choseData.FUnit || "";
} }
let result = await updateDataInfo(updateInfo, "Material") || 0; });
this.pageInfo.total = result.Data.Total || 0;
debugger this.dataList = result.Data.List;
},
//
async submitClick() {
let updateInfo = {
FID: this.objInfo.FID,
tempId:this.dataInfoObj.FTeamID,
taskId:this.dataInfoObj.FID
};
if (this.editType == 1) {
updateInfo.FSuccedaneumID = this.objInfo.choseData.FID || -1;
updateInfo.FSuccedaneumInfo = this.objInfo.choseData.FName || "";
updateInfo.FSuccedaneumType = this.objInfo.choseData.FType || "";
updateInfo.FSuccedaneumCode = this.objInfo.choseData.FCode || "";
} else {
updateInfo.FFuProductsID = this.objInfo.choseData.FID || -1;
updateInfo.FFuProductsInfo = this.objInfo.choseData.FName || "";
updateInfo.FFuProductsType = this.objInfo.choseData.FType || "";
updateInfo.FFuProductsCode = this.objInfo.choseData.FCode || "";
updateInfo.FFuProductsCount = this.objInfo.choseData.FCount || "";
updateInfo.FFuProductsUnit = this.objInfo.choseData.FUnit || "";
}
let result = await UpdateDataModel(updateInfo) || 0;
this.dataInfoObj
if (result > 0) { this.dataInfoObj
await commonSave({ debugger
teamId: this.dataInfoObj.FTeamID, if (result.Code==200) {
type: this.dataInfoObj['FType'], debugger
desc: this.objInfo["FName"]+"选择了替代物了:"+updateInfo["FSuccedaneumInfo"] await commonSave({
}, "OperateLog"); teamId: this.dataInfoObj.FTeamID,
layer.msg("操作成功", { type: this.dataInfoObj['FType'],
time: 1500, desc: "选择了" + this.objInfo.FTestCode + "的使用替代物料" + updateInfo["FSuccedaneumCode"]
icon: 1 }, "OperateLog");
}); layer.msg("操作成功", {
setTimeout(() => { time: 1500,
this.cancelClick(true); icon: 1
this.$emit("showEditMaterial"); });
}, 150) this._getPageList(true);
} else { setTimeout(() => {
layer.msg("操作失败", { this.cancelClick(true);
time: 1000, this.$emit("showEditMaterial");
icon: 2 }, 150)
}) } else {
} layer.msg("操作失败", {
}, time: 1000,
// icon: 2
cancelClick(isRefresh) { })
this.$emit('cancelClick', isRefresh == undefined ? false : isRefresh);
} }
},
//
cancelClick(isRefresh) {
this.$emit('cancelClick', isRefresh == undefined ? false : isRefresh);
} }
} }
}
</script> </script>

@ -139,7 +139,6 @@ export default {
}); });
} }
}); });
debugger
this.dataColumn = dataColumn; this.dataColumn = dataColumn;
let result2 = await getPageList({ let result2 = await getPageList({
FPageSize: 99, FPageSize: 99,
@ -169,6 +168,8 @@ export default {
return item; return item;
}) || []; }) || [];
debugger
}, },
cancelClick() { cancelClick() {
this.$emit('cancelClick', false); this.$emit('cancelClick', false);

@ -283,6 +283,7 @@
foot: result.filter(s => s.FGroup == 3) || [] foot: result.filter(s => s.FGroup == 3) || []
} }
this.dataProcess = dataProcess; this.dataProcess = dataProcess;
debugger
}, },
// //
async _getViewList() { async _getViewList() {
@ -317,6 +318,7 @@
}, },
async _getTeamworkView(data, type) { async _getTeamworkView(data, type) {
debugger
let viewType = parseInt(type == 1 ? data.seeCode : data.outCode); let viewType = parseInt(type == 1 ? data.seeCode : data.outCode);
if (type == 2) viewType = viewType - this.viewTypeCount; if (type == 2) viewType = viewType - this.viewTypeCount;
let postData = { let postData = {

@ -13,12 +13,15 @@
</lay-select> </lay-select>
<p class="note">配方号+版本号+描述</p> <p class="note">配方号+版本号+描述</p>
</lay-form-item> </lay-form-item>
<lay-form-item v-if="dataList.length > 0">
<lay-table height="200px" :columns="dataColumn" v-model:selected-key="selectedKey" id="FID" <lay-form-item>
:dataSource="dataList" :page="dataList.length > 0 ? pageInfo : null" @change="changePage"> <p class="note3">配方变更影响的旧物料</p>
<lay-table :columns="dataColumn" v-model:selected-key="selectedKey" id="FID"
:dataSource="dataList">
</lay-table> </lay-table>
</lay-form-item> </lay-form-item>
<lay-form-item> <lay-form-item class="remark">
<p>备注配方变更需要重新下载BOM配方配方变更后一下内容需要重新更新到SAP</p> <p>备注配方变更需要重新下载BOM配方配方变更后一下内容需要重新更新到SAP</p>
<p>1如果实验号变更那么实验号对应的受影响的物料会自动更新实验号</p> <p>1如果实验号变更那么实验号对应的受影响的物料会自动更新实验号</p>
<p>2配方变更会重新下载BOM配方</p> <p>2配方变更会重新下载BOM配方</p>
@ -57,7 +60,6 @@
.note3 { .note3 {
display: inline-flex; display: inline-flex;
line-height: 38px; line-height: 38px;
margin-left: 12px;
} }
.note2, .note2,
@ -84,6 +86,10 @@
.FSearchName { .FSearchName {
color: var(--global-primary-color) color: var(--global-primary-color)
} }
.remark{
line-height: 2;
font-size: 18px;
}
</style> </style>
<script> <script>
import { import {
@ -117,20 +123,24 @@ export default {
let dataColumn = [ { let dataColumn = [ {
title: "物料号", title: "物料号",
key: "FName" key: "F1",
width: "160px"
}, },
{ {
title: "试验号", title: "试验号",
key: "FTestCode" key: "F2",
width: "160px"
}, },
{ {
title: "物料描述", title: "物料描述",
key: "FTypeName", key: "F3",
width: "110px" width: "110px",
width: "260px"
}, },
{ {
title: "产品分类", title: "产品分类",
key: "FVersionCode" key: "F4",
width: "160px"
} }
]; ];
dataColumn.forEach((item) => { dataColumn.forEach((item) => {
@ -257,7 +267,9 @@ export default {
if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID
}); });
this.pageInfo.total = result.Data.Total || 0; this.pageInfo.total = result.Data.Total || 0;
this.dataList = result.Data.List; this.dataList = [{F1:"10000271",F2:"KTFTS22111101",F3:"KTFTS22111101-K001@测试",F4:"产成品"},
{F1:"",F2:"KTFTS22111101",F3:"12",F4:"半成品"},
{F1:"10000270",F2:"KTFTS22111101",F3:"KTFTS22111101-K001@测试",F4:"产成品"}];
}, },
//- //-
async submitClick(isCreate) { async submitClick(isCreate) {

File diff suppressed because one or more lines are too long

@ -1,7 +1,6 @@
<template> <template>
<div class="box-data"> <div class="box-data">
<lay-scroll height="800px"> <lay-scroll height="800px">
<lay-quote>配方变更详情</lay-quote>
<lay-container class="dataInfo"> <lay-container class="dataInfo">
<lay-row space="10"> <lay-row space="10">
@ -11,7 +10,7 @@
<lay-col md="18"><div class="grid-demo" style="text-align: left;">配方号+版本号+描述</div></lay-col> <lay-col md="18"><div class="grid-demo" style="text-align: left;">配方号+版本号+描述</div></lay-col>
</lay-row> </lay-row>
</lay-container> </lay-container>
<lay-quote v-if="dataList.length>0"></lay-quote> <lay-quote v-if="dataList.length>0"></lay-quote>
<lay-container class="tableInfo" v-if="dataList.length>0"> <lay-container class="tableInfo" v-if="dataList.length>0">
<lay-table :columns="dataColumn" :dataSource="dataList"> <lay-table :columns="dataColumn" :dataSource="dataList">
<template v-slot:operator="{ data }"> <template v-slot:operator="{ data }">
@ -26,7 +25,7 @@
</lay-container> </lay-container>
</lay-scroll> </lay-scroll>
<lay-layer area="90%" v-model="showEditBox" title="视图查看"> <lay-layer area="90%" v-model="showEditBox" title="视图查看">
<ShowView :viewList="viewList" :viewHeight="viewHeight" @cancelClick="cancelClick"></ShowView> <ShowMaterial :viewList="viewList" :viewHeight="viewHeight" @cancelClick="cancelClick"></ShowMaterial>
</lay-layer> </lay-layer>
</div> </div>
</template> </template>
@ -164,11 +163,11 @@
getBasicRoleList getBasicRoleList
} from "/src/api/api/user"; } from "/src/api/api/user";
import ShowView from './ShowView.vue'; import ShowMaterial from './ShowMaterial.vue';
export default { export default {
components: { components: {
ShowView ShowMaterial
}, },
setup() { setup() {
const dataList = ref([]); const dataList = ref([]);
@ -231,22 +230,7 @@
let result = await getTeamworkView(postData); let result = await getTeamworkView(postData);
layer.close(idx); layer.close(idx);
if (type == 1) { if (type == 1) {
let list = []; this.showEditBox = true;
let count = 0;
for (let key in result) {
list.push(result[key]);
count += result[key].length;
};
if (count == 0) {
layer.msg("请稍等,视图信息还在编辑中", {
time: 2000,
icon: 3
});
} else {
this.viewList = list;
this.viewHeight = Math.ceil(this.dataInfoObj.FHeight * 0.6);
this.showEditBox = true;
}
} else { } else {
window.open(result); window.open(result);
} }

File diff suppressed because one or more lines are too long

@ -1,6 +1,5 @@
<template> <template>
<lay-container fluid="true" <lay-container fluid="true" :style="'padding:10px;height:' + (dataInfoObj != undefined ? (dataInfoObj.FHeight + 'px') : 'auto')">
:style="'padding:10px;height:'+(dataInfoObj!=undefined?(dataInfoObj.FHeight+'px'):'auto')">
<lay-row space="10"> <lay-row space="10">
<lay-col span="24"> <lay-col span="24">
<lay-card> <lay-card>
@ -11,14 +10,14 @@
</lay-form-item> </lay-form-item>
<lay-form-item label="类型" prop="FType"> <lay-form-item label="类型" prop="FType">
<lay-select v-model="searchObj.FType"> <lay-select v-model="searchObj.FType">
<lay-select-option v-for="(tIdv,tIdx) in typeList" :key="tIdx" :value="tIdv.FValue" <lay-select-option v-for="(tIdv, tIdx) in typeList" :key="tIdx" :value="tIdv.FValue"
:label="tIdv.FName"></lay-select-option> :label="tIdv.FName"></lay-select-option>
</lay-select> </lay-select>
</lay-form-item> </lay-form-item>
<lay-form-item v-if="postData.FState!=99" label="事项状态" prop="FState"> <lay-form-item v-if="postData.FState != 99" label="事项状态" prop="FState">
<lay-select v-model="searchObj.FState"> <lay-select v-model="searchObj.FState">
<lay-select-option v-for="(tv,tx) in stateList" :key="tx" :value="tv.id" <lay-select-option v-for="(tv, tx) in stateList" :key="tx" :value="tv.id"
:label="tv.name"></lay-select-option> :label="tv.name"></lay-select-option>
</lay-select> </lay-select>
</lay-form-item> </lay-form-item>
<lay-form-item label="发起日期" prop="FDateRange"> <lay-form-item label="发起日期" prop="FDateRange">
@ -32,17 +31,17 @@
</lay-form-item> </lay-form-item>
</lay-form> </lay-form>
<lay-table v-if="hasLoaded" :columns="dataColumn" id="id" :dataSource="dataList" <lay-table v-if="hasLoaded" :columns="dataColumn" id="id" :dataSource="dataList"
v-model:selectedKeys="selectedKeys" :checkbox="checkbox" :default-toolbar="defaultToolbar" v-model:selectedKeys="selectedKeys" :checkbox="checkbox" :default-toolbar="defaultToolbar"
:page="dataList.length>0?pageInfo:null" @change="changePage"> :page="dataList.length > 0 ? pageInfo : null" @change="changePage">
<template v-slot:toolbar> <template v-slot:toolbar>
<lay-button size="sm" @click="_getPageList(false,true)"></lay-button> <lay-button size="sm" @click="_getPageList(false, true)">刷新</lay-button>
<lay-button size="sm" type="primary" @click="showEditMaterial(2)"></lay-button> <lay-button size="sm" type="primary" @click="showEditMaterial(2)"></lay-button>
</template> </template>
<template v-slot:FStateName="{ data }"> <template v-slot:FStateName="{ data }">
<span v-if="data.FStateName=='已完成'" style="color:#5FB878">{{ data.FStateName }}</span> <span v-if="data.FStateName == '已完成'" style="color:#5FB878">{{ data.FStateName }}</span>
<span v-else style="color:#1E9FFF">{{ data.FStateName }}</span> <span v-else style="color:#1E9FFF">{{ data.FStateName }}</span>
</template> </template>
<template v-if="dataInfoObj == undefined|| !dataInfoObj.FID" v-slot:operator="{ data }"> <template v-if="dataInfoObj == undefined || !dataInfoObj.FID" v-slot:operator="{ data }">
<lay-button size="xs" type="primary" @click="showEditMaterial(3)"></lay-button> <lay-button size="xs" type="primary" @click="showEditMaterial(3)"></lay-button>
</template> </template>
</lay-table> </lay-table>
@ -57,277 +56,252 @@
</lay-layer> </lay-layer>
</lay-container> </lay-container>
</template> </template>
<style scoped>
.layui-table-body {
min-height: 50vh;
}
</style>
<script> <script>
import { import {
ref, ref,
watch watch
} from "vue"; } from "vue";
import { import {
getBasicList, getBasicList,
getPageList getPageList
} from "/src/api/api/common"; } from "/src/api/api/common";
import ShowData1 from '../half/components/ShowData1.vue'; import ShowData1 from '../half/components/ShowData1.vue';
import EditMateria from '../half/components/EditMateria.vue'; import EditMateria from '../half/components/EditMateria.vue';
import EditView from '../half/components/EditView.vue'; import EditView from '../half/components/EditView.vue';
import '@layui/layui-vue/es/checkbox/index.css'; import '@layui/layui-vue/es/checkbox/index.css';
import '@layui/layui-vue/es/radio/index.css'; import '@layui/layui-vue/es/radio/index.css';
export default { export default {
components: { components: {
EditMateria, EditMateria,
EditView, EditView,
ShowData1 ShowData1
}, },
setup() { setup() {
let dataColumn = [ let dataColumn = [
{ {
title: "序号", title: "序号",
key: "FID", key: "F1",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
},{ }, {
title: "原验号", title: "原验号",
key: "FMdmCode", key: "F2",
width: "300px", width: "300px",
align: 'center', align: 'center',
hide: false hide: false
}, },
{ {
title: "原版本号", title: "原版本号",
key: "FSaleCode", key: "F3",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
}, },
{ {
title: "新实验号", title: "新试验号",
key: "FTestCode", key: "F4",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
},
{
title: "新版本号",
key: "FDesc",
width: "400px",
align: 'center'
},
{
title: "产品分类",
key: "FDesc",
width: "400px",
align: 'center'
},
{
title: "发起时间",
key: "FAddDate",
width: "180px",
align: 'center'
},
{
title: "发起人",
key: "FUserName",
width: "178px",
align: 'center'
},
{
title: "操作",
key: "operator",
width: "130px",
fixed: "right",
customSlot: 'operator',
align: 'center'
}
];
const selectedKeys = ref(["1"]);
const checkbox = ref(false);
const defaultToolbar = ref(true);
const pageInfo = ref({
total: 0,
limit: 10,
current: 1
});
const dataList = ref([]);
const typeList = ref([]);
const searchObj = ref({});
const postData = ref({});
const MaterialModel= ref({});
const showEditBox = ref([false, false, false, false, false, false, false, false, false, false, false, false,false]);
const modelArea = ref(["70%", "70%", "70%", "86%", "70%", "70%", "70%", "70%", "700px", "70%", "70%","70%","70%"]);
const objInfoObj = ref({});
const editType = ref(1);
const stateList = ref([{
id: 1,
name: "进行中"
}, {
id: 2,
name: "已完成"
}]);
const hasLoaded = ref(false);
const dataItem=ref([]);
return {
selectedKeys,
checkbox,
defaultToolbar,
dataColumn,
dataList,
pageInfo,
searchObj,
postData,
typeList,
showEditBox,
modelArea,
objInfoObj,
editType,
stateList,
hasLoaded,
MaterialModel,
dataItem
};
},
props: {
dataInfoObj: {
type: Object,
default: () => {},
}, },
{
pageTypeObj: { title: "新版本号",
type: Number, key: "F5",
default: () => 1, width: "400px",
align: 'center'
},
{
title: "产品分类",
key: "F6",
width: "400px",
align: 'center'
},
{
title: "发起时间",
key: "F7",
width: "180px",
align: 'center'
},
{
title: "发起人",
key: "F8",
width: "178px",
align: 'center'
},
{
title: "操作",
key: "operator",
width: "130px",
fixed: "right",
customSlot: 'operator',
align: 'center'
} }
];
const selectedKeys = ref(["1"]);
const checkbox = ref(false);
const defaultToolbar = ref(true);
const pageInfo = ref({
total: 0,
limit: 10,
current: 1
});
const dataList = ref([]);
const typeList = ref([]);
const searchObj = ref({});
const postData = ref({});
const MaterialModel = ref({});
const showEditBox = ref([false, false, false, false, false, false, false, false, false, false, false, false, false]);
const modelArea = ref(["70%", "70%", "70%", "40%", "70%", "70%", "70%", "70%", "700px", "70%", "70%", "70%", "70%"]);
const objInfoObj = ref({});
const editType = ref(1);
const stateList = ref([{
id: 1,
name: "进行中"
}, {
id: 2,
name: "已完成"
}]);
const hasLoaded = ref(false);
const dataItem = ref([]);
return {
selectedKeys,
checkbox,
defaultToolbar,
dataColumn,
dataList,
pageInfo,
searchObj,
postData,
typeList,
showEditBox,
modelArea,
objInfoObj,
editType,
stateList,
hasLoaded,
MaterialModel,
dataItem
};
},
props: {
dataInfoObj: {
type: Object,
default: () => { },
},
pageTypeObj: {
type: Number,
default: () => 1,
}
},
mounted() {
if (this.dataInfoObj) {
this.dataColumn.pop();
this.dataColumn[0].hide = true;
this.dataColumn[1].hide = true;
this.dataColumn[2].hide = true;
this.dataColumn[7].hide = false;
}
this._getTypeList();
this._getPageList(true);
},
methods: {
changePage(obj) {
this.pageInfo.current = obj.current;
this.pageInfo.limit = obj.limit;
this._getPageList();
}, },
mounted() { cancelClick(isRefresh, onlyRefresh) {
if (this.dataInfoObj) { if (isRefresh) {
this.dataColumn.pop(); this._getPageList(true);
this.dataColumn[0].hide = true; }
this.dataColumn[1].hide = true; if (onlyRefresh) return false;
this.dataColumn[2].hide = true; for (let i = 0; i < this.showEditBox.length; i++) {
this.dataColumn[7].hide = false; this.showEditBox[i] = false;
} }
this._getTypeList();
this._getPageList(true);
}, },
methods: { async _getTypeList() {
changePage(obj) { this.typeList = await getBasicList(33) || [];
this.pageInfo.current = obj.current; },
this.pageInfo.limit = obj.limit; //
this._getPageList(); async _getPageList(isFirst, showOk) {
},
cancelClick(isRefresh, onlyRefresh) {
if (isRefresh) {
this._getPageList(true);
}
if (onlyRefresh) return false;
for (let i = 0; i < this.showEditBox.length; i++) {
this.showEditBox[i] = false;
}
},
async _getTypeList() {
this.typeList = await getBasicList(33) || [];
},
//
async _getPageList(isFirst, showOk) {
this.dataList = [{ F1: 1, F2: "10020421", F3: "1.0", F4: "10020421", F5: "2.0", F6: "半成品", F7: "2022-10-24 11:00", F8: "kai" }];
this.hasLoaded = true;
},
//
dateFormat(dataStr) {
return dataStr.replace('T', ' ').split('.')[0];
},
getData(data) {
this.MaterialModel = data;
for (let i = 0; i < this.showEditBox.length; i++) {
this.showEditBox[i] = false;
}
this.showEditBox[11] = true;
this.editType = 1;
//this.dataList = []; },
this.pageInfo.total = 0; showEditMaterial(i) {
if (isFirst) { this.showEditBox[i] = true;
this.pageInfo.current = 1; },
this.pageInfo.total = 0; _clickSetInfo(data, type) {
}
if (this.dataInfoObj && this.dataInfoObj.FID) {
this.postData.FTeamID = this.dataInfoObj.FID;
this.postData.FIsUser = false;
}
if (this.pageTypeObj && this.pageTypeObj == 2) {
this.postData.FState = 99;
}
this.postData.FPageIndex = this.pageInfo.current;
this.postData.FPageSize = this.pageInfo.limit;
let result = await getPageList(this.postData, "Task");
result.Data.List = result.Data.List || [];
result.Data.List.forEach((item) => {
let type = this.typeList.find(s => s.FValue === item.FType);
item.FTypeName = type == null ? "" : type.FName;
let state = this.stateList.find(s => s.id === item.FState)
item.FStateName = state == null ? "" : state.name;
item.FAddDate = item.FAddDate == null ? "" : this.dateFormat(item.FAddDate);
item.FEditDate = item.FEditDate == null ? "" : this.dateFormat(item.FEditDate);
item.FFinishDate = item.FFinishDate == null ? "" : this.dateFormat(item.FFinishDate);
item["IsEdit"]=Math.floor(Math.random()*10)==0?"编辑":"新增";
});
this.pageInfo.total = result.Data.Total || 0;
debugger
this.dataList = result.Data.List;
this.hasLoaded = true;
},
//
dateFormat(dataStr) {
return dataStr.replace('T', ' ').split('.')[0];
},
getData(data){
this.MaterialModel = data;
for (let i = 0; i < this.showEditBox.length; i++) {
this.showEditBox[i] = false;
}
this.showEditBox[11] = true;
this.editType = 1;
}, for (let i = 0; i < this.showEditBox.length; i++) {
showEditMaterial(i){ this.showEditBox[i] = false;
this.showEditBox[i] = true; }
}, if (data.FType == 1) {
_clickSetInfo(data, type) { data.FBoxType = 1; //
} else if (data.FType == 2) {
for (let i = 0; i < this.showEditBox.length; i++) { data.FBoxType = 2; //BOM
this.showEditBox[i] = false; } else if (data.FType == 9 || data.FType == 10) {
} data.FBoxType = 4; //
if (data.FType == 1) { } else if ((data.FType >= 3 && data.FType <= 7) || data.FType == 11) {
data.FBoxType = 1; // data.FBoxType = 3; //
} else if (data.FType == 2) { } else if (data.FType == 8) {
data.FBoxType = 2; //BOM data.FBoxType = 5; //
} else if (data.FType == 9 || data.FType == 10) { } else if (data.FType == 12) {
data.FBoxType = 4; // data.FBoxType = 6; //
} else if ((data.FType >= 3 && data.FType <= 7) || data.FType == 11) { } else if (data.FType == 13) {
data.FBoxType = 3; // data.FBoxType = 7; //
} else if (data.FType == 8) { } else if (data.FType == 14) {
data.FBoxType = 5; // data.FBoxType = 8; //
} else if (data.FType == 12) { } else if (data.FType == 15) {
data.FBoxType = 6; // data.FBoxType = 9; //
} else if (data.FType == 13) { } else if (data.FType == 16) {
data.FBoxType = 7; // this.dataItem = data;
} else if (data.FType == 14) { data.FBoxType = 10; //
data.FBoxType = 8; // } else {
} else if (data.FType == 15) { return layer.msg("未知事项类型");
data.FBoxType = 9; // }
}else if(data.FType==16){ this.objInfoObj = data;
this.dataItem=data; this.editType = type;
data.FBoxType = 10; // this.showEditBox[data.FBoxType] = true;
}else { },
return layer.msg("未知事项类型");
}
this.objInfoObj = data;
this.editType = type;
this.showEditBox[data.FBoxType] = true;
},
//- //-
_clickSearch() { _clickSearch() {
this.postData = {}; this.postData = {};
for (let key in this.searchObj) { for (let key in this.searchObj) {
let val = this.searchObj[key]; let val = this.searchObj[key];
if (val != null && val !== "") this.postData[key] = val; if (val != null && val !== "") this.postData[key] = val;
}
this._getPageList(true);
},
//-
_clickReset() {
this.searchObj = {};
this._clickSearch();
} }
this._getPageList(true);
},
//-
_clickReset() {
this.searchObj = {};
this._clickSearch();
} }
} }
}
</script> </script>

@ -81,52 +81,52 @@
let dataColumn = [ let dataColumn = [
{ {
title: "序号", title: "序号",
key: "FID", key: "F1",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
},{ },{
title: "新验号", title: "新验号",
key: "FMdmCode", key: "F2",
width: "300px", width: "300px",
align: 'center', align: 'center',
hide: false hide: false
}, },
{ {
title: "新版本号", title: "新版本号",
key: "FSaleCode", key: "F3",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
}, },
{ {
title: "事项", title: "事项",
key: "FTestCode", key: "F4",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
}, },
{ {
title: "产品分类", title: "产品分类",
key: "FDesc", key: "F5",
width: "400px", width: "400px",
align: 'center' align: 'center'
}, },
{ {
title: "发起时间", title: "发起时间",
key: "FAddDate", key: "F6",
width: "180px", width: "180px",
align: 'center' align: 'center'
}, },
{ {
title: "发起人", title: "发起人",
key: "FUserName", key: "F7",
width: "178px", width: "178px",
align: 'center' align: 'center'
}, },
{ {
title: "负责人", title: "负责人",
key: "IsEdit", key: "F8",
width: "98px", width: "98px",
align: 'center', align: 'center',
customSlot: '', customSlot: '',
@ -259,16 +259,12 @@
}); });
this.pageInfo.total = result.Data.Total || 0; this.pageInfo.total = result.Data.Total || 0;
debugger debugger
this.dataList = [{"FSaleCode":"销售号测试","FTestCode":"KXFXG23030701", this.dataList = [{"F1":"1","F2":"10020421",
"FMdmCode":"1681355682","FFormulaName":"改名字了/2+KXFXG23030701+1.0000", "F3":"","F4":"物料分类选择",
"FViewType":2,"FUserName":"陈凯_TEST、陈超_TEST、林家亮、叶宏、施发权、张建财", "F5":"半成品","F6":"2022-10-24 11:00",
"FMaterialHalfIDs":"","FID":789,"FTeamID":216,"FType":1,"FName":"配方选择", "F7":"Kai","F8":"Kai"},
"FDesc":"没有合适配方,等待新配方选择","FFactoryID":-1,"FUserID":"2,4,8,9,11,12", {"F1":"2","F2":"10020421","F3":"","F4":"物料编辑",
"FState":1,"FCanEdit":1,"FAddDate":"2023-04-13 11:14:42","FEditUser":2,"FEditDate":"2023-04-13 11:14:42","FFinishDate":"","FTypeName":"","FStateName":"进行中"}, "F5":"半成品","F6":"2022-10-24 11:00","F7":"Kai","F8":"Kai"}];
{"FSaleCode":"C555","FTestCode":"HBFSY23030701","FMdmCode":"1681323910","FFormulaName":"测试/test+HBFSY23030701+1.0000",
"FViewType":1,"FUserName":"陈凯_TEST、陈超_TEST、林家亮、叶宏、宋佰昱、施发权、张建财","FMaterialHalfIDs":"67951","FID":788,
"FTeamID":215,"FType":15,"FName":"物料分类","FDesc":"物料分类选择","FFactoryID":-1,"FUserID":"2,4,8,9,10,11,12","FState":1,
"FCanEdit":1,"FAddDate":"2023-04-13 02:25:10","FEditUser":2,"FEditDate":"2023-04-13 02:25:10","FFinishDate":"","FTypeName":"","FStateName":"进行中"}];
this.hasLoaded = true; this.hasLoaded = true;
}, },
// //

@ -31,7 +31,7 @@
<lay-button size="sm" @click="_clickReset"></lay-button> <lay-button size="sm" @click="_clickReset"></lay-button>
</lay-form-item> </lay-form-item>
</lay-form> </lay-form>
<lay-table v-if="hasLoaded" :columns="dataColumn" id="id" :dataSource="dataList" <lay-table :columns="dataColumn" id="id" :dataSource="dataList"
v-model:selectedKeys="selectedKeys" :checkbox="checkbox" :default-toolbar="defaultToolbar" v-model:selectedKeys="selectedKeys" :checkbox="checkbox" :default-toolbar="defaultToolbar"
:page="dataList.length>0?pageInfo:null" @change="changePage"> :page="dataList.length>0?pageInfo:null" @change="changePage">
<template v-slot:toolbar> <template v-slot:toolbar>
@ -87,47 +87,47 @@
}, },
{ {
title: "ID", title: "ID",
key: "FID", key: "F1",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
},{ },{
title: "模块", title: "模块",
key: "FMdmCode", key: "F2",
width: "300px", width: "300px",
align: 'center', align: 'center',
hide: false hide: false
}, },
{ {
title: "功能", title: "功能",
key: "FSaleCode", key: "F3",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
}, },
{ {
title: "操作描述", title: "操作描述",
key: "FDesc", key: "F4",
width: "160px", width: "160px",
align: 'center', align: 'center',
hide: false hide: false
}, },
{ {
title: "操作时间", title: "操作时间",
key: "FAddDate", key: "F5",
width: "180px", width: "180px",
align: 'center' align: 'center'
}, },
{ {
title: "操作类型", title: "操作类型",
key: "FTestCode", key: "F6",
width: "400px", width: "400px",
align: 'center' align: 'center'
}, },
{ {
title: "操作人", title: "操作人",
key: "FUserName", key: "F7",
width: "178px", width: "178px",
align: 'center' align: 'center'
} }
@ -221,39 +221,11 @@
// //
async _getPageList(isFirst, showOk) { async _getPageList(isFirst, showOk) {
this.dataList = [
{"F1":"1","F2":"协同路线","F3":"KTFKP22100901-K501@测试","F4":"新增协同","F5":"2022-10-24 11:00","F6":"新增","F7":"Kai"},
{"F1":"2","F2":"协同路线","F3":"KTFKP22100901-K501@测试","F4":"查看了物料视图","F5":"2022-10-24 11:00","F6":"查看","F7":"Kai"}
];
//this.dataList = [];
this.pageInfo.total = 0;
if (isFirst) {
this.pageInfo.current = 1;
this.pageInfo.total = 0;
}
if (this.dataInfoObj && this.dataInfoObj.FID) {
this.postData.FTeamID = this.dataInfoObj.FID;
this.postData.FIsUser = false;
}
if (this.pageTypeObj && this.pageTypeObj == 2) {
this.postData.FState = 99;
}
this.postData.FPageIndex = this.pageInfo.current;
this.postData.FPageSize = this.pageInfo.limit;
let result = await getPageList(this.postData, "Task");
result.Data.List = result.Data.List || [];
result.Data.List.forEach((item) => {
let type = this.typeList.find(s => s.FValue === item.FType);
item.FTypeName = type == null ? "" : type.FName;
let state = this.stateList.find(s => s.id === item.FState)
item.FStateName = state == null ? "" : state.name;
item.FAddDate = item.FAddDate == null ? "" : this.dateFormat(item.FAddDate);
item.FEditDate = item.FEditDate == null ? "" : this.dateFormat(item.FEditDate);
item.FFinishDate = item.FFinishDate == null ? "" : this.dateFormat(item.FFinishDate);
item["IsEdit"]=Math.floor(Math.random()*10)==0?"编辑":"新增";
});
this.pageInfo.total = result.Data.Total || 0;
debugger
this.dataList = result.Data.List;
this.hasLoaded = true;
}, },
// //
dateFormat(dataStr) { dateFormat(dataStr) {

Loading…
Cancel
Save