Browse Source

2024-10-08

master
qiezi 1 year ago
parent
commit
3fac7da2a7
  1. 1
      src/api/base/site.js
  2. 2
      src/views/main-content.vue
  3. 13
      src/views/modules/base/companyInformation.vue
  4. 2
      src/views/modules/base/factoryInformation.vue
  5. 35
      src/views/modules/proofing/requestForProofing.vue
  6. 13
      src/views/modules/quotation/requestForQuote.vue
  7. 34
      src/views/modules/quotation/sellForQuotation.vue
  8. 5
      src/views/modules/quotation/toBeQuoted.vue

1
src/api/base/site.js

@ -25,6 +25,7 @@ export const deletePartFamily = data => createAPI(`/base/deletePartFamily`,'post
//------------会计单位信息----------------
// 获取停机原因
export const getCompanyInformation = data => createAPI(`/base/getCompanyInformation`,'post',data)
export const queryCompanyInformation = data => createAPI(`/base/queryCompanyInformation`,'post',data)
// 保存修改停机原因
export const saveCompanyInformation = data => createAPI(`/base/saveCompanyInformation`,'post',data)

2
src/views/main-content.vue

@ -15,7 +15,7 @@
<el-dropdown-item @click.native="tabsCloseOtherHandle">关闭其它标签页</el-dropdown-item>
<el-dropdown-item @click.native="tabsCloseAllHandle">关闭全部标签页</el-dropdown-item>
<el-dropdown-item @click.native="refresh()">刷新当前标签页</el-dropdown-item>
<!-- <el-dropdown-item @click.native="flag = true">筛选条件</el-dropdown-item>-->
<el-dropdown-item @click.native="flag = true">筛选条件</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-tab-pane

13
src/views/modules/base/companyInformation.vue

@ -120,6 +120,7 @@
searchFunctionButtonList,
} from "@/api/sysLanguage.js"
import {queryCompanyInformation} from "../../../api/base/site";
var functionId='100001001';
export default {
name: "companyInformation",
@ -481,6 +482,15 @@
this.dataList = data.rows
})
},
queryData(params){
params.no = 1
params.size = 2
queryCompanyInformation(params).then(({data})=>{
if (data && data.code === 0){
this.dataList = data.rows
}
})
},
addModal(){
this.modelData={};
this.modelData.add=0;
@ -672,6 +682,9 @@
this.getButtonAuthData();
this.getTableUserColumn()
},
activated() {
// this.$store.commit("sift/commitSearchFunction",this.queryData)
}
}
</script>

2
src/views/modules/base/factoryInformation.vue

@ -1012,6 +1012,7 @@ export default {
this.$message.error(error)
})
},
},
created() {
this.getMultiLanguageList()//
@ -1019,6 +1020,7 @@ export default {
//
this.getButtonAuthData();
this.getTableUserColumn()
this.$store.commit("sift/commitSearchFunction",this.getSiteDataDemo)
},
}
</script>

35
src/views/modules/proofing/requestForProofing.vue

@ -56,23 +56,12 @@
<dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false"
dict-type="priority_Level"></dict-data-select>
</el-form-item>
<el-form-item :label="'状态'" v-if="false">
<el-select v-model="searchData.proofingResultStatus" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="草稿" value="B"></el-option>
<el-option label="已下达" value="C"></el-option>
<el-option label="已完成打样" value="E"></el-option>
<el-option label="已提交打样" value="S"></el-option>
<el-option label="客户已反馈" value="R"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.proofingStatus" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="草稿" value="草稿"></el-option>
<el-option label="审批中" value="审批中"></el-option>
<el-option label="已完成" value="已完成"></el-option>
<el-option label="下达" value="下达"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
@ -252,7 +241,6 @@
</el-col>
<el-col :span="4">
<el-form-item>
<!-- <span style="cursor: pointer" slot="label" @click="getBaseList(103,2)"><a herf="#">Approver</a></span>-->
<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>
@ -260,7 +248,6 @@
</el-col>
<el-col :span="4">
<el-form-item>
<!-- <span style="cursor: pointer" slot="label" @click="getBaseList(103,2)"><a herf="#">Approver</a></span>-->
<label v-if="columnFlagByDelegateAccess('delegateAccess')" 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>
@ -2641,28 +2628,12 @@ export default {
this.$refs.modalForm.validate((valid) => {
if (!valid) {
this.validateDataValue()
// this.validateDataValue()
} else {
if (this.projectPartListSelections.length <= 0) {
this.$message.warning('请选择项目料号')
return
}
if(this.modalData.trackerName==''||this.modalData.trackerName==null){
this.$message.warning('请选择CS')
return
}
if(this.modalData.engineerName==''||this.modalData.engineerName==null){
this.$message.warning('请选择NPI工程师')
return
}
if(this.modalData.approverName==''||this.modalData.approverName==null){
this.$message.warning('请选择Approver')
return
}
if(this.delegateAccessName==''||this.delegateAccessName==null){
this.$message.warning('请选择DelegateAccess')
return
}
this.confirmProjectPart();
//
this.modalData.delegateAccessList = this.selectionDelegateAccess
@ -2725,11 +2696,11 @@ export default {
return
}
if (this.modalData.tracker === '' || this.modalData.tracker == null) {
this.$message.warning('请选择跟单员编码!')
this.$message.warning('请选择CS编码!')
return
}
if (this.modalData.trackerName === '' || this.modalData.trackerName == null) {
this.$message.warning('请选择跟单员名称!')
this.$message.warning('请选择CS名称!')
return
}
if (this.modalData.projectId === '' || this.modalData.projectId == null) {

13
src/views/modules/quotation/requestForQuote.vue

@ -59,21 +59,12 @@
<dict-data-select v-model="searchData.priorityLevel" clearable style="width: 120px" :use-default-value="false"
dict-type="priority_Level"/>
</el-form-item>
<el-form-item :label="'状态'" v-if="false">
<el-select v-model="searchData.quotationResultStatus" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="草稿" value="B"></el-option>
<el-option label="已下达" value="C"></el-option>
<el-option label="已完成报价" value="E"></el-option>
<el-option label="已提交报价" value="S"></el-option>
<el-option label="客户已反馈" value="R"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'状态'">
<el-select v-model="searchData.quotationStatus" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="草稿" value="草稿"></el-option>
<el-option label="下达" value="下达"></el-option>
<el-option label="审批中" value="审批中"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">

34
src/views/modules/quotation/sellForQuotation.vue

@ -307,41 +307,48 @@
@close="closeQuotationNoDialog"
@open="openQuotationNoDialog"
:close-on-click-modal="false"
width="1200px"
:visible.sync="quotationNoDialogFlag" v-drag>
<el-form label-position="top"
inline="inline"
:model="quotationNoSearchData"
size="mini"
label-width="120px">
size="mini">
<el-row :gutter="10">
<el-col :span="4">
<el-col :span="3">
<el-form-item label="询价单号">
<el-input v-model="quotationNoSearchData.quotationNo" clearable/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="申请批次号">
<el-input v-model="quotationNoSearchData.quotationBatchNo" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="序号">
<el-input v-model="quotationNoSearchData.quotationItemNo" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4">
<el-col :span="3">
<el-form-item label="物料编码">
<el-input v-model="quotationNoSearchData.testPartNo" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="物料名称">
<el-input v-model="quotationNoSearchData.partName" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item :label="'状态'">
<el-select v-model="quotationNoSearchData.quotationStatus" style="width:100%">
<el-option label="全部" value=""></el-option>
<el-option label="草稿" value="草稿"></el-option>
<el-option label="审批中" value="审批中"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item label=" ">
<el-button type="primary" style="padding: 3px 12px" @click="searchQuotationData">查询</el-button>
</el-form-item>
@ -354,7 +361,8 @@
<el-table-column width="60" align="center" header-align="center" prop="quotationItemNo" label="询价序号"/>
<el-table-column prop="projectName" header-align="center" label="项目名称"/>
<el-table-column width="180" prop="testPartNo" header-align="center" label="物料编码"/>
<el-table-column prop="partName" header-align="center" label="物料名称"/>
<el-table-column prop="partName" header-align="center" label="状态"/>
<el-table-column prop="quotationStatus" header-align="center" label="物料名称"/>
<el-table-column label="终端客户编码" header-align="center" prop="finalCustomerId"/>
<el-table-column label="终端客户名称" header-align="center" prop="finalCustomerName"/>
</el-table>
@ -791,6 +799,7 @@ export default {
quotationNo: "",//
quotationBatchNo: "",//
quotationItemNo: '',//
quotationStatus: "",//
partName:'',//
testPartNo:'',//
site: this.$store.state.user.site,//
@ -1240,6 +1249,7 @@ export default {
quotationNo: "",//
quotationBatchNo: "",//
quotationItemNo: '',//
quotationStatus: '',
partName:'',//
testPartNo:'',//
site: this.$store.state.user.site,//

5
src/views/modules/quotation/toBeQuoted.vue

@ -75,7 +75,8 @@
<el-select v-model="searchData.quotationStatus" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="草稿" value="草稿"></el-option>
<el-option label="下达" value="下达"></el-option>
<el-option label="审批中" value="审批中"></el-option>
<el-option label="已完成" value="已完成"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" ">
@ -180,7 +181,7 @@ export default {
trackerName: '',
testPartNo: '',
partName: '',
quotationStatus: '下达',
quotationStatus: '已完成',
quotationResultStatus: '',
startDate: '',
endDate: '',

Loading…
Cancel
Save