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

2024-10-21

master
qiezi 1 year ago
parent
283bcd639b
commit
9e8027b6d4
3 changed files with 220 additions and 300 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. 11
      src/views/modules/demoComponents/orderProperties.vue
  2. 271
      src/views/modules/proofing/requestForProofing.vue
  3. 2
      src/views/modules/test/requestForTest.vue

11
src/views/modules/demoComponents/orderProperties.vue
View File

@ -1,9 +1,9 @@
<template>
<div>
<div style="margin-top: 5px">
<el-button type="primary" @click="clickSaveBtn" v-if="orderNo">新增</el-button>
<el-button type="primary" :loading="loading" v-if="orderNo" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
<el-button type="primary" @click="refreshPropertiesModal" v-if="attributeDialog">刷新属性模板</el-button>
<el-button type="primary" @click="clickSaveBtn" v-if="orderNo" :disabled="disabled">新增</el-button>
<el-button type="primary" :loading="loading" v-if="orderNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
<el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled" v-if="attributeDialog">刷新属性模板</el-button>
</div>
<div class="rq " v-if="attributeDialog">
<el-table
@ -114,7 +114,10 @@ export default {
functionType:{
type:String,
},
disabled:{
type:Boolean,
default:false,
}
},
data(){
return{

271
src/views/modules/proofing/requestForProofing.vue
View File

@ -143,10 +143,15 @@
width="100"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="updateModal(scope.row)" v-if="scope.row.proofingStatus !== '已完成'">编辑</el-link>
<el-link style="cursor: pointer" v-if="scope.row.proofingResultStatus === 'B'"
<el-link style="cursor: pointer" @click="updateModal(scope.row)" v-if="scope.row.proofingStatus !== '已完成'">
编辑
</el-link>
<el-link style="cursor: pointer" v-if="scope.row.proofingStatus === '草稿'"
@click="updateModalStatus(scope.row,'C')">下达
</el-link>
<el-link style="cursor: pointer" v-if="scope.row.proofingStatus === '已完成'" @click="getDetailData(scope.row)">
详情
</el-link>
</template>
</el-table-column>
</el-table>
@ -165,8 +170,7 @@
</el-pagination>
<!-- 打样模态框 -->
<el-dialog :title="modalData.title" @close="closeModalDiaLog" @open="openModalDialog" :close-on-click-modal="false"
v-drag :visible.sync="modalFlag" top="10vh" width="1200px">
<el-dialog :title="modalData.title" @close="closeModalDiaLog" @open="openModalDialog" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" top="10vh" width="1200px">
<el-form label-position="top" ref="modalForm" :model="modalData" :rules="rules">
<el-row :gutter="15">
<el-col :span="8">
@ -175,7 +179,8 @@
<el-form-item prop="customerNo" label="客户编码" :show-message="false">
<span style="cursor: pointer" slot="label" v-if="modalData.flag === '1'"
@click="getBaseList(102,1)"><a herf="#">客户编码</a></span>
<el-input :disabled="modalData.flag !== '1' && columnFlagByHeader('customerNo')" v-model="modalData.customerNo" @blur="handleQueryCustomer"></el-input>
<el-input :disabled="modalData.flag !== '1' && columnFlagByHeader('customerNo')"
v-model="modalData.customerNo" @blur="handleQueryCustomer"></el-input>
</el-form-item>
</el-col>
<el-col :span="14">
@ -187,22 +192,21 @@
</el-col>
<el-col :span="4">
<el-form-item label="打样数量" prop="proofingNumber" :show-message="false">
<div class="right">
<el-input type="number" class="inlineNumber" :disabled="columnFlagByHeader('proofingNumber')" v-model="modalData.proofingNumber"
@input="modalData.proofingNumber = modalData.proofingNumber.replace(/^(0+)|[^\d]+/g, '')"></el-input>
</div>
<el-input-number :controls="false" :disabled="detailVisible" :min="0" v-model="modalData.proofingNumber" :step="0" style="width: 100%"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="优先等级" :show-message="false">
<dict-data-select v-if="modalFlag" :disabled="columnFlagByHeader('priorityLevel')" v-model="modalData.priorityLevel"
<dict-data-select v-if="modalFlag" :disabled="columnFlagByHeader('priorityLevel') || detailVisible"
v-model="modalData.priorityLevel"
dict-type="priority_Level"></dict-data-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="要求交付日期" prop="requiredDeliveryDate" :show-message="false">
<el-date-picker v-model="modalData.requiredDeliveryDate" style="width: 100%" type="date"
value-format="yyyy-MM-dd" placeholder="选择日期" :disabled="columnFlagByHeader('requiredDeliveryDate')"></el-date-picker>
value-format="yyyy-MM-dd" placeholder="选择日期"
:disabled="columnFlagByHeader('requiredDeliveryDate') || detailVisible"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
@ -226,38 +230,38 @@
</el-col>
<el-col :span="4">
<el-form-item :show-message="false">
<label v-if="columnFlagByHeader('tracker')" slot="label">CS</label>
<label v-if="columnFlagByHeader('tracker') || detailVisible" slot="label">CS</label>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2051)"><a herf="#">CS</a></span>
<el-input v-model="modalData.trackerName" :disabled="columnFlagByHeader('tracker')" readonly ></el-input>
<el-input v-model="modalData.trackerName" :disabled="columnFlagByHeader('tracker') || detailVisible" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :show-message="false">
<label v-if="columnFlagByHeader('engineer')" slot="label">NPI工程师</label>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2052)"><a herf="#">NPI工程师</a></span>
<el-input v-model="modalData.engineerName" :disabled="columnFlagByHeader('engineer')" readonly ></el-input>
<label v-if="columnFlagByHeader('engineer') || detailVisible" slot="label">NPI工程师</label>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2052)"><a>NPI工程师</a></span>
<el-input v-model="modalData.engineerName" :disabled="columnFlagByHeader('engineer') || detailVisible" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<label v-if="columnFlagByHeader('approver')" slot="label">Approver</label>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2053)"><a herf="#">Approver</a></span>
<el-input v-model="modalData.approverName" :disabled="columnFlagByHeader('approver')" readonly></el-input>
<label v-if="columnFlagByHeader('approver') || detailVisible" slot="label">Approver</label>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2053)"><a
herf="#">Approver</a></span>
<el-input v-model="modalData.approverName" :disabled="columnFlagByHeader('approver') || detailVisible" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<label v-if="columnFlagByDelegateAccess('delegateAccess')" slot="label">DelegateAccess</label>
<label v-if="columnFlagByDelegateAccess('delegateAccess') || detailVisible" slot="label">DelegateAccess</label>
<span v-else style="cursor: pointer" slot="label" @click="delegateAccessVisible = true"><a herf="#">DelegateAccess</a></span>
<el-input v-model="delegateAccessName" :disabled="columnFlagByDelegateAccess('delegateAccess')" readonly></el-input>
<el-input v-model="delegateAccessName" :disabled="columnFlagByDelegateAccess('delegateAccess') || detailVisible" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="15">
<el-col :span="24">
<el-form-item label="备注" style="height: 90px">
<el-input type="textarea" v-model="modalData.technicalConsiderations" :rows="3" resize='none'
show-word-limit></el-input>
<el-input type="textarea" v-model="modalData.technicalConsiderations" :disabled="detailVisible" :rows="3" resize='none' show-word-limit></el-input>
</el-form-item>
</el-col>
</el-row>
@ -313,7 +317,9 @@
<el-button type="primary" @click="saveData()">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<el-button v-if="modalData.proofingStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="modalData.proofingStatus === '审批中' && modalData.isReject === 'Y'" @click="rejectVisible = true" type="primary">驳回</el-button>
<el-button v-if="modalData.proofingStatus === '审批中' && modalData.isReject === 'Y'"
@click="rejectVisible = true" type="primary">驳回
</el-button>
</el-footer>
</el-dialog>
@ -478,7 +484,7 @@
<el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 300px;" type="border-card"
@tab-click="tabClick" class="customer-tab">
<el-tab-pane label="基本信息" name="attribute">
<proofing-attribute ref="dialogAttribute" :order-no="proofingCurrentRow.proofingNo" :code-no="'Proofing'" :function-type="'order'"></proofing-attribute>
<proofing-attribute ref="dialogAttribute" :disabled="proofingCurrentRow.proofingStatus === '已完成'" :order-no="proofingCurrentRow.proofingNo" :code-no="'Proofing'" :function-type="'order'"></proofing-attribute>
</el-tab-pane>
<!-- 项目信息页签 -->
<el-tab-pane label="项目信息" name="project_information">
@ -598,160 +604,11 @@
<!-- 客户信息页签 -->
<el-tab-pane label="客户信息" name="customer_information">
<customer-info :project="proofingCurrentRow"></customer-info>
<!-- <el-form label-position="top" :model="customerInformationData"-->
<!-- style="margin-left: 10px;margin-top: 5px;margin-right: 10px">-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户代码">-->
<!-- <el-input v-model="customerInformationData.customerNo" 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="customerInformationData.customerDesc" 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="customerInformationData.importantCustomer" 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="customerInformationData.customerCurrency" 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="customerInformationData.turnoverOfYear" 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="customerInformationData.potentialRevenueOfYear" 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="customerInformationData.customerStatus" 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="customerInformationData.customerIndustry" 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="customerInformationData.companyName" 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="customerInformationData.contactName" 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="customerInformationData.contactPhoneNumber1" 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="customerInformationData.position" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="12">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户描述">-->
<!-- <el-input v-model="customerInformationData.customerDescription" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="12">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="客户联系地址">-->
<!-- <el-input v-model="customerInformationData.addressName" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <div class="grid-content bg-purple">-->
<!-- <el-form-item label="地址类型">-->
<!-- <el-input v-model="customerInformationData.addressType" 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="创建时间">-->
<!-- <el-input v-model="customerInformationData.createDate" 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="customerInformationData.createBy" 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="customerInformationData.updateDate" 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="customerInformationData.updateBy" readonly></el-input>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
</el-tab-pane>
<el-tab-pane label="附件信息" name="proofing_file">
<!-- <profing-file ref="profingFile" :test-no="proofingCurrentRow.proofingNo" ></profing-file>-->
<oss-components label="打样单号" style="margin-top: 5px" height="28vh" :columns="ossColumns" :order-ref2="proofingCurrentRow.proofingNo" :order-ref1="proofingCurrentRow.site"></oss-components>
<oss-components label="打样单号" style="margin-top: 5px" height="28vh" :columns="ossColumns"
:order-ref2="proofingCurrentRow.proofingNo"
:order-ref1="proofingCurrentRow.site" :disabled="proofingCurrentRow.proofingStatus === '已完成'"></oss-components>
</el-tab-pane>
<!-- 审批信息 -->
<el-tab-pane label="审批信息" name="approvalInformation">
@ -980,6 +837,11 @@ export default {
},
"searchData.proofingNo"(newVal, oldVal) {
this.searchData.proofingNo = newVal.toUpperCase()
},
'modalFlag'(newVal, oldVal){
if (newVal === false){
this.detailVisible = false
}
}
},
computed: {
@ -2141,6 +2003,7 @@ export default {
],
rejectVisible: false,
rejectOpinion: '',
detailVisible:false,
}
},
mounted() {
@ -2458,6 +2321,60 @@ export default {
this.modalDisableFlag = true
this.modalFlag = true
},
async getDetailData(row) {
this.detailVisible = true
await this.getNodeAuthority(row)
this.modalData = {
flag: '2',
title: '打样编辑-' + row.proofingNo,
site: row.site,
proofingNo: row.proofingNo,
customerNo: row.customerNo,
customerDesc: row.customerDesc,
projectId: row.projectId,
projectName: row.projectName,
tracker: row.tracker,
trackerName: row.trackerName,
testPartNo: row.testPartNo,
partName: row.partName,
engineer: row.engineer,
engineerName: row.engineerName,
approver: row.approver,
approverName: row.approverName,
priorityLevel: row.priorityLevel,
proofingNumber: row.proofingNumber,
requiredDeliveryDate: row.requiredDeliveryDate,
remark: row.remark,
technicalConsiderations: row.technicalConsiderations,
isNeedToSendSamples: row.isNeedToSendSamples,
sendSamplesAddress: row.sendSamplesAddress,
consignee: row.consignee,
consigneeContact: row.consigneeContact,
actualityDeliveryDate: row.actualityDeliveryDate,
proofingResultInformation: row.proofingResultInformation,
actualitySendSamplesDate: row.actualitySendSamplesDate,
sendSamplesMethod: row.sendSamplesMethod,
deliverGoodsInformation: row.deliverGoodsInformation,
deliverGoodsRemark: row.deliverGoodsRemark,
actualityReplyDate: row.actualityReplyDate,
confirmResults: row.confirmResults,
confirmBy: row.confirmBy,
confirmInformation: row.confirmInformation,
proofingStatus: row.proofingStatus,
proofingResultStatus: row.proofingResultStatus,
nextToDo: row.nextToDo,
updateBy: this.$store.state.user.name,
nodeConclusion: '',
stepId: row.stepId,
rejectFlag: row.rejectFlag,
rejectStepId: row.rejectStepId,
isReject: row.isReject,
nodeId: row.nodeId
}
this.searchDelegateAccessByUser();
this.modalDisableFlag = true
this.modalFlag = true
},
// ======== 新增/编辑/删除方法 ========
/**

2
src/views/modules/test/requestForTest.vue
View File

@ -133,7 +133,7 @@
fixed="right"
header-align="center"
align="center"
width="100"
width="120"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" style="cursor:pointer;" v-if="scope.row.testStatus !== '已完成'" @click="updateModal(scope.row)">编辑</a>

Write Preview
Loading…
Cancel
Save