commit by yzf

master
Yang 3 years ago
parent 1960b50999
commit f752414cf5

5
components.d.ts vendored

@ -33,6 +33,8 @@ declare module '@vue/runtime-core' {
LayLogo: typeof import('@layui/layui-vue')['LayLogo']
LayMenu: typeof import('@layui/layui-vue')['LayMenu']
LayMenuItem: typeof import('@layui/layui-vue')['LayMenuItem']
LayProgress: typeof import('@layui/layui-vue')['LayProgress']
LayQuote: typeof import('@layui/layui-vue')['LayQuote']
LayRadio: typeof import('@layui/layui-vue')['LayRadio']
LayRow: typeof import('@layui/layui-vue')['LayRow']
LayScroll: typeof import('@layui/layui-vue')['LayScroll']
@ -44,6 +46,9 @@ declare module '@vue/runtime-core' {
LayTab: typeof import('@layui/layui-vue')['LayTab']
LayTabItem: typeof import('@layui/layui-vue')['LayTabItem']
LayTable: typeof import('@layui/layui-vue')['LayTable']
LayTextarea: typeof import('@layui/layui-vue')['LayTextarea']
LayTooltip: typeof import('@layui/layui-vue')['LayTooltip']
LayUpload: typeof import('@layui/layui-vue')['LayUpload']
LightIcon: typeof import('./src/components/LightIcon.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']

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.b3f8b7f1.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

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{v as o}from"./index.b3f8b7f1.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

@ -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.b3f8b7f1.js";/* empty css */import{g as $}from"./common.d8f31935.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};

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 r from"./all.b1b3f398.js";import{_ as n,r as p,J as e,o as m,c as s}from"./index.b3f8b7f1.js";/* empty css *//* empty css */import"./all.b6bc6e53.js";/* empty css */import"./common.d8f31935.js";import"./factory.c30f2aec.js";import"./materialType.f34aeb6a.js";import"./package.94c98454.js";/* empty css */const c={components:{AllData:r},setup(){return{dataInfoObj:p(2)}}};function i(o,f,l,t,_,d){const a=e("AllData");return m(),s(a,{dataInfoObj:t.dataInfoObj},null,8,["dataInfoObj"])}var B=n(c,[["render",i]]);export{B as default};

@ -1 +0,0 @@
import r from"./all.b1b3f398.js";import{_ as n,r as p,J as e,o as c,c as m}from"./index.b3f8b7f1.js";/* empty css *//* empty css */import"./all.b6bc6e53.js";/* empty css */import"./common.d8f31935.js";import"./factory.c30f2aec.js";import"./materialType.f34aeb6a.js";import"./package.94c98454.js";/* empty css */const s={components:{AllData:r},setup(){return{dataInfoObj:p(1)}}};function i(o,f,l,t,_,d){const a=e("AllData");return c(),m(a,{dataInfoObj:t.dataInfoObj},null,8,["dataInfoObj"])}var v=n(s,[["render",i]]);export{v as default};

@ -1 +0,0 @@
import{_ as e}from"./index.b3f8b7f1.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};

@ -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-cde57ee0]{height:400px;margin:20px 10px;display:block;position:relative;clear:both;float:none}

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{v as n}from"./index.b3f8b7f1.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};

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{v as n}from"./index.b3f8b7f1.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

File diff suppressed because one or more lines are too long

@ -1 +0,0 @@
import{S as p}from"./all.b6bc6e53.js";import{_ as r,r as a,J as n,o as s,c}from"./index.b3f8b7f1.js";/* empty css *//* empty css *//* empty css */import"./common.d8f31935.js";import"./factory.c30f2aec.js";import"./materialType.f34aeb6a.js";import"./package.94c98454.js";/* empty css */const m={components:{AllData:p},setup(){return{pageTypeObj:a(2)}}};function i(o,l,_,t,f,u){const e=n("AllData");return s(),c(e,{pageTypeObj:t.pageTypeObj},null,8,["pageTypeObj"])}var A=r(m,[["render",i]]);export{A as default};

File diff suppressed because one or more lines are too long

4
dist/index.html vendored

@ -119,8 +119,8 @@
}
}
</style>
<script type="module" crossorigin src="/assets/index.b3f8b7f1.js"></script>
<link rel="stylesheet" href="/assets/index.51079297.css">
<script type="module" crossorigin src="/assets/index.6f42d62f.js"></script>
<link rel="stylesheet" href="/assets/index.bdb27522.css">
</head>
<body>
<div id="app">

@ -75,8 +75,8 @@
<lay-layer :area="modelArea[9]" v-model="showEditBox[9]" :title="objInfoObj.FName">
<EditType v-if="showEditBox[9]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditType>
</lay-layer>
<lay-layer :area="modelArea[10]" v-model="showEditBox[10]" :title="objInfoObj.FName">
<EditFSuccedaneum v-if="showEditBox[10]" @getData="getData" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditFSuccedaneum>
<lay-layer :area="modelArea[10]" height="700px" v-model="showEditBox[10]" :title="objInfoObj.FName">
<EditFSuccedaneum style="height: 70vh;overflow: auto;" v-if="showEditBox[10]" @getData="getData" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditFSuccedaneum>
</lay-layer>
<lay-layer :area="modelArea[11]" v-model="showEditBox[11]" :title="objInfoObj.FName">
<EditMaterial v-if="showEditBox[11]" @getData="getData" @showEditMaterial="showEditMaterial" :MaterialModel="MaterialModel" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditMaterial>
@ -202,8 +202,8 @@
const searchObj = ref({});
const postData = ref({});
const MaterialModel= ref({});
const showEditBox = ref([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%"]);
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([{

@ -1,6 +1,7 @@
<template>
<lay-container fluid="true" class="content-box">
<lay-table class="row-select" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn"
<lay-container style="height:700px;overflow: auto;" fluid="true" class="content-box">
<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
<lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn"
:data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName">
<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>-->
@ -12,7 +13,7 @@
</lay-input>
</template>
<template v-if="dataList == undefined || !dataList.FID" v-slot:operator="{ data }">
<lay-button size="xs" type="primary" @click="changeVisible2(data)"></lay-button>
<lay-button size="sm" type="primary" @click="changeVisible2(data)"></lay-button>
</template>
</lay-table>
<OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog>
@ -22,6 +23,9 @@
</template>
</template>
<style scoped>
.content-box {
margin: 30px 10px;
@ -32,6 +36,7 @@
min-height: 740px;
}
.row-select td {
overflow: inherit;
}
@ -63,8 +68,6 @@
display: none;
}
.isBomShow {}
.isBomHidden {
display: none;
}
@ -92,10 +95,12 @@ import {
import { EditTypeList } from "/src/api/api/teamwork";
import OperateLog from "./OperateLog.vue";
import FormulaView from "./FormulaView.vue";
export default {
components: {
OperateLog
OperateLog,
FormulaView
},
setup() {
let dataColumn = [{
@ -142,7 +147,12 @@ export default {
width: "160px",
align: 'center'
},
{
title: "状态",
key: "selected",
width: "160px",
align: 'center'
},
{
title: "操作",
key: "operator",
@ -224,10 +234,22 @@ export default {
this.initPage(layer.load(2));
},
async initPage(idx) {
let _data = await GetMaterialInfoListByTeamId({
tempId: this.dataInfoObj.FTeamID
});
this.dataList = _data.Data;
this.dataList = _data.Data.map(function(item){
if(item){
if (item.FSuccedaneumID == -1) {
item["selected"] = "不选择";
}
else if (item.FSuccedaneumInfo != "") {
item["selected"] = "选择";
}
}
return item;
});
setTimeout(function () {
layer.close(idx);
}, 500);
@ -244,7 +266,12 @@ export default {
}
},
{
text: '不选择'
text: '不选择',
callback:function(id){
layer.close(id);
data.FSuccedaneumID=-1;
$this.saveBatch();
}
}]
})
@ -309,7 +336,7 @@ export default {
FViewType: this.dataInfoObj.FViewType
};
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
let cacheDataList = JSON.parse(localStorage.getItem('EditType' + saveId));
let cacheDataList = JSON.parse(localStorage.getItem('EditFSuccedaneum' + saveId));
this.dataList.forEach((row, index) => {
let cache = cacheDataList[index];
let dataObj = {};
@ -342,11 +369,11 @@ export default {
await commonSave({
teamId: updateObj.FTeamID,
type: this.dataInfoObj['FType'],
desc: updateLog
desc: this.objInfo["FName"]+"选择不使用替代物料"
}, "OperateLog");
let $this = this;
//$this.initPage();
localStorage.setItem('EditType' + saveId, JSON.stringify(this.dataList));
localStorage.setItem('EditFSuccedaneum' + saveId, JSON.stringify(this.dataList));
setTimeout(function () {
layer.close(idx);
layer.msg('保存成功');

@ -101,7 +101,8 @@
} from 'vue';
import {
updateDataInfo,
getPageList
getPageList,
commonSave
} from "/src/api/api/common";
export default {
@ -226,6 +227,7 @@
},
//-
async _getPageList(isFirst) {
debugger
this.pageInfo.total = 0;
if (isFirst) {
this.pageInfo.current = 1;
@ -267,7 +269,17 @@
updateInfo.FFuProductsUnit = this.objInfo.choseData.FUnit || "";
}
let result = await updateDataInfo(updateInfo, "Material") || 0;
debugger
this.dataInfoObj
if (result > 0) {
await commonSave({
teamId: this.dataInfoObj.FTeamID,
type: this.dataInfoObj['FType'],
desc: this.objInfo["FName"]+"选择了替代物了:"+updateInfo["FSuccedaneumInfo"]
}, "OperateLog");
layer.msg("操作成功", {
time: 1500,
icon: 1

@ -186,6 +186,7 @@
teamId: this.dataInfoObj.FTeamID,
viewType: ""
});
debugger
if(this.dataInfoObj.FViewType == 1){
this.inputCodeValue = _data.rows[0].HalfCode;
this.inputDescValue = _data.rows[0].HalfDesc;
@ -361,7 +362,7 @@
}
});
let updateLog = updateObj.LogList.join("、");
let $this=this;
if (updateLog != "") {
delete updateObj.LogList
//
@ -376,8 +377,8 @@
setTimeout(function() {
layer.close(idx);
layer.msg('保存成功');
this.$emit('cancelClick', true, true);
this.$refs.OperateLog._getPageList();
$this.$emit('cancelClick', true, false);
$this.$refs.OperateLog._getPageList();
}, 500);
}
} else {

@ -302,7 +302,7 @@ export default {
this.dataColumn = dataColumn;
this.originalColumns = this.deepCopy(dataColumn);
debugger
this._changeType(_data.rows[0],2);
setTimeout(function () {
layer.close(idx);
}, 500);

Loading…
Cancel
Save