From 45e7495fe17c3b390a6d0e2461f0b8f965d46f6f Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期四, 09 十一月 2023 09:11:28 +0800 Subject: [PATCH] modified: src/api/basic/param.js modified: src/views/basic/company/index.vue modified: src/views/basic/division/index.vue modified: src/views/basic/factory/index.vue modified: src/views/basic/param/index.vue modified: src/views/basic/part/index.vue modified: src/views/basic/template/index.vue modified: src/views/common/param.vue modified: src/views/common/ztt-table.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/completeproductstructure/index.vue modified: src/views/technology/structure/index.vue modified: src/views/technology/structure/single-structure-form.vue --- src/views/basic/template/index.vue | 5 src/views/common/param.vue | 66 ++++++------ src/views/technology/completeproductstructure/completeproductstructure-form.vue | 6 src/views/basic/factory/index.vue | 3 src/views/common/ztt-table.vue | 23 +++- src/views/basic/division/index.vue | 1 src/views/basic/param/index.vue | 26 ++++ src/views/basic/part/index.vue | 12 + src/views/technology/structure/single-structure-form.vue | 22 +++ src/api/basic/param.js | 7 + src/views/basic/company/index.vue | 5 src/views/technology/structure/index.vue | 14 ++ src/views/technology/completeproductstructure/index.vue | 98 +++++++++--------- 13 files changed, 177 insertions(+), 111 deletions(-) diff --git a/src/api/basic/param.js b/src/api/basic/param.js index 35f0ec3..c131ace 100644 --- a/src/api/basic/param.js +++ b/src/api/basic/param.js @@ -24,6 +24,13 @@ params: query }) } +export function pageInModel(query) { + return request({ + url: '/mes/param/pageInModel', + method: 'get', + params: query + }) +} export function getTechnologyParamPage(query, id) { return request({ url: '/mes/param/param/page/' + id, diff --git a/src/views/basic/company/index.vue b/src/views/basic/company/index.vue index 2e49f73..99fa2d4 100644 --- a/src/views/basic/company/index.vue +++ b/src/views/basic/company/index.vue @@ -34,7 +34,7 @@ multipleSelection: [], uploadInfo:{//鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl isShow:false, - url:'' + url:'/mes/company/upload' }, prelang:"operation", options: { @@ -48,7 +48,8 @@ seqNo:true, isShowHide:true,//鏄惁鏄剧ず鏄惧奖鎸夐挳 isSearch:false,//楂樼骇鏌ヨ鎸夐挳 - isCopy: true, + isCopy: false, + isRefresh: true, defaultOrderBy:{column:'createTime',direction:'desc'} }, table: { diff --git a/src/views/basic/division/index.vue b/src/views/basic/division/index.vue index b390fe0..6cded44 100644 --- a/src/views/basic/division/index.vue +++ b/src/views/basic/division/index.vue @@ -40,6 +40,7 @@ seqNo: true, isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳 isSearch: false, // 楂樼骇鏌ヨ鎸夐挳 + isRefresh: true, defaultOrderBy: { column: 'createTime', direction: 'desc' } }, table: { diff --git a/src/views/basic/factory/index.vue b/src/views/basic/factory/index.vue index f9c85c9..c8a8358 100644 --- a/src/views/basic/factory/index.vue +++ b/src/views/basic/factory/index.vue @@ -39,7 +39,7 @@ uploadInfo: { // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl isShow: false, - url: '' + url: '/mes/factory/' }, prelang: 'operation', options: { @@ -53,6 +53,7 @@ seqNo: true, isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳 isSearch: false, // 楂樼骇鏌ヨ鎸夐挳 + isRefresh: true, defaultOrderBy: { column: 'createTime', direction: 'desc' } }, table: { diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue index 113eb28..42a7e3a 100644 --- a/src/views/basic/param/index.vue +++ b/src/views/basic/param/index.vue @@ -267,32 +267,42 @@ this.option.column.forEach(item => { if (row.paramItemThree == "" && item.prop == 'paramItemThree') { item.display = false + }else if(row.paramItemThree != "" && item.prop == 'paramItemThree'){ + item.display = true } if (row.paramItemTwo == "" && item.prop == 'paramItemTwo') { item.display = false + }else if(row.paramItemTwo != "" && item.prop == 'paramItemTwo'){ + item.display = true } }) + console.log(row); + // let type=this.typeOptions.filter(t=>{ + // return t.label==row.paramType + // })[0] + // row.paramType=type.value this.$refs.crud.rowEdit(row, index) }, showDel(row, index) { this.$refs.crud.rowDel(row, index) }, updateParam(row, index, done, loading) { + // console.log(row); // this.formDisabled = true let data = { dict: '', - id: 0, + id: '', parameterFormat: '', parameterItem: '', type: row.paramType, unit: row.unit, } row.paramType == '2' ? data.dict = row.paramFormat : data.parameterFormat = row.paramFormat - if (row.threeId) { + if (row.threeId!="null") { data.id = row.threeId data.parameterItem = row.paramItemThree } else { - if (row.twoId) { + if (row.twoId!="null") { data.id = row.twoId data.parameterItem = row.paramItemTwo } else { @@ -300,7 +310,14 @@ data.parameterItem = row.paramItem } } - console.log(data) + if(data.type=='鏂囨湰鏍煎紡'){ + let type=this.typeOptions.filter(t=>{ + return t.label==row.paramType + })[0] + data.type=type.value + } + // console.log(data); + // return putObj(data).then(res => { if (res.data.data.code == 0) { this.$message.success("鏇存柊鎴愬姛") @@ -353,6 +370,7 @@ }, // 鏂板 / 淇敼 addOrUpdateHandle(row) { + console.log("1111",row); this.addOrUpdateVisible = true this.$nextTick(() => { this.$refs.addOrUpdate.init(row == null ? null : row.id) diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue index b545774..26cdc5d 100644 --- a/src/views/basic/part/index.vue +++ b/src/views/basic/part/index.vue @@ -5,10 +5,10 @@ :prelang="prelang" :options="options" :bottomOffset="125" :ajaxFun="ajaxFun" ref="partTable"> <template #toolbar></template> </ttable> - <el-upload :headers="{'Authorization': 'Bearer ' + yourToken}" class="upload-demo" action="/mes/part/uploadExcel" :on-preview="handlePreview" + <!-- <el-upload :headers="{'Authorization': 'Bearer ' + yourToken}" class="upload-demo" action="/mes/part/uploadExcel" :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :on-success="fileUpload" :limit="1"> <el-button size="small" type="primary">鐐瑰嚮Excel瀵煎叆</el-button> - </el-upload> + </el-upload> --> <!-- 寮圭獥, 鏂板 / 淇敼 --> <table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form> <PrintLabelForm :currshowlist.sync="showPrintLabelForm" :printLabelInfo="printLabelInfo" /> @@ -52,7 +52,7 @@ uploadInfo: { // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl isShow: true, - url: '/mes/part/upload' + url: '/mes/part/uploadExcel' }, prelang: 'operation', options: { @@ -66,6 +66,7 @@ seqNo: true, isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳 isSearch: false, // 楂樼骇鏌ヨ鎸夐挳 + isRefresh: true, defaultOrderBy: { column: 'id', direction: 'desc' } }, table: { @@ -749,3 +750,8 @@ } } </script> +<style> +.el-upload-dragger { + width: 300px !important; +} +</style> \ No newline at end of file diff --git a/src/views/basic/template/index.vue b/src/views/basic/template/index.vue index a076b9c..1fbaccb 100644 --- a/src/views/basic/template/index.vue +++ b/src/views/basic/template/index.vue @@ -67,7 +67,7 @@ align="center" > </el-table-column> - <el-table-column + <!-- <el-table-column label="鍙傛暟绫诲瀷" prop="type" align="center" @@ -106,7 +106,7 @@ </el-table-column> <el-table-column label="鍗曚綅" prop="unit" align="center"> - </el-table-column> + </el-table-column> --> <el-table-column label="鎿嶄綔" align="center"> <template slot-scope="scope"> <el-button @@ -444,6 +444,7 @@ }, // 娣诲姞 relateOperationParam() { + console.log(11111); if (this.templateId !== 0) { // 绛涢�夊嚭褰撳墠椤甸潰宸叉湁鐨勫弬鏁� this.paramSelArr = [] diff --git a/src/views/common/param.vue b/src/views/common/param.vue index 9d6f3df..3a9c1ab 100644 --- a/src/views/common/param.vue +++ b/src/views/common/param.vue @@ -31,7 +31,7 @@ </el-dialog> </template> <script> -import { fetchList, delObj } from '@/api/basic/param' +import { fetchList, delObj ,pageInModel} from '@/api/basic/param' import ttable from '@/views/common/ztt-table.vue' import { mapGetters } from 'vuex' import { remote } from '../../api/admin/dict' @@ -59,7 +59,7 @@ }, data() { return { - ajaxFun: fetchList, + ajaxFun: pageInModel, currentRow: false, typeOptions: [], innerVisible: false, @@ -110,37 +110,37 @@ isSearch: true, searchInfoType: 'text' }, - { - minWidth: '140', - prop: 'type', - label: '鍙傛暟绫诲瀷', - sort: true, - isTrue: true, - isSearch: true, - searchInfoType: 'select', - formatter: this.getParam, - optList: () => { - return this.typeOptions - } - }, - { - minWidth: '120', - prop: 'parameterFormat', - label: '鍙傛暟鏍煎紡', - sort: true, - isTrue: true, - isSearch: true, - searchInfoType: 'text' - }, - { - minWidth: '120', - prop: 'unit', - label: '鍗曚綅', - sort: true, - isTrue: true, - isSearch: true, - searchInfoType: 'text' - }, + // { + // minWidth: '140', + // prop: 'type', + // label: '鍙傛暟绫诲瀷', + // sort: true, + // isTrue: true, + // isSearch: true, + // searchInfoType: 'select', + // formatter: this.getParam, + // optList: () => { + // return this.typeOptions + // } + // }, + // { + // minWidth: '120', + // prop: 'parameterFormat', + // label: '鍙傛暟鏍煎紡', + // sort: true, + // isTrue: true, + // isSearch: true, + // searchInfoType: 'text' + // }, + // { + // minWidth: '120', + // prop: 'unit', + // label: '鍗曚綅', + // sort: true, + // isTrue: true, + // isSearch: true, + // searchInfoType: 'text' + // }, { minWidth: '200', prop: 'createUser', diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue index e947f8b..209e67a 100644 --- a/src/views/common/ztt-table.vue +++ b/src/views/common/ztt-table.vue @@ -480,10 +480,10 @@ </el-dialog> <el-dialog title="瀵煎叆" :visible.sync="importDialogVisible" width="22%"> <span> - <div> - <div> + <div style="width: 100%;"> + <div style="width: 100%;"> <el-upload - style="margin-left:8px;display: inline;" + style="margin-left:8px;display: inline;width: 100%;" class="upload-demo" drag :headers="headers" @@ -503,7 +503,7 @@ <i class="el-icon-upload"></i> <div class="el-upload__text"><em>鐐瑰嚮瀵煎叆鏁版嵁</em></div> <div class="el-upload__tip" slot="tip"> - 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�10M<el-button + 鍙兘涓婁紶xlsx/xls鏂囦欢锛屼笖涓嶈秴杩�30M<el-button type="text" style="font-size:15px;text-decoration: underline;" @click="downDataTemplate" @@ -1540,14 +1540,14 @@ this.colSelectDialogVisible = true this.handleCheckedCol() }, - // 闄愬埗鏂囦欢涓婁紶澶у皬锛岀洰鍓嶉檺鍒朵负10M锛堝彟鍙互鍔犵被鍨嬮檺鍒讹級 + // 闄愬埗鏂囦欢涓婁紶澶у皬锛岀洰鍓嶉檺鍒朵负30M锛堝彟鍙互鍔犵被鍨嬮檺鍒讹級 beforeAvatarUpload(file) { const fileName = file.name const fileType = fileName.substring(fileName.lastIndexOf('.') + 1) - const isLt10M = file.size / 1024 / 1024 < 10 - if (fileType !== 'xlsx' && fileType !== 'xls') { - this.$message.error('鏂囦欢鏍煎紡鍙兘涓簒lsx鎴杧ls,璇峰垹闄ゅ悗閲嶆柊涓婁紶') + const isLt10M = file.size / 1024 / 1024 < 30 + if (fileType !== 'xlsx' && fileType !== 'xls'&&fileType!=='csv') { + this.$message.error('鏂囦欢鏍煎紡鍙兘涓簒lsx鎴杧ls銆乧sv,璇峰垹闄ゅ悗閲嶆柊涓婁紶') } if (!isLt10M) { this.$message({ @@ -1568,6 +1568,7 @@ type: 'success' }) this.getDataList() + this.importDialogVisible=false } this.$refs.uploadScan.clearFiles() }, @@ -1873,4 +1874,10 @@ font-size: 14px; visibility: hidden; } +.upload-demo{ + width: 100%; +} +.el-upload-dragger { + width: 300px !important; +} </style> diff --git a/src/views/technology/completeproductstructure/completeproductstructure-form.vue b/src/views/technology/completeproductstructure/completeproductstructure-form.vue index 9ac0a9d..f33ff3a 100644 --- a/src/views/technology/completeproductstructure/completeproductstructure-form.vue +++ b/src/views/technology/completeproductstructure/completeproductstructure-form.vue @@ -133,9 +133,9 @@ :row-class-name="tableRowClassName" > <el-table-column type="selection" width="55"> </el-table-column> - <el-table-column prop="partName" label="闆朵欢鍚�" width="400"> + <el-table-column prop="partName" label="闆朵欢鍚�" width="430"> </el-table-column> - <el-table-column prop="partNo" label="闆朵欢鍙�" width="100"> + <el-table-column prop="partNo" label="闆朵欢鍙�" width="120"> </el-table-column> <el-table-column prop="originalQpa" @@ -257,7 +257,7 @@ default-expand-all class="preView-structure-table" > - <el-table-column prop="partName" label="闆朵欢鍚�" width="400"> + <el-table-column prop="partName" label="闆朵欢鍚�" width="430"> </el-table-column> <el-table-column prop="partNo" diff --git a/src/views/technology/completeproductstructure/index.vue b/src/views/technology/completeproductstructure/index.vue index d8d450f..7ec8c31 100644 --- a/src/views/technology/completeproductstructure/index.vue +++ b/src/views/technology/completeproductstructure/index.vue @@ -140,58 +140,58 @@ searchInfoType: 'text' }, - // 鏇夸唬鍙� - { - minWidth: '120', - prop: 'alternativeNo', - label: '鏇夸唬鍙�', - sort: true, - isTrue: true, - isSearch: true, - searchInfoType: 'text' - }, + // // 鏇夸唬鍙� + // { + // minWidth: '120', + // prop: 'alternativeNo', + // label: '鏇夸唬鍙�', + // sort: true, + // isTrue: true, + // isSearch: true, + // searchInfoType: 'text' + // }, - // 鏇夸唬鎻忚堪 - { - minWidth: '120', - prop: 'alternativeDesc', - label: '鏇夸唬鎻忚堪', - sort: true, - isTrue: true, - isSearch: true, - searchInfoType: 'text' - }, + // // 鏇夸唬鎻忚堪 + // { + // minWidth: '120', + // prop: 'alternativeDesc', + // label: '鏇夸唬鎻忚堪', + // sort: true, + // isTrue: true, + // isSearch: true, + // searchInfoType: 'text' + // }, - // 缁濈紭棰滆壊 - { - minWidth: '120', - prop: 'insulationColor', - label: '缁濈紭棰滆壊', - sort: true, - isTrue: true, - isSearch: true, - searchInfoType: 'text' - }, - // 鎶ゅ棰滆壊 - { - minWidth: '120', - prop: 'sheathColor', - label: '鎶ゅ棰滆壊', - sort: true, - isTrue: true, - isSearch: true, - searchInfoType: 'text' - }, + // // 缁濈紭棰滆壊 + // { + // minWidth: '120', + // prop: 'insulationColor', + // label: '缁濈紭棰滆壊', + // sort: true, + // isTrue: true, + // isSearch: true, + // searchInfoType: 'text' + // }, + // // 鎶ゅ棰滆壊 + // { + // minWidth: '120', + // prop: 'sheathColor', + // label: '鎶ゅ棰滆壊', + // sort: true, + // isTrue: true, + // isSearch: true, + // searchInfoType: 'text' + // }, // 鐗规��1 - { - minWidth: '120', - prop: 'characteristicOne', - label: '鐗规��1', - sort: true, - isTrue: true, - isSearch: true, - searchInfoType: 'text' - }, + // { + // minWidth: '120', + // prop: 'characteristicOne', + // label: '鐗规��1', + // sort: true, + // isTrue: true, + // isSearch: true, + // searchInfoType: 'text' + // }, // 鍒涘缓浜� { minWidth: '120', diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue index 0037fbb..09b2ad0 100644 --- a/src/views/technology/structure/index.vue +++ b/src/views/technology/structure/index.vue @@ -157,6 +157,15 @@ // 闆朵欢鍙� { minWidth: '140', + prop: 'custom', + label: '瀹㈡埛鍚嶇О', + sort: true, + isTrue: true, + isSearch: true, + searchInfoType: 'text', + }, + { + minWidth: '140', prop: 'partNo', label: '闆朵欢鍙�', sort: true, @@ -487,10 +496,11 @@ this.$message.warning(response.msg) } else { this.$message({ - message: '涓婁紶鎴愬姛', + message: '涓婁紶鎴愬姛,鍚庡彴姝e湪瀵煎叆,璇风◢鍚庨噸鏂板埛鏂帮紒', type: 'success' }) - this.getData() + this.importStructureVisible=false + // this.getData() } this.$refs.zhuangbeiUploadScan.clearFiles() }, diff --git a/src/views/technology/structure/single-structure-form.vue b/src/views/technology/structure/single-structure-form.vue index b26a3a4..cf210af 100644 --- a/src/views/technology/structure/single-structure-form.vue +++ b/src/views/technology/structure/single-structure-form.vue @@ -10,10 +10,10 @@ </div> </div> <div class="page-main"> - <div class="single-structure-basic" style="height: 22%;"> - <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes"> + <div class="single-structure-basic" style="height: 40%;width: 100%;"> + <el-form :inline="true" style="width: 100%;" label-position="left" :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes"> <el-row> - <el-col :span="24"> + <el-col :span="24" style="display: flex; justify-content: space-around;"> <el-form-item label="闆朵欢鍙�" prop="partNo"> <el-input v-model="dataForm.partNo" placeholder="璇烽�夋嫨闆朵欢" @blur="checkPartNo()"> <el-button slot="append" icon="el-icon-search" @click="openPartDialog()"></el-button> @@ -23,6 +23,10 @@ <el-input v-model="dataForm.partName" placeholder="闆朵欢鍚嶇О" :readonly="true"> </el-input> </el-form-item> + <el-form-item label="瀹㈡埛鍚嶇О" prop="custom"> + <el-input v-model="dataForm.custom" placeholder="瀹㈡埛鍚嶇О" :readonly="true"> + </el-input> + </el-form-item> <el-form-item label="缁撴瀯绫诲瀷" prop="bomTypeDb"> <el-select v-model="dataForm.bomTypeDb" placeholder="璇烽�夋嫨缁撴瀯绫诲瀷" style="width:100%"> <el-option v-for="(item, index) in bomTypeDbOptions" :label="item.label" :value="item.value" @@ -30,6 +34,7 @@ </el-option> </el-select> </el-form-item> + </el-col> <!-- <el-form-item label="鏇夸唬" prop="alternativeNo"> <el-input v-model="dataForm.alternativeNo"></el-input> </el-form-item> @@ -40,6 +45,7 @@ v-model="dataForm.alternativeDesc" ></el-input> </el-form-item> --> + <el-col :span="24" style="display: flex; justify-content: space-around;"> <el-form-item label="鐗堟湰鍙�" prop="version"> <el-input v-model="dataForm.version" disabled></el-input> </el-form-item> @@ -52,6 +58,8 @@ <el-form-item label="鍏嬮噸(kg)" prop="gramWeight"> <el-input v-model="dataForm.gramWeight"></el-input> </el-form-item> + </el-col> + <el-col :span="24" style="display: flex; justify-content: space-around;"> <el-form-item label="娴囧彛(kg)" prop="gateGramWeight"> <el-input v-model="dataForm.gateGramWeight"></el-input> </el-form-item> @@ -64,6 +72,8 @@ <el-form-item label="鍥炴枡姣斾緥(%)" prop="scale"> <el-input v-model="dataForm.scale"></el-input> </el-form-item> + </el-col> + <el-col :span="24" style="display: flex; justify-content: space-around;"> <el-form-item label="鐑樻枡鏃堕棿(h)" prop="dryingTime"> <el-input v-model="dataForm.dryingTime"></el-input> </el-form-item> @@ -76,13 +86,15 @@ <el-form-item label="澶囨敞" prop="remark"> <el-input type="textarea" :autosize="{ minRows: 1, maxRows: 3 }" v-model="dataForm.remark"></el-input> </el-form-item> + </el-col> <!-- <el-form-item label="宸插悓姝ヨ嚦IFS" prop="ifsSync"> <span style="width: 146px;display: inline-block;font-size:12px;font-weight:bold;" >{{ dataForm.ifsSync ? '鏄�' : '鍚�' }}</span > </el-form-item> --> - <el-form-item label="榛樿缁撴瀯" prop="master"> + <el-col :span="24" style="display: flex; justify-content: left;"> + <el-form-item label="榛樿缁撴瀯" style="margin-left: 5%;" prop="master"> <el-checkbox v-model="dataForm.master"></el-checkbox> </el-form-item> </el-col> @@ -297,6 +309,7 @@ partNo: null, partId: null, partName: null, + custom: null, remark: null, bomTypeDb: 'M', alternativeNo: '*', @@ -386,6 +399,7 @@ if (resCode === 0) { this.dataForm.id = resData.id this.dataForm.partNo = resData.partNo + this.dataForm.custom=resData.custom this.dataForm.partId = resData.partId this.dataForm.partName = resData.partName this.dataForm.remark = resData.remark -- Gitblit v1.9.3