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

111

master
rq 1 year ago
parent
b73d36095f
commit
cc7bef0f97
4 changed files with 179 additions and 43 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. 2
      src/views/modules/project/projectInfo/projectInfo.vue
  2. 15
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  3. 103
      src/views/modules/sampleManagement/technicalSpecificationList.vue
  4. 100
      src/views/modules/tooling/searchToolApply.vue

2
src/views/modules/project/projectInfo/projectInfo.vue
View File

@ -634,7 +634,7 @@
tableId: "101002001Table1",
tableName: "项目信息主表",
columnProp: "buNo",
headerAlign: "center",
headerAlign: 'center',
align: "left",
columnLabel: "BU编码",
columnHidden: false,

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

@ -19,7 +19,7 @@
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
<el-form-item :label="'正式料号'">
<el-form-item :label="'PLM料号'">
<el-input v-model="dataForm.finalPartNo" style="width: 130px" disabled></el-input>
</el-form-item>
<el-form-item :label="'项目号'">
@ -436,6 +436,9 @@
let strVal = ''
if (val === 134) {
if(type==1) {
if(this.dataForm.id!=0){
return false
}
strVal = this.dataForm.testPartNo
}
}
@ -525,6 +528,7 @@
page: 1,
limit: 10,
id:id,
userName:this.$store.state.user.name,
site:this.$store.state.user.site,
}
technicalSpecificationListSearch(inData).then(({data}) => {
@ -554,6 +558,12 @@
searchTechnicalSpecificationTeamStr(inData3).then(({data}) => {
this.dataForm.engineerList=data.rows
})
this.visible = true
}else {
this.$alert('技术参数卡数据有误！', '错误', {
confirmButtonText: '确定'
})
}
})
}else {
@ -589,9 +599,8 @@
mpOperator:'',
oriCodeNo:'',
}
}
this.visible = true
}
},
chooseProofingModel(){
if(this.dataForm.id!=0){

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

@ -107,36 +107,63 @@
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8"><div class="grid-content bg-purple">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'ECN变更'">
<el-input v-model="infoData.ecnFlag" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'ECN单据号'">
<el-input v-model="infoData.ecnNo" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple">
<el-col :span="12"><div class="grid-content bg-purple">
<el-form-item :label="'ECN文档链接'">
<el-input v-model="infoData.ecnAddress" readonly ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8"><div class="grid-content bg-purple">
<el-form-item :label="'报价员'">
<el-input v-model="infoData.quotationOfficer" readonly ></el-input>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'Select PE Engineer'">
<el-input v-model="infoData.engineer" ref="peOperaterName" placeholder="请选择人员" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple">
<el-form-item :label="'工程师'">
<el-input v-model="infoData.engineer" readonly ></el-input>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'Select Artwork'">
<el-input v-model="infoData.technician" ref="csOperaterName" placeholder="请选择人员" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="8"><div class="grid-content bg-purple">
<el-form-item :label="'技术员'">
<el-input v-model="infoData.technician" readonly ></el-input>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'CQC人员'">
<el-input v-model="infoData.cqcOperatorName" ref="dccOperaterName" placeholder="请选择人员" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'FAI人员'">
<el-input v-model="infoData.faiOperatorName" ref="mpOperatorName" placeholder="请选择人员" readonly ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'PE人员'">
<el-input v-model="infoData.peOperaterName" ref="peOperaterName" placeholder="请选择人员" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'CS人员'">
<el-input v-model="infoData.csOperaterName" ref="csOperaterName" placeholder="请选择人员" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'DCC人员'">
<el-input v-model="infoData.dccOperaterName" ref="dccOperaterName" placeholder="请选择人员" readonly ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'MP人员'">
<el-input v-model="infoData.mpOperatorName" ref="mpOperatorName" placeholder="请选择人员" readonly ></el-input>
</el-form-item>
</div></el-col>
</el-row>
@ -177,28 +204,6 @@
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'终端客户'">
<el-input v-model="customerData.finalCustomer" readonly ></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="customerData.finalCustomer" readonly ></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="customerData.finalCustomer" readonly ></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="customerData.finalCustomer" readonly ></el-input>
</el-form-item>
</div></el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24"><div class="grid-content bg-purple">
<el-form-item :label="'客户要求'" style="height: 70px">
@ -281,6 +286,10 @@
<!-- </el-form-item>-->
<!-- </el-form>-->
</el-tab-pane>
<!-- 审批信息 -->
<el-tab-pane label="审批信息" name="approvalInformation">
<approval-information ref="approvalTable" v-model:data-list="approvalList" :height="240"></approval-information>
</el-tab-pane>
</el-tabs>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="search" v-drag></add-or-update>
@ -325,14 +334,21 @@
import Chooselist from '@/views/modules/common/Chooselist'
import AddOrUpdate from './com_technical-add-or-update'
import BuSelect from "../base/BuSelect.vue";
import {
getNodeAuthority, // 获取节点权限
getApprovalList, // 查询审批信息
} from '@/api/changeManagement/changeManagement.js'
import ApprovalInformation from "../changeManagement/approvalInformation.vue";
export default {
components: {
ApprovalInformation,
Chooselist,
AddOrUpdate,
BuSelect,
},
data() {
return {
approvalList:[],
activeName:'info',
addOrUpdateVisible:false,
height:200,
@ -821,6 +837,9 @@
if (this.activeName == 'customerInfo') {
this.getTechnicalCustomerInfoData();
}
if (this.activeName === 'approvalInformation') {
this.getApprovalList()
}
},
getTechnicalCustomerInfoData(){
let inData={
@ -943,6 +962,22 @@
return s
},
getApprovalList () {
if (Object.keys(this.currentRow).length !== 0) {
let tempData = {
site: this.$store.state.user.site,
menuId: this.$route.meta.menuId,
documentNo: this.currentRow.applyNo
}
getApprovalList(tempData).then(({data}) => {
if (data && data.code === 0) {
this.approvalList = data.rows
} else {
this.approvalList = []
}
})
}
},
},
}
</script>

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

@ -138,6 +138,10 @@
</el-table>
</el-tab-pane>
<!-- 审批信息 -->
<el-tab-pane label="审批信息" name="approvalInformation">
<approval-information ref="approvalTable" v-model:data-list="approvalList" :height="240"></approval-information>
</el-tab-pane>
<el-tab-pane label="附件信息" name="down">
<oss-components height="25vh" label="附件" :columns="ossColumns" :order-ref1="currentRow.site" :order-ref2="currentRow.applyNo"></oss-components>
@ -183,10 +187,6 @@
<!-- </el-table-column>-->
<!-- </el-table>-->
</el-tab-pane>
<!-- 审批信息 -->
<el-tab-pane label="审批信息" name="approvalInformation">
<approval-information ref="approvalTable" v-model:data-list="approvalList" :height="240"></approval-information>
</el-tab-pane>
<el-tab-pane label="处理信息" name="tab4">
<el-form :inline="true" label-position="top" style="margin-top: 0px">
<!-- <el-button type="primary" :disabled="!(currentRow.statusCode==='50'||currentRow.statusCode==='60')" @click="openMassageModel()">申请信息录入</el-button>-->
@ -232,6 +232,98 @@
</el-form>
</el-tab-pane>
</el-tabs>
<el-dialog
width="800px" v-drag
:title="'刀模申请修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'申请编号'">
<el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input>
</el-form-item>
<el-form-item :label="'申请总数'">
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
</el-form-item>
<el-form-item label="部门" required="required">
<dict-data-select :site="$store.state.user.site" v-model="dataForm.department" dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select>
</el-form-item>
<el-form-item :label="'申请人'" required="required">
<el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input>
</el-form-item>
<el-form-item :label="'申请日期'" required="required">
<el-date-picker
value-format="yyyy-MM-dd"
style="width: 100%"
v-model="dataForm.applyDate"
type="date"
disabled
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item required="required">
<span slot="label" style="" @click="getBaseList(103,1)"><a herf="#">报价员</a></span>
<el-input v-model="dataForm.quoterName" ref="quoterName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
</el-form-item>
<el-form-item required="required">
<span slot="label" style="" @click="getBaseList(103,2)"><a herf="#">TP</a></span>
<el-input v-model="dataForm.tpName" ref="tpName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
</el-form-item>
<el-form-item required="required">
<span slot="label" style="" @click="getBaseList(103,3)"><a herf="#">采购员</a></span>
<el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'申请原因'">
<el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}"
v-model="dataForm.applyReason"/>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 60px">
<el-form-item :label="'备注'">
<el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}"
v-model="dataForm.remark"/>
</el-form-item>
</el-form>
<div class="rq" style="margin-top: 60px">
<el-table
height="250"
:data="toolData"
border
ref="toolTable"
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList2" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<div v-if="item.columnProp !== 'applyQty' ">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</div>
<div v-else>
<el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
style="width:98%"></el-input>
</div>
</template>
</el-table-column>
</el-table>
</div>
<span slot="footer" class="dialog-footer">
<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>
</span>
</el-dialog>
<el-dialog
width="800px" v-drag

Write Preview
Loading…
Cancel
Save