Browse Source

Merge remote-tracking branch 'origin/master'

master
qiezi 1 year ago
parent
commit
a2002a40ff
  1. 30
      src/views/modules/customer/customerInformationManagement.vue
  2. 23
      src/views/modules/part/partInformation.vue
  3. 85
      src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
  4. 10
      src/views/modules/tooling/searchToolApply.vue
  5. 12
      src/views/modules/tooling/toolingInfo.vue

30
src/views/modules/customer/customerInformationManagement.vue

@ -357,11 +357,6 @@
<el-input readonly v-model="projectInformationModalData.projectId" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="buDesc" :rules="projectInformationModalData.buDesc" label="BU">
<el-input v-model="projectInformationModalData.buDesc" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目名称" prop="projectName">
<el-input readonly v-model="projectInformationModalData.projectName"></el-input>
@ -379,11 +374,6 @@
v-model="projectInformationModalData.projectSource"></dict-data-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="customerName" label="直接客户">
<el-input v-model="projectInformationModalData.customerName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="priority" label="优先级">
<dict-data-select disabled dict-type="project_info_priority" v-if="projectInformationModalFlag"
@ -414,6 +404,26 @@
<el-input v-model="projectInformationModalData.projectOwnerName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="直接客户">
<el-input v-model="projectInformationModalData.customerId" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="customerName" label="直接客户名称:">
<el-input v-model="projectInformationModalData.customerName" readonly ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="终端客户:">
<el-input v-model="projectInformationModalData.finalCustomerId" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="终端客户名称:">
<el-input v-model="projectInformationModalData.finalCustomerName" readonly ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="项目描述" style="height: 70px">
<el-input type="textarea" readonly resize="none" :autosize="{minRows: 2, maxRows: 2}"

23
src/views/modules/part/partInformation.vue

@ -11,6 +11,12 @@
<el-form-item :label="'物料规格型号'">
<el-input v-model="searchData.spec" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'是否在用'">
<el-select v-model="searchData.active" clearable style="width: 120px">
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'录入时间'">
<el-date-picker
style="width: 120px"
@ -1511,6 +1517,7 @@
endDate: '',
partDesc: '',
spec: '',
active: '',
page: 1,
limit: 10
},
@ -2048,6 +2055,22 @@
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 104001,
serialNumber: '104001Table1ActiveDesc',
tableId: '104001Table1',
tableName: '物料信息表',
columnProp: 'activeDesc',
headerAlign: 'center',
align: 'center',
columnLabel: '是否在用',
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 104001,

85
src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue

@ -28,18 +28,6 @@
<dict-data-select dict-type="project_info_source" v-if="visible" v-model="dataForm.projectSource"></dict-data-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="customerName">
<span slot="label" style="" @click="getBaseList(102,1)"><a herf="#">直接客户</a></span>
<el-input v-model="dataForm.customerName" readonly ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="customerName">
<span slot="label" style="" @click="getBaseList(102,2)"><a herf="#">终端客户</a></span>
<el-input v-model="dataForm.finalCustomerName" readonly ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="priority" label="优先级">
<dict-data-select dict-type="project_info_priority" v-if="visible" v-model="dataForm.priority"></dict-data-select>
@ -68,6 +56,28 @@
<el-input v-model="dataForm.projectOwnerName" readonly ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="customerId">
<span slot="label" style="" @click="getBaseList(102,1)"><a herf="#">直接客户</a></span>
<el-input v-model="dataForm.customerId" @blur="getCustomerName(1)"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="customerName" label="直接客户名称:">
<el-input v-model="dataForm.customerName" disabled ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item >
<span slot="label" style="" @click="getBaseList(102,2)"><a herf="#">终端客户</a></span>
<el-input v-model="dataForm.finalCustomerId" @blur="getCustomerName(2)"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="终端客户名称:">
<el-input v-model="dataForm.finalCustomerName" disabled ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="项目描述" style="height: 70px">
<el-input type="textarea" resize="none" :autosize="{minRows: 2, maxRows: 2}" v-model="dataForm.projectDesc" ></el-input>
@ -238,6 +248,10 @@
} from "@/api/project/project.js"
import Chooselist from '@/views/modules/common/Chooselist'
import DictDataSelect from "../../sys/dict-data-select.vue";
import {queryCustomer
} from "@/api/customer/customerInformation";
export default {
model:{
prop:'value',
@ -319,6 +333,13 @@
trigger: ['change','blur']
}
],
customerId: [
{
required: true,
message: ' ',
trigger: ['change','blur']
}
],
needDate: [
{
required: true,
@ -792,6 +813,46 @@
this.changeAll(row)
}
},
getCustomerName(type){
if(type===1){
let params = {
site:this.$store.state.user.site,
customerNo:this.dataForm.customerId
}
queryCustomer(params).then(({data})=>{
if (data && data.code === 0 ) {
if (data.rows && data.rows.length === 1){
this.dataForm.customerName = data.rows[0].customerDesc
}else {
this.dataForm.customerName = ''
}
}else {
this.$message.warning(data.msg)
}
}).catch((error)=>{
this.$message.error(error)
})
}
if(type===2){
let params = {
site:this.$store.state.user.site,
customerNo:this.dataForm.finalCustomerId
}
queryCustomer(params).then(({data})=>{
if (data && data.code === 0 ) {
if (data.rows && data.rows.length === 1){
this.dataForm.finalCustomerName = data.rows[0].customerDesc
}else {
this.dataForm.finalCustomerName = ''
}
}else {
this.$message.warning(data.msg)
}
}).catch((error)=>{
this.$message.error(error)
})
}
},
},
}
</script>

10
src/views/modules/tooling/searchToolApply.vue

@ -264,15 +264,17 @@
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'申请原因'">
<el-input v-model="dataForm.applyReason" style="width: 770px" ></el-input>
<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" >
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 60px">
<el-form-item :label="'备注'">
<el-input v-model="dataForm.remark" style="width: 770px" ></el-input>
<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">
<div class="rq" style="margin-top: 60px">
<el-table
height="250"
:data="toolData"

12
src/views/modules/tooling/toolingInfo.vue

@ -110,15 +110,19 @@
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'申请原因'">
<el-input v-model="dataForm.applyReason" style="width: 770px" ></el-input>
<!-- <el-input v-model="dataForm.applyReason" style="width: 770px" ></el-input>-->
<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" >
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 60px">
<el-form-item :label="'备注'">
<el-input v-model="dataForm.remark" style="width: 770px" ></el-input>
<!-- <el-input v-model="dataForm.remark" style="width: 770px" ></el-input>-->
<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">
<div class="rq" style="margin-top: 60px">
<el-table
height="250"
:data="toolData"

Loading…
Cancel
Save