north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -190,7 +190,8 @@ </script> <template> <div class="main-div"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="orderInfo.reportFormDate" type="daterange" @@ -205,10 +206,11 @@ type="primary" style="margin-top: -5px" :icon="Search">{{$t('basicData.search')}}</el-button> <div class="order-detail"> </div> <div class="main-table"> <vxe-grid @filter-change="filterChanged" height="110%" height="100%" class="mytable-scrollbar" ref="xGrid" v-bind="gridOptions" @@ -276,13 +278,14 @@ border: none !important; background-color: transparent; } .order-primary{ .head{ width: 100%; height: 35px; } .order-detail{ width: 100%; height: calc(100% - 30px); .main-table{ width: 100%; height: calc(100% - 35px); } .vxe-grid { north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue
@@ -156,11 +156,11 @@ </script> <template> <div> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid style="width: 40vw;" class="mytable-scrollbar" max-height="500px" height="100%" ref="xGrid" v-bind="gridOptions" v-on="gridEvents" @@ -177,6 +177,7 @@ </template> </vxe-grid> </div> <el-dialog v-model="dialogTableVisible" destroy-on-close @@ -187,5 +188,13 @@ </template> <style scoped> .head{ width: 100%; height: 70px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue
@@ -150,7 +150,7 @@ if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){ ruleForm.value.id = Number(str) request.post(`/materialStore/getSelectMaterialStore/1/100`,ruleForm.value).then((res) => { request.post(`/materialStore/getSelectMaterialStore`,ruleForm.value).then((res) => { if(res.code==200){ ruleForm.value=deepClone(res.data.data[0]) value.value=ruleForm.value.type north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialOutbound.vue
@@ -296,7 +296,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="selectDate" type="daterange" @@ -307,9 +308,10 @@ /> <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button> </div> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -366,7 +368,7 @@ </vxe-grid> </div> <el-dialog :key="dialogKey" @@ -388,9 +390,14 @@ <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } @media print { @page { north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorage.vue
@@ -267,7 +267,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="selectDate" type="daterange" @@ -278,9 +279,10 @@ /> <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button> </div> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -338,12 +340,18 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue
@@ -166,7 +166,7 @@ }) }else{ //返库新增 request.post(`/materialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => { request.post(`/materialStore/getSelectMaterialStore`,filterData.value).then((res) => { if(res.code==200){ @@ -251,7 +251,7 @@ //数据绑定 const getStoreWorks = () => { request.post(`/materialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => { request.post(`/materialStore/getSelectMaterialStore`,filterData.value).then((res) => { if(res.code==200){ materialStore.value=[] north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue
@@ -583,7 +583,7 @@ //数据绑定 const getStoreWorks = () => { request.post(`/materialStore/getSelectMaterialStore/1/${total.pageSize}`,filterDatas.value).then((res) => { request.post(`/materialStore/getSelectMaterialStore`,filterDatas.value).then((res) => { if(res.code==200){ materialStores.value=[] north-glass-erp/northglass-erp/src/views/mm/productStock/CreateProductStock.vue
@@ -357,7 +357,7 @@ <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedGoodsIssue.vue
@@ -370,15 +370,17 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <vxe-select style="width: 260px" v-model="operateType" :placeholder="$t('productStock.pleaseSelectTheTypeOfWithdrawal')"> <vxe-option v-for="(item,index) in takeOut" :key="index" :value="item.operateTypeName" :label="item.operateTypeName" ></vxe-option> </vxe-select> <vxe-input v-model="remarks" :placeholder="$t('productStock.pleaseEnterANote')"></vxe-input> </div> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -427,12 +429,18 @@ <span class="vxe-table--cell-active-area" ></span> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } .vxe-grid { /* 禁用浏览器默认选中 */ north-glass-erp/northglass-erp/src/views/mm/productStock/OrderAllocation.vue
@@ -378,9 +378,10 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -434,12 +435,18 @@ <span class="vxe-table--cell-active-area" ></span> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } .vxe-grid { /* 禁用浏览器默认选中 */ north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue
@@ -340,7 +340,7 @@ <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecordPint.vue
@@ -305,7 +305,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="selectDate" type="daterange" @@ -316,9 +317,10 @@ /> <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button> </div> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -376,6 +378,7 @@ </vxe-grid> </div> <!-- 装箱单打印--> <el-dialog @@ -396,9 +399,14 @@ </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } :deep(#sizePrintCalrd .el-dialog__body) { height: 90%; north-glass-erp/northglass-erp/src/views/mm/productStock/TakeOutRecord.vue
@@ -349,7 +349,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="selectDate" type="daterange" @@ -360,9 +361,10 @@ /> <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button> </div> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -421,11 +423,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/mm/productStock/TransferRecord.vue
@@ -281,7 +281,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="selectDate" type="daterange" @@ -292,9 +293,10 @@ /> <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button> </div> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -352,11 +354,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/machine/AddMachine.vue
@@ -166,12 +166,12 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" height="650px" max-height="100%" height="100%" v-bind="gridOptions" v-on="teamGridEvents" @@ -202,15 +202,19 @@ <span>{{ row.basicCategory }}</span> </template> </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 80%; margin: 0 auto; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } .vxe-grid { /* 禁用浏览器默认选中 */ north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
@@ -224,12 +224,12 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" height="650px" max-height="100%" height="100%" v-bind="gridOptions" v-on="teamGridEvents" > @@ -275,14 +275,19 @@ </template> </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } .vxe-grid { north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue
@@ -253,9 +253,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" type="daterange" @@ -272,13 +271,13 @@ id="select" type="primary" :icon="Search">{{$t('basicData.search')}} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" > @@ -318,7 +317,7 @@ </vxe-grid> </div> <el-dialog v-model="dialogTableVisible" :title="$t('machine.maintenanceAndRepairEdit')"> <el-form :model="form"> @@ -433,12 +432,13 @@ </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 40%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/machine/SelectMachine.vue
@@ -132,9 +132,10 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid max-height="100%" height="100%" class="mytable-scrollbar" ref="xGrid" v-bind="gridOptions" @@ -164,6 +165,7 @@ </vxe-grid> </div> <el-dialog v-model="dialogFormVisible" :title="$t('machine.deviceEditing')"> <el-form :model="form"> @@ -213,8 +215,13 @@ </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue
@@ -655,7 +655,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable style="width: 90px"></el-input> @@ -688,6 +689,9 @@ :value="item.value" /> </el-select> </div> <div class="main-table"> <vxe-grid ref="xGrid" :checkbox-config="{labelField: 'name', highlight: true, range: true}" @@ -736,6 +740,7 @@ </vxe-grid> </div> <!-- 流程卡打印 --> <el-dialog id="sizePrintCalrd" @@ -847,9 +852,15 @@ </template> <style scoped> .main-div-customer { width: 99%; height: 92%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); }
@@ -727,7 +727,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-input v-show="isVisible" v-model="printMerge" :placeholder="$t('processCard.mergePrinting')" clearable style="width: 90px"></el-input> @@ -760,6 +761,9 @@ :value="item.value" /> </el-select> </div> <div class="main-table"> <vxe-grid ref="xGrid" :checkbox-config="{labelField: 'name', highlight: true, range: true}" @@ -811,6 +815,7 @@ </vxe-grid> </div> <!-- 流程卡打印 --> <el-dialog id="sizePrintCalrd" @@ -939,6 +944,16 @@ height: 92%; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } :deep(#sizeCheck .el-dialog__body) { height: 90%; north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -651,9 +651,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="orderInfo.workOrderDate" :default-time="defaultTime" @@ -690,13 +689,13 @@ :icon="Search" type="primary" @click="getWorkOrder">{{ $t('basicData.search') }} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" height="95%" height="100%" v-bind="gridOptions" v-on="gridEvents" @filter-change="filterChanged" @@ -740,19 +739,19 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 70%; height: 6%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } .vxe-grid { north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -258,9 +258,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="orderInfo.workOrderDate" :default-time="defaultTime" @@ -277,11 +276,12 @@ id="select" type="primary" :icon="Search">{{$t('basicData.search')}} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid height="95%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -326,6 +326,7 @@ </vxe-grid> </div> </div> </template> <style scoped> @@ -337,4 +338,13 @@ width: 50%; text-align: center; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintFlowCard.vue
@@ -335,9 +335,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="orderInfo.workOrderDate" :start-placeholder="$t('basicData.startDate')" @@ -358,12 +357,14 @@ type="primary" @click="getWorkOrder">{{ $t('basicData.search') }} </el-button> <vxe-checkbox style="margin-top:6px;margin-left:10px " v-if="!(checkedValue.value === 2 && inquiryMode === 2)" v-model="checkedValue.value" :content="$t('processCard.merge')" :checked-value="1" :unchecked-value="3" ></vxe-checkbox> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" height="95%" height="100%" v-bind="gridOptions" v-on="gridEvents" > @@ -397,6 +398,7 @@ </vxe-grid> </div> <el-dialog id="titleStyle" :title="$t('processCard.labelStyle')" @@ -420,12 +422,14 @@ </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; .main-table{ width: 100%; height: calc(100% - 35px); } :deep(#titleStyle .el-dialog__body){ height: 90%; north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue
@@ -298,9 +298,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :start-placeholder="$t('basicData.startDate')" @@ -317,8 +316,8 @@ :icon="Search" type="primary" @click="getWorkOrder">{{ $t('basicData.search') }} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" @@ -366,6 +365,7 @@ </vxe-grid> </div> <el-dialog id="titleStyle" :title="$t('processCard.labelStyle')" @@ -398,12 +398,14 @@ <style scoped> .main-div-customer { width: 99%; height: 93%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; .main-table{ width: 100%; height: calc(100% - 35px); } :deep(#titleStyle .el-dialog__body){ height: 90%; north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -430,9 +430,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="orderInfo.workOrderDate" :default-time="defaultTime" @@ -447,12 +446,13 @@ <el-button id="select" :icon="Search" style="margin-top: -5px" type="primary" @click="getWorkOrder">{{ $t('basicData.search') }} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" :checkbox-config="checkBoxConfig" @@ -536,16 +536,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 95%; .head{ width: 100%; height: 35px; } #selectForm { width: 40%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageReason.vue
@@ -141,12 +141,12 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="650px" height="100%" v-bind="gridOptions" v-on="teamGridEvents" @filter-change="filterChanged" @@ -176,7 +176,7 @@ </vxe-grid> </div> </div> </template> @@ -186,6 +186,16 @@ margin: 0 auto; height: 100%; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } .vxe-grid { /* 禁用浏览器默认选中 */ -webkit-user-select: none; north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddBreakageType.vue
@@ -142,12 +142,12 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="650px" height="100%" v-bind="gridOptions" v-on="teamGridEvents" @filter-change="filterChanged" @@ -176,7 +176,7 @@ </vxe-grid> </div> </div> </template> @@ -186,6 +186,15 @@ margin: 0 auto; height: 100%; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } .vxe-grid { /* 禁用浏览器默认选中 */ -webkit-user-select: none; north-glass-erp/northglass-erp/src/views/pp/productionBasicData/AddTeamGroup.vue
@@ -163,12 +163,12 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="650px" height="100%" v-bind="gridOptions" v-on="teamGridEvents" @filter-change="filterChanged" @@ -200,7 +200,7 @@ </template> </vxe-grid> </div> </div> </template> @@ -209,6 +209,15 @@ width: 99%; height: 100%; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } .vxe-grid { /* 禁用浏览器默认选中 */ -webkit-user-select: none; north-glass-erp/northglass-erp/src/views/pp/productionBasicData/SelectProductionBasicData.vue
@@ -184,9 +184,10 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid max-height="100%" height="100%" class="mytable-scrollbar" ref="xGrid" v-bind="gridOptions" @@ -234,6 +235,7 @@ </vxe-grid> </div> <el-dialog v-model="dialogTableVisible" :title="$t('productionBasicData.basicDataEdit')"> <el-row> @@ -291,11 +293,13 @@ </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .el-row{ margin: 10px; .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
@@ -273,7 +273,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid @filter-change="filterChanged" @@ -313,6 +314,7 @@ </vxe-grid> </div> </div> </template> <style scoped> @@ -320,5 +322,13 @@ width: 99%; height: 95%; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
@@ -691,7 +691,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :end-placeholder="$t('basicData.endDate')" @@ -737,6 +738,8 @@ :value="item.value" /> </el-select> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" @@ -784,6 +787,7 @@ </vxe-grid> </div> <el-dialog id="sizePrintCalrd" v-model="dialogTableVisible" @@ -849,11 +853,16 @@ </template> <style scoped> .main-div-customer { width: 99%; height: 94%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } :deep(#sizeCheck .el-dialog__body){ height: 90%; north-glass-erp/northglass-erp/src/views/pp/replenish/Replenish.vue
@@ -60,6 +60,5 @@ #main-body{ width: 99%; height: 92%; margin-top: 1%; } </style> north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
@@ -360,8 +360,8 @@ </script> <template> <div class="main-div-customer"> <el-header height="auto" style="padding: 0;margin:0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="selectDate" type="daterange" @@ -372,8 +372,8 @@ /> <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button> </el-header> </div> <div class="main-table"> <vxe-grid @filter-change="filterChanged" height="100%" @@ -437,6 +437,7 @@ </vxe-grid> </div> </div> </template> <style scoped> @@ -444,7 +445,13 @@ width: 99%; height: 94%; } #head{ width:40%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -281,27 +281,25 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :start-placeholder="$t('basicData.startDate')" :end-placeholder="$t('basicData.endDate')" format="YYYY/MM/DD" style="width: 100px" type="daterange" value-format="YYYY-MM-DD" /> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" @filter-change="filterChanged" @@ -350,12 +348,18 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } #selectForm { north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
@@ -291,27 +291,25 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :start-placeholder="$t('basicData.startDate')" :end-placeholder="$t('basicData.endDate')" format="YYYY/MM/DD" style="width: 100px" type="daterange" value-format="YYYY-MM-DD" /> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" > @@ -346,16 +344,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -201,9 +201,8 @@ </script> <template> <div class="main-div-customer" > <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-input v-model="form.orderId" clearable @@ -218,9 +217,9 @@ type="primary" :icon="Search">{{$t('basicData.search')}} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid height="100%" class="mytable-scrollbar" @@ -260,15 +259,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 90%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -360,9 +360,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <!-- <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>--> <!-- <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>--> @@ -371,7 +370,6 @@ :start-placeholder="$t('basicData.startDate')" :end-placeholder="$t('basicData.endDate')" format="YYYY/MM/DD" style="width: 100px" type="daterange" value-format="YYYY-MM-DD" /> @@ -389,13 +387,13 @@ /> </el-select> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" > @@ -438,16 +436,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 93%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue
@@ -182,15 +182,14 @@ </script> <template> <div class="main-div-customer" > <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-input v-model="form.orderId" clearable :disabled="props.orderId" :placeholder="$t('order.orderId')" style="width: 130px"></el-input> style="width: 140px" :placeholder="$t('order.orderId')"></el-input> <el-button :disabled="props.orderId" @@ -199,9 +198,9 @@ type="primary" :icon="Search">{{$t('basicData.search')}} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid height="100%" @filter-change="filterChanged" @@ -241,15 +240,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 95%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
@@ -288,27 +288,25 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :start-placeholder="$t('basicData.startDate')" :end-placeholder="$t('basicData.endDate')" format="YYYY/MM/DD" style="width: 100px" type="daterange" value-format="YYYY-MM-DD" /> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" > @@ -344,16 +342,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
@@ -269,27 +269,25 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :start-placeholder="$t('basicData.startDate')" :end-placeholder="$t('basicData.endDate')" format="YYYY/MM/DD" style="width: 100px" type="daterange" value-format="YYYY-MM-DD" /> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" > @@ -325,16 +323,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue
@@ -284,15 +284,13 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :end-placeholder="$t('basicData.endDate')" :start-placeholder="$t('basicData.startDate')" format="YYYY/MM/DD" style="width: 100px" type="daterange" value-format="YYYY-MM-DD" /> @@ -307,13 +305,13 @@ </el-select> <el-button type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" @filter-change="filterChanged" @@ -363,16 +361,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/SplittingDetailsOutside.vue
@@ -253,21 +253,20 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 130px"></el-input> <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 140px"></el-input> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" > @@ -297,16 +296,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
@@ -213,25 +213,25 @@ </script> <template> <div class="main-div-customer" > <div id="selectForm"> <el-row :gutter="0"> <el-input v-model="form.orderId" clearable :disabled="props.orderId" :placeholder="$t('order.orderId')" style="width: 130px"></el-input> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="time.date1" :start-placeholder="$t('basicData.startDate')" :end-placeholder="$t('basicData.endDate')" format="YYYY/MM/DD" style="width: 100px" type="daterange" value-format="YYYY-MM-DD" /> <el-input v-model="form.orderId" clearable :disabled="props.orderId" :placeholder="$t('order.orderId')" style="width: 130px"></el-input> <el-button :disabled="props.orderId" @click="getWorkOrder" @@ -239,11 +239,11 @@ type="primary" :icon="Search">{{$t('basicData.search')}} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid height="400px" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -286,15 +286,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -334,9 +334,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <!-- <el-input placeholder="销售单号" v-model="form.name" style="width: 150px"/>--> <!-- <el-input placeholder="项目名称" v-model="form.name" style="width: 150px"/>--> @@ -359,9 +358,10 @@ /> </el-select> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" @@ -413,16 +413,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 90%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -310,6 +310,8 @@ {field: 'stockArea', width: 120, title: t('report.inventoryArea'),visible: true}, {field: 'productName', width: 120, title: t('order.product'),visible: true}, {field: 'bendRadius', width: 120, title: t('order.bendRadius'),visible: true}, {field: 'teamsGroupsName', width: 110,title: '上工序报工',showOverflow:"ellipsis",filters: [{data: ''}], slots: {filter: 'num1_filter'}}, ],//表头按钮 toolbarConfig: { @@ -420,9 +422,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 130px"></el-input> @@ -446,10 +447,8 @@ /> </el-select> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div style="height: 100%"> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" @@ -513,13 +512,13 @@ </template> <style scoped> .main-div-customer { width: 99%; height: 90%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
@@ -327,15 +327,13 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :start-placeholder="$t('basicData.startDate')" :end-placeholder="$t('basicData.endDate')" format="YYYY/MM/DD" style="width: 100px" type="daterange" value-format="YYYY-MM-DD" /> @@ -349,13 +347,13 @@ /> </el-select> <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button> </el-row> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" max-height="100%" height="100%" v-bind="gridOptions" > @@ -391,16 +389,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 95%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -1317,8 +1317,8 @@ </script> <template> <div style="height: 100%;width: 100%"> <div id="head" style="height: 5%;width: 100%;margin-bottom: 5px"> <div style="width: 100%;height: 100%"> <div class="head"> <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" :placeholder="$t('reportingWorks.reportingWorkId')" style="width: 200px" /> <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" :placeholder="$t('processCard.processId')" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/> @@ -1342,7 +1342,7 @@ <label>{{technologicalProcess}}</label> </div> <div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%"> <div class="head1"> <el-row> <el-col :span="2"> <el-text>{{$t('order.orderId')}}：</el-text> @@ -1478,12 +1478,11 @@ </el-row> </div> <div class="main-div-customer" style="width: 100%;height: 70%"> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" :row-class-name="changeRowClass" max-height="100%" height="100%" size="small" v-bind="gridOptions" @@ -1507,6 +1506,7 @@ </vxe-grid> </div> <el-dialog @opened="openedBrokenTable" :before-close="checkClose" @@ -1611,11 +1611,23 @@ </vxe-grid> </el-dialog> </div> </div> </template> <style scoped> .head{ width: 100%; height: 35px; } .head1{ width: 100%; height: 105px; background-color: white; } .main-table{ width: 100%; height: calc(100% - 135px); } .processCard { width: 140px; north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
@@ -341,9 +341,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" type="daterange" @@ -373,9 +372,10 @@ type="primary" :icon="Search">{{$t('basicData.search')}} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid height="100%" @filter-change="filterChanged" @@ -436,15 +436,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer{ width: 99%; height: 95%; .head{ width: 100%; height: 35px; } #selectForm { width: 60%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -375,9 +375,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" type="daterange" @@ -397,9 +396,8 @@ type="primary" :icon="Search">{{$t('basicData.search')}} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid height="100%" @filter-change="filterChanged" @@ -474,6 +472,7 @@ </template> </vxe-grid> </div> <!-- <el-dialog v-model="updateWork" style="width: 80%;height:75% ">--> <!-- <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />--> <!-- </el-dialog>--> @@ -481,12 +480,13 @@ </template> <style scoped> .main-div-customer{ width: 99%; height: 96%; .head{ width: 100%; height: 35px; } #selectForm { width: 45%; text-align: center; .main-table{ width: 100%; height: calc(100% - 25px); } </style> north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -297,7 +297,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid height="100%" class="mytable-scrollbar" @@ -355,6 +356,7 @@ <span class="vxe-table--cell-active-area" ></span> </div> </div> </template> <style scoped> @@ -369,4 +371,14 @@ -ms-user-select: none; user-select: none; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue
@@ -651,7 +651,8 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="form.date1" :end-placeholder="$t('basicData.endDate')" @@ -697,6 +698,8 @@ :value="item.value" /> </el-select> </div> <div class="main-table"> <vxe-grid ref="xGrid" class="mytable-scrollbar" @@ -744,6 +747,7 @@ </vxe-grid> </div> <el-dialog id="sizePrintCalrd" v-model="dialogTableVisible" @@ -789,9 +793,16 @@ </template> <style scoped> .main-div-customer { width: 99%; height: 94%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); }
@@ -249,9 +249,10 @@ </script> <template> <div class="main-div-customer"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -291,11 +292,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -328,9 +328,8 @@ </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="orderInfo.workOrderDate" type="daterange" @@ -363,11 +362,11 @@ id="select" type="primary" :icon="Search">{{$t('basicData.search')}} </el-button> </el-row> </div> <div class="main-table"> <vxe-grid max-height="100%" height="100%" @filter-change="filterChanged" class="mytable-scrollbar" ref="xGrid" @@ -421,16 +420,17 @@ </vxe-grid> </div> </div> </template> <style scoped> .main-div-customer { width: 99%; height: 100%; .head{ width: 100%; height: 35px; } #selectForm { width: 50%; text-align: center; .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
@@ -162,9 +162,10 @@ //表头按钮 toolbarConfig: { buttons: [ {'code': 'add', 'name': t('basicData.insert'),status: 'primary'}, ], slots:{ buttons: "toolbar_buttons", tools:'add' }, // import: false, // export: true, @@ -187,6 +188,11 @@ } } } } const add = () => { rowIndex.value = null dialogTableVisible.value = true } request.get('/basicData/getBasicData').then(res => { @@ -253,22 +259,12 @@ </script> <template> <div> <el-row> <el-col :span="8"> <el-cascader v-model="basic.basicType" @change="handleChange" :options="options" clearable :placeholder="$t('processCard.pleaseSelect')" /> </el-col> </el-row> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid style="width: 40vw;" class="mytable-scrollbar" max-height="500px" height="100%" ref="xGrid" v-bind="gridOptions" v-on="gridEvents" @@ -294,8 +290,25 @@ </div> </template> <template #toolbar_buttons> <el-col :span="8"> <el-cascader v-model="basic.basicType" @change="handleChange" :options="options" clearable :placeholder="$t('processCard.pleaseSelect')" /> </el-col> </template> <template #add> <el-button @click="add" type="primary" style="margin-right: 3px">新增</el-button> </template> </vxe-grid> </div> <el-dialog v-model="dialogTableVisible" destroy-on-close @@ -306,5 +319,13 @@ </template> <style scoped> .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/sd/basicData/SearchGlassType.vue
@@ -153,11 +153,11 @@ </script> <template> <div> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid style="width: 40vw;" class="mytable-scrollbar" max-height="500px" height="100%" ref="xGrid" v-bind="gridOptions" v-on="gridEvents" @@ -171,6 +171,7 @@ </el-popconfirm> </template> </vxe-grid> </div> <el-dialog v-model="dialogTableVisible" destroy-on-close @@ -193,6 +194,7 @@ </el-row> </el-dialog> </div> </template> @@ -201,4 +203,13 @@ .el-row{ margin-top: 10px; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
@@ -306,6 +306,7 @@ <template> <div style="width: 100%;height: 100%"> <div class="head"> <el-date-picker v-model="orderInfo.reportFormDate" type="daterange" @@ -318,9 +319,10 @@ <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button> </div> <div class="main-table"> <vxe-grid max-height="97%" height="100%" class="mytable-scrollbar" @filter-change="filterChanged" ref="xGrid" @@ -379,11 +381,21 @@ </vxe-pager> </template> </vxe-grid> </div> </div> </template> <style scoped> .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 35px); } </style> north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
@@ -319,7 +319,7 @@ </div> <div class="main-table"> <vxe-grid max-height="100%" height="100%" class="mytable-scrollbar" @filter-change="filterChanged" ref="xGrid" north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
@@ -278,9 +278,10 @@ </script> <template> <div style="width: 50%;height: 100% ;"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid max-height="100%" height="100%" class="mytable-scrollbar" ref="xGrid" v-bind="gridOptions" @@ -306,7 +307,7 @@ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('role.rolePermissions')}}</el-button> </template> </vxe-grid> </div> <el-dialog v-model="dialogVisible" @open="getPermissionList" @@ -358,4 +359,13 @@ :deep(.el-dialog__body){ height: 80%; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/northglass-erp/src/views/system/user/UserList.vue
@@ -140,9 +140,10 @@ </script> <template> <div style="width: 100%;height: 100% ;"> <div style="width: 100%;height: 100%"> <div class="main-table"> <vxe-grid max-height="100%" height="100%" class="mytable-scrollbar" ref="xGrid" v-bind="gridOptions" @@ -168,6 +169,7 @@ </el-popconfirm> </template> </vxe-grid> </div> <el-dialog v-model="dialogVisible" @@ -198,4 +200,13 @@ .dialog-footer button:first-child { margin-right: 10px; } .head{ width: 100%; height: 35px; } .main-table{ width: 100%; height: calc(100% - 0px); } </style> north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
@@ -35,6 +35,13 @@ return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore)); } @ApiOperation("物料查询接口") @SaCheckPermission("selectIngredients.search") @PostMapping("/getSelectMaterialStore") public Result getSelectMaterialStores(@RequestBody MaterialStore materialStore){ return Result.seccess(materialStoreService.getSelectMaterialStores(materialStore)); } @ApiOperation("物料删除接口") @SaCheckPermission("selectIngredients.delete") @PostMapping("/deleteMaterialStore") north-glass-erp/src/main/java/com/example/erp/dto/pp/WorkInProgressDTO.java
@@ -41,4 +41,6 @@ private String bendRadius; @ExcelProperty("编号") private String glassNumber; @ExcelProperty("上工序报工班组") private String teamsGroupsName; } north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialStoreMapper.java
@@ -18,6 +18,8 @@ @Param("pageSize") Integer pageSize, @Param("materialStore") MaterialStore materialStore); List<MaterialStore> getSelectMaterialStores(@Param("materialStore") MaterialStore materialStore); MaterialStore getSelectMaterialStoreById(@Param("id") Long id);
@@ -106,6 +106,14 @@ return map; } public Map<String, Object> getSelectMaterialStores(MaterialStore materialStore) { Map<String, Object> map = new HashMap<>(); map.put("data", materialStoreMapper.getSelectMaterialStores(materialStore)); return map; } public String deleteMaterialStore(Map<String,Object> object) { String saveState = "true"; //设置回滚点 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -154,7 +154,6 @@ </if> </where> limit #{offset},#{pageSize}; </select> <select id="getSelectMaterialInventoryPageTotal"> @@ -170,7 +169,6 @@ </where> limit #{offset},#{pageSize}; </select> <select id="getSelectMaterialInventoryEngineering"> @@ -205,7 +203,6 @@ </where> limit #{offset},#{pageSize}; </select> <select id="getSelectMaterialInventoryEngineeringPageTotal"> @@ -224,7 +221,6 @@ </where> limit #{offset},#{pageSize}; </select> @@ -428,7 +424,6 @@ and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId} </if> </where> limit #{offset},#{pageSize}; </select> <select id="getSelectMaterialOutboundEngineering" > @@ -459,7 +454,6 @@ and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId} </if> </where> limit #{offset},#{pageSize}; </select> <select id="getSelectMaterialOutboundDetailPageTotal"> @@ -473,7 +467,6 @@ and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId} </if> </where> limit #{offset},#{pageSize}; </select> @@ -511,7 +504,6 @@ and rwd.returning_id regexp #{returningWarehouseDetail.returningId} </if> </where> limit #{offset},#{pageSize}; </select> <select id="getSelectReturningWarehouseDetailPageTotal"> north-glass-erp/src/main/resources/mapper/mm/MaterialStore.xml
@@ -21,6 +21,22 @@ limit #{offset},#{pageSize}; </select> <select id="getSelectMaterialStores"> select * from mm.material_store m <where> <if test="materialStore.id != null and materialStore.id != ''"> and m.id regexp #{materialStore.id} </if> <if test="materialStore.type != null and materialStore.type != ''"> and m.type regexp #{materialStore.type} </if> </where> order by m.id desc </select> <select id="getSelectMaterialStoreById"> select * from mm.material_store m where id=#{id} </select> north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -152,6 +152,7 @@ <result column="product_name" property="productName"/> <result column="bend_radius" property="bendRadius"/> <result column="glassNumber" property="glassNumber"/> <result column="teams_groups_name" property="teamsGroupsName"/> </resultMap> <!-- 流程卡进度--> @@ -338,7 +339,8 @@ odpd.broken_num) / 1000000, 2) as stockArea, od.product_name, od.bend_radius, ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber, rws.teams_groups_name from sd.order_detail AS od LEFT JOIN sd.order_glass_detail AS ogd @@ -374,6 +376,14 @@ and c.technology_number = fc.technology_number left join sd.`order` as o on o.order_id = od.order_id left join ( select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number from reporting_work as a left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 @@ -447,6 +457,14 @@ and c.technology_number = fc.technology_number left join sd.`order` as o on o.order_id = od.order_id left join ( select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number from reporting_work as a left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 @@ -1430,7 +1448,8 @@ sum(ROUND(ogd.child_width * ogd.child_height * (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num) / 1000000, 2)) as stockArea, od.product_name od.product_name, rws.teams_groups_name from sd.order_detail AS od LEFT JOIN sd.order_glass_detail AS ogd @@ -1466,6 +1485,14 @@ and c.technology_number = fc.technology_number left join sd.`order` as o on o.order_id = od.order_id left join ( select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number from reporting_work as a left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 @@ -1527,6 +1554,14 @@ and c.technology_number = fc.technology_number left join sd.`order` as o on o.order_id = od.order_id left join ( select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number from reporting_work as a left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 @@ -1562,7 +1597,8 @@ sum(ROUND(ogd.child_width * ogd.child_height * (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num) / 1000000, 2)) as stockArea, od.product_name od.product_name, rws.teams_groups_name from sd.order_detail AS od LEFT JOIN sd.order_glass_detail AS ogd @@ -1598,6 +1634,14 @@ and c.technology_number = fc.technology_number left join sd.`order` as o on o.order_id = od.order_id left join ( select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number from reporting_work as a left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0 @@ -1662,6 +1706,14 @@ and c.technology_number = fc.technology_number left join sd.`order` as o on o.order_id = od.order_id left join ( select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number from reporting_work as a left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses} where LENGTH(fc.process_id) = 14 and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num != 0
