wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-06-07 

表头增加URL File（放到数据字典中）
master
fengyuan_yang 7 months ago
parent
729f41ea31
commit
b752bbae7b
5 changed files with 82 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/sampleManagement/technicalSpecificationList.js
  2. 7
      src/views/modules/changeManagement/changeRecord.vue
  3. 20
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  4. 80
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
  5. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

1
src/api/sampleManagement/technicalSpecificationList.js
View File

@ -90,6 +90,7 @@ export const deleteBMPrintingColor= data => createAPI(`/technicalSpecification/d
export const upBMRevNo= data => createAPI(`/technicalSpecification/upBMRevNo`,'post',data)
export const searchBMBomDetail= data => createAPI(`/technicalSpecification/searchBMBomDetail`,'post',data)
export const updateBMBomRev= data => createAPI(`/technicalSpecification/updateBMBomRev`,'post',data)
export const updateBMProcessBom= data => createAPI(`/technicalSpecification/updateBMProcessBom`,'post',data)
export const searchRouteDetail= data => createAPI(`/technicalSpecification/searchRouteDetail`,'post',data)

7
src/views/modules/changeManagement/changeRecord.vue
View File

@ -3089,7 +3089,12 @@
temp.push(itemB)
}
})
this.chooseItemList2 = temp
this.chooseItemList2 = temp.map(item => {
if (item.availableValueList.length > 0) {
item.chooseValue = item.availableValueList[0].availableValue
}
return item
})
this.chooseModelFlag2 = false
},

20
src/views/modules/sampleManagement/com_technical-add-or-update.vue
View File

@ -65,6 +65,10 @@
<el-input v-model="dataForm.mpOperatorName" @focus="handleMpOperator()" ref="mpOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
</el-form-item>
<el-form-item>
<span slot="label" @click="getUserList(9)"><a herf="#">Select Planner</a></span>
<el-input v-model="dataForm.planOperatorName" ref="planOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
</el-form-item>
<el-form-item>
<!-- <span slot="label" @click="getUserList(1)"><a herf="#">Select CQC</a></span>-->
<span slot="label" @click="handleCqcOperator"><a>Select CQC</a></span>
<el-input v-model="dataForm.cqcOperatorName" @focus="handleCqcOperator()" ref="cqcOperatorName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
@ -464,6 +468,9 @@
customerRev: '',
mpOperatorList: [],
csOperatorList: [],
planOperator: '',
planOperatorName: '',
planOperatorList: [],
},
dccList:'',
dccFlag:false,
@ -582,6 +589,10 @@
strVal = this.dataForm.technicianNo
roleId = 'R014'
}
if(type === 9) {
strVal = this.dataForm.planOperator
roleId = 'R023'
}
this.$refs.userList.init(this.$store.state.user.site,this.dataForm.buNo!==''?this.dataForm.buNo:'%%', strVal,roleId)
})
},
@ -644,6 +655,10 @@
// this.$triggerInputEvent(this.$refs.mpOperatorName);
// });
}
if(this.tagNo1 === 9) {
this.dataForm.planOperator = val.username
this.dataForm.planOperatorName = val.userDisplay
}
},
// 获取基础数据列表S
getBaseList (val, type) {
@ -856,6 +871,9 @@
customerRev: '',
mpOperatorList: [],
csOperatorList: [],
planOperator: '',
planOperatorName: '',
planOperatorList: [],
}
// 获取DCCList
this.visible = true
@ -1094,6 +1112,8 @@
this.dataForm.technicianList.push(this.dataForm.technicianNo) // Artwork
this.dataForm.csOperatorList = []
this.dataForm.csOperatorList.push(this.dataForm.csOperater) // CS
this.dataForm.planOperatorList = []
this.dataForm.planOperatorList.push(this.dataForm.planOperator) // Planner
this.saveLoading = true
saveTechnicalSpecificationSheet(this.dataForm).then(({data}) => {
if (data && data.code === 0) {

80
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
View File

@ -3,26 +3,30 @@
<el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
<el-row :gutter="20">
<el-col :span="18">
<el-form-item label="物料">
<el-input v-model="bomData.partNo" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="BOM类型">
<el-input v-model="bomData.bomType" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="BOM版本">
<el-input v-model="bomData.engChgLevel" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="替代编码">
<el-input v-model="bomData.alternativeNo" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="searchTable(true)" >刷新</el-button>
<el-button type="primary" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin)" @click="changeBomRev()">变更</el-button>
<el-button type="primary" @click="jumpBom()">跳转至BOM</el-button>
<el-button v-if="baseForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && ((baseForm.isReject === 'Y' && !ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="submitDataModal">驳回</el-button>
<!-- <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>-->
</el-form-item>
<el-form-item label="物料">
<el-input v-model="bomData.partNo" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="BOM类型">
<el-input v-model="bomData.bomType" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="BOM版本">
<el-input v-model="bomData.engChgLevel" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="替代编码">
<el-input v-model="bomData.alternativeNo" readonly style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="URL File">
<dict-data-select :site="searchData.site" v-if="searchData.site" v-model="bomData.urlFile" style="width: 120px" dict-type="bm_url_file"></dict-data-select>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="searchTable(true)" >刷新</el-button>
<el-button type="primary" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin)" @click="changeBomRev()">变更</el-button>
<el-button type="primary" @click="jumpBom()">跳转至BOM</el-button>
<el-button type="primary" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin" @click="updateBMProcess()" >保存数据</el-button>
<el-button v-if="baseForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && ((baseForm.isReject === 'Y' && !ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="submitDataModal">驳回</el-button>
<!-- <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>-->
</el-form-item>
</el-col>
<el-col :span="3"><div class="grid-content bg-purple">
<el-form-item :label="'当前节点'" style="width: 100%">
@ -165,16 +169,20 @@
searchBMBom,
searchBMBomDetail,
updateBMBomRev,
tsdBasicInformationSearch,getBMStatusDesc,
tsdBasicInformationSearch,
getBMStatusDesc,
submitChange, // 提交
getOADetailForBM,
updateBMProcessBom, // 保存数据
} from "@/api/sampleManagement/technicalSpecificationList.js"
import {
getNodeAuthority, // 获取节点权限
} from '@/api/changeManagement/changeManagement.js'
import Chooselist from '@/views/modules/common/Chooselist'
import DictDataSelect from "../../sys/dict-data-select-highlight";
export default {
components: {
DictDataSelect,
Chooselist
},
@ -197,6 +205,7 @@
alternativeNo:'',
bomType:'',
engChgLevel:'',
urlFile: ''
},
currentRow:"",
bomList:[],
@ -515,18 +524,18 @@
})
return false;
}
if (this.currentRow.status!=='Buildable') {
if (this.currentRow.status !== 'Buildable') {
this.$alert('只有Buildable状态的可以保存！', '错误', {
confirmButtonText: '确定'
})
return false;
}
let inData = {
site:this.bomData.site,
codeNo:this.searchData.codeNo,
bomType:this.currentRow.bomType,
engChgLevel:this.currentRow.engChgLevel,
bomAlternativeNo:this.currentRow.alternativeNo
site: this.bomData.site,
codeNo: this.searchData.codeNo,
bomType: this.currentRow.bomType,
engChgLevel: this.currentRow.engChgLevel,
bomAlternativeNo: this.currentRow.alternativeNo
}
updateBMBomRev(inData).then(({data})=>{
if(data&& data.code===0){
@ -602,6 +611,23 @@
})
},
// 修改表单数据
updateBMProcess () {
let inData = {
site: this.bomData.site,
codeNo: this.searchData.codeNo,
urlFile: this.bomData.urlFile
}
updateBMProcessBom(inData).then(({data})=>{
if (data&& data.code === 0) {
this.searchTable()
this.$message.success( '操作成功')
} else {
this.$message.error(data.msg)
}
})
},
// 同意提交
agreeSubmit () {
this.$confirm(`是否确认提交?`, '提示', {

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
View File

@ -481,8 +481,8 @@
documentSource: '',
copyFlag: '',
shopOrder: '',
planOperator:'',
planOperatorName:'',
planOperator: '',
planOperatorName: '',
},
dataRole: {
partTypeDesc: [

Write Preview
Loading…
Cancel
Save