diff --git a/src/api/base/properties.js b/src/api/base/properties.js index 1c5ea5d..2d88ed3 100644 --- a/src/api/base/properties.js +++ b/src/api/base/properties.js @@ -47,4 +47,6 @@ export const updateBMModal= data => createAPI(`/technicalSpecification/updateBMM export const searchMenuAllListId= (data) => createAPI(`/properties/menu/list`,'post',data) export const searchBUList= (data) => createAPI(`/properties/bu/list`,'post',data) export const searchPropertiesGroup= (data) => createAPI(`/properties/group/list`,'post',data) +export const searchBUPropertiesList= (data) => createAPI(`/bu/properties/list`,'post',data) +export const saveBUPropertiesList= (data) => createAPI(`/bu/properties/save`,'post',data) diff --git a/src/api/dict.js b/src/api/dict.js index ba23b27..9aa2eeb 100644 --- a/src/api/dict.js +++ b/src/api/dict.js @@ -42,7 +42,7 @@ export const updateDictType = (data) => createAPI(`/sys/dictType/update`,'post', * @returns {*} */ export const selectDictDataPage = (no,size,data) =>createAPI(`/sys/dictData/${no}/${size}`,'get',data) -export const selectDictDataList = (data) =>createAPI(`/sys/dictData/list`,'get',data) +export const selectDictDataList = (data) =>createAPI(`/sys/dictData/list`,'post',data) /** * 新增字典数据 * @param data diff --git a/src/api/test/testProperties.js b/src/api/test/testProperties.js index 28262f0..8967b0e 100644 --- a/src/api/test/testProperties.js +++ b/src/api/test/testProperties.js @@ -3,3 +3,4 @@ import {createAPI} from "../../utils/httpRequest"; export const getTestPropertiesList = (data)=>createAPI(`/test/properties/list`,'post',data) export const updateTestPropertiesList = (data)=>createAPI(`/test/properties/update`,'post',data) export const searchTestPropertiesList = (data)=>createAPI(`/test/properties/search`,'post',data) +export const searchModalDetails = (data)=>createAPI(`/properties/searchModalDetails`,'post',data) diff --git a/src/views/modules/base/propertiesItem/propertiesModel.vue b/src/views/modules/base/propertiesItem/propertiesModel.vue index 40490fa..1dc9b6c 100644 --- a/src/views/modules/base/propertiesItem/propertiesModel.vue +++ b/src/views/modules/base/propertiesItem/propertiesModel.vue @@ -7,34 +7,42 @@ - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + + + + + + + - - - - - - + + + + + + 查询 @@ -99,10 +107,11 @@ :label="item.columnLabel"> @@ -129,37 +142,26 @@ :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> - + - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -210,7 +228,7 @@ label="排序"> @@ -261,7 +281,8 @@ - +
@@ -279,7 +300,7 @@
- 可选属性： + 可选属性： - 已有属性： + 已有属性： - + @@ -391,859 +412,963 @@ 关闭 - + + + + + + + + + + + + + + + 保存 + 关闭 + + + diff --git a/src/views/modules/common/uploadFileList.vue b/src/views/modules/common/uploadFileList.vue index f83c52f..f7f6b89 100644 --- a/src/views/modules/common/uploadFileList.vue +++ b/src/views/modules/common/uploadFileList.vue @@ -27,6 +27,10 @@ export default { fileList:{ type: Array, default:()=>[], + }, + folder:{ + type:String, + default:'' } }, data(){ @@ -66,6 +70,7 @@ export default { data.append("orderRef2",this.no) data.append("createBy",this.$store.state.user.name) data.append("fileRemark",this.fileRemark) + data.append("folder", this.folder) uploadFileList(this.path,data).then(({data})=>{ if (data && data.code === 0){ this.$emit('update:uploadDialog',false) diff --git a/src/views/modules/sys/dict-data-select.vue b/src/views/modules/sys/dict-data-select.vue index ee32a20..09a8825 100644 --- a/src/views/modules/sys/dict-data-select.vue +++ b/src/views/modules/sys/dict-data-select.vue @@ -21,7 +21,10 @@ export default { props:{ dictType: { type: String, - required: true + }, + dictTypeList:{ + type:Array, + default:()=>[], }, value:{ required: true, @@ -62,7 +65,8 @@ export default { // 组合查询条件 let params = { site:this.useSite?this.$store.state.user.site:"*", - dictType:this.dictType + dictType:this.dictType, + dictTypeList: this.dictTypeList } try { // 等待返回值 @@ -70,6 +74,9 @@ export default { // 参数赋值 if (data && data.code === 0){ this.options = data.rows; + if (this.options.length === 0){ + this.$emit("change",'') + } } if (this.useDefaultValue){ this.dictDefaultValue(); diff --git a/src/views/modules/test/file/testFile.vue b/src/views/modules/test/file/testFile.vue index 961459a..702b687 100644 --- a/src/views/modules/test/file/testFile.vue +++ b/src/views/modules/test/file/testFile.vue @@ -135,7 +135,7 @@ export default { - + diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 1aa1f9d..1430c81 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -262,30 +262,27 @@ - - - 是否需要Artwork + + + 设计师 + - - - - - - - 是否需要计划 + + 计划员 + - + 送样地址 - + @@ -299,6 +296,12 @@
+ + + + + + @@ -371,9 +374,6 @@ - - - @@ -696,6 +696,9 @@ + + + @@ -705,9 +708,6 @@ - - - @@ -1048,7 +1048,7 @@ - +
@@ -1079,14 +1079,9 @@ customerContactSearch, // 客户联系人列表查询 } from '@/api/customer/customerContact.js' import ChooseList from '@/views/modules/common/Chooselist' - import testUploadFile from "./test_upload_file" + import TestUploadFile from "./test_upload_file" import DictDataSelect from "../sys/dict-data-select.vue"; - import { - selectTestSoBom, - saveTestSoBom, - removeTestSoBom, - updateTestSoBom - } from "../../../api/test/testSoBom"; + import {selectTestSoBom,} from "../../../api/test/testSoBom"; import TestTable from "./testSoBom/testTable.vue"; import TestRoutingTable from "./testSoRouting/testRoutingTable.vue"; import {selectTestSoRoutingList} from "../../../api/test/testSoRouting"; @@ -1105,7 +1100,7 @@ TestTable, DictDataSelect, ChooseList, - testUploadFile + TestUploadFile }, watch: { searchData: { @@ -1159,8 +1154,9 @@ testSoRoutingList:[], testSoBomList:[], testPropertiesList:[], - activeTab:'partAttribute', - activeTabList:['partAttribute'], + copyTestPropertiesList:[], + activeTab:'attribute', + activeTabList:['attribute'], clickTestRow:false, // 导出 exportData: [], @@ -1197,7 +1193,7 @@ // 其它 dataListLoading: false, // 初始页签 - activeTable: 'test_attribute', + activeTable: 'attribute', // ======== 数据对象 ======== modalData: { flag: '1', @@ -1217,7 +1213,11 @@ priorityLevel: '一般', testNumber: 1, doesNeedArtwork:'', + artwork:'', + artworkName:'', doesNeedPlanner:'', + planner:'', + plannerName:'', requiredDeliveryDate: '', remark: '', technicalConsiderations: '', @@ -2327,7 +2327,11 @@ projectName: row.projectName, tracker: row.tracker, doesNeedArtwork:row.doesNeedArtwork, + artwork:row.artwork, + artworkName:row.artworkName, doesNeedPlanner:row.doesNeedPlanner, + planner: row.planner, + plannerName: row.plannerName, trackerName: row.trackerName, testPartNo: row.testPartNo, partName: row.partName, @@ -2495,7 +2499,7 @@ if (data && data.code === 0) { this.getDataList(); this.activeTabList = ['product','process','attribute','partAttribute','file'] - this.activeTab = 'product' + this.activeTab = 'attribute' this.modalData.testNo = data.row // this.modalFlag = false this.$message.success("操作成功") @@ -2930,6 +2934,14 @@ strVal = this.modalData.engineerName conSql = " and b.site = '" + this.$store.state.user.site + "'" } + if (val === 2003) { + strVal = this.modalData.artworkName + conSql = " and b.site = '" + this.$store.state.user.site + "'" + } + if (val === 2004) { + strVal = this.modalData.plannerName + conSql = " and b.site = '" + this.$store.state.user.site + "'" + } this.$refs.baseList.init(val, strVal, conSql) }) }, @@ -2975,6 +2987,14 @@ this.modalData.engineer = val.username this.modalData.engineerName = val.user_display } + if (this.tagNo === 2003){ + this.modalData.artwork = val.username; + this.modalData.artworkName = val.user_display; + } + if (this.tagNo === 2004){ + this.modalData.planner = val.username; + this.modalData.plannerName = val.user_display; + } }, // ======== 导出相关方法 ======== @@ -3017,7 +3037,11 @@ customerDesc: '', projectId: '', doesNeedArtwork:'', + artwork:'', + artworkName:'', doesNeedPlanner:'', + planner: '', + plannerName: '', projectName: '', tracker: '', trackerName: '', @@ -3052,9 +3076,10 @@ updateDate: '', updateBy: '' } - this.activeTab = 'partAttribute'; - this.activeTabList = ['partAttribute'] + this.activeTab = 'attribute'; + this.activeTabList = ['attribute'] this.dialogProperties = []; + this.copyTestPropertiesList = []; }, checkSelectable(row,index){ if (this.modalData.flag === '1' && this.activeTabList.length === 1){ diff --git a/src/views/modules/test/testAttribute/testProperties.vue b/src/views/modules/test/testAttribute/testProperties.vue index face2b5..d1dd01d 100644 --- a/src/views/modules/test/testAttribute/testProperties.vue +++ b/src/views/modules/test/testAttribute/testProperties.vue @@ -26,6 +26,10 @@ export default { type:Number, default:300 }, + showSaveButton:{ + type:Boolean, + default:true + } }, model:{ prop:"dataList", @@ -34,7 +38,7 @@ export default { data(){ return{ loading:false, - attributeDialog:false, + attributeDialog:true, copyAttributeList:[], productColumnList: [ { @@ -131,25 +135,7 @@ export default { columnProp: 'textValue', headerAlign: "center", align: "left", - columnLabel: '文本值', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth:120, - }, - { - userId: this.$store.state.user.name, - functionId: 100002001, - serialNumber: '100002001TableMinValue', - tableId: "100002001Table", - tableName: "属性表", - columnProp: 'numValue', - headerAlign: "center", - align: "right", - columnLabel: '数字值', + columnLabel: '实测值', columnHidden: false, columnImage: false, columnSortable: false, @@ -158,6 +144,24 @@ export default { fixed: '', columnWidth:120, }, + // { + // userId: this.$store.state.user.name, + // functionId: 100002001, + // serialNumber: '100002001TableMinValue', + // tableId: "100002001Table", + // tableName: "属性表", + // columnProp: 'numValue', + // headerAlign: "center", + // align: "right", + // columnLabel: '数字值', + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth:120, + // }, { userId: this.$store.state.user.name, functionId: 100002001, @@ -179,9 +183,6 @@ export default { } }, methods:{ - openTestProperties(){ - this.copyAttributeList = JSON.parse(JSON.stringify(this.dataList)) - }, getTestProperties(){ let params = { site:this.$store.state.user.site, @@ -198,35 +199,32 @@ export default { }) }, updateTestPropertiesList(){ + this.loading = true updateTestPropertiesList(this.copyAttributeList).then(({data})=>{ if (data && data.code === 0){ this.$message.success(data.msg); this.getTestProperties(); - this.attributeDialog = false; + this.attributeDialog = true; }else { this.$message.warning(data.msg); } + this.loading = false }).catch((error)=>{ this.$message.error(error) + this.loading = false }) }, - searchTestPropertiesList(){ - let params = { - site:this.$store.state.user.site, - testNo: this.testNo + clickSave(){ + if (!this.attributeDialog){ + this.updateTestPropertiesList(); + }else { + this.copyAttributeList = JSON.parse(JSON.stringify(this.dataList)) } - this.loading = true - searchTestPropertiesList(params).then(({data})=>{ - if (data && data.code === 0){ - this.getTestProperties(); - }else { - this.$message.warning(data.msg) - } - this.loading = false - }).catch((error)=>{ - this.loading = false - this.$message.error(error) - }) + this.attributeDialog = false; + }, + clickSaveBtn(){ + //查询 属性模板 + } }, } @@ -235,32 +233,38 @@ export default { - - - 保存 - 关闭 - - +