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

plm BMM

master
ruanqi 1 year ago
parent
024755b1c4
commit
e93b6f9e0d
9 changed files with 246 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/assets/scss/rq.scss
  2. 53
      src/views/modules/project/projectInfo/com_project_technicalSpecification.vue
  3. 53
      src/views/modules/project/projectInfo/com_project_toolApplyCation.vue
  4. 53
      src/views/modules/project/projectPart/com_projectPart_technicalSpecification.vue
  5. 15
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  6. 24
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  7. 29
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  8. 35
      src/views/modules/sampleManagement/technicalSpecificationList.vue
  9. 6
      src/views/modules/tooling/searchToolApply.vue

5
src/assets/scss/rq.scss
View File

@ -100,6 +100,11 @@
} }
.bigButton {
width:60px;height: 25px;font-size: 14px;
}

53
src/views/modules/project/projectInfo/com_project_technicalSpecification.vue
View File

@ -120,6 +120,59 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 50 columnWidth: 50
},
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table9NodeId',
tableId: "101002001Table9",
tableName: "技术参数卡列表",
columnProp: "nodeId",
headerAlign: "center",
align: "left",
columnLabel: "当前节点",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 70
},
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table9NodeName',
tableId: "101002001Table9",
tableName: "技术参数卡列表",
columnProp: "nodeName",
headerAlign: "center",
align: "left",
columnLabel: "节点名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
},{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table9SP',
tableId: "101002001Table9",
tableName: "技术参数卡列表",
columnProp: "sp",
headerAlign: "center",
align: "left",
columnLabel: "当前审批人",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{ },{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 101002001, functionId: 101002001,

53
src/views/modules/project/projectInfo/com_project_toolApplyCation.vue
View File

@ -210,6 +210,59 @@
fixed: '', fixed: '',
columnWidth: 200 columnWidth: 200
}, },
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table10NodeId',
tableId: "101002001Table10",
tableName: "技术参数卡列表",
columnProp: "nodeId",
headerAlign: "center",
align: "left",
columnLabel: "当前节点",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 70
},
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table10NodeName',
tableId: "101002001Table10",
tableName: "技术参数卡列表",
columnProp: "nodeName",
headerAlign: "center",
align: "left",
columnLabel: "节点名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
},{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table10SP',
tableId: "101002001Table10",
tableName: "技术参数卡列表",
columnProp: "sp",
headerAlign: "center",
align: "left",
columnLabel: "当前审批人",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 101002001, functionId: 101002001,

53
src/views/modules/project/projectPart/com_projectPart_technicalSpecification.vue
View File

@ -183,6 +183,59 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 50 columnWidth: 50
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table9NodeId',
tableId: "101002002Table9",
tableName: "技术参数卡列表",
columnProp: "nodeId",
headerAlign: "center",
align: "left",
columnLabel: "当前节点",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 70
},
{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table9NodeName',
tableId: "101002002Table9",
tableName: "技术参数卡列表",
columnProp: "nodeName",
headerAlign: "center",
align: "left",
columnLabel: "节点名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
},{
userId: this.$store.state.user.name,
functionId: 101002002,
serialNumber: '101002002Table9SP',
tableId: "101002002Table9",
tableName: "技术参数卡列表",
columnProp: "sp",
headerAlign: "center",
align: "left",
columnLabel: "当前审批人",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{ },{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 101002002, functionId: 101002002,

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

@ -33,6 +33,9 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole"> <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
<el-form-item :label="'BU'" >
<el-input v-model="dataForm.buNo" disabled style="width: 130px" ></el-input>
</el-form-item>
<el-form-item :label="'参数卡编码'" > <el-form-item :label="'参数卡编码'" >
<el-input v-model="dataForm.oriCodeNo" disabled style="width: 130px" ></el-input> <el-input v-model="dataForm.oriCodeNo" disabled style="width: 130px" ></el-input>
</el-form-item> </el-form-item>
@ -156,7 +159,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
width="900px"
width="950px"
title="选择打样单" title="选择打样单"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="proofingModelFlag"> :visible.sync="proofingModelFlag">
@ -225,6 +228,13 @@
min-width="120" min-width="120"
label="物料名称"> label="物料名称">
</el-table-column> </el-table-column>
<el-table-column
prop="buNo"
header-align="center"
align="left"
min-width="80"
label="BU">
</el-table-column>
<el-table-column <el-table-column
prop="customerDesc" prop="customerDesc"
header-align="center" header-align="center"
@ -378,6 +388,7 @@
dccOperaterName:'', dccOperaterName:'',
mpOperatorName:'', mpOperatorName:'',
mpOperator:'', mpOperator:'',
buNo:'',
}, },
proofingSearch:{ proofingSearch:{
projectId:'', projectId:'',
@ -781,6 +792,7 @@
this.dataForm.testPartNo=row.testPartNo this.dataForm.testPartNo=row.testPartNo
this.dataForm.partDesc=row.partDesc this.dataForm.partDesc=row.partDesc
this.dataForm.finalPartNo=row.finalPartNo this.dataForm.finalPartNo=row.finalPartNo
this.dataForm.buNo=row.buNo
this.partModelFlag=false this.partModelFlag=false
}, },
chooseProofingNo(row){ chooseProofingNo(row){
@ -788,6 +800,7 @@
this.dataForm.projectId=row.projectId this.dataForm.projectId=row.projectId
this.dataForm.testPartNo=row.testPartNo this.dataForm.testPartNo=row.testPartNo
this.dataForm.partDesc=row.partDesc this.dataForm.partDesc=row.partDesc
this.dataForm.buNo=row.buNo
let inData={ let inData={
site:this.$store.state.user.site, site:this.$store.state.user.site,
testPartNo: row.testPartNo testPartNo: row.testPartNo

24
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
View File

@ -26,6 +26,16 @@
</el-form> </el-form>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"> <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'直接客户/Direct Customer'" >
<el-input v-model="dataForm.customerId" disabled ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'客户名称'">
<el-input v-model="dataForm.customerDesc" disabled ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple"> <el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'终端客户/End Customer'"> <el-form-item :label="'终端客户/End Customer'">
<el-input v-model="dataForm.finalCustomerNo" disabled ></el-input> <el-input v-model="dataForm.finalCustomerNo" disabled ></el-input>
@ -36,16 +46,6 @@
<el-input v-model="dataForm.finalCustomerDesc" disabled ></el-input> <el-input v-model="dataForm.finalCustomerDesc" disabled ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<!-- <el-col :span="6"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'直接客户/Direct Customer'" >-->
<!-- <el-input v-model="dataForm.directCustomerNo" disabled ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="6"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户名称'">-->
<!-- <el-input v-model="dataForm.directCustomerDesc" disabled ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple"> <el-col :span="6"><div class="grid-content bg-purple">
@ -241,8 +241,8 @@
codeNo:'', codeNo:'',
finalCustomerNo:'', finalCustomerNo:'',
finalCustomerDesc:'', finalCustomerDesc:'',
directCustomerNo:'',
directCustomerDesc:'',
customerId:'',
customerDesc:'',
partNo:'', partNo:'',
partDesc:'', partDesc:'',
customerRevNo:'', customerRevNo:'',

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

@ -8,6 +8,7 @@
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button> <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag&&isAuth('103002:bmSave')">保存</el-button>
<el-button v-if="dataForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button> <el-button v-if="dataForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button> <el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
<el-button v-if="dataForm.status === 'cg'&&!ifDisableFlag" type="primary" @click="issueModal">下达</el-button>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
@ -287,7 +288,7 @@
searchTechnicalSpecificationTeamStr, searchTechnicalSpecificationTeamStr,
updateBMBasicInformation, updateBMBasicInformation,
searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM, searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM,
submitChange, // 提交
submitChange, issueChange, // 下达 // 提交
} from "@/api/sampleManagement/technicalSpecificationList.js" } from "@/api/sampleManagement/technicalSpecificationList.js"
import { import {
getNodeAuthority, // 获取节点权限 getNodeAuthority, // 获取节点权限
@ -780,7 +781,31 @@
this.submitData(tempData) this.submitData(tempData)
}) })
}, },
// 下达
issueModal (row) {
this.$confirm(`是否确认下达?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let tempData = {
site: this.searchData.site,
userName: this.searchData.username,
codeNo: this.searchData.codeNo,
menuId: '103002'
}
issueChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.search()
this.$message({message: '操作成功', type: 'success'})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
// 打开提交模态框 // 打开提交模态框
submitDataModal () { submitDataModal () {

35
src/views/modules/sampleManagement/technicalSpecificationList.vue
View File

@ -463,10 +463,10 @@
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table1NodeId',
tableId: "106002Table1",
tableName: "刀具申请主表",
functionId: 103002,
serialNumber: '103002Table1NodeId',
tableId: "103002Table1",
tableName: "技术参数卡列表",
columnProp: "nodeId", columnProp: "nodeId",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
@ -481,10 +481,10 @@
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 106002,
serialNumber: '106002Table1NodeName',
tableId: "106002Table1",
tableName: "刀具申请主表",
functionId: 103002,
serialNumber: '103002Table1NodeName',
tableId: "103002Table1",
tableName: "技术参数卡列表",
columnProp: "nodeName", columnProp: "nodeName",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
@ -496,6 +496,23 @@
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150 columnWidth: 150
},{
userId: this.$store.state.user.name,
functionId: 103002,
serialNumber: '103002Table1SP',
tableId: "103002Table1",
tableName: "技术参数卡列表",
columnProp: "sp",
headerAlign: "center",
align: "left",
columnLabel: "当前审批人",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{ },{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
@ -614,7 +631,7 @@
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 50
columnWidth: 65
},{ },{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,

6
src/views/modules/tooling/searchToolApply.vue
View File

@ -480,9 +480,9 @@
</el-tabs> </el-tabs>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>--> <!-- <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>-->
<el-button type="primary" @click="visible = false">{{'取消'}}</el-button>
<el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal">驳回</el-button>
<el-button type="primary" @click="visible = false" class="bigButton">{{'取消'}}</el-button>
<el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button>
<el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal" class="bigButton">驳回</el-button>
</span> </span>
</el-dialog> </el-dialog>

Write Preview
Loading…
Cancel
Save