| src/assets/api/controller.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/finishedProductInspection.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/raw-ins.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/rawInsDetail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/rawUnqualified/raw.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/technical.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/assets/api/controller.js
@@ -1,8 +1,12 @@ // 技术管理-标准Bom const standard = { // 技术管理-标准Bom selectTreeByMaterial: "material/selectTreeByMaterial", //查询物料的树 selectProductByMaterial: "product/selectTreeByMaterial",//根据物料查询项目表格 selectTechnologyByMaterial: "technology/select" selectTechnologyByMaterial: "technology/select", // 技术管理-技术文件 selectAllOrder: "/orders/selectAllOrder",//查询所有订单列表 selectOrderById: "/orders/selectOrderById",//根据订单id查询订单详情 } // 原材料检验 const raw = { @@ -10,13 +14,24 @@ selectRawInspectsListById: "rawInspect/selectRawInspectsListById/",//根据检验单id获取检验单详情 updaterawInsProduct:'rawInsProduct/updaterawInsProduct',//修改项目的检验值 updateRawInspectsById:"/rawInspect/updateRawInspectsById/",//上报, listMaterial:"/finished-inspect/list_material",//添加检验单时的项目列表 selectRawMaterial:"/rawInspect/selectMaterial",//查询原材料信息 selectSpBySt:"/rawInspect/selectSpBySt",//根据材料id查询所有型号, addRawInspects :"/rawInspect/addRawInspects" } // 成品检验 const finishedIns ={ finishedInsListPage:"/finished-inspect/list_page",//获取成品检验列表 // listMaterial:"/finished-inspect/list_material",//添加检验单时的项目列表 finishedInspectUser:"/finished-inspect/page_user",//获取所有主机工 projectListByfinishId:"/inspection-item/list_user",//根据id查询所有项目 } const url = { enter: "user/enter", //登录 ...standard, ...raw ...raw, ...finishedIns }
@@ -13,31 +13,29 @@ </div> <div class="nav"> <span>检验结果：</span> <el-select v-model="inspectionResult" size="small" placeholder="请选择" style="width: 224px;margin-right: 52px;"> <el-option value="选项1"></el-option> <el-option value="选项2"></el-option> <el-select v-model="searchData.inspectResult" size="small" placeholder="请选择" style="width: 224px;margin-right: 52px;"> <el-option value="1" label="合格"></el-option> <el-option value="2" label="不合格"></el-option> </el-select> <span>检验日期：</span> <el-date-picker v-model="inspectionDate" v-model="searchData.inspectDate" type="date" placeholder="选择日期" style="margin-right: 52px"> </el-date-picker> <span>检验人：</span> <el-select v-model="inspecter" size="small" placeholder="请选择" style="width: 224px;margin-right: 52px;"> <el-option value="选项1"></el-option> <el-option value="选项2"></el-option> <el-select v-model="searchData.inspectUsername" size="small" placeholder="请选择" style="width: 224px;margin-right: 52px;"> <el-option :value="item.id" :key="item.id" :label="item.name" v-for="item in usernameOptions"></el-option> </el-select> <el-button size="mini"><span>重 置</span></el-button> <el-button size="mini" type="primary" style="background: #004EA2;"><span>查 询</span></el-button> <el-button size="mini" @click="()=>{searchData={};getInspectionTableData()}"><span>重 置</span></el-button> <el-button size="mini" type="primary" @click="getInspectionTableData" style="background: #004EA2;"><span>查 询</span></el-button> </div> <div class="content-body"> <div class="inspectionTable"> <el-table ref="inspectionTable" :height="400" :max-height="400" height="620" :cell-style="{textAlign: 'center'}" :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}" :data="inspectionTable" @@ -48,22 +46,22 @@ width="50"> </el-table-column> <el-table-column prop="number" prop="order_number" label="订单号" min-width="100" /> <el-table-column prop="username" prop="customer_name" label="客户名称" min-width="80" /> <el-table-column prop="projectname" prop="project_name" label="工程名称" min-width="80" /> <el-table-column prop="tracenumber" prop="quality_traceability" label="质量追溯号" min-width="108" /> @@ -73,12 +71,12 @@ min-width="100" /> <el-table-column prop="class" prop="material" label="产品大类" min-width="72" /> <el-table-column prop="specificationmodel" prop="specifications_model" label="规格型号" min-width="110" /> @@ -93,22 +91,7 @@ min-width="50" /> <el-table-column prop="machine" label="机台" min-width="60" /> <el-table-column prop="group" label="班组" min-width="50" /> <el-table-column prop="worker" label="主机工" min-width="60" /> <el-table-column prop="date" prop="detectionPeriod" label="检验日期" min-width="80" /> @@ -116,13 +99,19 @@ prop="result" label="检测结果" min-width="80" /> > <template slot-scope="scope"> <span>{{scope.row.result===1?'合格':'不合格'}}</span> </template> </el-table-column> <el-table-column label="操作" min-width="80" > <template slot-scope="scope"> <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button> <el-button type="text" size="small" @click="goToDetail(scope.row)">查看</el-button> <el-button type="text" size="small">打印</el-button> </template> </el-table-column> @@ -131,11 +120,11 @@ <!-- 分页器 --> <div class="pagination"> <el-pagination :current-page="currentPage" :current-page="pageParams.pageNo" :page-sizes="[100, 200, 300, 400]" :page-size="pageSize" :page-size="pageParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="this.inspectionTable.length" :total="pageParams.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" /> @@ -149,93 +138,87 @@ <el-col :span="12">新增成品检验单</el-col> <el-col :span="12" style="text-align: right;"> <!-- 点击返回，当前页面值为false --> <el-button @click="showAddPage = false" type="primary" size="mini" icon="el-icon-back" style="background: #004EA2; ">返回</el-button> <el-button @click="()=>{showAddPage = false;showDetail = false}" type="primary" size="mini" icon="el-icon-back" style="background: #004EA2; ">返回</el-button> </el-col> </el-row> <el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="left" label-width="100px" size="mini" > <el-form :model="addInspectionform" ref="addInspectionform" class="addInspectionform" label-position="right" label-width="100px" size="mini" > <div class="formwrapper"> <el-row :gutter="450"> <el-col :span="5"> <el-row> <el-col :span="7"> <el-form-item label="订单号："> <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="请输入订单号" autocomplete="off" /> <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.number" placeholder="请输入订单号" autocomplete="off" /> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.order_number" placeholder="请输入订单号1" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="5"> <el-col :span="7"> <el-form-item label="客户名称："> <el-input style="width: 180px;" v-model="addInspectionform.username" placeholder="请输入客户名称" autocomplete="off" /> <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.username" placeholder="请输入客户名称" autocomplete="off" /> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.customer_name" placeholder="请输入客户名称" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="5"> <el-col :span="7"> <el-form-item label="工程名称："> <el-input style="width: 180px;" v-model="addInspectionform.projectname" placeholder="请输入工程名称" autocomplete="off" /> <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.projectname" placeholder="请输入工程名称" autocomplete="off" /> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.project_name" placeholder="请输入工程名称" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="450"> <el-col :span="5"> <el-row > <el-col :span="7"> <el-form-item label="质量追溯号：" > <el-input style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="请输入追溯号" autocomplete="off" /> <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.tracenumber" placeholder="请输入追溯号" autocomplete="off" /> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quality_traceability" placeholder="请输入追溯号" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="5"> <el-col :span="7"> <el-form-item label="产品编码："> <el-input style="width: 180px;" v-model="addInspectionform.code" placeholder="请输入产品编码" autocomplete="off" /> </el-form-item> <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.material_code" placeholder="请输入产品编码" autocomplete="off" /> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material_code" placeholder="请输入产品编码" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="5"> <el-col :span="7"> <el-form-item label="产品名称："> <el-select style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="请选择产品名称"> <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.class" size="small" placeholder="请选择产品名称"> <el-option value="选项1"></el-option> <el-option value="选项2"></el-option> </el-select> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.material" placeholder="请输入产品编码" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="450"> <el-col :span="5"> <el-row > <el-col :span="7"> <el-form-item label="规格型号：" > <el-select style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="请选择规格型号"> <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.specificationmodel" size="small" placeholder="请选择规格型号"> <el-option value="选项1"></el-option> <el-option value="选项2"></el-option> </el-select> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="请输入产品编码" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="5"> <el-col :span="7"> <el-form-item label="单位：" > <el-select style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="请选择单位"> <el-select v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.unit" size="small" placeholder="请选择单位"> <el-option value="选项1"></el-option> <el-option value="选项2"></el-option> </el-select> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.specifications_model" placeholder="请输入产品编码" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="5"> <el-col :span="7"> <el-form-item label="数量："> <el-input style="width: 180px;" v-model="addInspectionform.quantity" placeholder="请输入数量" autocomplete="off" /> <el-input v-show="showDetail == false" style="width: 180px;" v-model="addInspectionform.quantity" placeholder="请输入数量" autocomplete="off" /> <el-input v-show="showDetail !== false" style="width: 180px;" v-model="finishedInsInfo.quantity" placeholder="请输入产品编码" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="450"> <!-- <el-col :span="5"> <el-form-item label="班组：" > <el-select style="width: 180px;" v-model="addInspectionform.group" size="small" placeholder="请选择班组"> <el-option value="选项1"></el-option> <el-option value="选项2"></el-option> </el-select> </el-form-item> </el-col> --> <el-col :span="5"> <el-form-item label="主机工：" > <el-select style="width: 180px;" v-model="addInspectionform.worker" size="small" placeholder="请选择主机工"> <el-option value="选项1"></el-option> <el-option value="选项2"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="机台：" > <el-select style="width: 180px;" v-model="addInspectionform.machine" size="small" placeholder="请选择产品机台"> <el-option value="选项1"></el-option> <el-option value="选项2"></el-option> </el-select> </el-form-item> <el-row > <el-col v-show="showDetail !== false" :span="7"> <el-form-item label="主机工：" > <el-input style="width: 180px;" v-model="finishedInsInfo.name" placeholder="请输入产品编码" autocomplete="off" /> </el-form-item> </el-col> </el-row> </div> @@ -277,8 +260,7 @@ <el-table-column prop="operation" label="上报"></el-table-column> </el-table> </div> </div> </div> </div> </template> @@ -287,45 +269,22 @@ export default { data(){ return { inspectionResult: '', inspectionDate: '', inspecter: '', inspectionTable:[{ number: '8540395029753', username: 'jack', projectname: '布隆迪', tracenumber: '826403164021', code: 'C-982164', class: '成品', specificationmodel: '8.8/15kV JLS-3.2', unit: '吨', quantity: '15', machine: '拉闸机', group: '1组', worker: '黄小明', date: '2023-08-01', result: '合格', operation: '' },{ number: '2497320327652', username: 'rose', projectname: '布隆迪', tracenumber: '826403164021', code: 'C-24114', class: '成品', specificationmodel: '8.6/15kV JAD-3.2', unit: '吨', quantity: '43', machine: '拉闸机', group: '1组', worker: '黄小明', date: '2023-08-01', result: '合格', operation: '' }], currentPage: 1, // 当前页码 pageSize: 100, searchData:{ inspectionResult: '', inspectionDate: '', inspecter: '', }, // 主机工下拉框 usernameOptions:[], inspectionTable:[ ], pageParams:{ pageNo: 1, // 当前页码 pageSize: 100, total:0 }, showAddPage: false, showDetail:false, addInspectionform: [{ number: '', username: '', @@ -355,8 +314,13 @@ inspecter:'111', conclusion:'', operation:'' }] }], finishedInsInfo:{} } }, created() { this.init() this.getInspectionTableData() }, methods:{ // 每页条数改变时触发 选择一页显示多少行 @@ -372,6 +336,24 @@ }, handleAddNew(){ this.showAddPage=true }, async getInspectionTableData() { const {data:{row,total}} = await this.$axios.get(this.$api.url.finishedInsListPage,{params:{...this.pageParams,...this.searchData}}) console.log(row) this.inspectionTable = row this.pageParams.total = total }, goToDetail(row) { this.showAddPage = true this.showDetail = true this.finishedInsInfo = row console.log(this.showDetail) // this.addInspectionform = [] }, async init() { const {data} = await this.$axios.get(this.$api.url.finishedInspectUser) this.usernameOptions = data } } @@ -433,4 +415,18 @@ background-color: #fff; padding: 10px 12px; } .rawPage{ height: 100%; display: flex; flex-direction: column; overflow-y: scroll; } .rawPage .content-body{ flex: 1; } /* .inspectionTable{ flex: 1; overflow-y: scroll; } */ </style> src/components/view/raw-ins.vue
@@ -1,5 +1,7 @@ <style scoped> .raw_ins {} .raw_ins { height: 100%; } .raw_ins .title .el-button { height: 32px; @@ -110,7 +112,7 @@ </div> <div class="thing"> <el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)" max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" border default-expand-all max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id"> <el-table-column type="selection" width="50"> </el-table-column> src/components/view/rawInsDetail.vue
@@ -83,31 +83,44 @@ <el-form v-model="detailInfo" label-position="right" label-width="120px" > <el-row> <el-col :span="7"> <el-form-item label="来料日期:"> <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.formTime"></el-input> <el-date-picker v-else type="date" v-model="detailInfo.formTime" placeholder="选择日期"> </el-date-picker> <el-form-item label="原材料名称:"> <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.name"></el-input> <el-select @change="checkRawName" v-else placeholder="请选择项目名称" v-model="detailInfo.name"> <el-option v-for="item in materialOptions" :key="item.id" :label="item.name" :value="item.name"></el-option> </el-select> </el-form-item> </el-col> <el-col :span="7"> <el-form-item label="规格型号:"> <el-input :disabled="detailId!==null" v-model="detailInfo.specifications"></el-input> <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.specifications"></el-input> <el-cascader placeholder="请选择规格型号" v-else :disabled="specificationOptions.length===0" :props="{label:'name',value:'name'}" v-model="detailInfo.specificationsArr" :options="specificationOptions" ></el-cascader> </el-form-item> </el-col> <el-col :span="7"> <el-form-item label="原材料编码:"> <el-input :disabled="detailId!==null" v-model="detailInfo.code"></el-input> <el-input disabled v-model="detailInfo.code"></el-input> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="7"> <el-form-item label="原材料名称:"> <el-input :disabled="detailId!==null" v-model="detailInfo.name"></el-input> <el-form-item label="来料日期:"> <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.formTime"></el-input> <el-date-picker v-else type="date" value-format="yyyy-MM-dd" v-model="detailInfo.formTime" placeholder="选择日期"> </el-date-picker> </el-form-item> </el-col> <el-col :span="7"> @@ -295,7 +308,7 @@ label="检验员" width="542"> <template slot-scope="scope"> <span v-for="item in scope.row.names" :key="item.username" :style="{marginRight:'8px'}">{{item}}</span> <span v-for="item in scope.row.names" :key="item&&item.userName" :style="{marginRight:'8px'}">{{item}}</span> </template> </el-table-column> <el-table-column @@ -344,8 +357,9 @@ conclusion.name = this.detailInfo.name conclusion.code = this.detailInfo.code conclusion.names= [...new Set(this.projectTable.map(item=>item.userName))] console.log(this.projectTable.filter(item=>item.testState===0)) if(this.projectTable.filter(item=>item.testState===null).length){ console.log(conclusion,this.projectTable) console.log(this.projectTable.filter(item=>item.testState===null).length) if(this.projectTable.filter(item=>item.testState===null).length===this.projectTable.length){ conclusion.testState = null return [conclusion] } @@ -370,7 +384,9 @@ // 新建检验单参数对象 rawInsParams:{}, // 项目名称options materialOptions:[] materialOptions:[], specificationOptions:[] } }, methods:{ @@ -379,11 +395,19 @@ const {data} = await this.$axios.get(this.$api.url.selectRawInspectsListById+`${this.detailId}`,{params:{id:this.detailId}}) this.detailInfo = data this.projectTable = data.rawInsProducts // console.log(this.projectTable) console.log(data) }, // 新增检验单 addNewRawInspect() { console.log(this.detailInfo) async addNewRawInspect() { this.detailInfo.specifications = this.detailInfo.specificationsArr.join("-") // const time = this.detailInfo.formTime // this.detailInfo.formTime = `${time.getFullYear()}-${time.getMonth() + 1 < 10 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1}-${time.getDate() < 10 ? '0' + time.getDate() : time.getDate()}` const res = await this.$axios.post(this.$api.url.addRawInspects,{...this.detailInfo},{headers:{'Content-Type':'application/json'}}) console.log(res) this.detailId = res.data this.getDetailInfo() this.$message.success('提交成功') }, // 修改项目的检测值改变结论 async changeState(row){ @@ -398,8 +422,23 @@ this.getDetailInfo() }, async getOptions() { const {data} = await this.$axios.get(this.$api.url.listMaterial) // const {data} = await this.$axios.get(this.$api.url.listMaterial) // this.materialOptions = data const {data} = await this.$axios.get(this.$api.url.selectRawMaterial) this.materialOptions = data console.log(this.materialOptions) }, checkRawName(data) { console.log('选择原材料名称',data) this.materialOptions.forEach(item=>{ if(item.name===data){ console.log(item.id) this.detailInfo.code = item.code this.$axios.get(this.$api.url.selectSpBySt,{params:{id:item.id}}).then(res=>{ this.specificationOptions= res.data }) } }) } } } src/components/view/rawUnqualified/raw.vue
@@ -1,9 +1,10 @@ <style scoped> .unqualifiedBox{ width: 100%; height: 100%; max-height: 100%; display: flex; flex-direction: column; overflow-y: scroll; } .unqualifiedBox .title .el-button { height: 32px; @@ -47,7 +48,7 @@ <div class="unqualifiedBox"> <div class="title"> <el-row> <el-col :span="12" style="line-height: 32px;">原材料检验</el-col> <el-col :span="12" style="line-height: 32px;">原材料不合格</el-col> <el-col :span="12" style="text-align: right;"> <el-button icon="el-icon-download" @click="()=>{}">导出</el-button> </el-col> @@ -73,7 +74,7 @@ 询</span></el-button> </div> <div class="unqualifiedTable"> <el-table :data="unqualifiedData" height="630"> <el-table :data="unqualifiedData" height="620"> <el-table-column type="selection" width="55"> src/components/view/technical.vue
@@ -48,7 +48,7 @@ color: #fff; } /* 输入框的样式 */ .search-header .el-form-item .el-input .el-input__inner{ .search-header .el-form-item .el-input >>>.el-input__inner{ width: 224px; height: 32px ; box-sizing: border-box; @@ -86,6 +86,17 @@ margin-bottom: 24px; font-size: 16px; } .detail-model >>>.el-form-item__label{ color: rgb(51, 51, 51); } .detail-model >>>.el-input__inner{ width: 224px; height: 32px; box-sizing: border-box; background: rgb(238, 238, 238); border: 1px solid rgb(221, 221, 221); border-radius:4px; } </style> @@ -102,18 +113,19 @@ <div class="search-header"> <el-form v-model="searchData" :inline="true"> <el-form-item label="订单号:"> <el-input v-model="searchData.number"></el-input> <el-input v-model="searchData.id"></el-input> </el-form-item> <el-form-item label="下单日期:"> <el-date-picker v-model="searchData.date" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"> </el-date-picker> </el-form-item> <el-form-item> <el-button plain @click="resetBtn">重 置</el-button> <el-button @click="filteredTableData">查 询</el-button> <el-button @click="searchTechnical">查 询</el-button> </el-form-item> </el-form> </div> @@ -128,66 +140,68 @@ width="78"> </el-table-column> <el-table-column prop="date" prop="id" label="订单号" width="124"> </el-table-column> <el-table-column prop="name" prop="proname" label="工程名称" width="160"> </el-table-column> <el-table-column prop="address" prop="code" label="产品编码" width="168" > </el-table-column> <el-table-column prop="name" prop="type" label="产品大类" width="128"> </el-table-column> <el-table-column prop="address" prop="specifications" label="规格型号" width="170"> </el-table-column> <el-table-column prop="name" prop="unit" label="单位" width="100"> </el-table-column> <el-table-column prop="address" prop="number" label="数量" width="118" > </el-table-column> <el-table-column prop="name" prop="username" label="下单人" width="114"> </el-table-column> <el-table-column prop="address" prop="createTime" label="下单日期" width="153" > </el-table-column> <el-table-column prop="address" prop="deliveryTime" label="交货日期" width="137"> </el-table-column> <el-table-column prop="address" prop="state" label="状态" width="85" > <template slot-scope="scope"> {{scope.state==1?'待编制':'已编制'}} </template> </el-table-column> <el-table-column fixed="right" label="操作" width="194"> <template slot-scope="scope"> @@ -200,80 +214,82 @@ <el-pagination :current-page="1" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageParams.pageNo" :page-sizes="[100, 200, 300, 400]" :page-size="100" :page-size="pageParams.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="400"> :total="pageParams.total"> </el-pagination> <!-- 查看详情模态框 --> <el-dialog title="文件详情" :visible.sync="showDetail" width="687px" @close="showDetail = false"> <el-dialog title="文件详情" class="detail-model" :visible.sync="showDetail" width="687px" @close="showDetail = false"> <el-form label-position="right" label-width="70px" :model="selectedRow"> <span class="formtitle">基本信息</span> <el-row :gutter="31"> <el-col :span="12"> <el-form-item label="订单号"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.id" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="工程名称"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;"/> <el-input :value="selectedRow.proname" :readonly="true" style="height: 32px; width: 224px;"/> </el-form-item> </el-col> </el-row> <el-row :gutter="31"> <el-col :span="12"> <el-form-item label="产品编码"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.code" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="产品大类"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.type" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> </el-row> <el-row :gutter="31"> <el-col :span="12"> <el-form-item label="规格型号"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.specifications" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="单位"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.unit" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> </el-row> <el-row :gutter="31"> <el-col :span="12"> <el-form-item label="数量"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.number" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="下单人"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.custname" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> </el-row> <el-row :gutter="31"> <el-col :span="12"> <el-form-item label="下单日期"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.createTime" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="交货日期"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.deliveryTime" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> </el-row> <el-row :gutter="31"> <el-col :span="12"> <el-form-item label="状态"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.state==1?'待编制':'已编制'" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> </el-row> @@ -281,24 +297,24 @@ <el-row :gutter="31"> <el-col :span="12"> <el-form-item label="客户名称"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.proname" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="省份"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.province" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> </el-row> <el-row :gutter="31"> <el-col :span="12"> <el-form-item label="事业部"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.department" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="业务员"> <el-input :value="selectedRow.date" readonly="true" style="height: 32px; width: 224px;" /> <el-input :value="selectedRow.salesman" :readonly="true" style="height: 32px; width: 224px;" /> </el-form-item> </el-col> </el-row> @@ -316,10 +332,13 @@ <script> export default { filters:{ }, data() { return { searchData:{ number:'', id:'', date:'' }, technicalTable: [{ @@ -367,15 +386,46 @@ name: '王小虎', address: '上海市' } ], showDetail: false, selectedRow: '' ], showDetail: false, selectedRow: {}, pageParams:{ pageNo:1, pageSize:10, total:0 } } }, created() { this.getTechnicalTableData() }, methods: { showDetails(row){ async showDetails(row){ this.showDetail = true this.selectedRow = row const res = await this.$axios.get(this.$api.url.selectOrderById,{params:{id:row.id}}) this.selectedRow = res.data console.log(this.selectedRow) }, async getTechnicalTableData() { const res = await this.$axios.get(this.$api.url.selectAllOrder,{params:{pageSize:(this.pageParams.pageNo-1),countSize:this.pageParams.pageSize,...this.searchData}}) this.technicalTable = res.data.row this.pageParams.total = res.data.total }, // 头部条件查询-重置 resetBtn() { this.searchData={} }, // 头部条件查询-查询 searchTechnical() { this.getTechnicalTableData() }, handleSizeChange(value){ this.pageParams.pageSize = value this.getTechnicalTableData() }, handleCurrentChange(value){ this.pageParams.pageNo = value this.getTechnicalTableData() } }, }
