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

2025-06-24 

按钮权限：包括询价、测试、打样、刀具
master
fengyuan_yang 8 months ago
parent
9df35ce75b
commit
3782280cf6
8 changed files with 241 additions and 246 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. 62
      src/views/modules/changeManagement/changeRecord.vue
  2. 61
      src/views/modules/demoComponents/orderProperties.vue
  3. 10
      src/views/modules/proofing/requestForProofing.vue
  4. 15
      src/views/modules/quotation/priceCheckProperties.vue
  5. 15
      src/views/modules/quotation/requestForQuote.vue
  6. 25
      src/views/modules/test/requestForTest.vue
  7. 15
      src/views/modules/test/testAttribute/testProperties.vue
  8. 108
      src/views/modules/tooling/searchToolApply.vue

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

@ -221,7 +221,7 @@
<div class="rq"> <div class="rq">
<el-table <el-table
:data="chooseDataList" :data="chooseDataList"
height="320px"
height="345px"
border border
style="width:100%"> style="width:100%">
<!-- <el-table-column--> <!-- <el-table-column-->
@ -335,20 +335,6 @@
</div> </div>
</el-form> </el-form>
</div> </div>
<el-footer style="height:25px;text-align:center">
<template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
<template v-if="authSubmit">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
</template>
<template v-if="authReject">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
</template>
</template>
</el-footer>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="库存成本影响" name="inventoryCostImpact" v-loading="submitLoading"> <el-tab-pane label="库存成本影响" name="inventoryCostImpact" v-loading="submitLoading">
@ -442,20 +428,6 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-footer style="height:25px;text-align:center">
<template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
<template v-if="authSubmit">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
</template>
<template v-if="authReject">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
</template>
</template>
</el-footer>
</el-tab-pane > </el-tab-pane >
<el-tab-pane label="TP&执行信息" name="actionInformation" v-loading="submitLoading"> <el-tab-pane label="TP&执行信息" name="actionInformation" v-loading="submitLoading">
@ -464,7 +436,7 @@
<div class="rq"> <div class="rq">
<el-table <el-table
:data="chooseItemList2" :data="chooseItemList2"
height="230px"
height="232px"
border border
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
@ -549,7 +521,7 @@
<div class="rq"> <div class="rq">
<el-table <el-table
:data="chooseItemList" :data="chooseItemList"
height="230px"
height="265px"
border border
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
@ -600,29 +572,15 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<el-footer style="height:25px;text-align:center">
<template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
<template v-if="authSubmit">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
</template>
<template v-if="authReject">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
</template>
</template>
</el-footer>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="会签信息" name="countersignature" v-loading="submitLoading"> <el-tab-pane label="会签信息" name="countersignature" v-loading="submitLoading">
<div style="height: 670px">
<div style="height: 705px">
<el-button type="primary" @click="chooseCSModel">选择会签信息</el-button> <el-button type="primary" @click="chooseCSModel">选择会签信息</el-button>
<div class="rq"> <div class="rq">
<el-table <el-table
:data="chooseCSItemList" :data="chooseCSItemList"
height="600px"
height="675px"
border border
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
@ -662,22 +620,24 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<el-footer style="height:25px;text-align:center">
</el-tab-pane>
</el-tabs>
<el-footer style="height:35px;margin-top: 15px;text-align:center">
<template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')"> <template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button> <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
</template> </template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button> <el-button type="primary" @click="modalFlag = false">关闭</el-button>
<template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
<template v-if="authSubmit"> <template v-if="authSubmit">
<template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button> <el-button v-if="modalData.changeStatus === '审批中' && modalData.tpProcessControl !== 'Y' && modalData.csProcessControl !== 'Y'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
</template> </template>
</template>
<template v-if="authReject"> <template v-if="authReject">
<template v-if="superAdmin || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2))">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button> <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
</template> </template>
</template> </template>
</el-footer> </el-footer>
</el-tab-pane>
</el-tabs>
</el-dialog> </el-dialog>
<!-- 页签 --> <!-- 页签 -->

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

@ -1,25 +1,20 @@
<template> <template>
<div> <div>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<!-- <template v-if="approvalUsername && approvalUsername.split(';').includes($store.state.user.name)">-->
<!-- <template v-if="isAuth('103001:tab1:save')">-->
<!-- <el-button type="primary" @click="clickSaveBtn" v-if="orderNo && proofingStatus === '审批中'" :disabled="disabled">新增</el-button>-->
<!-- </template>-->
<!-- <template v-if="isAuth('103001:tab1:update')">-->
<!-- <el-button type="primary" :loading="loading" v-if="orderNo && proofingStatus === '审批中'" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>-->
<!-- </template>-->
<!-- <template v-if="isAuth('103001:tab1:save')">-->
<!-- <el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled" v-if="attributeDialog && orderNo && proofingStatus === '审批中'">刷新属性模板</el-button>-->
<!-- </template>-->
<!-- </template>-->
<template v-if="isAuth('103001:tab1:save')"> <template v-if="isAuth('103001:tab1:save')">
<el-button type="primary" @click="clickSaveBtn" v-if="orderNo" :disabled="disabled">新增</el-button>
<template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
<el-button type="primary" @click="clickSaveBtn" v-if="orderNo && !disabled">新增</el-button>
</template>
</template> </template>
<template v-if="isAuth('103001:tab1:update')"> <template v-if="isAuth('103001:tab1:update')">
<el-button type="primary" :loading="loading" v-if="orderNo" :disabled="disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
<template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
<el-button type="primary" :loading="loading" v-if="orderNo && !disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
</template>
</template> </template>
<template v-if="isAuth('103001:tab1:save')"> <template v-if="isAuth('103001:tab1:save')">
<el-button type="primary" @click="refreshPropertiesModal" :disabled="disabled" v-if="attributeDialog && orderNo">刷新属性模板</el-button>
<template v-if="proofingStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && proofingStatus === '审批中')">
<el-button type="primary" v-if="attributeDialog && orderNo && !disabled" @click="refreshPropertiesModal">刷新属性模板</el-button>
</template>
</template> </template>
</div> </div>
<div class="rq " v-if="attributeDialog"> <div class="rq " v-if="attributeDialog">
@ -140,6 +135,10 @@ export default {
disabled: { disabled: {
type:Boolean, type:Boolean,
default:false, default:false,
},
superAdmin: {
type: Boolean,
default: false
} }
}, },
data () { data () {
@ -293,12 +292,13 @@ export default {
searchDataList: [], searchDataList: [],
dataList: [], dataList: [],
dataList2: [], dataList2: [],
sp: this.$store.state.user.name,
} }
}, },
watch: { watch: {
orderNo (newValue, oldValue) { orderNo (newValue, oldValue) {
if (newValue) { if (newValue) {
this.getProperties();
this.getProperties()
} }
}, },
}, },
@ -318,11 +318,11 @@ export default {
} }
refreshPropertiesModal(params).then(({data}) => { refreshPropertiesModal(params).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success('操作成功');
this.getProperties();
this.attributeDialog = true;
this.$message.success('操作成功')
this.getProperties()
this.attributeDialog = true
} else { } else {
this.$message.warning(data.msg);
this.$message.warning(data.msg)
} }
this.loading = false this.loading = false
}).catch((error) => { }).catch((error) => {
@ -331,6 +331,7 @@ export default {
}) })
}) })
}, },
getProperties () { getProperties () {
let params = { let params = {
site:this.$store.state.user.site, site:this.$store.state.user.site,
@ -340,8 +341,8 @@ export default {
} }
getPropertiesListByPartAndCodeNo(params).then(({data})=>{ getPropertiesListByPartAndCodeNo(params).then(({data})=>{
if (data && data.code === 0){ if (data && data.code === 0){
this.dataList = data.rows;
this.dataList2 = JSON.parse(JSON.stringify(data.rows));
this.dataList = data.rows
this.dataList2 = JSON.parse(JSON.stringify(data.rows))
for (let i = 0; i <this.dataList2.length ; i++) { for (let i = 0; i <this.dataList2.length ; i++) {
this.dataList2[i].itemNo= this.dataList2[i].propertiesItemNo this.dataList2[i].itemNo= this.dataList2[i].propertiesItemNo
} }
@ -353,26 +354,28 @@ export default {
this.$message.error(error) this.$message.error(error)
}) })
}, },
clickSave () { clickSave () {
if(this.dataList.length==0){
if (this.dataList.length === 0) {
return false return false
} }
if (!this.attributeDialog) { if (!this.attributeDialog) {
this.updateTestPropertiesList();
this.updateTestPropertiesList()
} else { } else {
this.copyAttributeList = JSON.parse(JSON.stringify(this.dataList)) this.copyAttributeList = JSON.parse(JSON.stringify(this.dataList))
this.attributeDialog = false;
this.attributeDialog = false
} }
}, },
updateTestPropertiesList () { updateTestPropertiesList () {
this.loading = true this.loading = true
updatePropertiesList(this.copyAttributeList).then(({data})=>{ updatePropertiesList(this.copyAttributeList).then(({data})=>{
if (data && data.code === 0){ if (data && data.code === 0){
this.$message.success('操作成功');
this.getProperties();
this.attributeDialog = true;
this.$message.success('操作成功')
this.getProperties()
this.attributeDialog = true
} else { } else {
this.$message.warning(data.msg);
this.$message.warning(data.msg)
} }
this.loading = false this.loading = false
}).catch((error)=>{ }).catch((error)=>{
@ -380,6 +383,7 @@ export default {
this.loading = false this.loading = false
}) })
}, },
clickSaveBtn () { clickSaveBtn () {
if (!this.attributeDialog) { if (!this.attributeDialog) {
this.$message.warning('请保存更改！') this.$message.warning('请保存更改！')
@ -389,6 +393,7 @@ export default {
this.searchAttributeList({}) this.searchAttributeList({})
this.attributeSaveDialog = true; this.attributeSaveDialog = true;
}, },
saveTestPropertiesItem (params) { saveTestPropertiesItem (params) {
let i = 0; let i = 0;
let arr = params.searchTableList.map(item=>{ let arr = params.searchTableList.map(item=>{

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

@ -374,11 +374,13 @@
<el-button type="primary" @click="saveData()">保存</el-button> <el-button type="primary" @click="saveData()">保存</el-button>
</template> </template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button> <el-button type="primary" @click="modalFlag = false">关闭</el-button>
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<template v-if="isAuth('103001:submit')"> <template v-if="isAuth('103001:submit')">
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<el-button v-if="modalData.proofingStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button> <el-button v-if="modalData.proofingStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
</template> </template>
</template>
<template v-if="isAuth('103001:rejected')"> <template v-if="isAuth('103001:rejected')">
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<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>
</template> </template>
</template> </template>
@ -545,11 +547,13 @@
<!-- 页签 --> <!-- 页签 -->
<el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 300px;" type="border-card" @tab-click="tabClick" class="customer-tab"> <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"> <el-tab-pane label="基本信息" name="attribute">
<proofing-attribute ref="dialogAttribute"
<proofing-attribute
ref="dialogAttribute"
:disabled="proofingCurrentRow.proofingStatus === '已完成'" :disabled="proofingCurrentRow.proofingStatus === '已完成'"
:order-no="proofingCurrentRow.proofingNo" :order-no="proofingCurrentRow.proofingNo"
:approval-username="proofingCurrentRow.approvalUsername" :approval-username="proofingCurrentRow.approvalUsername"
:proofing-status="proofingCurrentRow.proofingStatus" :proofing-status="proofingCurrentRow.proofingStatus"
:super-admin="superAdmin"
:code-no="'Proofing'" :code-no="'Proofing'"
:function-type="'order'"> :function-type="'order'">
</proofing-attribute> </proofing-attribute>
@ -858,9 +862,11 @@ import BuSelect from "../base/BuSelect.vue";
import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue"; import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue";
import FilterSearch from "../../common/filterSearch.vue"; import FilterSearch from "../../common/filterSearch.vue";
import {testInformationSearchAny} from "../../../api/test/testInformation"; import {testInformationSearchAny} from "../../../api/test/testInformation";
import PriceCheckProperties from "../quotation/priceCheckProperties.vue";
export default { export default {
components: { components: {
PriceCheckProperties,
FilterSearch, FilterSearch,
CustomerInfo, CustomerInfo,
BuSelect, BuSelect,

15
src/views/modules/quotation/priceCheckProperties.vue
View File

@ -31,6 +31,16 @@ export default {
disabled: { disabled: {
type: Boolean, type: Boolean,
default: false default: false
},
approvalUsername: {
type: String,
},
quotationStatus: {
type: String,
},
superAdmin: {
type: Boolean,
default: false
} }
}, },
model: { model: {
@ -185,6 +195,7 @@ export default {
// }, // },
], ],
searchDataList: [], searchDataList: [],
sp: this.$store.state.user.name,
} }
}, },
methods:{ methods:{
@ -311,11 +322,15 @@ export default {
<div> <div>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<template v-if="isAuth('102001001:tab1:save')"> <template v-if="isAuth('102001001:tab1:save')">
<template v-if="quotationStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && quotationStatus === '审批中')">
<el-button type="primary" :loading="loading" v-if="quotationNo && !disabled" @click="saveBtnClick">新增</el-button> <el-button type="primary" :loading="loading" v-if="quotationNo && !disabled" @click="saveBtnClick">新增</el-button>
</template> </template>
</template>
<template v-if="isAuth('102001001:tab1:update')"> <template v-if="isAuth('102001001:tab1:update')">
<template v-if="quotationStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && quotationStatus === '审批中')">
<el-button type="primary" @click="saveClick" v-if="quotationNo && !disabled">{{ attributeDialog?'编辑':'保存' }}</el-button> <el-button type="primary" @click="saveClick" v-if="quotationNo && !disabled">{{ attributeDialog?'编辑':'保存' }}</el-button>
</template> </template>
</template>
</div> </div>
<div class="rq" v-if="attributeDialog"> <div class="rq" v-if="attributeDialog">
<el-table <el-table

15
src/views/modules/quotation/requestForQuote.vue
View File

@ -378,11 +378,13 @@
<el-button type="primary" v-if="!detailVisible" @click="saveData">保存</el-button> <el-button type="primary" v-if="!detailVisible" @click="saveData">保存</el-button>
</template> </template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button> <el-button type="primary" @click="modalFlag = false">关闭</el-button>
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<template v-if="isAuth('102001001:submit')"> <template v-if="isAuth('102001001:submit')">
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<el-button v-if="modalData.quotationStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button> <el-button v-if="modalData.quotationStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
</template> </template>
</template>
<template v-if="isAuth('102001001:rejected')"> <template v-if="isAuth('102001001:rejected')">
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<el-button v-if="modalData.quotationStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectVisible = true">驳回</el-button> <el-button v-if="modalData.quotationStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectVisible = true">驳回</el-button>
</template> </template>
</template> </template>
@ -574,7 +576,16 @@
<!-- 页签 --> <!-- 页签 -->
<el-tabs v-model="activeTable" type="border-card" style="margin-top: 0px;" @tab-click="tabClick" class="customer-tab"> <el-tabs v-model="activeTable" type="border-card" style="margin-top: 0px;" @tab-click="tabClick" class="customer-tab">
<el-tab-pane label="基本信息" name="priceCheck"> <el-tab-pane label="基本信息" name="priceCheck">
<price-check-properties :disabled="quotationCurrentRow.quotationStatus === '已完成'" ref="tabProperties" v-model:data-list="priceCheckPropertiesList" :quotation-no="quotationCurrentRow.quotationBatchNo" height="45vh"></price-check-properties>
<price-check-properties
:disabled="quotationCurrentRow.quotationStatus === '已完成'"
ref="tabProperties"
v-model:data-list="priceCheckPropertiesList"
:quotation-no="quotationCurrentRow.quotationBatchNo"
:approval-username="quotationCurrentRow.approvalUsername"
:quotation-status="quotationCurrentRow.quotationStatus"
:super-admin="superAdmin"
height="45vh">
</price-check-properties>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="采购详细信息" name="tabMaterialSourcing"> <el-tab-pane label="采购详细信息" name="tabMaterialSourcing">
<price-check-detail :disabled="quotationCurrentRow.quotationStatus === '已完成'" :quote="quotationCurrentRow" :data-list="priceCheckDetailList" @refresh="getPriceCheckDetailList" :height="500"></price-check-detail> <price-check-detail :disabled="quotationCurrentRow.quotationStatus === '已完成'" :quote="quotationCurrentRow" :data-list="priceCheckDetailList" @refresh="getPriceCheckDetailList" :height="500"></price-check-detail>

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

@ -394,17 +394,17 @@
</el-tabs> </el-tabs>
</div> </div>
<el-footer style="height:30px;text-align:center;margin-top: 8px"> <el-footer style="height:30px;text-align:center;margin-top: 8px">
<template
v-if="modalData.testStatus === '草稿' || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name) && modalData.testStatus === '审批中')">
<template v-if="modalData.testStatus === '草稿' || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name) && modalData.testStatus === '审批中')">
<el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1' && !detailFlag">保存</el-button> <el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1' && !detailFlag">保存</el-button>
</template> </template>
<!-- <el-button type="primary" @click="modalFlag = false">关闭</el-button>-->
<el-button type="primary" @click="closeDialog">关闭</el-button> <el-button type="primary" @click="closeDialog">关闭</el-button>
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<template v-if="isAuth('107001:submit')"> <template v-if="isAuth('107001:submit')">
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<el-button v-if="modalData.testStatus === '审批中' && !detailFlag" type="primary" @click="agreeSubmit">同意</el-button> <el-button v-if="modalData.testStatus === '审批中' && !detailFlag" type="primary" @click="agreeSubmit">同意</el-button>
</template> </template>
</template>
<template v-if="isAuth('107001:rejected')"> <template v-if="isAuth('107001:rejected')">
<template v-if="superAdmin || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y' && !detailFlag" @click="rejectVisible = true" type="primary">驳回</el-button> <el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y' && !detailFlag" @click="rejectVisible = true" type="primary">驳回</el-button>
</template> </template>
</template> </template>
@ -634,11 +634,18 @@
</el-dialog> </el-dialog>
<!-- 页签 --> <!-- 页签 -->
<el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card"
@tab-click="tabClick" class="customer-tab">
<el-tabs v-model="activeTable" style="margin-top: 0px; width: 100%; min-height: 500px;" type="border-card" @tab-click="tabClick" class="customer-tab">
<el-tab-pane label="基本信息" name="attribute"> <el-tab-pane label="基本信息" name="attribute">
<test-properties ref="tabProperties" v-model:data-list="testPropertiesList" :test-no="testCurrentRow.testNo"
:disabled="testCurrentRow.testStatus === '已完成'" height="45vh"></test-properties>
<test-properties
ref="tabProperties"
v-model:data-list="testPropertiesList"
:test-no="testCurrentRow.testNo"
:disabled="testCurrentRow.testStatus === '已完成'"
:approval-username="testCurrentRow.approvalUsername"
:test-status="testCurrentRow.testStatus"
:super-admin="superAdmin"
height="45vh">
</test-properties>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物料属性" name="test_attribute" style="padding: 5px"> <el-tab-pane label="物料属性" name="test_attribute" style="padding: 5px">
<el-table <el-table
@ -966,6 +973,7 @@ import CustomerInfo from "../quotation/sellForQuotation/customerInfo.vue";
import FilterSearch from "../../common/filterSearch.vue"; import FilterSearch from "../../common/filterSearch.vue";
import {quotationInformationSearchByAnyField} from "../../../api/quotation/quotationInformation"; import {quotationInformationSearchByAnyField} from "../../../api/quotation/quotationInformation";
import {testInformationSearchAny} from "../../../api/test/testInformation"; import {testInformationSearchAny} from "../../../api/test/testInformation";
import PriceCheckProperties from "../quotation/priceCheckProperties.vue";
export default { export default {
computed: { computed: {
@ -984,6 +992,7 @@ export default {
}, },
name: "test", name: "test",
components: { components: {
PriceCheckProperties,
FilterSearch, FilterSearch,
CustomerInfo, CustomerInfo,
BuSelect, BuSelect,

15
src/views/modules/test/testAttribute/testProperties.vue
View File

@ -36,6 +36,16 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
approvalUsername: {
type: String,
},
testStatus: {
type: String,
},
superAdmin: {
type: Boolean,
default: false
}
}, },
model:{ model:{
prop:"dataList", prop:"dataList",
@ -119,6 +129,7 @@ export default {
}, },
], ],
searchDataList:[], searchDataList:[],
sp: this.$store.state.user.name,
} }
}, },
methods:{ methods:{
@ -231,11 +242,15 @@ export default {
<div> <div>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<template v-if="isAuth('107001:tab1:save')"> <template v-if="isAuth('107001:tab1:save')">
<template v-if="testStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && testStatus === '审批中')">
<el-button type="primary" @click="clickSaveBtn" v-if="testNo && !disabled">新增</el-button> <el-button type="primary" @click="clickSaveBtn" v-if="testNo && !disabled">新增</el-button>
</template> </template>
</template>
<template v-if="isAuth('107001:tab1:update')"> <template v-if="isAuth('107001:tab1:update')">
<template v-if="testStatus === '草稿' || superAdmin || (approvalUsername && approvalUsername.split(';').includes(sp) && testStatus === '审批中')">
<el-button type="primary" :loading="loading" v-if="testNo && !disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button> <el-button type="primary" :loading="loading" v-if="testNo && !disabled" @click="clickSave">{{ attributeDialog?'编辑':'保存' }}</el-button>
</template> </template>
</template>
</div> </div>
<div class="rq " v-if="attributeDialog"> <div class="rq " v-if="attributeDialog">
<el-table <el-table

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

@ -109,7 +109,16 @@
<el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick"> <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="基本信息" name="attribute"> <el-tab-pane label="基本信息" name="attribute">
<order-attribute ref="dialogAttribute" :order-no="currentRow.applyNo" :code-no="'toolApply'" :function-type="'TL_Receipt'"></order-attribute>
<order-attribute
ref="dialogAttribute"
:disabled="currentRow.status === '已完成'"
:order-no="currentRow.applyNo"
:approval-username="currentRow.sp"
:proofing-status="currentRow.status"
:super-admin="superAdmin"
:code-no="'toolApply'"
:function-type="'TL_Receipt'">
</order-attribute>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工具明细" name="detail"> <el-tab-pane label="工具明细" name="detail">
<el-table <el-table
@ -211,11 +220,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog
width="800px" v-drag
:title="'刀模申请修改'"
:close-on-click-modal="false"
:visible.sync="visibleU">
<el-dialog width="800px" v-drag :title="'刀模申请修改'" :close-on-click-modal="false" :visible.sync="visibleU">
<el-form :inline="true" label-position="top" label-width="100px"> <el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="'申请编号'"> <el-form-item :label="'申请编号'">
<el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input>
@ -300,19 +305,13 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')"> <div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> <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>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div> </div>
<div v-else-if=" (item.columnProp === 'standardCost')"> <div v-else-if=" (item.columnProp === 'standardCost')">
<el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number"
@change="changeSum(scope.row)" placeholder="请输入成本"
style="width:98%"></el-input>
<el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本" style="width:98%"></el-input>
</div> </div>
<div v-else> <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>
<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> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -329,8 +328,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" style="height: 80px"> <el-form-item label="备注" style="height: 80px">
<el-input type="textarea" v-model="modelData.remark1" :rows="3" style="height: 60px"
:disabled="$store.state.user.name!==dataForm.tp"></el-input>
<el-input type="textarea" v-model="modelData.remark1" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.tp"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -346,22 +344,19 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="厂商名称"> <el-form-item label="厂商名称">
<el-input v-model="modelData.supplierName"
:disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input v-model="modelData.supplierName" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="总成本(元)"> <el-form-item label="总成本(元)">
<el-input v-model="modelData.allCost" type="number"
:disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="15" style="margin-top: 0px"> <el-row :gutter="15" style="margin-top: 0px">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" style="height: 80px"> <el-form-item label="备注" style="height: 80px">
<el-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px"
:disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -374,11 +369,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog
width="800px" v-drag
:title="'刀模申请审批'"
:close-on-click-modal="false"
:visible.sync="visible">
<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 :inline="true" label-position="top" label-width="100px">
<el-form-item :label="'申请编号'"> <el-form-item :label="'申请编号'">
<el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input>
@ -387,8 +378,7 @@
<el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input> <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'总成本'"> <el-form-item :label="'总成本'">
<el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px"
disabled></el-input>
<el-input v-if="accessField('10601001')" v-model="dataForm.totalCost" style="width: 130px" disabled></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input> <el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'申请人'" required="required"> <el-form-item :label="'申请人'" required="required">
@ -405,39 +395,32 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="部门" required="required"> <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>
<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>
<el-form-item required="required"> <el-form-item required="required">
<span slot="label" style="" @click="getBaseList(2002,1)"><a herf="#">报价员</a></span> <span slot="label" style="" @click="getBaseList(2002,1)"><a herf="#">报价员</a></span>
<el-input v-model="dataForm.quoterName" ref="quoterName" placeholder="请选择人员" readonly
style="width: 130px"></el-input>
<el-input v-model="dataForm.quoterName" ref="quoterName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item required="required"> <el-form-item required="required">
<span slot="label" style="" @click="getBaseList(2042,2)"><a herf="#">TP</a></span> <span slot="label" style="" @click="getBaseList(2042,2)"><a herf="#">TP</a></span>
<el-input v-model="dataForm.tpName" ref="tpName" placeholder="请选择人员" readonly
style="width: 130px"></el-input>
<el-input v-model="dataForm.tpName" ref="tpName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item required="required"> <el-form-item required="required">
<span slot="label" style="" @click="getBaseList(2000,3)"><a herf="#">采购员</a></span> <span slot="label" style="" @click="getBaseList(2000,3)"><a herf="#">采购员</a></span>
<el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly
style="width: 130px"></el-input>
<el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px"> <el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="'申请原因'"> <el-form-item :label="'申请原因'">
<el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}"
v-model="dataForm.applyReason"/>
<el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}" v-model="dataForm.applyReason"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 60px"> <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 60px">
<el-form-item :label="'备注'"> <el-form-item :label="'备注'">
<el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}"
v-model="dataForm.remark"/>
<el-input type="textarea" style="width: 770px" resize="none" :autosize="{minRows: 3, maxRows: 3}" v-model="dataForm.remark"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-tabs style="font-size: 12px;min-height: 330px;margin-top: 60px" class="customer-tab" v-model="activeModelName"
type="border-card">
<el-tabs style="font-size: 12px;min-height: 330px;margin-top: 60px" class="customer-tab" v-model="activeModelName" type="border-card">
<el-tab-pane label="工具明细" name="detail"> <el-tab-pane label="工具明细" name="detail">
<div class="rq" style="margin-top: 0px"> <div class="rq" style="margin-top: 0px">
<el-table <el-table
@ -460,19 +443,13 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')"> <div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> <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>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div> </div>
<div v-else-if=" (item.columnProp === 'standardCost')"> <div v-else-if=" (item.columnProp === 'standardCost')">
<el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number"
@change="changeSum(scope.row)" placeholder="请输入成本"
style="width:98%"></el-input>
<el-input v-if="accessField('10601001')" v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)" placeholder="请输入成本" style="width:98%"></el-input>
</div> </div>
<div v-else> <div v-else>
<el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)"
:disabled="changeApplyDetailFlag('applyQty') === 'N'" placeholder="请输入数量"
onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
style="width:98%"></el-input>
<el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)" :disabled="changeApplyDetailFlag('applyQty') === 'N'" placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width:98%"></el-input>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -489,8 +466,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" style="height: 80px"> <el-form-item label="备注" style="height: 80px">
<el-input type="textarea" v-model="modelData.remark1" :rows="3" style="height: 60px"
:disabled="$store.state.user.name!==dataForm.tp"></el-input>
<el-input type="textarea" v-model="modelData.remark1" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.tp"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -506,24 +482,20 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="厂商名称"> <el-form-item label="厂商名称">
<el-input v-model="modelData.supplierName"
:disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input v-model="modelData.supplierName" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="总成本(元)"> <el-form-item label="总成本(元)">
<el-input v-if="accessField('10601001')" v-model="modelData.allCost" type="number"
:disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px"
disabled></el-input>
<el-input v-if="accessField('10601001')" v-model="modelData.allCost" type="number" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input v-if="!accessField('10601001')" v-model="valueNull" style="width: 130px" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="15" style="margin-top: 0px"> <el-row :gutter="15" style="margin-top: 0px">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" style="height: 80px"> <el-form-item label="备注" style="height: 80px">
<el-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px"
:disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
<el-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.purchaser"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -533,17 +505,19 @@
<span slot="footer" class="dialog-footer" style="height: 40px"> <span slot="footer" class="dialog-footer" style="height: 40px">
<!-- <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>--> <!-- <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>-->
<el-button type="primary" @click="visible = false" class="bigButton">{{ '取消' }}</el-button> <el-button type="primary" @click="visible = false" class="bigButton">{{ '取消' }}</el-button>
<!-- 2025-05-31 保存、同意、驳回的权限没生效 - 与ECN的判断保持一致 -->
<template v-if="dataForm.status === '草稿' || (dataForm.sp && dataForm.sp.split(';').includes(sp) && dataForm.status === '审批中')"> <template v-if="dataForm.status === '草稿' || (dataForm.sp && dataForm.sp.split(';').includes(sp) && dataForm.status === '审批中')">
<el-button type="primary" @click="saveData" class="bigButton">保存</el-button> <el-button type="primary" @click="saveData" class="bigButton">保存</el-button>
</template> </template>
<template v-if="isAuth('106002:submit')">
<template v-if="superAdmin || (dataForm.sp && dataForm.sp.split(';').includes(sp))"> <template v-if="superAdmin || (dataForm.sp && dataForm.sp.split(';').includes(sp))">
<el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button> <el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button>
</template>
</template>
<template v-if="isAuth('106002:rejected')">
<template v-if="superAdmin || (dataForm.sp && dataForm.sp.split(';').includes(sp))">
<el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal" class="bigButton">驳回</el-button> <el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal" class="bigButton">驳回</el-button>
</template> </template>
<!-- <el-button type="primary" @click="saveData" 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>-->
</template>
</span> </span>
</el-dialog> </el-dialog>

Write Preview
Loading…
Cancel
Save